mixture 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdcfd77ffa0853daa936e5a7e7c10d18dcc12bd6
-  data.tar.gz: acb4173454fe8c014f33d6b43f489f9cba7338f4
+  metadata.gz: cfc27126b02c841b844840b39021ef62be841b1e
+  data.tar.gz: 29d1ec9b68e85b1d6968552626d5b66c26256753
 SHA512:
-  metadata.gz: fb75c08641030b0c5acc22a1a51bc21cdb122fde7a3cdd5d8ffd6b19f1ae2014cf56bddc46cda61239c8c65baeb1e4ea2c2cf2f8c7cf6f5f5ac1ccd7f593ecc4
-  data.tar.gz: e425fa998b3198e7f9c43123a757700de9635063505c5ca6b588c58aecc6696d41ee1f48bdf70c7b781c47006f55e29d62bf406bf5d2abb0fafa947fb0a7ec75
+  metadata.gz: 88f9b2ad44278155c2f528e144f5486686099a75a5a9ce0ce040cbae473e0d2835133f3bb843da0486190b6db0023a76b17505277fed06310cfdec651c406b46
+  data.tar.gz: a0e1457884b2a9bd58a29dc20f4b5e9381dd55f0df52df1c8931b06dd19e3ca09e0b7bbe76a768ccccfd012847e20fb20b0fe5077531cfad6dce839e558dac99

data/Gemfile.lock

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

data/lib/mixture/types/array.rb

@@ -5,6 +5,7 @@ module Mixture
     # The array type.  This is a collection, and as such, can be used
     # with the `.[]` accessor.
     class Array < Collection
+      register
       options[:primitive] = ::Array
       options[:method] = :to_array
       as :array

data/lib/mixture/types/boolean.rb

@@ -8,6 +8,7 @@ module Mixture
     # odd stuff from happening.  It can still be matched by other
     # values.
     class Boolean < Object
+      register
       options[:primitive] = nil
       as :bool, :boolean, true, false
 

data/lib/mixture/types/class.rb

@@ -5,12 +5,22 @@ module Mixture
     # A class type.  This can be subtyped, and is subtyped for
     # non-primitive classes.
     class Class < Object
+      register
       options[:primitive] = ::Class
       options[:noinfer]   = true
       options[:members]   = [Object]
       options[:method]    = :to_class
       options[:types]     = ThreadSafe::Cache.new
       extend Access
+
+      constraints.clear
+      constraint do |value|
+        if value.is_a?(::Class)
+          options.fetch(:members).first == value
+        else
+          options.fetch(:members).first === value
+        end
+      end
     end
   end
 end

data/lib/mixture/types/date.rb

@@ -5,6 +5,7 @@ module Mixture
     # A date type.  I don't know why ruby has Date, DateTime, and
     # Time, but someone thinks we need it.
     class Date < Object
+      register
       options[:primitive] = ::Date
       options[:method] = :to_date
       as :date

data/lib/mixture/types/datetime.rb

@@ -5,6 +5,7 @@ module Mixture
     # A datetime type.  I don't know why Ruby has a Date, DateTime, and
     # Time type, but someone thinks we needs it.
     class DateTime < Object
+      register
       options[:primitive] = ::DateTime
       options[:method] = :to_datetime
       as :datetime

data/lib/mixture/types/float.rb

@@ -4,6 +4,7 @@ module Mixture
   module Types
     # A float.  Not much to say here.
     class Float < Numeric
+      register
       options[:primitive] = ::Float
       options[:method] = :to_float
       as :float

data/lib/mixture/types/hash.rb

@@ -5,6 +5,7 @@ module Mixture
     # A hash.  This is also accessable, and expects two member types;
     # one for the keys, and one for the values.
     class Hash < Object
+      register
       options[:primitive] = ::Hash
       options[:members]   = [Object, Object]
       options[:method]    = :to_hash

data/lib/mixture/types/integer.rb

@@ -4,6 +4,7 @@ module Mixture
   module Types
     # An integer.  Not much to say here.
     class Integer < Numeric
+      register
       options[:primitive] = ::Integer
       options[:method] = :to_integer
       as :int, :integer

data/lib/mixture/types/nil.rb

@@ -4,6 +4,7 @@ module Mixture
   module Types
     # Represents a nil type.  This has no coercions.
     class Nil < Object
+      register
       options[:primitive] = ::NilClass
       as nil
     end

data/lib/mixture/types/object.rb

@@ -6,6 +6,7 @@ module Mixture
     # inherit from Object) have; i.e., it must be an object, and
     # it must be the type's primitive.
     class Object < Type
+      register
       options[:primitive] = ::Object
       options[:method] = :to_object
       as :object
@@ -33,6 +34,20 @@ module Mixture
         ::Object === value
         # rubocop:enable Style/CaseEquality
       end
+
+      # We can't match anything as an object that isn't an object.
+      constraint do |value|
+        # The first constraint is that the class cannot be an object.
+        # This is the same as removing this constraint on inherited
+        # classes.
+        # The second constraint is that if the class is an object,
+        # then the value's class must be object.
+        # This is so we can properly infer objects, since it's likely
+        # _someone_'s gonna throw us an object.
+        self != Object ||
+          (self == Object && value.class == ::Object)
+      end
+
       constraint { |value| value.is_a?(options[:primitive]) }
     end
   end

data/lib/mixture/types/range.rb

@@ -4,6 +4,7 @@ module Mixture
   module Types
     # The range type.
     class Range < Enumerable
+      register
       options[:primitive] = ::Range
       options[:method] = :to_range
       as :range

data/lib/mixture/types/rational.rb

@@ -5,6 +5,7 @@ module Mixture
     # A rational.  I've personally never used this, but I don't see it
     # as a bad thing.
     class Rational < Numeric
+      register
       options[:primitive] = ::Rational
       options[:method] = :to_rational
       as :rational

data/lib/mixture/types/set.rb

@@ -8,6 +8,7 @@ module Mixture
     # @see Array
     # @see http://ruby-doc.org/stdlib/libdoc/set/rdoc/Set.html
     class Set < Collection
+      register
       options[:primitive] = ::Set
       options[:method] = :to_set
       as :set

data/lib/mixture/types/string.rb

@@ -4,6 +4,7 @@ module Mixture
   module Types
     # A string.
     class String < Object
+      register
       options[:primitive] = ::String
       options[:method] = :to_string
       as :str, :string

data/lib/mixture/types/symbol.rb

@@ -6,6 +6,7 @@ module Mixture
     # they added garbage collection for symbols; however, it is still
     # not a brilliant idea to turn user input into symbols.
     class Symbol < Object
+      register
       options[:primitive] = ::Symbol
       options[:method] = :to_symbol
       as :symbol

data/lib/mixture/types/time.rb

@@ -5,6 +5,7 @@ module Mixture
     # A time type.  I'm not sure why Ruby has a Date, DateTime, and
     # Time object, but someone thinks we need it.
     class Time < Object
+      register
       options[:primitive] = ::Time
       options[:method] = :to_time
       as :time

data/lib/mixture/types/type.rb

@@ -49,11 +49,18 @@ module Mixture
       # @param sub [Class] The new subclass.
       # @return [void]
       def self.inherited(sub)
-        Types.types << sub unless sub.anonymous?
         sub.options.merge!(options)
         sub.constraints.concat(constraints)
       end
 
+      # Registers the type.  This shouldn't be called on anonymous
+      # classes.
+      #
+      # @return [void]
+      def self.register
+        Types.types << self
+      end
+
       # Checks if the given value passes all of the constraints
       # defined on this type.  Each constraint is executed within the
       # context of the class, to provide access to {.options}.

data/lib/mixture/types.rb

@@ -82,7 +82,10 @@ module Mixture
       case object
       when ::Array then Array[object.first]
       when ::Set   then Set[object.first]
-      else types.reverse.find { |type| type.matches?(object) }
+      when ::Hash  then Hash[object.keys.first => object.values.first]
+      else
+        types.find { |type| type.matches?(object) } ||
+          infer_class(object.class)
       end
     end
   end

data/lib/mixture/version.rb

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

metadata

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