roda-component 0.1.46 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a37accc2a509987a4cc84739978f698929bb74cc
-  data.tar.gz: 1c60476fc587fa408012bf6565c0b142f288a5d3
+  metadata.gz: db967a5d53670bf26c1ac99c411d102b9fca65aa
+  data.tar.gz: de3138f17fca28020fb597d56c5ec6f309096d38
 SHA512:
-  metadata.gz: 113ef63e5eb521f6a4bf282c6f721f506155e55aee3bcfa04e01864af1a135d7327808d70ae334426fa353cf70efd183bbe86843195b6b8c2a63bbf4a6530564
-  data.tar.gz: 82dae7f4f53186c30cc4e41a81daa1cf58455a95ebccb28aad09ea7e57ceb48cf5a4ca76d7f1cda70e7538e08daadf80ef71470aa73c749d950b7edea3f06725
+  metadata.gz: 63552b4280b8e375c8aaff6b1b19e029dae92f550b4cdb0c59718eba1a92b648fc6061fa146d4af83add8171da394d9ca776ed142953e94c04c652f159b0c6b1
+  data.tar.gz: 59b16710cff293192b61145ae2d158dd86a4d3cec4f2033e0c595534a4708b6da0ef178b00369bb4deaafcb94e168d3bbfd0c7b62ac17ce4dbe7aa2fb9bc971c

data/lib/roda/component.rb

@@ -451,7 +451,7 @@ class Roda
 
     def load_component name, options = {}
       # component_opts[:comp][name] ||= component_opts[:class_name][name].split('::').inject(Object) {|o,c| o.const_get(c)}.new self, options
-      component_opts[:comp][name]
+      component_opts[:comp][name][:class]
     end
 
     def render_fields data, options = {}

data/lib/roda/component/events.rb

@@ -136,9 +136,9 @@ class Roda
 
       def component comp
         if server?
-          Object.const_get(component_opts[:class_name][comp]).new scope
+          Object.const_get(component_opts[:class_name][comp][:class]).new scope
         else
-          component_opts[:comp][comp]
+          component_opts[:comp][comp][:class]
         end
       end
 

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.46"
+    VERSION = "0.1.47"
   end
 end

data/lib/roda/plugins/component.rb

@@ -104,21 +104,34 @@ class Roda
               $component_opts[:class_name] = JSON.parse(Base64.decode64('#{class_name}'))
             end
 
-            unless $component_opts[:comp][:"#{comp_name}"]
+            if !$component_opts[:comp][:"#{comp_name}"]
               $component_opts[:faye] ||= {}
-              $component_opts[:comp][:"#{comp_name}"] = true
+              $component_opts[:comp][:"#{comp_name}"] = {cache: {}}
               `$.getScript("/#{component_opts[:assets_route]}#{file_path}").done(function(){`
+                if action != 'false'
+                  c = $component_opts[:comp][:"#{comp_name}"][:class] = #{comp.class}.new
+                else
+                  c = $component_opts[:comp][:"#{comp_name}"][:class] = #{comp.class}.new(JSON.parse(Base64.decode64('#{options}')))
+                end
+                c.instance_variable_set(:@_cache, ($component_opts[:comp][:"#{comp_name}"][:cache] = JSON.parse(Base64.decode64('#{cache}'))))
+
                 Document.ready? do
-                  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}'))) if action != 'false'
                 end
+
+                Document.on 'page:load' do
+                  c.#{action}(JSON.parse(Base64.decode64('#{options}'))) if action != 'false'
+                end
               `}).fail(function(jqxhr, settings, exception){ window.console.log(exception); });`
+            elsif $component_opts[:comp][:"#{comp_name}"] && $component_opts[:comp][:"#{comp_name}"][:class]
+              if action != 'false'
+                c = $component_opts[:comp][:"#{comp_name}"][:class] = #{comp.class}.new
+              else
+                c = $component_opts[:comp][:"#{comp_name}"][:class] = #{comp.class}.new(JSON.parse(Base64.decode64('#{options}')))
+              end
+              c.instance_variable_set(:@_cache, $component_opts[:comp][:"#{comp_name}"][:cache])
+              c.#{action}(JSON.parse(Base64.decode64('#{options}'))) if action != 'false'
             end
           EOF
 

metadata

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