axiom-types 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODM0YjEzMzYzZTYwY2JhYTg5ZDQwNDRiNGJjZjMzOWEzNDljMTkzYw==
+    OTk1ZjkwNjg3MjZkNzIwNmI5Yzc4YmNlMTQ5NjNlNDhkNWI5Y2EyZg==
   data.tar.gz: !binary |-
-    NTQ1ZjM0ODk1NzA0OThmYzAyYWM1MmMxN2E5MGRmZjkxNWRjODA0Zg==
+    NTllNTE2NWUzNDUwNGJlODJmODk2NzBiZmM1YmIwYWZlNGM3YzZjNw==
 SHA512:
   metadata.gz: !binary |-
-    ZTlhM2FmMWM4MTY1NmI5MDc2ZDc4MjYxMGRkNzIyNDRkYzJiMGVlMDkzN2I3
-    Yjk0MDEwZmI2NzIzMzNhYTczYWJlYzZlZTRiNDcwYjVmYmY2ZjA0MGY1Mjg3
-    YmFmYjYyNTk5ODEzYmVkMjI0MDdmZDYyZDA4MWJiNjAzMjFhZjE=
+    YjJkYjk1OWQ1MmQ5NjVkZWU4Y2FhZjVlY2VlZGFhNzMzYWE3MWZkMjc0MGY4
+    YmQzYjNiYmIzOGYzMzdjYzUwOTg5NmU5ZTBlN2ZjYjg3MWMxMWYzNTE4ZjA3
+    ZTQ0ZGI3N2YyM2ZjZGQ4MmQ2ZTA2ZTgwMTA3NmNiZjcxMTYyMTQ=
   data.tar.gz: !binary |-
-    ZGY5ZjFiYjlhN2E2ZjRkMTYxZjdjMTI1ZjA5MGE3Y2EzODIwNTlmMmNkMzE5
-    NjliMzg5Y2U3MDQ3MGRkNzMzNmE0YzgyMzYzM2UzMDgxYzQxNjY3MDFlNmY3
-    Y2FmYmEwMzZjOWM3ZWYxZTZhMmU4N2Q1YWFmMGI1OWY5NTg2ZDk=
+    MGQwZmUxMDZhNjhjYWFhNTQ0NjY0ODQ2OGJmMDAwMzI0M2UwMDQ0ODg4OGRm
+    MzA0ZTkxYjZjNWJkYjMyNjBhZmFkMzE2Yzc4YjA4Zjk0ODI0OGQ3OTcwNjBh
+    OTIzZGRhODBjZjdlOWJjYTY2YTViYTVkMzY3ZmEyOThmMGU1YTE=

data/CONTRIBUTING.md

@@ -1,5 +1,4 @@
-Contributing
-------------
+# Contributing
 
 * If you want your code merged into the mainline, please discuss the proposed changes with me before doing any work on it. This library is still in early development, and the direction it is going may not always be clear. Some features may not be appropriate yet, may need to be deferred until later when the foundation for them is laid, or may be more applicable in a plugin.
 * Fork the project.

data/README.md

@@ -1,5 +1,4 @@
-axiom-types
-===========
+# axiom-types
 
 Define types with optional constraints for use within axiom and other libraries.
 
@@ -15,8 +14,7 @@ Define types with optional constraints for use within axiom and other libraries.
 [codeclimate]: https://codeclimate.com/github/dkubb/axiom-types
 [coveralls]: https://coveralls.io/r/dkubb/axiom-types
 
-Examples
---------
+## Examples
 
 ```ruby
 # Setup constraints for all defined types
@@ -35,12 +33,10 @@ Name.include?('')        # => false
 Name.include?('a' * 31)  # => false
 ```
 
-Contributing
--------------
+## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
 
-Copyright
----------
+## Copyright
 
 Copyright © 2013 Dan Kubb. See LICENSE for details.

data/axiom-types.gemspec

@@ -10,12 +10,12 @@ Gem::Specification.new do |gem|
   gem.description = 'Abstract types for logic programming'
   gem.summary     = 'Define types with optional constraints for use within axiom and other libraries.'
   gem.homepage    = 'https://github.com/dkubb/axiom-types'
-  gem.licenses    = %w[MIT]
+  gem.license     = 'MIT'
 
   gem.require_paths    = %w[lib]
   gem.files            = `git ls-files`.split($/)
   gem.test_files       = `git ls-files -- spec/unit`.split($/)
-  gem.extra_rdoc_files = %w[LICENSE README.md TODO]
+  gem.extra_rdoc_files = %w[LICENSE README.md CONTRIBUTING.md TODO]
 
   gem.add_dependency('descendants_tracker', '~> 0.0.1')
   gem.add_dependency('ice_nine',            '~> 0.9')

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 19
-total_score: 155
+total_score: 162

data/lib/axiom/types/collection.rb

@@ -84,8 +84,7 @@ module Axiom
       #
       # @api private
       def self.infer_from_primitive_instance(object)
-        member      = object.first
-        member_type = Types.infer(member) || Object
+        member_type = Types.infer(object.first) || Object
         infer_from(member_type) || new_from(member_type)
       end
       private_class_method :infer_from_primitive_instance

data/lib/axiom/types/object.rb

@@ -60,8 +60,8 @@ module Axiom
       #
       # @api private
       def self.match_primitive?(object)
-        object.respond_to?(:ancestors) &&
-        object.ancestors.include?(primitive)
+        Module === object &&
+        (equal?(Object) || object.ancestors.include?(primitive))
       end
       private_class_method :match_primitive?
 

