shape_of 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e28929cd043b2227c3fcfc7ec697afeebdcd77aa4fe82f3239c0c70518a653b
-  data.tar.gz: ea1433d60b53e1cf9793e5824a02d08d990d079ab67d62684dbf5a9a8278227c
+  metadata.gz: 1bc19b15cdef25be887c599f9e7f2702eff443cf137e939917c8922228fd2503
+  data.tar.gz: 53edce21813f01af895d7786a5ada4adb4c452d505009c0b98e003d23a91c691
 SHA512:
-  metadata.gz: 1f4a6d76316870ae8945faa6de5797647c9aa9cbe259017b7acaf773a75c6100dfea4770d1f290dd2e8abcd37293111b74a6beb60767db6814a4ffab7714fec5
-  data.tar.gz: 8dae349aab3980850618761687ad7b3e61701dd9e29ebdc6880757bb744dd5f708e5a63d931de5121777e619054c7cdddfd8931416cd40a5960448bd89c3e60e
+  metadata.gz: 6ddaec475681a32007affaa2fbc69b233960a3efca5511313846266c0f35e68739ca25d1c5998688e422789a982bb68494f73df63d3f1f7b786a02694075b12c
+  data.tar.gz: 38dd75becd965acbfa020874b80235c3de84b3a3a7634c1ef6e50a8936dc982f57abe062e4107c2c53b243aa982d9d90b42bd2d3ae764036c7954d3579f37a4f

data/lib/shape_of.rb

@@ -161,7 +161,7 @@ module ShapeOf
             if @shape.respond_to? :shape_of?
               @shape.shape_of? elem
             elsif @shape.is_a? ::Array
-              Array[@shape].shape_of? elem
+              Array[@shape.first].shape_of? elem
             elsif @shape.is_a? ::Hash
               Hash[@shape].shape_of? elem
             elsif @shape.is_a? Class
@@ -222,7 +222,7 @@ module ShapeOf
             if @shape[key].respond_to? :shape_of?
               @shape[key].shape_of? elem
             elsif @shape[key].is_a? ::Array
-              Array[@shape[key]].shape_of? elem
+              Array[@shape[key].first].shape_of? elem
             elsif @shape[key].is_a? ::Hash
               Hash[@shape[key]].shape_of? elem
             elsif @shape[key].is_a? Class
@@ -316,15 +316,9 @@ module ShapeOf
     end
   end
 
-  class Regexp < Shape
-    @internal_class = ::Regexp 
-
-    def self.shape_of?(object)
-      object.instance_of? @internal_class
-    end
-
+  class Pattern < Shape
     def self.[](shape)
-      raise TypeError, "Shape must be #{::Regexp.inspect}, was #{shape.inspect}" unless shape.instance_of? ::Regexp
+      raise TypeError, "Shape must be #{Regexp.inspect}, was #{shape.inspect}" unless shape.instance_of? Regexp
 
       Class.new(self) do
         @class_name = "#{superclass.name}[#{shape.inspect}]"
@@ -343,15 +337,9 @@ module ShapeOf
         end
 
         def self.shape_of?(object)
-          unless object.instance_of?(::Regexp) || object.instance_of?(String)
-            raise TypeError, "expected #{::Regexp.inspect} or #{String.inspect}, was instead #{object.inspect}"
-          end
+          raise TypeError, "expected #{String.inspect}, was instead #{object.inspect}" unless object.instance_of?(String)
 
-          if object.instance_of?(::Regexp)
-            @shape == object
-          else # string
-            @shape.match?(object)
-          end
+          @shape.match?(object)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shape_of
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - John Isom
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest