roda-component 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e05764f5a7a8fe5b77136f9891195edaca1359e2
-  data.tar.gz: 1d11a49a6c6c760fa831f26467c98f5fc36f8837
+  metadata.gz: c6ee949a432159269d22a12ba98d86e352f46d5a
+  data.tar.gz: 5a07e83ab446cd2e71350b06240b3ef04623e17c
 SHA512:
-  metadata.gz: f214e8ef5271ff4dff4cc64f90da2218169416ed066b75e1b757a62ad64413d375e8f46ce26330f8079560095ad1a5e25ff58f6c22a56e3841a3a0ddcb3e71ad
-  data.tar.gz: 5091aee707250510f74705c00f842c79bde57a9fcaaf96a6106616302db4bdba578e7ab9f39d58fed1412ed158f4de1c6939545d4115d8a17ccfcf978bae312e
+  metadata.gz: fd87d95cb234b6161cb6e3a881bbcf89263c8e66f1e9b2aac1dc9fae8a66708675db7833abf4c82412fa0ee06087f45fe1d7ddf16fb7f55a38b978adedddeacb
+  data.tar.gz: 6c784e64507255430a245ad25c1e289fdfca84f7d8b36eefbec193e0bbb446504e62fdf9af4aee15256e9fa19979a7e2b2ac23779bce22208044503f3d28429f

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.16"
+    VERSION = "0.1.17"
   end
 end

data/lib/roda/component.rb

@@ -91,7 +91,20 @@ class Roda
 
       def on_server &block
         if server?
+          m = Module.new(&block)
+
           yield
+
+          m.public_instance_methods(false).each do |meth|
+            alias_method :"original_#{meth}", :"#{meth}"
+            define_method "#{meth}" do |*args, &blk|
+              if blk
+                blk.call send("original_#{meth}", *args)
+              else
+                send("original_#{meth}", *args)
+              end
+            end
+          end
         else
           m = Module.new(&block)
 
@@ -105,7 +118,7 @@ class Roda
                   'X-CSRF-TOKEN' => Element.find('meta[name=_csrf]').attr('content'),
                   'X-RODA-COMPONENT-ON-SERVER' => true
                 },
-                payload: args.first) do |response|
+                payload: args) do |response|
 
                   # We set the new csrf token
                   xhr  = Native(response.xhr)

data/lib/roda/plugins/component.rb

@@ -69,7 +69,7 @@ class Roda
           ).new self
         end
 
-        def load_component_js comp, action = :display
+        def load_component_js comp, action = :display, 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
@@ -111,17 +111,26 @@ class Roda
           action  = options.delete(:call)    || :display
           trigger = options.delete(:trigger) || false
           js      = options.delete(:js)
+          args    = options.delete(:args)
 
           # call action
           # TODO: make sure the single method parameter isn't a block
           if trigger
-            comp_response = comp.trigger trigger, options
+            if args
+              comp_response = comp.trigger trigger, *args
+            else
+              comp_response = comp.trigger trigger, options
+            end
           else
             # 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\)/]
               if comp.method(action).parameters.length > 0
-                comp_response = comp.send(action, options, &block)
+                if args
+                  comp_response = comp.send(action, *args, &block)
+                else
+                  comp_response = comp.send(action, options, &block)
+                end
               else
                 comp_response = comp.send(action, &block)
               end
@@ -130,7 +139,7 @@ class Roda
             end
           end
 
-          load_component_js comp, action
+          load_component_js comp, action, options
 
           if js && comp_response.is_a?(Roda::Component::DOM)
             comp_response = comp_response.to_xml
@@ -221,6 +230,10 @@ class Roda
               data = {}
             end
 
+            if data.is_a? Array
+              data = {args: data}
+            end
+
             case type
             when 'call'
               data[:call] = action

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - cj