isomorfeus-react 16.12.18 → 16.12.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cdb3fe9f9ac0989e122cd62cebb2eb9c9d906e65b160d6ec89311410673c796
-  data.tar.gz: 4fe01c1d3bba31402af4fc1e3d12a208735178f66f42c54beb9a49d4e725f75d
+  metadata.gz: 132a99117abaac3fec23a796fc8ecfcbf5345e3958610a1f99e323121c585bd7
+  data.tar.gz: 819016d219fbb375aa3099fe42ab632b25482de9d4994c17cc566d86b9ecf2b6
 SHA512:
-  metadata.gz: 2f4d13ca4f1d3ca81f3563a57e72ff7ef338606e2abcdfd41518cd8e85e4a1a5fe952904d6382a9100c1db7d882e0387effa6568b71b2d8375ac6d1a0cd173ad
-  data.tar.gz: d7887ef8e4ab8f5b0a91de7feeebd0bfcb6bfa613b2a2cfc389c39a4a020d91c373bd95e5311f6431f3d3813767f71f95eff8e849ac8afd92625bae40d95f87c
+  metadata.gz: a15c75fcc3c20763f875572b36bd65eb98d756675f83beeab24272804911febf0e76e9cc975e8d8319478d0103f7c1cd2e49942131b3821b833d2dbfa2679412
+  data.tar.gz: 49436125dcab5c7fb04a4ad8201b20e6f242cfe83110d4319db06a2e347302188e6f46562c213789ee31954ea30b91a764334eddef9873186a5603a4593d0ed3

data/lib/isomorfeus/props/validate_hash_proxy.rb

@@ -169,14 +169,12 @@ module Isomorfeus
       # sub types
 
       def Email
-        @validation_hash[:type] = :string
-        @validation_hash[:validate][:sub_type] = :email
+        @validation_hash[:type] = :email
         self
       end
 
       def Url
-        @validation_hash[:type] = :string
-        @validation_hash[:validate][:sub_type] = :url
+        @validation_hash[:type] = :uri
         self
       end
 

data/lib/isomorfeus/props/validator.rb

@@ -72,6 +72,8 @@ module Isomorfeus
           case @o[:type]
           when :boolean
             Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a boolean") unless @v.class == TrueClass || @v.class == FalseClass
+          else
+            c_string_sub_types
           end
         end
       end
@@ -133,10 +135,34 @@ module Isomorfeus
         Isomorfeus.raise_error(message: "#{@c}: #{@p} test condition check failed") unless @o[:test].call(@v)
       end
 
-      def c_sub_type(v)
-        case v
+      def c_string_sub_types
+        Isomorfeus.raise_error(message: "#{@c}: #{@p} must be a String") unless @v.class == String
+        case @o[:type]
         when :email
-        when :url
+          Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid email address") unless @v.match? /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+        when :uri
+          if RUBY_ENGINE == 'opal'
+            %x{
+              try {
+                new URL(#@v);
+              } catch {
+                #{Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid uri")}
+              }
+            }
+          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
+          end
         end
       end
     end

data/lib/lucid_prop_declaration/mixin.rb

@@ -68,6 +68,12 @@ module LucidPropDeclaration
       false
     end
 
+    def valid_props?(props)
+      validate_props(props)
+    rescue
+      false
+    end
+
     def validate
       Isomorfeus::Props::ValidateHashProxy.new
     end

data/lib/react/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.12.18
+  version: 16.12.19
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -277,7 +277,7 @@ metadata:
   github_repo: ssh://github.com/isomorfeus/gems
 post_install_message: |2+
 
-  isomorfeus-react 16.12.18:
+  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