axiom-types 0.0.5 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTk1ZjkwNjg3MjZkNzIwNmI5Yzc4YmNlMTQ5NjNlNDhkNWI5Y2EyZg==
-  data.tar.gz: !binary |-
-    NTllNTE2NWUzNDUwNGJlODJmODk2NzBiZmM1YmIwYWZlNGM3YzZjNw==
+SHA1:
+  metadata.gz: c3f4ab34cb8059c83c6512f6f7e3eaf4516583db
+  data.tar.gz: 3b75505765e6c9efe0bedb546350affe457d1419
 SHA512:
-  metadata.gz: !binary |-
-    YjJkYjk1OWQ1MmQ5NjVkZWU4Y2FhZjVlY2VlZGFhNzMzYWE3MWZkMjc0MGY4
-    YmQzYjNiYmIzOGYzMzdjYzUwOTg5NmU5ZTBlN2ZjYjg3MWMxMWYzNTE4ZjA3
-    ZTQ0ZGI3N2YyM2ZjZGQ4MmQ2ZTA2ZTgwMTA3NmNiZjcxMTYyMTQ=
-  data.tar.gz: !binary |-
-    MGQwZmUxMDZhNjhjYWFhNTQ0NjY0ODQ2OGJmMDAwMzI0M2UwMDQ0ODg4OGRm
-    MzA0ZTkxYjZjNWJkYjMyNjBhZmFkMzE2Yzc4YjA4Zjk0ODI0OGQ3OTcwNjBh
-    OTIzZGRhODBjZjdlOWJjYTY2YTViYTVkMzY3ZmEyOThmMGU1YTE=
+  metadata.gz: f4ae3db9a977137f1d50f696f4c88846b0d9754f6cb34809f1d4772d9aa4f4f32a970a626902df4997873f4b1f059f4e9c2b9eb8988d81ac82f027ecf610d8c6
+  data.tar.gz: 913fea68aa5f22cf384e142710ddfeb7f53470f50a85d850d37192c5560902724ffb4c44e80d2cfdac8722ac50656cbb5c928690a27d0a2966b7a33f3fc603f5

data/.rubocop.yml

@@ -0,0 +1,6 @@
+AllCops:
+  Includes:
+    - 'Gemfile'
+  Excludes:
+    - 'Gemfile.devtools'
+    - 'vendor/**'

data/.travis.yml

@@ -1,23 +1,26 @@
 language: ruby
 before_install: gem install bundler
 bundler_args: --without yard guard benchmarks
-script: "bundle exec rake ci"
+script: "bundle exec rake ci:metrics"
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
-  - rbx-19mode
+  - rbx
 matrix:
   include:
     - rvm: jruby-19mode
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
+    - rvm: jruby-20mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
+    - rvm: jruby-21mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
     - rvm: jruby-head
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
   allow_failures:
-    - rvm: 1.9.3       # mutant fails
-    - rvm: 2.0.0       # mutant fails
-    - rvm: ruby-head   # travis broken
-    - rvm: rbx-19mode  # mutant fails
+    - rvm: 2.1.0  # buggy runtime
+  fast_finish: true
 notifications:
   irc:
     channels:

data/Gemfile

@@ -4,6 +4,10 @@ source 'https://rubygems.org'
 
 gemspec
 
+platforms :rbx do
+  gem 'rubysl-bigdecimal', '~> 2.0.2'
+end
+
 group :development, :test do
   gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
 end

data/Gemfile.devtools

@@ -4,21 +4,24 @@ group :development do
   gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.14.1'
   gem 'yard',  '~> 0.8.7'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.2.0'
+  gem 'kramdown', '~> 1.3.0'
 end
 
 group :guard do
-  gem 'guard',         '~> 1.8.1'
-  gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 3.0.2'
-  gem 'guard-rubocop', '~> 0.2.0'
-  gem 'guard-mutant',  '~> 0.0.1'
+  gem 'guard',         '~> 2.3.0'
+  gem 'guard-bundler', '~> 2.0.0'
+  gem 'guard-rspec',   '~> 4.2.0'
+  gem 'guard-rubocop', '~> 1.0.0'
 
   # file system change event handling
