shape_of 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9663853638d239d448381e9ab748aeb7813a76b42ed9bd97c423f6d142c95d80
-  data.tar.gz: b1bdfeb51c08760c7c83519ce640c48d1202d23f3878adb93a2824761525219e
+  metadata.gz: cf335e236284c12e251182de9ed6d299a732e9a9c08802702da1982e74c07a05
+  data.tar.gz: 417d9223a3a039c70205dcff26d23844a5067e2ffe2dad1b38f3d84644399123
 SHA512:
-  metadata.gz: 49cc6be2be276d554b25affe85bd97aca4ff3a134ee2a6334a0d37f35982f34ff28c39d3ce090418d2843b15dbc9d4b5b3bcbe568be69acbed90e31bcfab1ec6
-  data.tar.gz: cbaa2ed60315ffc111228a0f2093e950ad930a5ecbbba25c471f2d55044d1f14829e040e04d6e6705fcb767519994b1df46b67d0e61ea1046d90a54b87ff3057
+  metadata.gz: bb681e7c250d0ef0f81c66ebbf126cc1f7f13fef4dce314364686fa6301181009a0e8e961a6ea23e724aea6737bcde9643a096e168379a43825e953050fe97b1
+  data.tar.gz: a46c0b1712c6003c75edf9a5641fc03f1a64672b0b6e2882cfaa996a8b3a0609306b53a0184d6cb2924132cc4ca94f55b0adf2fc4413822224568518c1eeca30

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: 0.2.0
+  version: 0.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