extjs-mvc 0.3.1 → 0.3.2

data/README.rdoc

@@ -127,6 +127,7 @@ Now render a store in an erb template:
 
     @store = extjs_store(
       :controller => "users",
+			:fieldset => :grid,	# <-- Specify a particular fieldset as defined in the Model (used to render DataReader)
       :proxy => "http"  # <-- default
       :format => "json" # <-- default
       :model => "user", # <-- default: controller_name.singularize

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/controller/controller.rb

@@ -9,12 +9,12 @@ module ExtJS::Controller
   #
   module ClassMethods
 
-    def extjs_reader(model)
+    def extjs_reader(model, fieldset = nil)
       {
         "successProperty" => extjs_success_property,
         "root" => extjs_root,
         "messageProperty" => extjs_message_property
-      }.merge(model.extjs_record)
+      }.merge(model.extjs_record(fieldset))
     end
 
     def extjs_proxy(params)

data/lib/extjs/data/store.rb

@@ -8,8 +8,8 @@ module ExtJS::Data
     def initialize(*params)
       options = params.extract_options!
       options[:format] = 'json' if options[:format].nil?
-
-      @config = options[:config]
+      
+      @config     = options[:config]
       @format     = options[:format]
       @proxy      = options[:proxy] || 'http'
       @writer     = options[:writer]
@@ -18,7 +18,7 @@ module ExtJS::Data
       @model      = self.get_model(options[:controller], options[:model])
 
       # Merge Reader/Proxy config
-      @config.merge!(@controller.extjs_reader(@model))
+      @config.merge!(@controller.extjs_reader(@model, options[:fieldset]))
       @config.merge!(@controller.extjs_proxy(options))
       @config["format"] = @format
 

data/lib/model/base.rb

@@ -37,7 +37,7 @@ module ExtJS
         pk      = self.class.extjs_primary_key
         
         # build the initial field data-hash
-        data    = {pk => self.send(pk)}
+        data    = extjs_prepare_data(pk)
          
         fields.each do |field|
           next if data.has_key? field[:name] # already processed (e.g. explicit mentioning of :id)
@@ -76,6 +76,15 @@ module ExtJS
         end
         data
       end
+      
+      ##
+      # prepares the initial data-hash.  Had to implement this to fix a MongoMapper issue where pk
+      # is an Object.  Messed things up when converting to JSON.  Perhaps a better way is possible.
+      # Any adapter can override this but typical relational dbs with Integer pks won't need to.
+      #
+      def extjs_prepare_data(pk)
+        {pk => self.send(pk)}
+      end
     end
     
     ##
@@ -276,7 +285,6 @@ module ExtJS
         end
         field
       end
-      
 
       # ##
       # # Returns an array of symbolized association names that will be referenced by a call to to_record

data/lib/model/data_mapper.rb

@@ -1,6 +1,7 @@
 ##
 # DataMapper adapter for ExtJS::Model mixin
 #
+
 module ExtJS
   module Model
     module ClassMethods

data/lib/model/mongo_mapper.rb

@@ -1,8 +1,15 @@
 ##
 # MongoMapper adapter to ExtJS::Model mixin
 #
+    
 module ExtJS
   module Model
+    module InstanceMethods
+      def extjs_prepare_data(pk)
+        {pk => self.send(pk).to_s}
+      end
+    end
+    
     ##
     # ClassMethods
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: extjs-mvc
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Chris Scott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -05:00
+date: 2010-02-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency