extjs-mvc 0.1.19 → 0.1.20

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.20

data/lib/active_record/model.rb

@@ -15,7 +15,7 @@ module ExtJS
     module InstanceMethods
       def to_record
         data = {self.class.primary_key => self.send(self.class.primary_key)}
-        self.class.extjs_fields.each do |f|
+        self.class.extjs_record_fields.each do |f|
           data[f] = self.send(f)
         end
         data
@@ -51,10 +51,8 @@ module ExtJS
       def extjs_record
         self.extjs_record_fields = self.columns.collect {|c| c.name.to_sym } if self.extjs_record_fields.empty?
         {
-          "fields" => extjs_record_fields.collect {|f|
+          "fields" => self.extjs_record_fields.collect {|f|
             col = self.columns.find {|c| c.name.to_sym === f}
-	    puts "COL: " + col.to_s
-
             type = col.type
             case col.type
               when :datetime || :date || :time || :timestamp

data/lib/extjs/component.rb

@@ -3,9 +3,9 @@
 #
 class ExtJS::Component
   attr_accessor :config
-  def initialize(controller, params)
-    @config = params.extract_options!
-    @controller = controller
+  def initialize(params)
+    @config = params#params.extract_options!
+    @controller = @config.delete(:controller) unless @config[:controller].nil?
 
     @config[:items] = [] if config[:items].nil?
 
@@ -19,6 +19,11 @@ class ExtJS::Component
     @config.merge!(params)
   end
 
+  ##
+  # Adds a config {} or ExtJS::Component instance to this component's items collection.
+  # NOTE:  When :partial option is used a String will of course be returned.  Otherwise an ExtJS::Component
+  # instance will be returned.
+  # @return {String/ExtJS::Component}
   def add(*config)
     options = config.extract_options!
     if !options.keys.empty?
@@ -28,21 +33,30 @@ class ExtJS::Component
         return @controller.render(:partial => url, :locals => {:container => self})
       else
         options.merge!(@partial_config) unless @partial_config.nil?
-        @config[:items] << options
+        options[:controller] = @controller unless @controller.nil?
+        cmp = ExtJS::Component.new(options)
+        @partial_config = nil
+        @config[:items] << cmp
+        return cmp
       end
     elsif !config.empty? && config.first.kind_of?(ExtJS::Component)
       cmp = config.first
       cmp.apply(@partial_config) unless @partial_config.nil?
+      @partial_config = nil
       @config[:items] << cmp.config
+      return cmp
     end
-    @partial_config = nil
+  end
+
+  def to_json
+    config.to_json
   end
 
   def render
     # If there are any listeners attached in json, we have to get rid of double-quotes in order to expose
     # the javascript object.
     # eg:  "listeners":"SomeController.listeners.grid" -> {"listeners":SomeController.listeners.grid, ...}
-    json = @config.to_json.gsub(/\"listeners\":\s?\"([a-zA-Z\.\[\]\(\)]+)\"/, '"listeners":\1')
+    json = @config.to_json.gsub(/\"(listeners|handler|scope)\":\s?\"([a-zA-Z\.\[\]\(\)]+)\"/, '"\1":\2')
     "Ext.ComponentMgr.create(#{json});"
   end
-end
+end

data/lib/extjs/data/store.rb

@@ -8,7 +8,7 @@ module ExtJS::Data
     def initialize(params)
       options = params.extract_options!
       options[:format] = 'json' if options[:format].nil?
-
+	
       @config = options[:config]
 
       @format     = options[:format]

data/lib/helpers/component.rb

@@ -12,7 +12,9 @@ module ExtJS::Helpers
     end
 
     def extjs_component(*params)
-      ExtJS::Component.new(self, params)
+      options = params.extract_options!
+      options[:controller] = self
+      ExtJS::Component.new(options)
     end
 
     ##
@@ -32,4 +34,4 @@ module ExtJS::Helpers
       "<script>\nExt.onReady(function() {\n\t#{@@onready_queue.collect {|cmp| (cmp.kind_of?(ExtJS::Component)) ? cmp.render : cmp}.join("\n\t")}\n });\n</script>"
     end
   end
-end
+end

data/lib/helpers/store.rb

@@ -1,7 +1,7 @@
 module ExtJS::Helpers
   module Store
     def extjs_store(*params)
-      ExtJS::Data::Store.new(params)
+	ExtJS::Data::Store.new(params)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: extjs-mvc
 version: !ruby/object:Gem::Version 
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors: 
 - Chris Scott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -07:00
+date: 2009-09-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/extjs/mvc
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -71,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Ruby tools for ExtJS development