axiom-types 0.0.2 → 0.0.3

data/.rspec

@@ -1,4 +1,5 @@
 --color
 --format progress
 --profile
+--warnings
 --order random

data/.travis.yml

@@ -3,29 +3,24 @@ before_install: gem install bundler
 bundler_args: --without yard guard benchmarks
 script: "bundle exec rake ci"
 rvm:
-  - ree
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - ruby-head
-  - rbx-18mode
   - rbx-19mode
-  - jruby-18mode
-notifications:
-  irc:
-    channels:
-      - irc.freenode.org#rom-rb
-    on_success: never
-    on_failure: change
-  email:
-    recipients:
-      - dan.kubb@gmail.com
-    on_success: never
-    on_failure: change
 matrix:
   include:
     - rvm: jruby-19mode
       env: JRUBY_OPTS="$JRUBY_OPTS --debug"
     - rvm: jruby-head
       env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+  allow_failures:
+    - rvm: 1.9.3       # mutant fails
+    - rvm: 2.0.0       # mutant fails
+    - rvm: ruby-head   # travis broken
+    - rvm: rbx-19mode  # mutant fails
+notifications:
+  irc:
+    channels:
+      - irc.freenode.org#rom-rb
+    on_success: never
+    on_failure: change

data/Gemfile

@@ -4,5 +4,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'devtools', :git => 'https://github.com/rom-rb/devtools.git'
-eval File.read('Gemfile.devtools')
+group :development, :test do
+  gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
+end
+
+eval_gemfile 'Gemfile.devtools'

data/Gemfile.devtools

@@ -2,50 +2,45 @@
 
 group :development do
   gem 'rake',  '~> 10.1.0'
-  gem 'rspec', '~> 2.13.0'
-  gem 'yard',  '~> 0.8.6.1'
+  gem 'rspec', '~> 2.14.1'
+  gem 'yard',  '~> 0.8.7'
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.0.1'
+  gem 'kramdown', '~> 1.1.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'
 
   # file system change event handling
-  gem 'listen',     '~> 1.2.2'
-  gem 'rb-fchange', '~> 0.0.6', :require => false
-  gem 'rb-fsevent', '~> 0.9.3', :require => false
-  gem 'rb-inotify', '~> 0.9.0', :require => false
+  gem 'listen',     '~> 1.3.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
 
   # notification handling
-  gem 'libnotify',               '~> 0.8.0', :require => false
-  gem 'rb-notifu',               '~> 0.0.4', :require => false
-  gem 'terminal-notifier-guard', '~> 1.5.3', :require => false
+  gem 'libnotify',               '~> 0.8.0', require: false
+  gem 'rb-notifu',               '~> 0.0.4', require: false
+  gem 'terminal-notifier-guard', '~> 1.5.3', require: false
 end
 
 group :metrics do
-  gem 'backports', '~> 3.3', '>= 3.3.2'
   gem 'coveralls', '~> 0.6.7'
-  gem 'flay',      '~> 2.3.0'
-  gem 'flog',      '~> 4.1.0'
-  gem 'reek',      '~> 1.3.1', :git => 'https://github.com/troessner/reek.git'
+  gem 'flay',      '~> 2.4.0'
+  gem 'flog',      '~> 4.1.1'
+  gem 'reek',      '~> 1.3.2'
+  gem 'rubocop',   '~> 0.11.0'
   gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.6'
-
-  platforms :ruby_19 do
-    gem 'yard-spellcheck', '~> 0.1.5'
-  end
+  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
 
   platforms :ruby_19, :ruby_20 do
-    gem 'mutant', '~> 0.3.0.beta4'
-  end
-
-  platforms :rbx do
-    gem 'pelusa', '~> 0.2.2'
+    gem 'mutant', git: 'https://github.com/mbj/mutant.git'
+    gem 'yard-spellcheck', '~> 0.1.5'
   end
 end
 

data/Guardfile

@@ -2,23 +2,31 @@
 
 guard :bundler do
   watch('Gemfile')
-  watch('axiom-types.gemspec')
+  watch('Gemfile.lock')
+  watch(%w{.+.gemspec\z})
 end
 
-guard :rspec, :keep_failed => false do
-  # run all specs if configuration is modified
+guard :rspec, cli: File.read('.rspec').split.push('--fail-fast').join(' '), keep_failed: false do
+  # Run all specs if configuration is modified
+  watch('.rspec')              { 'spec' }
   watch('Guardfile')           { 'spec' }
   watch('Gemfile.lock')        { 'spec' }
   watch('spec/spec_helper.rb') { 'spec' }
 
-  # run all specs if supporting files files are modified
-  watch(%r{\Aspec/(?:lib|support|shared)/.+\.rb\z}) { 'spec' }
+  # Run all specs if supporting files files are modified
+  watch(%r{\Aspec/(?:fixtures|lib|support|shared)/.+\.rb\z}) { 'spec' }
 
