tinytyping 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98b8ac5e9350094a53bcf326f802cfe799bffe8e
-  data.tar.gz: d535dbad1253288a8d279a0f5055ef8dd56c92e6
+  metadata.gz: cba2458a80da86752f355d90a207e9eaa78c2897
+  data.tar.gz: 38df98d991b18264e5c4e8753e11f4183e9b05bf
 SHA512:
-  metadata.gz: 3a2124dba1f5236766b439a17cd30105117862fcca4f88e4b20d44e56ee3d73fc3a590d1330c72e3325078402fc801910baaa92c32ea6f989bbb0392b56461d5
-  data.tar.gz: e9cb78daf8a369f539584ffd387fe68811a14bfe191558bf62637663250cfcc93a0921aeb205db91eed8c4ab848ddde00b48fbd60b666f52d8d6e4748296d9ee
+  metadata.gz: 9dc39325c75c19eb403b830fd61168873bd1602181ca3d293231893f710d02b77297fed8ea12ee9b1ef1fca1ca76a1fb918434bf0eee97a451dd8dae0c97caee
+  data.tar.gz: 4cb899ee424fbd42ec732d491203482992e9d93b215e457bd24c08c20e31945436f989295aaca2585ee882628bbdf211343a2f4f6ced286bd53dde7bce98aaee

data/lib/tinytyping.rb

@@ -1,4 +1,61 @@
 module TinyTyping
+  class Tester
+    class << self
+      def expect_shape(type, value)
+        case type
+        when Class
+          value.is_a?(type)
+        when true, false, nil
+          value == type
+        when Array
+          return false unless value.is_a?(Array)
+          value.each { |val| expect(type, val) }
+          true
+        when Hash
+          return false unless value.is_a?(Hash)
+          class_key_types = []
+          named_key_types = []
+          type.each_key do |key|
+            case key
+            when Class, Array
+              class_key_types << key
+            else
+              named_key_types << key
+            end
+          end
+          (value.keys + named_key_types).uniq.each do |key|
+            expect(class_key_types.flatten(1), key) unless type.include?(key)
+            ktypes = []
+            ktypes << key if named_key_types.include?(key)
+            ktypes.push(*class_key_types.select { |t| expect_any(t, key) }) if value.include?(key)
+            expect(ktypes.flat_map { |k| type[k] }, value[key])
+          end
+          true
+        else
+          raise TypeError, "no implicit conversion of #{type.class} into Class"
+        end
+      end
+
+      def expect_any(types, value)
+        (Array.try_convert(types) || [types]).any? { |type| expect_shape(type, value) }
+      end
+
+      def expect(types, value)
+        return if expect_any(types, value)
+        raise ArgumentError, "#{value.inspect} isn't #{(Array.try_convert(types) || [types]).map(&:inspect).join(' or ')}."
+      end
+    end
+
+    def initialize(*types)
+      @types = types
+    end
+
+    def run!(value)
+      self.class.expect(@types, value)
+      nil
+    end
+  end
+
   class << self
     def test?(*args)
       test!(*args)
@@ -8,85 +65,51 @@ module TinyTyping
     end
 
     def test!(value, *types)
-      check!(types, value)
-      nil
+      Tester.new(*types).run!(value)
     end
 
     private
 
-    def check!(types, value)
-      index = types.index { |type| check?(type, value) }
-      raise ArgumentError, "#{value.inspect} isn't #{types.map(&:inspect).join(' or ')}." unless index
-      types[index]
-    end
+    def included(base)
+      base.class_eval do
+        private
 
-    def check?(type, value)
-      case type
-      when Class
-        value.is_a?(type)
-      when true, false, nil
-        value == type
-      when Array
-        return false unless value.is_a?(Array)
-        value.each { |val| check!(type, val) }
-        true
-      when Hash
-        return false unless value.is_a?(Hash)
-        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])
+        def test!(*args)
+          TinyTyping.test!(*args)
         end
-        true
-      else
-        raise TypeError, "no implicit conversion of #{type.class} into Class"
-      end
-    end
-  end
 
-  def test!(*args)
-    TinyTyping.test!(*args)
-  end
+        class << self
+          private
 
-  class Base
-    include TinyTyping
-    private :test!
-
-    class << self
-      private
+          def typed_def(method, *types, &block)
+            define_method(method) do |*args|
+              types.each_with_index do |type, index|
+                test!(args[index], *(Array.try_convert(type) || [type]))
+              end
+              instance_exec(*args, &block)
+            end
+          end
 
-      def typed_def(method, *types, &block)
-        define_method(method) do |*args|
-          types.each_with_index do |type, index|
-            test!(args[index], *(Array.try_convert(type) || [type]))
+          def typed_attr_writer(pairs)
+            pairs.each do |key, types|
+              typed_def "#{key}=", types do |value|
+                instance_variable_set("@#{key}", value)
+              end
+            end
           end
-          instance_exec(*args, &block)
-        end
-      end
 
-      def typed_attr_writer(pairs)
-        pairs.each do |key, types|
-          typed_def "#{key}=", types do |value|
-            instance_variable_set("@#{key}", value)
+          def typed_attr_accessor(pairs)
+            attr_reader(*pairs.keys)
+            typed_attr_writer(pairs)
           end
         end
       end
-
-      def typed_attr_accessor(pairs)
-        attr_reader(*pairs.keys)
-        typed_attr_writer(pairs)
-      end
     end
   end
+
+  class Base
+    include TinyTyping
+  end
 end
 
 require 'tinytyping/version'

data/lib/tinytyping/version.rb

@@ -1,3 +1,3 @@
 module TinyTyping
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/tinytyping.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tinytyping/version'
@@ -22,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinytyping
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - ofk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: tinytyping is simply type check.