hyper-vis 1.0.0.lap32 → 1.0.0.lap33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9599859672df50fe23f5e4b3aa0682c5c9cb03aabfd6f18d0837b95b5912c5d
-  data.tar.gz: 0ba0e2f4f5ae34dc1ad8abd9294c0d631a16df8b05d6ce39600c3674ad20d645
+  metadata.gz: f799dc3b8c07ab55625f9ffdf9cac43be68da27c42a30b13f7dac1f34f4317c7
+  data.tar.gz: 2464840ea345428c77007782c3e1869bf807c9156fdb5bbbdfd95a5fb18d37fc
 SHA512:
-  metadata.gz: 276a63e35161cb20da14ad594ee878acb956b16bb151046ded665c97f3f4999299d58a7f606ac869c6f739b2e1bb2fdfefd14b757f6077b113be3a3bbaf2bb66
-  data.tar.gz: a24e913fd92dba5528266af23b807cdf63a785aa0020ffaa1d8a24e9f2cf020983931a8a8989b380beac7d436a95f2fa4b1bec38bd288554d1ab62398ef34d6b
+  metadata.gz: 7ae3ef6974eaf3e282345551c9e20b29fa2edaf39f0e5bdc1f668fdaa4a6ed1bdcb81b9841109bf0bfd567e4755b0e882c08184d037458493abbca333f719752
+  data.tar.gz: 4bebab093bd040555d50092c5b7948c597593c906fb50af64a35dcb1d30614d8e4dcf89ba9a8cf527d34f9a2fc822c30d5fc143d1d3cebc4d1ee621340f3971c

data/lib/hyperloop/vis/version.rb

@@ -1,5 +1,5 @@
 module Hyperloop
   module Vis
-    VERSION = '1.0.0.lap32'
+    VERSION = '1.0.0.lap33'
   end
 end

data/lib/vis/utilities.rb

@@ -44,7 +44,7 @@ module Vis
     def options_to_native(options)
       return unless options
       # options must be duplicated, so callbacks dont get wrapped twice
-      new_opts = options.dup
+      new_opts = {}.merge!(options)
       _rubyfy_configure_options(new_opts) if new_opts.has_key?(:configure)
       _rubyfy_edges_options(new_opts) if new_opts.has_key?(:edges)
       _rubyfy_manipulation_options(new_opts) if new_opts.has_key?(:manipulation)
@@ -53,38 +53,47 @@ module Vis
       if new_opts.has_key?(:join_condition)
         block = new_opts[:join_condition]
         if `typeof block === "function"`
-          new_opts[:join_condition] = %x{
-            function(node_options, child_options) {
-              if (child_options !== undefined && child_options !== null) {
-                return #{block.call(`Opal.Hash.$new(node_options)`, `Opal.Hash.$new(child_options)`)};
-              } else {
-                return #{block.call(`Opal.Hash.$new(node_options)`)};
+          unless new_opts[:join_condition].JS[:hyper_wrapped]
+            new_opts[:join_condition] = %x{
+              function(node_options, child_options) {
+                if (child_options !== undefined && child_options !== null) {
+                  return #{block.call(`Opal.Hash.$new(node_options)`, `Opal.Hash.$new(child_options)`)};
+                } else {
+                  return #{block.call(`Opal.Hash.$new(node_options)`)};
+                }
               }
             }
-          }
+            new_opts[:join_condition].JS[:hyper_wrapped] = true
+          end
         end
       end
 
       if new_opts.has_key?(:process_properties)
         block = new_opts[:process_properties]
         if `typeof block === "function"`
-          new_opts[:process_properties] = %x{
-            function(item) {
-              var res = #{block.call(`Opal.Hash.$new(item)`)};
-              return res.$to_n();
+          unless new_opts[:process_properties].JS[:hyper_wrapped]
+            new_opts[:process_properties] = %x{
+              function(item) {
+                var res = #{block.call(`Opal.Hash.$new(item)`)};
+                return res.$to_n();
+              }
             }
-          }
+            new_opts[:process_properties].JS[:hyper_wrapped] = true
+          end
         end
       end
 
       if new_opts.has_key?(:filter)
         block = new_opts[:filter]
         if `typeof block === "function"`
-          new_opts[:filter] = %x{
-            function(item) {
-              return #{block.call(`Opal.Hash.$new(item)`)};
+          unless new_opts[:filter].JS[:hyper_wrapped]
+            new_opts[:filter] = %x{
+              function(item) {
+                return #{block.call(`Opal.Hash.$new(item)`)};
+              }
             }
-          }
+            new_opts[:filter].JS[:hyper_wrapped] = true
+          end
         end
       end
 
@@ -95,11 +104,14 @@ module Vis
       if options[:configure].has_key?(:filter)
         block = options[:configure][:filter]
         if `typeof block === "function"`
-          options[:configure][:filter] = %x{
-            function(option, path) {
-              return #{block.call(`Opal.Hash.$new(options)`, `path`)};
+          unless options[:configure][:filter].JS[:hyper_wrapped]
+            options[:configure][:filter] = %x{
+              function(option, path) {
+                return #{block.call(`Opal.Hash.$new(options)`, `path`)};
+              }
             }
-          }
+            options[:configure][:filter].JS[:hyper_wrapped] = true
+          end
         end
       end
     end
@@ -111,11 +123,14 @@ module Vis
           if chosen.has_key?(key)
             block = chosen[key]
             if `typeof block === "function"`
-              options[:edges][:chosen][key] = %x{
-                function(values, id, selected, hovering) {
-                  return #{block.call(`Opal.Hash.$new(values)`, `id`, `selected`, `hovering`)};
+              unless options[:edges][:chosen][key].JS[:hyper_wrapped]
+                options[:edges][:chosen][key] = %x{
+                  function(values, id, selected, hovering) {
+                    return #{block.call(`Opal.Hash.$new(values)`, `id`, `selected`, `hovering`)};
+                  }
                 }
-              }
+                options[:edges][:chosen][key].JS[:hyper_wrapped] = true
+              end
             end
           end
         end
@@ -124,11 +139,14 @@ module Vis
         if options[:edges].has_key?(key)
           block = options[:edges][key]
           if `typeof block === "function"`
-            options[:edgea][key] = %x{
-              function(width) {
-                return #{block.call(`width`)};
+            unless options[:edges][key].JS[:hyper_wrapped]
+              options[:edges][key] = %x{
+                function(width) {
+                  return #{block.call(`width`)};
+                }
               }
-            }
+              options[:edges][key].JS[:hyper_wrapped] = true
+            end
           end
         end
       end
@@ -136,11 +154,14 @@ module Vis
         if options[:edges][:scaling].has_key?(:custom_scaling_function)
           block = options[:edges][:scaling][:custom_scaling_function]
           if `typeof block === "function"`
-            options[:edgea][:scaling][:custom_scaling_function] = %x{
-              function(min, max, total, value) {
-                return #{block.call(`min`, `max`, `total`, `value`)};
+            unless options[:edges][:scaling][:custom_scaling_function].JS[:hyper_wrapped]
+              options[:edges][:scaling][:custom_scaling_function] = %x{
+                function(min, max, total, value) {
+                  return #{block.call(`min`, `max`, `total`, `value`)};
+                }
               }
-            }
+              options[:edges][:scaling][:custom_scaling_function].JS[:hyper_wrapped] = true
+            end
           end
         end
       end
@@ -151,12 +172,15 @@ module Vis
         next unless options[:manipulation].has_key?(key)
         block = options[:manipulation][key]
         if `typeof block === "function"`
-          options[:manipulation][key] = %x{
-            function(nodeData, callback) {
-              var wrapped_callback = #{ proc { |new_node_data| `callback(new_node_data.$to_n());` }};
-              block.$call(Opal.Hash.$new(nodeData), wrapped_callback);
+          unless options[:manipulation][key].JS[:hyper_wrapped]
+            options[:manipulation][key] = %x{
+              function(nodeData, callback) {
+                var wrapped_callback = #{ proc { |new_node_data| `callback(new_node_data.$to_n());` }};
+                block.$call(Opal.Hash.$new(nodeData), wrapped_callback);
+              }
             }
-          }
+          end
+          options[:manipulation][key].JS[:hyper_wrapped] = true
         end
       end
       # for delete the order of args for the callback is not clear
@@ -164,12 +188,15 @@ module Vis
         next unless options[:manipulation].has_key?(key)
         block = options[:manipulation][key]
         if `typeof block === "function"`
-          options[:manipulation][key] = %x{
-            function(nodeData, callback) {
-              var wrapped_callback = #{ proc { |new_node_data| `callback(new_node_data.$to_n());` }};
-              block.$call(Opal.Hash.$new(nodeData), wrapped_callback);
+          unless options[:manipulation][key].JS[:hyper_wrapped]
+            options[:manipulation][key] = %x{
+              function(nodeData, callback) {
+                var wrapped_callback = #{ proc { |new_node_data| `callback(new_node_data.$to_n());` }};
+                block.$call(Opal.Hash.$new(nodeData), wrapped_callback);
+              }
             }
-          }
+            options[:manipulation][key].JS[:hyper_wrapped] = true
+          end
         end
       end
     end
@@ -181,11 +208,14 @@ module Vis
           if chosen.has_key?(key)
             block = chosen[key]
             if `typeof block === "function"`
-              options[:nodes][:chosen][key] = %x{
-                function(values, id, selected, hovering) {
-                  return #{block.call(`Opal.Hash.$new(values)`, `id`, `selected`, `hovering`)};
+              unless options[:nodes][:chosen][key].JS[:hyper_wrapped]
+                options[:nodes][:chosen][key] = %x{
+                  function(values, id, selected, hovering) {
+                    return #{block.call(`Opal.Hash.$new(values)`, `id`, `selected`, `hovering`)};
+                  }
                 }
-              }
+                options[:nodes][:chosen][key].JS[:hyper_wrapped] = true
+              end
             end
           end
         end
@@ -194,11 +224,14 @@ module Vis
         if options[:nodes][:scaling].has_key?(:custom_scaling_function)
           block = options[:nodes][:scaling][:custom_scaling_function]
           if `typeof block === "function"`
-            options[:nodes][:scaling][:custom_scaling_function] = %x{
-              function(min, max, total, value) {
-                return #{block.call(`min`, `max`, `total`, `value`)};
+            unless options[:nodes][:scaling][:custom_scaling_function].JS[:hyper_wrapped]
+              options[:nodes][:scaling][:custom_scaling_function] = %x{
+                function(min, max, total, value) {
+                  return #{block.call(`min`, `max`, `total`, `value`)};
+                }
               }
-            }
+              options[:nodes][:scaling][:custom_scaling_function].JS[:hyper_wrapped] = true
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyper-vis
 version: !ruby/object:Gem::Version
-  version: 1.0.0.lap32
+  version: 1.0.0.lap33
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal