mixture 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ab32fefd14e5972a0071d69fb66f9156f91646c
-  data.tar.gz: 5fbffe97e27bf69ff078396dd05e48f7342fde40
+  metadata.gz: 5c8c8801295aa86e683119fa365df2fd15c80816
+  data.tar.gz: e9ec965a80f069d50e50b1997d13e1f5dab3d978
 SHA512:
-  metadata.gz: 89592f7b40701da4b53fdba900626ec16fda88d532e97acc9af67053427c95bf6952fd3131e731c594008547a6401e4c2ad8ae2e0e77ad6cef12a88eddacb205
-  data.tar.gz: 1e94eb32b2acf05935a1c5adcbaf7b9ae1c2f3d5c04790ed13800bf9aee699f48091b044f44a5df63bec835bf0d2cc815744b89d41069f739725976b0add878e
+  metadata.gz: a3423a7c7d910fbf8e70e51b8fc22505774e9f6b6de60d063e29cbfaba7f8652b4d0c455c00994a5661e2167fe509417154255ebaf01a3ca2ee05a8b740064aa
+  data.tar.gz: 26d4de5767aebb91b9ff0669d3dab43a5f0bcc70aa0e100d8c071cdec64a39c2b55617da06643cb41624fb430ff76933f5ba5a89962befc27ad807a5980f8c52

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mixture (0.3.1)
+    mixture (0.3.2)
       thread_safe (~> 0.3)
 
 GEM

data/lib/mixture/coerce/base.rb

@@ -125,12 +125,13 @@ module Mixture
       # @raise [CoercionError] If it could not find the coercion.
       # @return [Proc{(Object) => Object}]
       def to(type)
-        method_name = self.class.coercions.fetch(type) do
-          fail CoercionError, "Undefined coercion #{self.class.type} " \
-            "=> #{type}" unless method_name
-        end
+        coercions = self.class.coercions
+        coercable = type.inheritable
+                    .find { |ancestor| coercions.key?(ancestor) }
+        fail CoercionError, "Undefined coercion #{self.class.type} " \
+          "=> #{type}" unless coercable
 
-        public_send(method_name)
+        public_send(coercions[coercable])
       end
     end
   end

data/lib/mixture/coerce.rb

@@ -43,9 +43,9 @@ module Mixture
     #   The type to coerce to.
     # @return [Proc{(Object, Mixture::Types::Object) => Object}]
     def self.coerce(from, to)
-      coercers
-        .fetch(from) { fail CoercionError, "No coercer for #{from}" }
-        .to(to)
+      type = from.inheritable.find { |ancestor| coercers.key?(ancestor) }
+      fail CoercionError, "No coercer for #{from}" unless type
+      coercers[type].to(to)
     end
 
     # Performs the actual coercion, since blocks require a value and

data/lib/mixture/types/access.rb

@@ -15,8 +15,9 @@ module Mixture
       # @param subs [Object] The subtypes to use.
       # @return [Class] The new subtype.
       def [](*subs)
-        options[:types].fetch([self, subs]) do
-          create(subs)
+        inferred = infer_subs(subs)
+        options[:types].fetch([self, inferred]) do
+          create(inferred)
         end
       end
 
@@ -27,18 +28,25 @@ module Mixture
       # options, it doesn't infer the type of each subtype; otherwise,
       # it does.
       #
-      # @param subs [Array<Object>] The subtypes.
+      # @param inferred [Array<Object>] The subtypes.
       # @return [Class] The new subtype.
-      def create(subs)
+      def create(inferred)
         subtype = ::Class.new(self)
-        members = if options[:noinfer]
-                    subs
-                  else
-                    subs.map { |sub| Types.infer(sub) }
-                  end
-        name    = "#{inspect}[#{members.join(', ')}]"
-        subtype.options.merge!(members: members, name: name)
-        options[:types][[self, subs]] = subtype
+        name    = "#{inspect}[#{inferred.join(', ')}]"
+        subtype.options.merge!(members: inferred, name: name)
+        options[:types][[self, inferred]] = subtype
+      end
+
+      # Infers the subtypes, if the `:noinfer` option is not set.
+      #
+      # @param subs [Array<Object>] The subtypes to infer.
+      # @return [Array<Object>] The inferred subtypes.
+      def infer_subs(subs)
+        if options[:noinfer]
+          subs
+        else
+          subs.map { |sub| Types.infer(sub) }
+        end
       end
     end
   end

data/lib/mixture/types/object.rb

@@ -10,6 +10,21 @@ module Mixture
       options[:method] = :to_object
       as :object
 
+      # This, like {Type.inheritable}, provides a list of inheritable
+      # coercions; however, by default, if the requesting type isn't
+      # an Object, it _also_ leaves out the Object type; this is so
+      # that types that are incompatible with another type all the way
+      # up to the Object don't end up getting coerced incorrectly.
+      #
+      # @return [Array<Class>]
+      def self.inheritable
+        if self == Object
+          super
+        else
+          ancestors - Object.ancestors
+        end
+      end
+
       constraint do |value|
         # This may seem a bit odd, but this returns false for
         # BasicObject; and since this is meant to represent Objects,

data/lib/mixture/types/type.rb

@@ -66,40 +66,13 @@ module Mixture
         end
       end
 
-      # Determines if this type is equal to another type.  This is
-      # used by Ruby's hash, and is used to make an anonymous type
-      # equal to its supertype (e.g.
-      # `Types::Array[Types::Integer] == Types::Array`), mainly for
-      # coercion.
+      # A list of types that this type can inherit coercion behavior
+      # from.  For example, a collection can be coerced into an
+      # array or a set.
       #
-      # @param other [Object]
-      # @return [Boolean]
-      def self.eql?(other)
-        if anonymous?
-          superclass == other
-        elsif other.respond_to?(:anonymous?) && other.anonymous?
-          other.superclass.eql?(self)
-        else
-          super
-        end
-      end
-
-      # (see .eql?)
-      def self.==(other)
-        eql?(other)
-      end
-
-      # Used by ruby's Hash, this determines the hash of the type.  If
-      # this is anonymous, it uses its supertype's hash.
-      #
-      # @see .eql?
-      # @return [Numeric]
-      def self.hash
-        if anonymous?
-          superclass.hash
-        else
-          super
-        end
+      # @return [Array<Class>]
+      def self.inheritable
+        ancestors - Type.ancestors
       end
 
       # If this class is anonymous.  This is counting on the fact that

data/lib/mixture/types.rb

@@ -80,8 +80,8 @@ module Mixture
     # @return [Mixture::Types::Type] The inferred type.
     def self.infer_type(object)
       case object
-      when ::Array then Array[infer(object.first)]
-      when ::Set   then Set[infer(object.first)]
+      when ::Array then Array[object.first]
+      when ::Set   then Set[object.first]
       else types.reverse.find { |type| type.matches?(object) }
       end
     end

data/lib/mixture/version.rb

@@ -5,5 +5,5 @@ module Mixture
   # The current version of Mixture.
   #
   # @return [String]
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixture
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jeremy Rodi