extjs-mvc 0.1.16 → 0.1.17

data/VERSION

@@ -1 +1 @@
-0.1.16
+0.1.17

data/lib/extjs/component.rb

@@ -0,0 +1,48 @@
+##
+# @class ExtJS::Component
+#
+class ExtJS::Component
+  attr_accessor :config
+  def initialize(controller, params)
+    @config = params.extract_options!
+    @controller = controller
+
+    @config[:items] = [] if config[:items].nil?
+
+    if container = @config.delete(:container)
+      container.add(self)
+    end
+    @partial_config = nil
+  end
+
+  def apply(params)
+    @config.merge!(params)
+  end
+
+  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})
+      else
+        options.merge!(@partial_config) unless @partial_config.nil?
+        @config[:items] << options
+      end
+    elsif !config.empty? && config.first.kind_of?(ExtJS::Component)
+      cmp = config.first
+      cmp.apply(@partial_config) unless @partial_config.nil?
+      @config[:items] << cmp.config
+    end
+    @partial_config = nil
+  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')
+    "Ext.ComponentMgr.create(#{json});"
+  end
+end

data/lib/extjs/data/store.rb

@@ -0,0 +1,65 @@
+##
+# ExtJS::Data::Store
+#
+module ExtJS::Data
+  class Store
+    def initialize(params)
+      options = params.extract_options!
+      options[:format] = 'json' if options[:format].nil?
+
+      @config = options[:config]
+
+      @format     = options[:format]
+      @proxy      = options[:proxy] || 'http'
+      @writer     = options[:writer]
+      @type       = (@proxy === 'direct' ? @proxy : @format).capitalize
+      @controller = "#{options[:controller].to_s.capitalize}Controller".constantize
+      @model      = ((options[:model]) ? options[:model] : @controller.controller_name.singularize).camelize.constantize
+
+      # Merge Reader/Proxy config
+      @config.merge!(@controller.extjs_reader(@model))
+      @config.merge!(@controller.extjs_proxy(options))
+
+      # Set storeId implicitly based upon Model name if not set explicitly
+      @config["storeId"] = @model.to_s.downcase unless @config["storeId"]
+    end
+
+    ##
+    # pre-load a store with data.  Not yet tested.  In theory, this *should* work.
+    #
+    def load(*params)
+      #@config["loadData"] = @model.all(params).collect {|rec| rec.to_record }
+    end
+
+    ##
+    # renders the configured store
+    # @param {Boolean} script_tag [true] Not yet implemented.  Always renders <script></script> tags.
+    def render(script_tag = true)
+      script = ''
+      # ugly hack for DirectProxy API.  Have to add an Ext.onReady() after the Store constructor to set API
+      if @proxy === 'direct'
+        auto_load = @config.delete("autoLoad")
+        cname = @controller.capitalize
+        script = "Ext.onReady(function() { var s = Ext.StoreMgr.get('#{@config["storeId"]}');"
+        if (@options["directFn"])
+          script += "s.proxy.directFn = #{cname}.#{@config["directFn"]};"
+        else
+          script += "s.proxy.setApi({create:#{cname}.#{@config["api"]["create"]},read:#{cname}.#{@config["api"]["read"]},update:#{cname}.#{@config["api"]["update"]},destroy:#{cname}.#{@config["api"]["destroy"]}});"
+        end
+        if auto_load
+          script += "s.load();"
+        end
+        script += "});"
+      end
+
+      if @writer  # <-- ugly hack because 3.0.1 can't deal with Writer as config-param
+        json = @config.to_json
+        json[json.length-1] = ','
+        json += "writer:new Ext.data.#{@format.capitalize}Writer(#{@writer.to_json})}"
+        "<script>new Ext.data.#{@type}Store(#{json});#{script}</script>"
+      else
+        "<script>new Ext.data.#{@type}Store(#{@config.to_json});#{script}</script>"
+      end
+    end
+  end
+end

data/lib/extjs-mvc.rb

@@ -10,9 +10,14 @@ module ExtJS
       if defined?(ActiveRecord)
         require 'active_record/model'
       end
+      require 'extjs/component'
+      require 'extjs/data/store'
+
       require 'action_view/helpers/component'
-      require 'action_controller/controller'
       require 'action_view/helpers/store'
+
+      require 'action_controller/controller'
+
    end
 end
 

data/lib/helpers/component.rb