-  # run unit specs if associated lib code is modified
-  watch(%r{\Alib/(.+)\.rb\z})                                         { |m| Dir["spec/unit/#{m[1]}"]         }
-  watch(%r{\Alib/(.+)/support/(.+)\.rb\z})                            { |m| Dir["spec/unit/#{m[1]}/#{m[2]}"] }
-  watch("lib/#{File.basename(File.expand_path('../', __FILE__))}.rb") { 'spec'                               }
+  # Run unit specs if associated lib code is modified
+  watch(%r{\Alib/(.+)\.rb\z})                                         { |m| Dir["spec/unit/#{m[1]}*"]         }
+  watch(%r{\Alib/(.+)/support/(.+)\.rb\z})                            { |m| Dir["spec/unit/#{m[1]}/#{m[2]}*"] }
+  watch("lib/#{File.basename(File.expand_path('../', __FILE__))}.rb") { 'spec'                                }
 
-  # run a spec if it is modified
+  # Run a spec if it is modified
   watch(%r{\Aspec/(?:unit|integration)/.+_spec\.rb\z})
 end
+
+guard :rubocop, cli: %w[--config config/rubocop.yml] do
+  watch(%r{.+\.(?:rb|rake)\z})
+  watch(%r{\Aconfig/rubocop\.yml\z})  { |m| File.dirname(m[0]) }
+  watch(%r{(?:.+/)?\.rubocop\.yml\z}) { |m| File.dirname(m[0]) }
+end

data/README.md

@@ -1,3 +1,8 @@
+axiom-types
+===========
+
+Define types with optional constraints for use within axiom and other libraries.
+
 [![Gem Version](https://badge.fury.io/rb/axiom-types.png)][gem]
 [![Build Status](https://secure.travis-ci.org/dkubb/axiom-types.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/dkubb/axiom-types.png)][gemnasium]
@@ -10,11 +15,6 @@
 [codeclimate]: https://codeclimate.com/github/dkubb/axiom-types
 [coveralls]: https://coveralls.io/r/dkubb/axiom-types
 
-axiom-types
-===========
-
-Define types with optional constraints for use within axiom and other libraries.
-
 Examples
 --------
 
@@ -35,29 +35,6 @@ Name.include?('')        # => false
 Name.include?('a' * 31)  # => false
 ```
 
-Installation
-------------
-
-With Rubygems:
-
-```bash
-$ gem install axiom-types
-$ irb -rubygems
->> require 'axiom-types'
-=> true
-```
-
-With git and local working copy:
-
-```bash
-$ git clone git://github.com/dkubb/axiom-types.git
-$ cd axiom-types
-$ rake install
-$ irb -rubygems
->> require 'axiom-types'
-=> true
-```
-
 Contributing
 -------------
 

data/axiom-types.gemspec

@@ -17,9 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files       = `git ls-files -- spec/unit`.split($/)
   gem.extra_rdoc_files = %w[LICENSE README.md TODO]
 
-  gem.add_runtime_dependency('backports',           '~> 3.3', '>= 3.3.2')
-  gem.add_runtime_dependency('descendants_tracker', '~> 0.0.1')
-  gem.add_runtime_dependency('ice_nine',            '~> 0.8.0')
+  gem.add_dependency('descendants_tracker', '~> 0.0.1')
+  gem.add_dependency('ice_nine',            '~> 0.9')
 
   gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')
 end

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
-threshold: 14
-total_score: 135
+threshold: 19
+total_score: 142

data/config/flog.yml

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

data/config/reek.yml

@@ -18,7 +18,8 @@ DataClump:
   min_clump_size: 2
 DuplicateMethodCall:
   enabled: true
-  exclude: []
+  exclude:
+  - Axiom::Types::Infinity#self.coerce
   max_calls: 1
   allow_calls: []
 FeatureEnvy:
@@ -52,7 +53,8 @@ NilCheck:
     - Axiom::Types::Type#self.constraint
 RepeatedConditional:
   enabled: true
-  exclude: []
+  exclude:
+  - Axiom::Types::Infinity
   max_ifs: 1
 TooManyInstanceVariables:
   enabled: true
@@ -71,32 +73,32 @@ UncommunicativeMethodName:
   enabled: true
   exclude: []
   reject:
-    - !ruby/regexp /^[a-z]$/
-    - !ruby/regexp /[0-9]$/
-    - !ruby/regexp /[A-Z]/
+  - !ruby/regexp /^[a-z]$/
+  - !ruby/regexp /[0-9]$/
+  - !ruby/regexp /[A-Z]/
   accept: []
 UncommunicativeModuleName:
   enabled: true
   exclude: []
   reject:
-    - !ruby/regexp /^.$/
-    - !ruby/regexp /[0-9]$/
+  - !ruby/regexp /^.$/
+  - !ruby/regexp /[0-9]$/
   accept: []
 UncommunicativeParameterName:
   enabled: true
   exclude: []
   reject:
-    - !ruby/regexp /^.$/
-    - !ruby/regexp /[0-9]$/
-    - !ruby/regexp /[A-Z]/
+  - !ruby/regexp /^.$/
+  - !ruby/regexp /[0-9]$/
+  - !ruby/regexp /[A-Z]/
   accept: []
 UncommunicativeVariableName:
   enabled: true
   exclude: []
   reject:
-    - !ruby/regexp /^.$/
-    - !ruby/regexp /[0-9]$/
-    - !ruby/regexp /[A-Z]/
+  - !ruby/regexp /^.$/
+  - !ruby/regexp /[0-9]$/
+  - !ruby/regexp /[A-Z]/
   accept: []
 UnusedParameters:
   enabled: true

data/config/rubocop.yml

@@ -0,0 +1,62 @@
+AllCops:
+  Includes:
+    - '../**/*.rake'
+    - 'Gemfile'
+    - 'Gemfile.devtools'
+  Excludes:
+    - '**/vendor/**'
+    - '**/benchmarks/**'
+
+# Avoid parameter lists longer than five parameters.
+ParameterLists:
+  Max: 3
+  CountKeywordArgs: true
+
+# Avoid more than `Max` levels of nesting.
+BlockNesting:
+  Max: 3
+
+# Align with the style guide.
+CollectionMethods:
+  PreferredMethods:
+    collect:  'map'
+    inject:   'reduce'
+    find:     'detect'
+    find_all: 'select'
+
+# Do not force public/protected/private keyword to be indented at the same
+# level as the def keyword. My personal preference is to outdent these keywords
+# because I think when scanning code it makes it easier to identify the
+# 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:
+  Enabled: false
+
+# Limit line length
+LineLength:
+  Max: 79
+
+# Disable documentation checking until a class needs to be documented once
+Documentation:
+  Enabled: false
+
+# Do not always use &&/|| instead of and/or.
+AndOr:
+  Enabled: false
+
+# Do not favor modifier if/unless usage when you have a single-line body
+IfUnlessModifier:
+  Enabled: false
+
+# Allow case equality operator (in limited use within the specs)
+CaseEquality:
+  Enabled: false
+
+# Constants do not always have to use SCREAMING_SNAKE_CASE
+ConstantName:
+  Enabled: false
+
+# Not all trivial readers/writers can be defined with attr_* methods
+TrivialAccessors:
+  Enabled: false

data/lib/axiom/types.rb

@@ -4,11 +4,12 @@ require 'bigdecimal'
 require 'date'
 require 'set'
 
-require 'backports'
 require 'ice_nine'
 require 'descendants_tracker'
 
 module Axiom
+
+  # Gem namespace
   module Types
 
     # Represent an undefined argument
@@ -23,8 +24,8 @@ module Axiom
     # Cache the type inference lookup by object
     @inference_cache = Hash.new do |cache, object|
       type = nil
-      Type.descendants.each do |descendant|
-        break if type = descendant.infer(object)
+      Type.descendants.detect do |descendant|
+        type = descendant.infer(object)
       end
       cache[object] = type
     end
@@ -60,6 +61,7 @@ module Axiom
   end # module Types
 end # module Axiom
 
+require 'axiom/types/support/infinity'
 require 'axiom/types/support/options'
 
 require 'axiom/types/value_comparable'

data/lib/axiom/types/boolean.rb

@@ -20,8 +20,10 @@ module Axiom
       #
       # @api private
       def self.infer_from_primitive_class(object)
-        self if TrueClass.singleton_class  === object ||
-                FalseClass.singleton_class === object
+        case object
+        when TrueClass.singleton_class, FalseClass.singleton_class
+          self
+        end
       end
 
       private_class_method :infer_from_primitive_class

data/lib/axiom/types/collection.rb

@@ -76,6 +76,7 @@ module Axiom
         member_type = Types.infer(member) || Object
         infer_from(member_type) || new_from(member_type)
       end
+      private_class_method :infer_from_primitive_instance
 
       # Infer the type from the member_type
       #
@@ -90,6 +91,7 @@ module Axiom
       def self.infer_from(member_type)
         self if self.member_type.equal?(member_type)
       end
+      private_class_method :infer_from
 
       # Instantiate a new type from a base type
       #
@@ -104,6 +106,7 @@ module Axiom
       def self.new_from(member_type)
         new { member_type(member_type) } if base?
       end
+      private_class_method :new_from
 
       # Test if the type is a base type
       #
@@ -113,6 +116,7 @@ module Axiom
       def self.base?
         # noop
       end
+      private_class_method :base?
 
       # Add a constraints for the member
       #
@@ -125,8 +129,7 @@ module Axiom
         end
       end
 
-      private_class_method :infer_from_primitive_instance, :infer_from,
-        :new_from, :base?, :matches_member_type
+      private_class_method :matches_member_type
 
     end # class Collection
   end # module Types