axiom-types 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODQxZTk1YzZmZDU0YjMyNTU1ZmMzNzI4ZWY2YzA5ZGZmODFmNTU4ZA==
-  data.tar.gz: !binary |-
-    YzU3ZjcxZjZjYzQwZGVkODY5YTgyM2YzNjI5Y2YzMmVlMjRlYTI0Yg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NGYzODhiZmE3NzA2ODI0MWUyZjQ5ZTBjNTBiMDljNWYxOWQ3MTZjZmI1ODVh
-    MmYyNDcyNzcwMTNlZTgxNmE1MTc3MzFlNDRiNWI4YzhkNGZjZmJiMzUxZjcw
-    NTFlMThkNWM5NTM3MDUyOWMxN2NmMTYxODRiNTBlNGFhYzhmOTg=
-  data.tar.gz: !binary |-
-    MWNkMmEwZTQ4NmMzZTc0YmRhYTI0YTE4ZjM4Yzk3YmQ4MjRhOWM4NTBhNTlk
-    MzU2MjhhNTYxZmI4NTc4ZmZmNWNmMWUxNjBkNTU3ZjJjOGQzZjVjOWQ1MzEx
-    MWFhZDA2N2MzMDRmNGE1YWFkZDc0MWZhYmIyOWNmZDlhOTg5ODg=
+SHA1:
+  metadata.gz: 0654768ee346ef4d7c2ee67b09c6689a8d6511a7
+  data.tar.gz: edca992fe60fe03b32b5fe64e72889c228d5eaf3
+SHA512:
+  metadata.gz: 0b028989bca769e2c8f50c8d8fd6ed2ebe3b4b11f162ee84973e91a4602c3de65a2d6f6c79ee76de021578cdc10e04f6371f8337f40bf4569aa4bfe08ace4d41
+  data.tar.gz: 8233f236b4b993d2774fb4cdbe00de69ae1713700c1d52433af60ce8ee735537a137d6f73e42792839d2b4efb8265f05ea64ee7f5f625fddf91ce0a1770450ba

data/.gitignore

@@ -11,7 +11,7 @@ tmtags
 .\#*
 
 ## VIM
-*.swp
+*.sw[op]
 
 ## Rubinius
 *.rbc

data/.ruby-gemset

@@ -0,0 +1 @@
+axiom-types

data/.travis.yml

@@ -11,10 +11,11 @@ rvm:
   - ruby-head
   - rbx-18mode
   - rbx-19mode
+  - jruby-18mode
 notifications:
   irc:
     channels:
-      - "irc.freenode.org#datamapper"
+      - irc.freenode.org#rom-rb
     on_success: never
     on_failure: change
   email:
@@ -24,12 +25,7 @@ notifications:
     on_failure: change
 matrix:
   include:
-    - rvm: jruby-18mode
     - rvm: jruby-19mode
       env: JRUBY_OPTS="$JRUBY_OPTS --debug"
     - rvm: jruby-head
       env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-  allow_failures:
-    # yard parser fails
-    - rvm: jruby-head
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"

data/CONTRIBUTING.md

@@ -0,0 +1,11 @@
+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.
+* Make your feature addition or bug fix.
+  * Follow this [style guide](https://github.com/dkubb/styleguide).
+* Add specs for it. This is important so I don't break it in a future version unintentionally. Tests must cover all branches within the code, and code must be fully covered.
+* Commit, do not mess with Rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Run "rake ci". This must pass and not show any regressions in the metrics for the code to be merged.
+* Send me a pull request. Bonus points for topic branches.

data/Gemfile

@@ -4,7 +4,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'coveralls', '~> 0.6.2'
-
-gem 'devtools', :git => 'https://github.com/datamapper/devtools.git'
+gem 'devtools', :git => 'https://github.com/rom-rb/devtools.git'
 eval File.read('Gemfile.devtools')

data/Gemfile.devtools

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.0.3'
+  gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.13.0'
-  gem 'yard',  '~> 0.8.5'
+  gem 'yard',  '~> 0.8.6.1'
 end
 
 group :yard do
@@ -11,17 +11,16 @@ group :yard do
 end
 
 group :guard do
-  gem 'guard',         '~> 1.6.2'
+  gem 'guard',         '~> 1.8.1'
   gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 2.5.1'
+  gem 'guard-rspec',   '~> 3.0.2'
 
   # 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', '~> 0.7.3'
-
   # notification handling
   gem 'libnotify',               '~> 0.8.0', :require => false
   gem 'rb-notifu',               '~> 0.0.4', :require => false
@@ -29,21 +28,20 @@ group :guard do
 end
 
 group :metrics do
-  gem 'backports',       '~> 3.1', '>= 3.1.1'
-  gem 'flay',            '~> 2.1.0'
-  gem 'flog',            '~> 3.2.2'
-  gem 'reek',            '~> 1.3.1', :git => 'https://github.com/troessner/reek.git'
-  gem 'metric_fu-roodi', '~> 2.2.1'
-  gem 'simplecov',       '~> 0.7.1'
-  gem 'yardstick',       '~> 0.9.4'
-
-  platforms :ruby_18, :ruby_19 do
-    # this indirectly depends on ffi which does not build on ruby-head
+  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 'simplecov', '~> 0.7.1'
+  gem 'yardstick', '~> 0.9.6'
+
+  platforms :ruby_19 do
     gem 'yard-spellcheck', '~> 0.1.5'
   end
 
-  platforms :mri_19, :rbx do
-    gem 'mutant', '~> 0.2.20'
+  platforms :ruby_19, :ruby_20 do
+    gem 'mutant', '~> 0.3.0.beta4'
   end
 
   platforms :rbx do
@@ -57,6 +55,6 @@ end
 
 platform :jruby do
   group :jruby do
-    gem 'jruby-openssl', '~> 0.8.2'
+    gem 'jruby-openssl', '~> 0.8.5'
   end
 end

data/README.md

@@ -61,14 +61,7 @@ $ irb -rubygems
 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.
-* Make your feature addition or bug fix.
-  * Follow this [style guide](https://github.com/dkubb/styleguide).
-* Add specs for it. This is important so I don't break it in a future version unintentionally. Tests must cover all branches within the code, and code must be fully covered.
-* Commit, do not mess with Rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Run "rake ci". This must pass and not show any regressions in the metrics for the code to be merged.
-* Send me a pull request. Bonus points for topic branches.
+See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
 
 Copyright
 ---------

data/Rakefile

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-require 'rake'
 require 'devtools'
 
 Devtools.init_rake_tasks

data/TODO

@@ -1,8 +1,6 @@
 TODO
 ----
 
-* Add mechanism to find best matching type for a given primitive.
-
 * Add finite limits to all "primitive" types.
 
 * Add optional constraint on Date for the timezone
@@ -19,7 +17,3 @@ TODO
 * When axiom-logic is available, replace the Proc based constraints with real
   predicates so that they can be serialized into SQL or optimized, etc.
   * Can be performed as part of type finalization
-
-* Create a factory method for the Hash type
-  * Make sure the primitive lookup system can use the key/value to find the best
-    match for a given Hash type.

data/axiom-types.gemspec

@@ -3,24 +3,23 @@
 require File.expand_path('../lib/axiom/types/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name             = 'axiom-types'
-  gem.version          = Axiom::Types::VERSION.dup
-  gem.authors          = ['Dan Kubb']
-  gem.email            = 'dan.kubb@gmail.com'
-  gem.description      = 'Abstract types for logic programming'
-  gem.summary          = gem.description
-  gem.homepage         = 'https://github.com/dkubb/axiom-types'
+  gem.name        = 'axiom-types'
+  gem.version     = Axiom::Types::VERSION.dup
+  gem.authors     = ['Dan Kubb']
+  gem.email       = 'dan.kubb@gmail.com'
+  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.require_paths    = %w[lib]
   gem.files            = `git ls-files`.split($/)
-  gem.test_files       = `git ls-files spec/{unit,integration}`.split($/)
+  gem.test_files       = `git ls-files -- spec/unit`.split($/)
   gem.extra_rdoc_files = %w[LICENSE README.md TODO]
 
-  gem.add_runtime_dependency('backports',           '~> 3.1', '>= 3.1.1')
+  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.7.0')
+  gem.add_runtime_dependency('ice_nine',            '~> 0.8.0')
 
-  gem.add_development_dependency('rake',  '~> 10.0.3')
-  gem.add_development_dependency('rspec', '~> 2.13.0')
-  gem.add_development_dependency('yard',  '~> 0.8.5')
+  gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')
 end

data/config/devtools.yml

@@ -0,0 +1,2 @@
+---
+unit_test_timeout: 0.1

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 14
-total_score: 82
+total_score: 135

data/config/flog.yml

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

data/config/reek.yml

@@ -1,100 +1,107 @@
 ---
-UncommunicativeParameterName:
-  accept: []
-  exclude: []
+Attribute:
   enabled: true
-  reject:
-  - !ruby/regexp /^.$/
-  - !ruby/regexp /[0-9]$/
-  - !ruby/regexp /[A-Z]/
-LargeClass:
-  max_methods: 0
   exclude: []
+BooleanParameter:
   enabled: true
-  max_instance_variables: 1
-UncommunicativeMethodName:
-  accept: []
   exclude: []
+ClassVariable:
   enabled: true
-  reject:
-  - !ruby/regexp /^[a-z]$/
-  - !ruby/regexp /[0-9]$/
-  - !ruby/regexp /[A-Z]/
-LongParameterList:
-  max_params: 2
   exclude: []
+ControlParameter:
   enabled: true
-  overrides: {}
-FeatureEnvy:
-  exclude:
-    - Axiom::Types::Encodable#has_encoding
+  exclude: []
+DataClump:
   enabled: true
-ClassVariable:
   exclude: []
+  max_copies: 0
+  min_clump_size: 2
+DuplicateMethodCall:
   enabled: true
-BooleanParameter:
   exclude: []
+  max_calls: 1
+  allow_calls: []
+FeatureEnvy:
   enabled: true
+  exclude:
+    - Axiom::Types::Encodable#has_encoding
 IrresponsibleModule:
+  enabled: true
   exclude: []
+LongParameterList:
   enabled: true
-UncommunicativeModuleName:
-  accept: []
   exclude: []
+  max_params: 2
+  overrides:
+    initialize:
+      max_params: 3
+LongYieldList:
   enabled: true
-  reject:
-  - !ruby/regexp /^.$/
-  - !ruby/regexp /[0-9]$/
+  exclude: []
+  max_params: 2
 NestedIterators:
+  enabled: true
+  exclude:
+    - Axiom::Types::Hash#self.matches_key_and_value_types
+    - Axiom::Types::Collection#self.matches_member_type
+  max_allowed_nesting: 1
   ignore_iterators: []
+NilCheck:
+  enabled: true
   exclude:
-    - Axiom::Types::Hash#self.matches
+    - Axiom::Types::Type#self.constraint
+RepeatedConditional:
   enabled: true
-  max_allowed_nesting: 1
-LongMethod:
-  max_statements: 5
   exclude: []
+  max_ifs: 1
+TooManyInstanceVariables:
   enabled: true
-Duplication:
-  allow_calls: []
   exclude: []
+  max_instance_variables: 1
+TooManyMethods:
   enabled: true
-  max_calls: 1
-UtilityFunction:
-  max_helper_calls: 0
   exclude: []
+  max_methods: 0
+TooManyStatements:
   enabled: true
-Attribute:
-  exclude: []
-  enabled: false
-UncommunicativeVariableName:
-  accept: []
-  exclude: []
+  exclude:
+    - each
+  max_statements: 5
+UncommunicativeMethodName:
   enabled: true
-  reject:
-  - !ruby/regexp /^.$/
-  - !ruby/regexp /[0-9]$/
-  - !ruby/regexp /[A-Z]/
-SimulatedPolymorphism:
   exclude: []
+  reject:
+    - !ruby/regexp /^[a-z]$/
+    - !ruby/regexp /[0-9]$/
+    - !ruby/regexp /[A-Z]/
+  accept: []
+UncommunicativeModuleName:
   enabled: true
-  max_ifs: 1
-DataClump:
   exclude: []
+  reject:
+    - !ruby/regexp /^.$/
+    - !ruby/regexp /[0-9]$/
+  accept: []
+UncommunicativeParameterName:
   enabled: true
-  max_copies: 0
-  min_clump_size: 2
-ControlCouple:
   exclude: []
+  reject:
+    - !ruby/regexp /^.$/
+    - !ruby/regexp /[0-9]$/
+    - !ruby/regexp /[A-Z]/
+  accept: []
+UncommunicativeVariableName:
   enabled: true
-LongYieldList:
-  max_params: 0
   exclude: []
-  enabled: true
+  reject:
+    - !ruby/regexp /^.$/
+    - !ruby/regexp /[0-9]$/
+    - !ruby/regexp /[A-Z]/
+  accept: []
 UnusedParameters:
   enabled: true
   exclude: []
-NilCheck:
+UtilityFunction:
   enabled: true
-  exclude:
-    - Axiom::Types::Type#self.constraint
+  exclude: []
+  max_helper_calls: 0

data/lib/axiom/types.rb

@@ -20,12 +20,36 @@ module Axiom
     # A false proposition
     Contradiction = proc { false }.freeze
 
+    # 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)
+      end
+      cache[object] = type
+    end
+
+    # Infer the type of an object
+    #
+    # @example
+    #   Axiom::Types.infer(Integer)  # => Axiom::Types::Integer
+    #
+    # @param [Object] object
+    #   object to infer the type of
+    #
+    # @return [Class<Axiom::Types::Type>]
+    #
+    # @api public
+    def self.infer(object)
+      @inference_cache[object]
+    end
+
     # Finalize Axiom::Types::Type subclasses
     #
     # @example
     #   Axiom::Types.finalize  # => Axiom::Types
     #
-    # @return [Axiom::Types]
+    # @return [Module<Axiom::Types>]
     #
     # @api public
     def self.finalize
@@ -46,6 +70,7 @@ require 'axiom/types/type'
 
 require 'axiom/types/object'
 
+require 'axiom/types/collection'
 require 'axiom/types/numeric'
 
 require 'axiom/types/array'