@@ -0,0 +1,35 @@
+##
+# ExtJS::Helpers::Component
+#
+module ExtJS::Helpers
+  module Component
+    ##
+    # add class-var @@extjs_on_ready
+    def self.included(controller)
+      controller.class_eval do
+        @@onready_queue = []
+      end
+    end
+
+    def extjs_component(*params)
+      ExtJS::Component.new(self, params)
+    end
+
+    ##
+    # Adds a script or ExtJS::Component instance to on_ready queue.  The queue is emptied and rendered to
+    # <script></script> via #extjs_render
+    #
+    def extjs_onready(*params)
+      params.each do |cmp|
+        @@onready_queue << cmp
+      end
+    end
+
+    ##
+    # Empties the on_ready queue.  Renders within <script></script> tags
+    #
+    def extjs_render
+      "<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

data/lib/helpers/store.rb

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

data/lib/mvc.rb

@@ -10,10 +10,13 @@ module ExtJS
       if defined?(ActiveRecord)
         require 'active_record/model'
       end
-      require 'action_controller/controller'
-      require 'action_view/helpers/store'
-      require 'action_view/helpers/component'
-   end
-end
+      require 'extjs/component'
+      require 'extjs/data/store'
 
+      require 'helpers/component'
+      require 'helpers/store'
 
+      require 'action_controller/controller'
+
+   end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: extjs-mvc
 version: !ruby/object:Gem::Version 
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors: 
 - Chris Scott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 -07:00
+date: 2009-09-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,11 +39,13 @@ files:
 - Rakefile
 - VERSION
 - lib/action_controller/controller.rb
-- lib/action_view/helpers/component.rb
-- lib/action_view/helpers/store.rb
 - lib/active_record/model.rb
 - lib/dm/model.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
 - test/test_helper.rb

data/lib/action_view/helpers/component.rb

@@ -1,57 +0,0 @@
-module ExtJS::Helpers
-  module Component
-    def extjs_component(*params)
-      ExtJS::Component.new(self, params.extract_options!)
-    end
-
-    def extjs_onready(*params)	
-        output = ''
-	params.each do |cmp|
-	    output += (cmp.kind_of?(ExtJS::Component)) ? cmp.render : cmp
-	end
-	"<script>Ext.onReady(function() { #{output} });</script>"
-    end
-
-  end
-end
-
-class ExtJS::Component
-  attr_accessor :config
-  def initialize(controller, config)
-    @controller = controller
-    @config = config
-    @config[:items] = [] if config[:items].nil?
-    
-    if container = @config.delete(:container)
-	container.add(self)
-    end
-    @partial_config = nil
-  end
-  
-  def apply(params)
-    @config.merge!(params)
-  end
-
-  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})
-	else
-	    options.merge!(@partial_config) unless @partial_config.nil?
-	    @config[:items] << options
-	end
-    elsif !config.empty? && config.first.kind_of?(ExtJS::Component)
-	cmp = config.first
-        cmp.apply(@partial_config) unless @partial_config.nil?
-	@config[:items] << cmp.config
-    end
-    @partial_config = nil
-  end
-
-  def render
-    "Ext.ComponentMgr.create(#{@config.to_json});"
-  end
-end

data/lib/action_view/helpers/store.rb

@@ -1,48 +0,0 @@
-module ExtJS::Helpers
-  module Store
-    def extjs_store(params)
-      params[:format] = 'json' if params[:format].nil?
-      params[:proxy] = 'http' if params[:proxy].nil?
-
-      controller = "#{params[:controller].to_s.capitalize}Controller".constantize
-      model = ((params[:model]) ? params[:model] : params[:controller].singularize).capitalize.constantize
-
-      reader = controller.extjs_reader(model)
-      proxy = controller.extjs_proxy(params)
-
-      params[:config]["storeId"] = model.to_s.downcase if params[:config]["storeId"].nil?
-      params[:config].merge!(reader)
-      params[:config].merge!(proxy)
-
-      type = (params[:proxy] === 'direct' ? params[:proxy] : params[:format]).capitalize
-
-      script = ''
-      # ugly hack for DirectProxy API.  Have to add an Ext.onReady() after the Store constructor to set API
-      if params[:proxy] === 'direct'
-        auto_load = params[:config].delete("autoLoad")
-        cname = params[:controller].capitalize
-        script = "Ext.onReady(function() { var s = Ext.StoreMgr.get('#{params[:config]["storeId"]}');"
-        if (params[:config]["directFn"])
-          script += "s.proxy.directFn = #{cname}.#{params[:config]["directFn"]};"
-        else
-          script += "s.proxy.setApi({create:#{cname}.#{params[:config]["api"]["create"]},read:#{cname}.#{params[:config]["api"]["read"]},update:#{cname}.#{params[:config]["api"]["update"]},destroy:#{cname}.#{params[:config]["api"]["destroy"]}});"
-        end
-        if auto_load
-          script += "s.load();"
-        end
-        script += "});"
-      end
-
-      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