-  gem 'listen',     '~> 1.3.0'
+  gem 'listen',     '~> 2.4.0'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.3', require: false
   gem 'rb-inotify', '~> 0.9.0', require: false
@@ -30,18 +33,29 @@ group :guard do
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.6.7'
+  gem 'coveralls', '~> 0.7.0'
   gem 'flay',      '~> 2.4.0'
-  gem 'flog',      '~> 4.1.1'
+  gem 'flog',      '~> 4.2.0'
   gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.13.0'
-  gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
+  gem 'rubocop',   '~> 0.16.0'
+  gem 'simplecov', '~> 0.8.2'
+  gem 'yardstick', '~> 0.9.9'
+
+  platforms :mri do
+    gem 'mutant', '~> 0.3.4'
+  end
 
   platforms :ruby_19, :ruby_20 do
-    gem 'mutant', git: 'https://github.com/mbj/mutant.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
+
+  platform :rbx do
+    gem 'json',               '~> 1.8.1'
+    gem 'racc',               '~> 1.4'
+    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'rubysl-open-uri',    '~> 2.0.0'
+    gem 'rubysl-prettyprint', '~> 2.0.2'
+  end
 end
 
 group :benchmarks do

data/axiom-types.gemspec

@@ -17,8 +17,11 @@ Gem::Specification.new do |gem|
   gem.test_files       = `git ls-files -- spec/unit`.split($/)
   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')
+  gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')
+  gem.add_runtime_dependency('descendants_tracker', '~> 0.0.3')
+  gem.add_runtime_dependency('ice_nine',            '~> 0.11.0')
+  gem.add_runtime_dependency('thread_safe',         '~> 0.1.3')
+
+  gem.add_development_dependency('bundler', '~> 1.5', '>= 1.5.2')
 end

data/config/flay.yml

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

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 10.0
+threshold: 11.4

data/config/reek.yml

@@ -1,7 +1,9 @@
 ---
 Attribute:
   enabled: true
-  exclude: []
+  exclude:
+  - Axiom::Types::LengthComparable
+  - Axiom::Types::ValueComparable
 BooleanParameter:
   enabled: true
   exclude: []
@@ -10,7 +12,12 @@ ClassVariable:
   exclude: []
 ControlParameter:
   enabled: true
-  exclude: []
+  exclude:
+  - Axiom::Types::Boolean#self.infer_from_primitive_class
+  - Axiom::Types::Collection#self.infer_from
+  - Axiom::Types::Infinity#<=>
+  - Axiom::Types::Object#self.infer_from_primitive_class
+  - Axiom::Types::Type#self.infer
 DataClump:
   enabled: true
   exclude: []
@@ -63,7 +70,7 @@ TooManyInstanceVariables:
 TooManyMethods:
   enabled: true
   exclude: []
-  max_methods: 0
+  max_methods: 4
 TooManyStatements:
   enabled: true
   exclude:

data/config/rubocop.yml

@@ -1,11 +1,4 @@
-AllCops:
-  Includes:
-    - '../**/*.rake'
-    - 'Gemfile'
-    - 'Gemfile.devtools'
-  Excludes:
-    - '**/vendor/**'
-    - '**/benchmarks/**'
+inherit_from: ../.rubocop.yml
 
 # Avoid parameter lists longer than five parameters.
 ParameterLists:
@@ -30,7 +23,7 @@ CollectionMethods:
 # sections of code and visually separate them. When the keyword is at the same
 # level I think it sort of blends in with the def keywords and makes it harder
 # to scan the code and see where the sections are.
-AccessControl:
+AccessModifierIndentation:
   Enabled: false
 
 # Limit line length
@@ -60,3 +53,11 @@ ConstantName:
 # Not all trivial readers/writers can be defined with attr_* methods
 TrivialAccessors:
   Enabled: false
+
+# The #<=> method argument has an underscore because it is not referenced
+OpMethod:
+  Enabled: false
+
+# Allow empty lines around body
+EmptyLinesAroundBody:
+  Enabled: false

data/lib/axiom/types.rb

@@ -3,9 +3,11 @@
 require 'bigdecimal'
 require 'date'
 require 'set'
+require 'singleton'
 
-require 'ice_nine'
 require 'descendants_tracker'
+require 'ice_nine'
+require 'thread_safe'
 
 module Axiom
 
@@ -22,7 +24,7 @@ module Axiom
     Contradiction = ->(_value) { true }.freeze
 
     # Cache the type inference lookup by object
-    @inference_cache = Hash.new do |cache, object|
+    @inference_cache = ThreadSafe::Cache.new do |cache, object|
       type = nil
       Type.descendants.detect do |descendant|
         type = descendant.infer(object)
@@ -61,8 +63,8 @@ module Axiom
   end # module Types
 end # module Axiom
 
-require 'axiom/types/support/infinity'
 require 'axiom/types/support/options'
+require 'axiom/types/support/infinity'
 
 require 'axiom/types/value_comparable'
 require 'axiom/types/length_comparable'

data/lib/axiom/types/encodable.rb

@@ -34,7 +34,7 @@ module Axiom
       # @api private
       def finalize
         return self if frozen?
-        ascii_compatible? ? has_ascii_compatible_encoding : has_encoding
+        ascii_compatible? ? use_ascii_compatible_encoding : use_encoding
         super
       end
 
@@ -54,7 +54,7 @@ module Axiom
       # @return [undefined]
       #
       # @api private
-      def has_ascii_compatible_encoding
+      def use_ascii_compatible_encoding
         constraint do |object|
           object.encoding.equal?(encoding) || object.to_s.ascii_only?
         end
@@ -65,11 +65,10 @@ module Axiom
       # @return [undefined]
       #
       # @api private
-      def has_encoding
+      def use_encoding
         constraint { |object| object.encoding.equal?(encoding) }
       end
 
-    end
-
+    end # module Encodable
   end # module Types
 end # module Axiom

data/lib/axiom/types/length_comparable.rb

@@ -6,6 +6,13 @@ module Axiom
     # Add a minimum and maximum length constraint to a type
     module LengthComparable
 
+      # The range of allowed lengths
+      #
+      # @return [Range]
+      #
+      # @api public
+      attr_reader :range
+
       # Hook called when module is extended
       #
       # Add #minimum_length and #maximum_length DSL methods to descendant.
@@ -19,8 +26,8 @@ module Axiom
         super
         descendant.class_eval do
           accept_options :minimum_length, :maximum_length
-          minimum_length Infinity
-          maximum_length NegativeInfinity
+          minimum_length Infinity.instance
+          maximum_length NegativeInfinity.instance
         end
       end
 
@@ -31,7 +38,8 @@ module Axiom
       # @api private
       def finalize
         return self if frozen?
-        has_length_within_range
+        @range = IceNine.deep_freeze(minimum_length..maximum_length)
+        use_length_within_range
         super
       end
 
@@ -44,8 +52,7 @@ module Axiom
       # @todo freeze the minimum_length and maximum_length
       #
       # @api private
-      def has_length_within_range
-        range = minimum_length..maximum_length
+      def use_length_within_range
         constraint { |object| range.cover?(object.length) }
       end
 

data/lib/axiom/types/numeric.rb

@@ -10,8 +10,8 @@ module Axiom
       primitive       ::Numeric
       coercion_method :to_numeric
 
-      minimum NegativeInfinity
-      maximum Infinity
+      minimum NegativeInfinity.instance
+      maximum Infinity.instance
 
     end # class Numeric
   end # module Types

data/lib/axiom/types/object.rb

@@ -37,6 +37,15 @@ module Axiom
         super
       end
 
+      # The type name and primitive
+      #
+      # @return [String]
+      #
+      # @api public
+      def self.inspect
+        "#{base} (#{primitive})"
+      end
+
       # Infer the type if the primitive class matches
       #
       # @param [Object] object

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

@@ -4,8 +4,13 @@ module Axiom
   module Types
 
     # Represent an infinite number
-    class Infinity < BasicObject
-      extend ::Comparable
+    class Infinity
+      extend Options, DescendantsTracker
+      include ::Comparable, ::Singleton
+
+      accept_options :inverse, :number
+
+      number ::Float::INFINITY
 
       # Test the number against infinity
       #
@@ -17,64 +22,57 @@ module Axiom
       #   returned if the other object is something other than infinity
       #
       # @api private
-      def self.<=>(other)
+      def <=>(other)
+        klass = self.class
         case other
