roda-component 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fcaa4c0679c09e6a9069c746125953d2b99ff0a
-  data.tar.gz: 371d39e0be53e7a81630ab70da3c4b2729c65218
+  metadata.gz: 9619f6a2faccd6bdc5c5807da80281688b65fb7b
+  data.tar.gz: 41c4d0675c13804033f5827b28371d92d4a3959f
 SHA512:
-  metadata.gz: 00b04cc7fb8befcc3d4539bac1659301df76124f18f4ee4a87f9bc164bd103769016e27fc3fea1b528d6f5a53035cfd16e205c09457cf0d5853d7dabad415822
-  data.tar.gz: db05cde6ce3cf267299e9ae88a3dc342b607a86f350302bb706120518ce251171089e383d281c698b4a616dd847089298dbd2407450b09977fab7ccc8ae4a003
+  metadata.gz: 6a908cb1261aad8d41fd009fd1564c687d08f53643da59ac0beb5d1026bdb365f45e31c0257f33767c662123cdc8f14a89a7cde852a28f6d99d6b9d1bee0c8b6
+  data.tar.gz: 2bd4aadf95c10e0604b7e6bbe60b1b6bf6e1d954ac7f6740c7f97547c859ae074a94f24232f3e205cde14fb63d6d52c4f83abf0046d05c937029be44fe7246eb

data/lib/roda/component.rb

@@ -105,10 +105,11 @@ class Roda
   end
 
   class Component
-    attr_accessor :scope, :cache
+    def initialize(data = false)
+    end
 
-    def initialize(scope = false)
-      @scope   = scope
+    def _initialize(scope = false)
+      @_scope = scope
 
       if client? && !$component_opts[:faye][:"#{self.class._name}"]
         $component_opts[:faye][:"#{self.class._name}"] = true
@@ -135,11 +136,19 @@ class Roda
           trigger :disconnect
         end
       end
+
     end
 
     class << self
       attr_accessor :_name
 
+      def new(*args, &block)
+        obj = self.allocate
+        obj.instance_variable_set :@_scope, args.shift
+        obj.send :initialize, *args, &block
+        obj
+      end
+
       if RUBY_ENGINE == 'ruby'
         def inherited(subclass)
           super
@@ -396,13 +405,13 @@ class Roda
 
     if RUBY_ENGINE == 'opal'
       def component name, options = {}, &block
-        comp = load_component name
-
-        action  = options.delete(:call)    || :display
-        trigger = options.delete(:trigger) || false
+        action  = options.delete(:call)
+        trigger = options.delete(:trigger)
         js      = options.delete(:js)
         args    = options.delete(:args)
 
+        comp = load_component name, options
+
         # call action
         # TODO: make sure the single method parameter isn't a block
         if trigger
@@ -411,7 +420,7 @@ class Roda
           else
             comp_response = comp.trigger trigger, options
           end
-        else
+        elsif action
           # We want to make sure it's not a method that already exists in ruba
           # otherwise that would give us a false positive.
           if comp.methods.include? action
@@ -421,12 +430,16 @@ class Roda
           end
         end
 
-        comp_response
+        if trigger || action
+          comp_response
+        else
+          comp
+        end
       end
     end
 
-    def load_component name
-      component_opts[:class_name][name].split('::').inject(Object) {|o,c| o.const_get(c)}.new self
+    def load_component name, options = {}
+      component_opts[:class_name][name].split('::').inject(Object) {|o,c| o.const_get(c)}.new self. options
     end
 
     def render_fields data, options = {}
@@ -531,8 +544,16 @@ class Roda
       end
     end
 
+    def render *args, &block
+      display *args, &block
+    end
+
     private
 
+    def scope
+      @_scope
+    end
+
     def from_server?
       if request
         !request.env.include?('HTTP_X_RODA_COMPONENT_ON_SERVER')

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.33"
+    VERSION = "0.1.34"
   end
 end

data/lib/roda/plugins/component.rb

@@ -63,13 +63,15 @@ class Roda
           request.env['loaded_component_js'] ||= []
         end
 
-        def load_component name
-          Object.const_get(
+        def load_component name, options = {}
+          c = Object.const_get(
             component_opts[:class_name][name.to_s]
-          ).new self
+          )
+
+          c.new self, options
         end
 
-        def load_component_js comp, action = :display, options = {}
+        def load_component_js comp, action = false, options = {}
           # grab a copy of the cache
           cache = comp.class.cache.dup
           # remove html and dom cache as we don't need that for the client
@@ -87,6 +89,8 @@ class Roda
           }.uniq.first.gsub("#{Dir.pwd}/#{component_opts[:path]}", '').gsub(/\.rb\Z/, '.js')
 
           js = <<-EOF
+            action = '#{action || 'false'}'
+
             unless $faye
               $faye = Roda::Component::Faye.new('/faye')
             end
@@ -100,10 +104,14 @@ class Roda
               $component_opts[:comp][:"#{comp_name}"] = true
               `$.getScript("/#{component_opts[:assets_route]}#{file_path}", function(){`
                 Document.ready? do
-                  c = $component_opts[:comp][:"#{comp_name}"] = #{comp.class}.new
+                  if action != 'false'
+                    c = $component_opts[:comp][:"#{comp_name}"] = #{comp.class}.new
+                  else
+                    c = $component_opts[:comp][:"#{comp_name}"] = #{comp.class}.new(JSON.parse(Base64.decode64('#{options}')))
+                  end
                   c.instance_variable_set(:@_cache, JSON.parse(Base64.decode64('#{cache}')))
                   c.events.trigger_jquery_events
-                  c.#{action}(JSON.parse(Base64.decode64('#{options}')))
+                  c.#{action}(JSON.parse(Base64.decode64('#{options}'))) if action != 'false'
                 end
               `});`
             end
@@ -113,13 +121,15 @@ class Roda
         end
 
         def component name, options = {}, &block
-          comp = load_component name
-
-          action        = options.delete(:call)    || :display
-          trigger       = options.delete(:trigger) || false
+          action        = options.delete(:call)
+          trigger       = options.delete(:trigger)
           js            = options.delete(:js)
           args          = options.delete(:args)
 
+          action = :display if js && !action
+
+          comp = load_component name, options
+
           # call action
           # TODO: make sure the single method parameter isn't a block
           if trigger
@@ -128,7 +138,7 @@ class Roda
             else
               comp_response = comp.trigger trigger, options
             end
-          else
+          elsif action
             # We want to make sure it's not a method that already exists in ruba
             # otherwise that would give us a false positive.
             if comp.respond_to?(action) && !"#{comp.method(action)}"[/\(Kernel\)/]
@@ -146,17 +156,21 @@ class Roda
             end
           end
 
-          load_component_js comp, action, options
+          if trigger || action
+            load_component_js comp, action, options
 
-          if js && comp_response.is_a?(Roda::Component::DOM)
-            comp_response = comp_response.to_xml
-          end
+            if js && comp_response.is_a?(Roda::Component::DOM)
+              comp_response = comp_response.to_xml
+            end
 
-          if comp_response.is_a?(String) && js
-            comp_response << component_js
-          end
+            if comp_response.is_a?(String) && js
+              comp_response << component_js
+            end
 
-          comp_response
+            comp_response
+          else
+            comp
+          end
         end
         alias :comp :component
         alias :roda_component :component

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal