isomorfeus-react 16.12.19 → 16.12.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 132a99117abaac3fec23a796fc8ecfcbf5345e3958610a1f99e323121c585bd7
-  data.tar.gz: 819016d219fbb375aa3099fe42ab632b25482de9d4994c17cc566d86b9ecf2b6
+  metadata.gz: 5cd560bbc4d738f45fc2fc376accd70646fea4e685125fa625f36cda2951325e
+  data.tar.gz: 18316ba50bcef63a799ed6840f034948a93f1aacf89f0f6f5f46f9459b28f902
 SHA512:
-  metadata.gz: a15c75fcc3c20763f875572b36bd65eb98d756675f83beeab24272804911febf0e76e9cc975e8d8319478d0103f7c1cd2e49942131b3821b833d2dbfa2679412
-  data.tar.gz: 49436125dcab5c7fb04a4ad8201b20e6f242cfe83110d4319db06a2e347302188e6f46562c213789ee31954ea30b91a764334eddef9873186a5603a4593d0ed3
+  metadata.gz: 71819e7ad7d0832eabb0428ef7aa7758bd79cc6db7ef18d4d9175599852cd4ccb9b39a244780b4f3b6863db41d779921d9608b721febeca0e73e62ae7201a1ad
+  data.tar.gz: d0fece0bcb479b7f24639fc1599024e82530060205b5cf35cac5200366ad352be64978ce4dd323221a597b317eb731674b251d5e5829a2b1935eb3623739967f

data/lib/isomorfeus-react.rb

@@ -126,6 +126,7 @@ if RUBY_ENGINE == 'opal'
 
   Isomorfeus.zeitwerk.push_dir('components')
 else
+  require 'uri'
   require 'oj'
   require 'opal'
   require 'opal-activesupport'

data/lib/isomorfeus/props/validator.rb

@@ -150,18 +150,7 @@ module Isomorfeus
               }
             }
           else
-            unless @v.match? /\A([a-zA-Z][\-+.a-zA-Z\d]*):(?:((?:[\-_.!~*'()a-zA-Z\d;?:@&=+$,]|%[a-fA-F\d]{2})(?:[\-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]]|
-                              %[a-fA-F\d]{2})*)|(?:(?:\/\/(?:(?:(?:((?:[\-_.!~*'()a-zA-Z\d;:&=+$,]|%[a-fA-F\d]{2})*)@)?(?:((?:(?:[a-zA-Z0-9\-.]|
-                              %\h\h)+|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|\[(?:(?:[a-fA-F\d]{1,4}:)*(?:[a-fA-F\d]{1,4}|
-                              \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|
-                              (?:(?:[a-fA-F\d]{1,4}:)*[a-fA-F\d]{1,4})?::(?:(?:[a-fA-F\d]{1,4}:)*(?:[a-fA-F\d]{1,4}|
-                              \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}))?)\]))(?::(\d*))?))?|((?:[\-_.!~*'()a-zA-Z\d$,;:@&=+]|%[a-fA-F\d]{2})+))|
-                              (?!\/\/))(\/(?:[\-_.!~*'()a-zA-Z\d:@&=+$,]|%[a-fA-F\d]{2})*(?:;(?:[\-_.!~*'()a-zA-Z\d:@&=+$,]|
-                              %[a-fA-F\d]{2})*)*(?:\/(?:[\-_.!~*'()a-zA-Z\d:@&=+$,]|%[a-fA-F\d]{2})*(?:;(?:[\-_.!~*'()a-zA-Z\d:@&=+$,]|
-                              %[a-fA-F\d]{2})*)*)*)?)(?:\?((?:[\-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]]|
-                              %[a-fA-F\d]{2})*))?)(?:\#((?:[\-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]]|%[a-fA-F\d]{2})*))?\z/x
-              Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid uri")
-            end
+            Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid uri") unless @v.match? /\A#{URI.regexp}\z/
           end
         end
       end

data/lib/react.rb

@@ -28,6 +28,12 @@ module React
       return element;
     };
 
+    self.native_to_ruby_event = function(event) {
+       if (event.hasOwnProperty('target')) { return #{::React::SyntheticEvent.new(`event`)}; }
+       else if (Array.isArray(event)) { return event; }
+       else { return Opal.Hash.$new(event); }
+    };
+
     self.to_native_react_props = function(ruby_style_props) {
       let result = {};
       let keys = ruby_style_props.$keys();
@@ -41,18 +47,14 @@ module React
           if (type === "function") {
             let active_c = self.active_component();
             result[Opal.React.lower_camelize(key)] = function(event, info) {
-              let ruby_event;
-              if (typeof event === "object") { #{ruby_event = ::React::SyntheticEvent.new(`event`)}; }
-              else { ruby_event = event; }
-              #{`active_c.__ruby_instance`.instance_exec(ruby_event, `info`, &`handler`)};
+              let ruby_event = Opal.React.native_to_ruby_event(event);
+              #{`active_c.__ruby_instance`.instance_exec(`ruby_event`, `info`, &`handler`)};
             }
           } else if (type === "object" && typeof handler.$call === "function" ) {
             if (!handler.react_event_handler_function) {
               handler.react_event_handler_function = function(event, info) {
-                let ruby_event;
-                if (typeof event === "object") { #{ruby_event = ::React::SyntheticEvent.new(`event`)}; }
-                else { ruby_event = event; }
-                handler.$call(ruby_event, `info`)
+                let ruby_event = Opal.React.native_to_ruby_event(event);
+                handler.$call(ruby_event, info)
               };
             }
             result[Opal.React.lower_camelize(key)] = handler.react_event_handler_function;
@@ -73,10 +75,8 @@ module React
             if (method_ref) {
               if (!method_ref.react_event_handler_function) {
                 method_ref.react_event_handler_function = function(event, info) {
-                  let ruby_event;
-                  if (typeof event === "object") { #{ruby_event = ::React::SyntheticEvent.new(`event`)}; }
-                  else { ruby_event = event; }
-                  method_ref.$call(ruby_event, `info`)
+                  let ruby_event = Opal.React.native_to_ruby_event(event);
+                  method_ref.$call(ruby_event, info)
                 };
               }
               result[Opal.React.lower_camelize(key)] = method_ref.react_event_handler_function;

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.12.19'
+  VERSION = '16.12.20'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.12.19
+  version: 16.12.20
 platform: ruby
 authors:
 - Jan Biedermann
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.17
+        version: 4.0.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.17
+        version: 4.0.18
 - !ruby/object:Gem::Dependency
   name: isomorfeus-speednode
   requirement: !ruby/object:Gem::Requirement
@@ -275,13 +275,7 @@ licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/isomorfeus/gems
-post_install_message: |2+
-
-  isomorfeus-react 16.12.19:
-   Breaking change:
-     The event_handler DSL is gone. Instead use normal methods and method_ref, see:
-     https://github.com/isomorfeus/isomorfeus-react/blob/master/ruby/docs/events.md
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib