extjs-mvc 0.1.33 → 0.2.0

data/README.rdoc

@@ -11,11 +11,8 @@ A collection of helpers, MVC mixins and PORs (plain-old-ruby-object) to assist w
 In <tt>environment.rb</tt>
 
     Rails::Initializer.run do |config|
-        .
-        .
-        .
+        config.gem "extjs-mvc"
     end
-    require 'extjs-mvc'
 
 
 === An ActiveRecord mixin:  ExtJS::Model

data/VERSION

@@ -1 +1 @@
-0.1.33
+0.2.0

data/lib/core_ext/array/extract_options.rb

@@ -0,0 +1,15 @@
+##
+# add Rails-style Array#extract_options! method
+#
+module ExtJS
+  module CoreExtensions
+    module Array
+      module ExtractOptions
+        def extract_options!
+          last.is_a?(::Hash) ? pop : {}
+        end
+      end
+    end
+  end
+end
+Array.send(:include, ExtJS::CoreExtensions::Array::ExtractOptions)

data/lib/extjs/component.rb

@@ -7,7 +7,7 @@ class ExtJS::Component
     @config = params#params.extract_options!
     @controller = @config.delete(:controller) unless @config[:controller].nil?
 
-    @config[:items] = [] if config[:items].nil?
+    @config["items"] = [] if config["items"].nil?
 
     if container = @config.delete(:container)
       container.add(self)
@@ -25,25 +25,32 @@ class ExtJS::Component
   # instance will be returned.
   # @return {String/ExtJS::Component}
   def add(*config)
+
     options = config.extract_options!
     if !options.keys.empty?
       if url = options.delete(:partial)
         # rendering a partial, cache the config until partial calls #add method.  @see else.
         @partial_config = options
-        return @controller.render(:partial => url, :locals => {:container => self})
+        if (@controller.respond_to?(:partial))
+          # Merb
+          return @controller.partial(url, :with => self, :as => :container)
+        else
+          # Rails
+          return @controller.render(:partial => url, :locals => {:container => self})
+        end
       else
         options.merge!(@partial_config) unless @partial_config.nil?
         options[:controller] = @controller unless @controller.nil?
         cmp = ExtJS::Component.new(options)
         @partial_config = nil
-        @config[:items] << cmp
+        @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
+      @config["items"] << cmp.config
       return cmp
     end
   end
@@ -53,6 +60,8 @@ class ExtJS::Component
   end
 
   def render
+    @config.delete("items") if @config["items"].empty?
+
     # 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, ...}

data/lib/extjs/data/store.rb

@@ -15,8 +15,8 @@ module ExtJS::Data
       @proxy      = options[:proxy] || 'http'
       @writer     = options[:writer]
       @type       = (@proxy === 'direct' ? @proxy : @format).capitalize
-      @controller = "#{options[:controller].to_s.camelize}Controller".constantize
-      @model      = ((options[:model]) ? options[:model] : @controller.controller_name.singularize).camelize.constantize
+      @controller = self.get_controller(options[:controller])
+      @model      = self.get_model(options[:controller], options[:model])
 
       # Merge Reader/Proxy config
       @config.merge!(@controller.extjs_reader(@model))
@@ -63,5 +63,21 @@ module ExtJS::Data
         "<script>new Ext.data.#{@type}Store(#{@config.to_json});#{script}</script>"
       end
     end
+
+    def get_controller(name)
+      if (defined?(Rails))
+        "#{name.to_s.camelize}Controller".constantize
+      else
+        Extlib::Inflection.constantize("#{Extlib::Inflection.camelize(name)}")
+      end
+    end
+
+    def get_model(controller, model)
+      if (defined?(Rails))
+        ((model) ? model : controller.singularize).camelize.constantize
+      else
+        Extlib::Inflection.constantize(Extlib::Inflection.camelize(((model) ? model : Extlib::Inflection.singularize(controller))))
+      end
+    end
   end
 end

data/lib/extjs-mvc.rb

@@ -7,16 +7,28 @@ module ExtJS
       cattr_accessor :message_property
       cattr_accessor :root
 
+      # Detect orm, include appropriate mixin.
       if defined?(ActiveRecord)
-        require 'active_record/model'
+        require 'model/active_record/model'
+      elsif defined?(DataMapper)
+        require 'model/dm/model'
       end
+
+      # Rails-style Array#extract_options! used heavily
+      if defined?(Merb)
+        require 'core_ext/array/extract_options'
+      end
+
+      # ExtJS Component and Store wrappers
       require 'extjs/component'
       require 'extjs/data/store'
 
+      # Component/Store view-helpers
       require 'helpers/component'
       require 'helpers/store'
 
-      require 'action_controller/controller'
+      # Controller mixin.  Works for both Rails and Merb.
+      require 'controller/controller'
 
    end
-end
+end

data/lib/helpers/component.rb

@@ -6,7 +6,7 @@ module ExtJS::Helpers
     ##
     # add class-var @@extjs_on_ready
     def self.included(helper)
-    
+
     end
 
     def extjs_component(*params)
@@ -21,9 +21,8 @@ module ExtJS::Helpers
     #
     def extjs_onready(*params)
       @onready_queue = [] if @onready_queue.nil?
-
       params.each do |cmp|
-	@onready_queue << cmp
+        @onready_queue << cmp
       end
     end
 
@@ -31,7 +30,7 @@ module ExtJS::Helpers
     # Empties the on_ready queue.  Renders within <script></script> tags
     #
     def extjs_render
-      @onready_queue = [] if @onready_queue.nil? # <--- ugly, ugh...having trouble with initializing my instance vars.
+      @onready_queue = [] if @onready_queue.nil?
       "<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

data/lib/model/dm/model.rb

@@ -0,0 +1,96 @@
+module ExtJS
+  module Model
+    def self.included(model)
+      model.send(:extend, ClassMethods)
+      model.send(:include, InstanceMethods)
+      model.class_eval do
+        cattr_accessor :extjs_record_fields
+      end
+      model.extjs_record_fields = []
+    end
+
+    ##
+    # InstanceMethods
+    #
+    module InstanceMethods
+      def to_record
+        properties = self.class.properties
+        pk = self.class.key.first.name
+
+        data = {pk => self.send(pk)}
+        self.class.extjs_record_fields.each do |f|
+          if refl = self.class.relationships[f]
+            if refl.options[:max].nil? && refl.options[:min].nil? # belongs_to
+              assn = self.send(f)
+              data[f] = (assn) ? assn.to_record : {} # <-- a thing was requested, give emtpy thing.
+            elsif refl.options[:max] > 1
+              #data[f] = self.send(f).collect {|r| r.to_record}  CAREFUL!!!!!!!!!!!!1
+            end
+          else
+            data[f] = self.send(f)
+          end
+        end
+        data
+      end
+    end
+    ##
+    # ClassMethods
+    #
+    module ClassMethods
+      ##
+      # Defines the subset of AR columns used to create Ext.data.Record def'n.
+      # @param {Array/Hash} list-of-fields to include, :only, or :exclude
+      #
+      def extjs_fields(*params)
+        options = params.extract_options!
+        if !options.keys.empty?
+          if options[:exclude]
+            self.extjs_record_fields = self.properties.reject {|p| options[:exclude].find {|ex| p.name === ex}}.collect {|p| p.name}
+          end
+        elsif !params.empty?
+          self.extjs_record_fields = params
+        else
+          self.extjs_record_fields
+        end
+      end
+
+      ##
+      # render AR columns to Ext.data.Record.create format
+      # eg: {name:'foo', type: 'string'}
+      #
+      def extjs_record
+        if self.extjs_record_fields.empty?
+          self.extjs_record_fields = self.properties.collect {|p| p.name}
+        end
+
+        pk = self.key.first
+
+        return {
+          "fields" => self.extjs_record_fields.collect {|f|
+            if self.properties.has_property?(f)
+              col = self.properties[f]
+              type = ((col.type.respond_to?(:primitive)) ? col.type.primitive : col.type).to_s
+              case type
+                when "DateTime" || "Date" || "Time"
+                  type = :date
+                when "String"
+                  type = :string
+                when "Float"
+                  type = :float
+                when "Integer" || "BigDecimal"
+                  type = :int
+              end
+              field = {:name => col.name, :allowBlank => (col === pk) ? true : col.nullable?, :type => type}
+              field[:dateFormat] = "c" if type === :date  # <-- ugly hack for date
+              field
+            elsif assn = self.relationships[f]
+              field = {:name => f, :allowBlank => true, :type => 'auto'}
+            end
+          },
+          "idProperty" => pk.name
+        }
+      end
+    end
+  end
+end
+

data/test/component_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class ComponentTest < Test::Unit::TestCase
+    context "An ExtJS::Component Instance" do
+
+	setup do
+	    @cmp = ExtJS::Component.new("title" => "A Component", "xtype" => "panel")
+	end
+
+	should "Render" do
+	    assert @cmp.render.match(/Ext.ComponentMgr.create/)
+	end
+    end
+end
+

data/test/test_helper.rb

@@ -2,9 +2,13 @@ require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 
+require 'active_record'
+require 'active_support'
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'mvc'
+
+require 'extjs-mvc'
 
 class Test::Unit::TestCase
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: extjs-mvc
 version: !ruby/object:Gem::Version 
-  version: 0.1.33
+  version: 0.2.0
 platform: ruby
 authors: 
 - Chris Scott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 -04:00
+date: 2009-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,16 +38,19 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/action_controller/controller.rb
-- lib/active_record/model.rb
-- lib/dm/model.rb
+- lib/controller/controller.rb
+- lib/core_ext/array/extract_options.rb
 - lib/extjs-mvc.rb
 - lib/extjs/component.rb
 - lib/extjs/data/store.rb
 - lib/helpers/component.rb
 - lib/helpers/store.rb
-- lib/mvc.rb
-- test/mvc_test.rb
+- lib/model/active_record/model.rb
+- lib/model/dm/model.rb
+- test/component_test.rb
+- test/controller_test.rb
+- test/model_test.rb
+- test/store_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/extjs/mvc

data/lib/mvc.rb

@@ -1,22 +0,0 @@
-module ExtJS
-    class MVC
-      @@success_property = :success
-      @@message_property = :message
-      @@root = :data
-      cattr_accessor :success_property
-      cattr_accessor :message_property
-      cattr_accessor :root
-
-      if defined?(ActiveRecord)
-        require 'active_record/model'
-      end
-      require 'extjs/component'
-      require 'extjs/data/store'
-
-      require 'helpers/component'
-      require 'helpers/store'
-
-      require 'action_controller/controller'
-
-   end
-end

data/test/mvc_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class MvcTest < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end