v0.1.2

CHANGELOG

@@ -1,3 +1,9 @@
+v0.1.2
+Fixed the bug with <widget>_class_definition returning empty string on sequential loading.
+
+v0.1.1.1
+Meta: moving from GitHub to RubyForge
+
 v0.1.1
 Inter-widget dependencies code reworked
 JS-class code generation code slightly reworked

Rakefile

@@ -5,7 +5,6 @@ Echoe.new("netzke-core") do |p|
   p.email = "[email protected]"
   p.summary = "Build ExtJS/Rails widgets with minimum effort"
   p.url = "http://writelesscode.com"
-  # p.runtime_dependencies = ["searchlogic >=1.6.2"]
   p.development_dependencies = []
   p.test_pattern = 'test/**/*_test.rb'
   p.retain_gemspec = true

generators/netzke_core/netzke_core_generator.rb

@@ -5,9 +5,15 @@ def manifest
       # m.directory "public/javascripts/netzke"
       # m.file 'netzke.js', "public/javascripts/netzke/netzke.js"
       m.file 'netzke.html.erb', "app/views/layouts/netzke.html.erb"
-      m.migration_template 'create_netzke_preferences.rb', "db/migrate", {:migration_file_name => "create_netzke_preferences"}
+
       # FIXME: how do we avoid getting the same migration IDs?
-      m.migration_template 'create_netzke_layouts.rb', "db/migrate", {:migration_file_name => "create_netzke_layouts"}
+      # m.migration_template 'create_netzke_preferences.rb', "db/migrate", {:migration_file_name => "create_netzke_preferences"}
+      # m.migration_template 'create_netzke_layouts.rb', "db/migrate", {:migration_file_name => "create_netzke_layouts"}
+
+      # Work-around for now
+      time = Time.now.utc.strftime("%Y%m%d%H%M%S")
+      m.file 'create_netzke_layouts.rb', "db/migrate/#{time}_create_netzke_layouts"
+      m.file 'create_netzke_preferences.rb', "db/migrate/#{time.to_i+1}_create_netzke_preferences"
     end
   end
 end

init.rb

@@ -1 +1 @@
-# require 'netzke-core'
+require 'netzke-core'

lib/netzke-core.rb

@@ -7,16 +7,13 @@
 # Vendor
 require 'vendor/facets/hash/recursive_merge'
 
-
 %w{ models controllers }.each do |dir|
   path = File.join(File.dirname(__FILE__), 'app', dir)
   $LOAD_PATH << path
   ActiveSupport::Dependencies.load_paths << path
   ActiveSupport::Dependencies.load_once_paths.delete(path)
 end
 
-# raise 'test'
-
 ActionController::Base.class_eval do
   include Netzke::ControllerExtensions
 end
@@ -25,4 +22,4 @@
 ActiveSupport::Dependencies.load_once_paths.delete(File.join(File.dirname(__FILE__)))
 
 # Include the javascript
-Netzke::Base.config[:javascripts] << "#{File.dirname(__FILE__)}/../javascripts/core.js"
+Netzke::Base.config[:javascripts] << "#{File.dirname(__FILE__)}/../javascripts/core.js"

lib/netzke/controller_extensions.rb

@@ -64,10 +64,10 @@ def #{name}_widget_instance(config = {})
           def #{name}_class_definition
             result = ""
             config = controller.class.widget_config_storage[:#{name}]
-            @@generated_widget_classes ||= []
+            @generated_widget_classes ||= []
             # do not duplicate javascript code on the same page
-            unless @@generated_widget_classes.include?("#{config[:widget_class_name]}")
-              @@generated_widget_classes << "#{config[:widget_class_name]}"
+            unless @generated_widget_classes.include?("#{config[:widget_class_name]}")
+              @generated_widget_classes << "#{config[:widget_class_name]}"
               result = Netzke::#{config[:widget_class_name]}.js_class_code
             end
             result

netzke-core.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-core}
-  s.version = "0.1.0.2"
+  s.version = "0.1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
-  s.date = %q{2008-12-28}
+  s.date = %q{2009-01-02}
   s.description = %q{Build ExtJS/Rails widgets with minimum effort}
   s.email = %q{[email protected]}
   s.extra_rdoc_files = ["CHANGELOG", "lib/app/controllers/netzke_controller.rb", "lib/app/models/netzke_layout.rb", "lib/app/models/netzke_preference.rb", "lib/netzke/base.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/js_class_builder.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "README.mdown", "tasks/netzke_core_tasks.rake"]