extjs-extjs-mvc 0.1.0 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.8

data/lib/action_controller/controller.rb

@@ -2,9 +2,6 @@ module ExtJS::Controller
 
   def self.included(controller)
     controller.send(:extend, ClassMethods)
-    controller.class_eval do
-      helper ExtJS::Data
-    end
   end
 
   ##
@@ -55,4 +52,4 @@ module ExtJS::Controller
     end
 
   end
-end
+end

data/lib/action_view/helpers/{data/store.rb → store.rb}

@@ -1,4 +1,4 @@
-module ExtJS::Data
+module ExtJS::Helpers
   module Store
     def extjs_store(params)
       params[:format] = 'json' if params[:format].nil?
@@ -32,8 +32,17 @@ module ExtJS::Data
         end
         script += "});"
       end
-      "new Ext.data.#{type}Store(#{params[:config].to_json});#{script}"
+
+      if params[:config]["writer"]  # <-- ugly hack because 3.0.1 can't deal with Writer as config-param
+        writer = params[:config].delete("writer")
+        json = params[:config].to_json
+        json[json.length-1] = ','
+        json += "writer:new Ext.data.#{params[:format].capitalize}Writer(#{writer.to_json})}"
+        "new Ext.data.#{type}Store(#{json});#{script}"
+      else
+        "new Ext.data.#{type}Store(#{params[:config].to_json});#{script}"
+      end
 
     end
   end
-end
+end

data/lib/active_record/model.rb

@@ -50,7 +50,16 @@ module ExtJS
         {
           "fields" => @@fields.collect {|f|
             col = self.columns.find {|c| c.name.to_sym === f}
-            field = {:name => col.name, :allowBlank => col.null, :type => col.type}
+            type = col.type
+            case col.type
+              when :datetime || :date || :time || :timestamp
+                type = :date
+              when :text
+                type = :string
+              when :integer
+                type = :int
+            end
+            field = {:name => col.name, :allowBlank => col.null, :type => type}
             field[:dateFormat] = "c" if col.type === :datetime || col.type === :date  # <-- ugly hack for date
             field
           },

data/lib/extjs-mvc.rb

@@ -11,7 +11,7 @@ module ExtJS
         require 'active_record/model'
       end
       require 'action_controller/controller'
-      require 'action_view/helpers/data/store'
+      require 'action_view/helpers/store'
    end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: extjs-extjs-mvc
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.8
 platform: ruby
 authors: 
 - Chris Scott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-27 00:00:00 -07:00
+date: 2009-08-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,7 +39,7 @@ files:
 - Rakefile
 - VERSION
 - lib/action_controller/controller.rb
-- lib/action_view/helpers/data/store.rb
+- lib/action_view/helpers/store.rb
 - lib/active_record/model.rb
 - lib/dm/model.rb
 - lib/extjs-mvc.rb