data/lib/axiom/types/support/infinity.rb

@@ -20,7 +20,7 @@ module Axiom
       def self.<=>(other)
         case other
         when ::BigDecimal                       then 1
-        when number                             then 0
+        when ->(arg) { arg == number }          then 0
         when ::Numeric, inverse.singleton_class then 1
         end
       end

data/lib/axiom/types/version.rb

@@ -4,7 +4,7 @@ module Axiom
   module Types
 
     # Gem version
-    VERSION = '0.0.4'.freeze
+    VERSION = '0.0.5'.freeze
 
   end # module Types
 end # module Axiom

data/spec/unit/axiom/types/collection/class_methods/infer_spec.rb

@@ -9,10 +9,20 @@ describe Axiom::Types::Collection, '.infer' do
     object.finalize
   end
 
-  before do
-    # Initialize a custom type that will be used if the class lookup does not
-    # restrict matching to only types with an Object member_type
-    Axiom::Types.infer(SortedSet[Float])
+  context 'with the type' do
+    let(:object) { described_class }
+
+    context 'when the argument is the type object' do
+      let(:arg) { object }
+
+      it { should be(object) }
+    end
+
+    context 'when the argument is ::Enumerable' do
+      let(:arg) { ::Enumerable }
+
+      it { should be(object) }
+    end
   end
 
   context 'with a base class' do
@@ -26,6 +36,12 @@ describe Axiom::Types::Collection, '.infer' do
       end
     end
 
+    before do
+      # Initialize a custom type that will be used if the class lookup does not
+      # restrict matching to only types with an Object member_type
+      Axiom::Types.infer(SortedSet[Float])
+    end
+
     context 'when the argument is the type object' do
       let(:arg) { object }
 

data/spec/unit/axiom/types/object/class_methods/infer_spec.rb

@@ -5,60 +5,102 @@ require 'spec_helper'
 describe Axiom::Types::Object, '.infer' do
   subject { object.infer(arg) }
 
-  let(:object) { described_class }
+  context 'with the type' do
+    let(:object) { described_class }
 
-  context 'when the argument is the type object' do
-    let(:arg) { object }
+    context 'when the argument is the type object' do
+      let(:arg) { object }
 
-    it { should be(object) }
-  end
+      it { should be(object) }
+    end
 
-  context 'when the argument is ::BasicObject' do
-    let(:arg) { ::BasicObject }
+    context 'when the argument is ::BasicObject' do
+      let(:arg) { ::BasicObject }
 
-    it { should be(object) }
-  end
+      it { should be(object) }
+    end
+
+    context 'when the argument is ::Object' do
+      let(:arg) { ::Object }
+
+      it { should be(object) }
+    end
 
-  context 'when the argument is ::Object' do
-    let(:arg) { ::Object }
+    Axiom::Types::Object.descendants.each do |descendant|
+      primitive = descendant.primitive
+
+      context "when the argument is #{descendant}" do
+        let(:object) { descendant }
+        let(:arg)    { object     }
+
+        it { should be(object) }
+      end
+
+      context "when the argument is ::#{primitive}" do
+        let(:arg) { primitive }
+
+        it { should be(object) }
+      end
+    end
+
+    context 'when the argument is an ::Object instance' do
+      let(:arg) { ::Object.new }
+
+      it { should be_nil }
+    end
 
-    it { should be(object) }
+    context 'when the argument is nil' do
+      let(:arg) { nil }
+
+      it { should be_nil }
+    end
   end
 
-  Axiom::Types::Object.descendants.each do |descendant|
-    primitive = descendant.primitive
+  context 'with a subclass' do
+    let(:object) do
+      described_class.new { primitive ::Struct }
+    end
 
-    context "when the argument is #{descendant}" do
-      let(:object) { descendant }
-      let(:arg)    { object     }
+    context 'when the argument is the type object' do
+      let(:arg) { object }
 
       it { should be(object) }
     end
 
-    context "when the argument is ::#{primitive}" do
-      let(:arg) { primitive }
-
-      if primitive.instance_of?(::Module)
-        it 'does not match modules' do
-          should be_nil
-        end
-      else
-        it 'matches all classes' do
-          should be(object)
-        end
-      end
+    context 'when the argument is ::BasicObject' do
+      let(:arg) { ::BasicObject }
+
+      it { should be_nil }
     end
-  end
 
-  context 'when the argument is an object instance' do
-    let(:arg) { ::Object.new }
+    context 'when the argument is ::Object' do
+      let(:arg) { ::Object }
 
-    it { should be_nil }
-  end
+      it { should be_nil }
+    end
 
-  context 'when the argument is nil' do
-    let(:arg) { nil }
+    context 'when the argument is an ::Object instance' do
+      let(:arg) { ::Object.new }
+
+      it { should be_nil }
+    end
 
-    it { should be_nil }
+    context 'when the argument is ::Struct' do
+      let(:arg) { ::Struct }
+
+      it { should be(object) }
+    end
+
+    context 'when the argument is a ::Struct instance' do
+      let(:arg) { ::Struct.new(:a).new(1) }
+
+      it { should be_nil }
+    end
+
+    context 'when the argument is nil' do
+      let(:arg) { nil }
+
+      it { should be_nil }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axiom-types
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dan Kubb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descendants_tracker
@@ -65,6 +65,7 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 - README.md
+- CONTRIBUTING.md
 - TODO
 files:
 - .gitignore