tinytyping 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad218feab5996c898d325cc3f44f9be37f6d4822
-  data.tar.gz: 3f3701d19c755c1a7b9cb1eb5d97b42917909cfd
+  metadata.gz: c219fda2f7091c601dd8c91c5bfa98480a4102be
+  data.tar.gz: 90e73b4a5348db7639246eab6bdc48af95c5ba85
 SHA512:
-  metadata.gz: 9314e8d4f56abaef43a9da56eb5d2b06b11b519ce8d70f027bc56cef0091c8ffdbf62767c9321267c7cdcf95b21159a5513d706ef0a8535610be14eb457f42e0
-  data.tar.gz: 29eceec1230f8667faee9ff81444bbf4710d10acddf684e629755ca648480d153ab5c11b86e10bee23c14dab125ecbbc1da8407b50789513b9990ac36b568135
+  metadata.gz: ac1093b555c1f3d420047d5fba233db96a8b9d642612b376833daaa98da8eaee0a59c8ec274f95b77e7d26aa62fda66e308f92caa85429601cdeb31053654720
+  data.tar.gz: 63eb63c60d8f310c82a66ca0c2e3b20364a6873a6046f2bdc816f25bc427eaa983976918567b0d52c91032c8695915e4c36ecfb85e73298bdef2c3eea4c60198

data/lib/tinytyping/version.rb

@@ -1,3 +1,3 @@
 module TinyTyping
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/tinytyping.rb

@@ -9,13 +9,15 @@ module TinyTyping
 
     def test!(value, *types)
       check!(types, value)
+      nil
     end
 
     private
 
     def check!(types, value)
-      return if types.any? { |type| check?(type, value) }
-      raise ArgumentError, "#{value.inspect} isn't #{types.map(&:inspect).join(' or ')}."
+      index = types.index { |type| check?(type, value) }
+      raise ArgumentError, "#{value.inspect} isn't #{types.map(&:inspect).join(' or ')}." unless index
+      types[index]
     end
 
     def check?(type, value)
@@ -30,7 +32,20 @@ module TinyTyping
         true
       when Hash
         return false unless value.is_a?(Hash)
-        type.each { |key, val| check!(Array.try_convert(val) || [val], value[key]) }
+        class_key_types = []
+        named_key_types = []
+        type.each_key do |key|
+          if [Class, Array, Hash].any? { |klass| key.is_a?(klass) }
+            class_key_types << key
+          else
+            named_key_types << key
+          end
+        end
+        (value.keys + named_key_types).uniq.each do |key|
+          ktype = type.include?(key) ? key : check!(class_key_types, key)
+          vtype = type[ktype]
+          check!(Array.try_convert(vtype) || [vtype], value[key])
+        end
         true
       else
         raise TypeError, "no implicit conversion of #{type.class} into Class"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinytyping
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ofk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: tinytyping is simply type check.