-        when ::BigDecimal                       then 1
-        when ->(arg) { arg == number }          then 0
-        when ::Numeric, inverse.singleton_class then 1
+        when BigDecimal                      then 1
+        when ->(arg) { arg == klass.number } then 0
+        when ::Numeric, klass.inverse        then 1
         end
       end
 
-      # Coerce a number into an Infinity class for comparison
+      # Coerce a number into an Infinity instance for comparison
       #
       # @param [::Numeric] other
       #
       # @return [Array(Infinity, Infinity)]
       #
       # @api private
-      def self.coerce(other)
+      def coerce(other)
         case other
-        when ::BigDecimal then [inverse, self]
-        when number       then [self,    self]
-        when ::Numeric    then [inverse, self]
+        when BigDecimal        then [inverse, self]
+        when self.class.number then [self,    self]
+        when ::Numeric         then [inverse, self]
         else
-          raise ::TypeError, "#{other.class} cannot be coerced"
+          fail TypeError, "#{other.class} cannot be coerced"
         end
       end
 
       # Return the next successive object, which is always self
       #
-      # @return [Class<Infinity>]
+      # @return [Infinity]
       #
       # @api private
-      def self.succ
+      def succ
         self
       end
 
-      # The inverse of infinity
-      #
-      # @return [Class<NegativeInfinity>]
-      #
-      # @api private
-      def self.inverse
-        NegativeInfinity
-      end
-      private_class_method :inverse
+    private
 
-      # The numeric representation of infinity
+      # The inverse instance
       #
-      # @return [Float]
+      # @return [Infinity]
       #
       # @api private
-      def self.number
-        ::Float::INFINITY
+      def inverse
+        self.class.inverse.instance
       end
-      private_class_method :number
 
     end # class Infinity
 
     # Represent a negative infinite number
     class NegativeInfinity < Infinity
+      number(-::Float::INFINITY)
 
       # Test the number against negative infinity
       #
@@ -86,31 +84,16 @@ module Axiom
       #   returned if the other object is not negative infinity
       #
       # @api private
-      def self.<=>(_other)
+      def <=>(_other)
         comparison = super
         -comparison if comparison
       end
 
-      # The inverse of negative infinity
-      #
-      # @return [Class<Infinity>]
-      #
-      # @api private
-      def self.inverse
-        Infinity
-      end
-      private_class_method :inverse
+    end # class NegativeInfinity
 
-      # The numeric representation of negative infinity
-      #
-      # @return [Float]
-      #
-      # @api private
-      def self.number
-        -::Float::INFINITY
-      end
-      private_class_method :number
+    # Define inverse classes
+    Infinity.inverse NegativeInfinity
+    NegativeInfinity.inverse Infinity
 
-    end # class NegativeInfinity
   end # module Types
 end # module Axiom

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

@@ -105,7 +105,7 @@ module Axiom
       # @api private
       def assert_method_available(name)
         return unless respond_to?(name)
-        raise(
+        fail(
           ReservedMethodError,
           "method named `#{name.inspect}` is already defined"
         )

data/lib/axiom/types/type.rb

@@ -131,6 +131,33 @@ module Axiom
         constraint(&set.method(:include?))
       end
 
+      # The base type for the type
+      #
+      # @return [Class<Axiom::Types::Type>]
+      #
+      # @api public
+      def self.base
+        base? ? self : superclass.base
+      end
+
+      # Test if the type is a base type
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def self.base?
+        !anonymous?
+      end
+
+      # Test if the type is anonymous
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def self.anonymous?
+        name.to_s.empty?
+      end
+
       # Add new constraint to existing constraint, if any
       #
       # @param [#call] constraint

data/lib/axiom/types/value_comparable.rb

@@ -6,6 +6,13 @@ module Axiom
     # Add a minimum and maximum value constraint to a type
     module ValueComparable
 
+      # The range of allowed values
+      #
+      # @return [Range]
+      #
+      # @api public
+      attr_reader :range
+
       # Hook called when module is extended
       #
       # Add #minimum and #maximum DSL methods to descendant.
@@ -17,9 +24,7 @@ module Axiom
       # @api private
       def self.extended(descendant)
         super
-        descendant.class_eval do
-          accept_options :minimum, :maximum
-        end
+        descendant.accept_options :minimum, :maximum
       end
 
       # Finalize by setting up a value range constraint
@@ -29,7 +34,8 @@ module Axiom
       # @api private
       def finalize
         return self if frozen?
-        has_value_within_range
+        @range = IceNine.deep_freeze(minimum..maximum)
+        use_value_within_range
         super
       end
 
@@ -42,8 +48,7 @@ module Axiom
       # @todo freeze the minimum and maximum
       #
       # @api private
-      def has_value_within_range
-        range = minimum..maximum
+      def use_value_within_range
         constraint(range.method(:cover?))
       end
 

data/lib/axiom/types/version.rb

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

data/spec/unit/axiom/types/class_methods/finalize_spec.rb

@@ -11,7 +11,7 @@ describe Axiom::Types, '.finalize' do
   it_should_behave_like 'a command method'
 
   it 'finalizes the descendants' do
-    descendant.should_receive(:finalize)
+    expect(descendant).to receive(:finalize)
     subject
   end
 end

data/spec/unit/axiom/types/encodable/class_methods/extended_spec.rb

@@ -13,7 +13,7 @@ describe Axiom::Types::Encodable, '.extended' do
     # RSpec tracks the original method (if any), then we add our own stub that
     # actually works, and finally when the example finishes RSpec will reset
     # the Module#extended method back to it's original state.
-    Module.any_instance.stub(:extended).with(object)
+    allow_any_instance_of(Module).to receive(:extended).with(object)
 
     delegated_ancestor = false
     Module.send(:undef_method, :extended)

data/spec/unit/axiom/types/encodable/finalize_spec.rb

@@ -9,7 +9,7 @@ describe Axiom::Types::Encodable, '#finalize' do
 
   # Test if Symbol encoding is supported
   let(:symbol_encoding) do
-    ! RUBY_PLATFORM.include?('java') && begin
+    !RUBY_PLATFORM.include?('java') && begin
       encoding = Encoding::UTF_32BE
       ''.force_encoding(encoding).to_sym.encoding.equal?(encoding)
     end

data/spec/unit/axiom/types/infinity/{class_methods/coerce_spec.rb → coerce_spec.rb}

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe Axiom::Types::Infinity, '.coerce' do
+describe Axiom::Types::Infinity, '#coerce' do
   subject { object.coerce(other) }
 
-  let(:object) { described_class }
+  let(:object) { described_class.instance }
 
   [
     1,                # Fixnum
@@ -18,7 +18,7 @@ describe Axiom::Types::Infinity, '.coerce' do
       let(:other) { number }
 
       it 'coerces into an array containing inverse and self' do
-        should eql([Axiom::Types::NegativeInfinity, object])
+        should eql([Axiom::Types::NegativeInfinity.instance, object])
       end
 
       it 'coerces when comparing' do
@@ -32,7 +32,7 @@ describe Axiom::Types::Infinity, '.coerce' do
     let(:other) { Float::INFINITY }
 
     it 'coerces into an array containing inverse and self' do
-      should eql([Axiom::Types::Infinity, object])
+      should eql([Axiom::Types::Infinity.instance, object])
     end
 
     it 'coerces when comparing' do
@@ -45,7 +45,7 @@ describe Axiom::Types::Infinity, '.coerce' do
     let(:other) { -Float::INFINITY }
 
     it 'coerces into an array containing inverse and self' do
-      should eql([Axiom::Types::NegativeInfinity, object])
+      should eql([Axiom::Types::NegativeInfinity.instance, object])
     end
 
     it 'coerces when comparing' do

data/spec/unit/axiom/types/infinity/{class_methods/spaceship_operator_spec.rb → spaceship_operator_spec.rb}

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe Axiom::Types::Infinity, '.<=>' do
+describe Axiom::Types::Infinity, '#<=>' do
   subject { object <=> other }
 
-  let(:object) { described_class }
+  let(:object) { described_class.instance }
 
   [
     1,                # Fixnum
@@ -26,7 +26,7 @@ describe Axiom::Types::Infinity, '.<=>' do
   end
 
   context 'when the other object is negative infinity' do
-    let(:other) { Axiom::Types::NegativeInfinity }
+    let(:other) { Axiom::Types::NegativeInfinity.instance }
 
     it { should be(1) }
 

data/spec/unit/axiom/types/infinity/{class_methods/succ_spec.rb → succ_spec.rb}

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe Axiom::Types::Infinity, '.succ' do
+describe Axiom::Types::Infinity, '#succ' do
   subject { object.succ }
 
-  let(:object) { described_class }
+  let(:object) { described_class.instance }
 
   it { should be(object) }
 end

data/spec/unit/axiom/types/length_comparable/class_methods/extended_spec.rb

@@ -13,7 +13,7 @@ describe Axiom::Types::LengthComparable, '.extended' do
     # RSpec tracks the original method (if any), then we add our own stub that
     # actually works, and finally when the example finishes RSpec will reset
     # the Module#extended method back to it's original state.
-    Module.any_instance.stub(:extended).with(object)
+    allow_any_instance_of(Module).to receive(:extended).with(object)
 
     delegated_ancestor = false
     Module.send(:undef_method, :extended)
@@ -32,10 +32,12 @@ describe Axiom::Types::LengthComparable, '.extended' do
   end
 
   it 'sets the default minimum_length' do
-    expect(subject.minimum_length).to equal(Axiom::Types::Infinity)
+    expect(subject.minimum_length)
+      .to equal(Axiom::Types::Infinity.instance)
   end
 
   it 'sets the default maximum_length' do
-    expect(subject.maximum_length).to equal(Axiom::Types::NegativeInfinity)
+    expect(subject.maximum_length)
+      .to equal(Axiom::Types::NegativeInfinity.instance)
   end
 end

data/spec/unit/axiom/types/length_comparable/finalize_spec.rb

@@ -18,6 +18,7 @@ describe Axiom::Types::LengthComparable, '#finalize' do
 
   it { should be_frozen }
 
+  its(:range)      { should be_frozen }
   its(:constraint) { should be_frozen }
 
   it 'adds a constraint that returns true for a length within range' do

data/spec/unit/axiom/types/length_comparable/range_spec.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Axiom::Types::LengthComparable, '#range' do
+  subject { object.range }
+
+  let(:object) do
+    Class.new(Axiom::Types::Type) do
+      extend Axiom::Types::LengthComparable
+      minimum_length 1
+      maximum_length 2
+    end
+  end
+
+  before do
+    object.finalize
+  end
+
+  it_should_behave_like 'an idempotent method'
+
+  it { should be_frozen }
+
+  it { should eql(1..2) }
+end

data/spec/unit/axiom/types/negative_infinity/{class_methods/spaceship_operator_spec.rb → spaceship_operator_spec.rb}

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe Axiom::Types::NegativeInfinity, '.<=>' do
+describe Axiom::Types::NegativeInfinity, '#<=>' do
   subject { object <=> other }
 
-  let(:object) { described_class }
+  let(:object) { described_class.instance }
 
   [
     1,                # Fixnum
@@ -26,7 +26,7 @@ describe Axiom::Types::NegativeInfinity, '.<=>' do
   end
 
   context 'when the other object is infinity' do
-    let(:other) { Axiom::Types::Infinity }
+    let(:other) { Axiom::Types::Infinity.instance }
 
     it { should be(-1) }
 

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

@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Axiom::Types::Object, '.inspect' do
+  subject { object.inspect }
+
+  let(:object) { described_class }
+
+  it { should eql("Axiom::Types::Object (#{object.primitive})") }
+end

data/spec/unit/axiom/types/options/inherited_spec.rb

@@ -22,7 +22,7 @@ describe Axiom::Types::Options, '#inherited' do
   end
 
   it 'delegates to the ancestor' do
-    ancestor.should_receive(:inherited).twice
+    expect(ancestor).to receive(:inherited).twice
     subject
   end
 

data/spec/unit/axiom/types/type/class_methods/anonymous_predicate_spec.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Axiom::Types::Type, '.anonymous?' do
+  subject { object.anonymous? }
+
+  context 'when the type is named' do
+    let(:object) { described_class }
+
+    it { should be(false) }
+  end
+
+  context 'when the type is anonymous' do
+    let(:object) { Class.new(described_class) }
+
+    it { should be(true) }
+  end
+end

data/spec/unit/axiom/types/type/class_methods/base_predicate_spec.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Axiom::Types::Type, '.base?' do
+  subject { object.base? }
+
+  context 'when the type is named' do
+    let(:object) { described_class }
+
+    it { should be(true) }
+  end
+
+  context 'when the type is anonymous' do
+    let(:object) { Class.new(described_class) }
+
+    it { should be(false) }
+  end
+end

data/spec/unit/axiom/types/type/class_methods/base_spec.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Axiom::Types::Type, '.base' do
+  subject { object.base }
+
+  context 'when the type is named' do
+    let(:object) { described_class }
+
+    it { should be(object) }
+  end
+
+  context 'when the type is anonymous' do
+    let(:object) { Class.new(Class.new(described_class)) }
+
+    it { should be(described_class) }
+  end
+end

data/spec/unit/axiom/types/type/class_methods/includes_spec.rb

@@ -26,8 +26,8 @@ describe Axiom::Types::Type, '.includes' do
     end
 
     it 'removes duplicate members' do
-      member.should_receive(:frozen?).and_return(true)
-      member.should_receive(:hash).exactly(3).times.and_return(1)
+      expect(member).to receive(:freeze).and_return(member)
+      expect(member).to receive(:hash).exactly(3).times.and_return(1)
       subject
       expect(object).to include(member)
     end

data/spec/unit/axiom/types/value_comparable/class_methods/extended_spec.rb

@@ -13,7 +13,7 @@ describe Axiom::Types::ValueComparable, '.extended' do
     # RSpec tracks the original method (if any), then we add our own stub that
     # actually works, and finally when the example finishes RSpec will reset
     # the Module#extended method back to it's original state.
-    Module.any_instance.stub(:extended).with(object)
+    allow_any_instance_of(Module).to receive(:extended).with(object)
 
     delegated_ancestor = false
     Module.send(:undef_method, :extended)

data/spec/unit/axiom/types/value_comparable/finalize_spec.rb

@@ -18,6 +18,7 @@ describe Axiom::Types::ValueComparable, '#finalize' do
 
   it { should be_frozen }
 
+  its(:range)      { should be_frozen }
   its(:constraint) { should be_frozen }
 
   it 'adds a constraint that returns true for a value within range' do

data/spec/unit/axiom/types/value_comparable/range_spec.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Axiom::Types::ValueComparable, '#range' do
+  subject { object.range }
+
+  let(:object) do
+    Class.new(Axiom::Types::Type) do
+      extend Axiom::Types::ValueComparable
+      minimum 1
+      maximum 2
+    end
+  end
+
+  before do
+    object.finalize
+  end
+
+  it_should_behave_like 'an idempotent method'
+
+  it { should be_frozen }
+
+  it { should eql(1..2) }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axiom-types
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Dan Kubb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descendants_tracker
@@ -16,48 +16,62 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: thread_safe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ! '>='
+        version: '1.5'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ! '>='
+        version: '1.5'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.5.2
 description: Abstract types for logic programming
 email: dan.kubb@gmail.com
 executables: []
@@ -70,6 +84,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .ruby-gemset
 - .travis.yml
 - .yardopts
@@ -126,19 +141,24 @@ files:
 - spec/unit/axiom/types/encodable/finalize_spec.rb
 - spec/unit/axiom/types/hash/class_methods/finalize_spec.rb
 - spec/unit/axiom/types/hash/class_methods/infer_spec.rb
-- spec/unit/axiom/types/infinity/class_methods/coerce_spec.rb
-- spec/unit/axiom/types/infinity/class_methods/spaceship_operator_spec.rb
-- spec/unit/axiom/types/infinity/class_methods/succ_spec.rb
+- spec/unit/axiom/types/infinity/coerce_spec.rb
+- spec/unit/axiom/types/infinity/spaceship_operator_spec.rb
+- spec/unit/axiom/types/infinity/succ_spec.rb
 - spec/unit/axiom/types/length_comparable/class_methods/extended_spec.rb
 - spec/unit/axiom/types/length_comparable/finalize_spec.rb
-- spec/unit/axiom/types/negative_infinity/class_methods/spaceship_operator_spec.rb
+- spec/unit/axiom/types/length_comparable/range_spec.rb
+- spec/unit/axiom/types/negative_infinity/spaceship_operator_spec.rb
 - spec/unit/axiom/types/object/class_methods/coercion_method_spec.rb
 - spec/unit/axiom/types/object/class_methods/finalize_spec.rb
 - spec/unit/axiom/types/object/class_methods/infer_spec.rb
+- spec/unit/axiom/types/object/class_methods/inspect_spec.rb
 - spec/unit/axiom/types/object/class_methods/primitive_spec.rb
 - spec/unit/axiom/types/options/accept_options_spec.rb
 - spec/unit/axiom/types/options/inherited_spec.rb
 - spec/unit/axiom/types/set/class_methods/infer_spec.rb
+- spec/unit/axiom/types/type/class_methods/anonymous_predicate_spec.rb
+- spec/unit/axiom/types/type/class_methods/base_predicate_spec.rb
+- spec/unit/axiom/types/type/class_methods/base_spec.rb
 - spec/unit/axiom/types/type/class_methods/constraint_spec.rb
 - spec/unit/axiom/types/type/class_methods/finalize_spec.rb
 - spec/unit/axiom/types/type/class_methods/include_predicate_spec.rb
@@ -147,6 +167,7 @@ files:
 - spec/unit/axiom/types/type/class_methods/new_spec.rb
 - spec/unit/axiom/types/value_comparable/class_methods/extended_spec.rb
 - spec/unit/axiom/types/value_comparable/finalize_spec.rb
+- spec/unit/axiom/types/value_comparable/range_spec.rb
 homepage: https://github.com/dkubb/axiom-types
 licenses:
 - MIT
@@ -157,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.1
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Define types with optional constraints for use within axiom and other libraries.
@@ -182,19 +203,24 @@ test_files:
 - spec/unit/axiom/types/encodable/finalize_spec.rb
 - spec/unit/axiom/types/hash/class_methods/finalize_spec.rb
 - spec/unit/axiom/types/hash/class_methods/infer_spec.rb
-- spec/unit/axiom/types/infinity/class_methods/coerce_spec.rb
-- spec/unit/axiom/types/infinity/class_methods/spaceship_operator_spec.rb
-- spec/unit/axiom/types/infinity/class_methods/succ_spec.rb
+- spec/unit/axiom/types/infinity/coerce_spec.rb
+- spec/unit/axiom/types/infinity/spaceship_operator_spec.rb
+- spec/unit/axiom/types/infinity/succ_spec.rb
 - spec/unit/axiom/types/length_comparable/class_methods/extended_spec.rb
 - spec/unit/axiom/types/length_comparable/finalize_spec.rb
-- spec/unit/axiom/types/negative_infinity/class_methods/spaceship_operator_spec.rb
+- spec/unit/axiom/types/length_comparable/range_spec.rb
+- spec/unit/axiom/types/negative_infinity/spaceship_operator_spec.rb
 - spec/unit/axiom/types/object/class_methods/coercion_method_spec.rb
 - spec/unit/axiom/types/object/class_methods/finalize_spec.rb
 - spec/unit/axiom/types/object/class_methods/infer_spec.rb
+- spec/unit/axiom/types/object/class_methods/inspect_spec.rb
 - spec/unit/axiom/types/object/class_methods/primitive_spec.rb
 - spec/unit/axiom/types/options/accept_options_spec.rb
 - spec/unit/axiom/types/options/inherited_spec.rb
 - spec/unit/axiom/types/set/class_methods/infer_spec.rb
+- spec/unit/axiom/types/type/class_methods/anonymous_predicate_spec.rb
+- spec/unit/axiom/types/type/class_methods/base_predicate_spec.rb
+- spec/unit/axiom/types/type/class_methods/base_spec.rb
 - spec/unit/axiom/types/type/class_methods/constraint_spec.rb
 - spec/unit/axiom/types/type/class_methods/finalize_spec.rb
 - spec/unit/axiom/types/type/class_methods/include_predicate_spec.rb
@@ -203,4 +229,5 @@ test_files:
 - spec/unit/axiom/types/type/class_methods/new_spec.rb
 - spec/unit/axiom/types/value_comparable/class_methods/extended_spec.rb
 - spec/unit/axiom/types/value_comparable/finalize_spec.rb
+- spec/unit/axiom/types/value_comparable/range_spec.rb
 has_rdoc: