axiom 0.1.0 → 0.1.1

data/.gitignore

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

data/.rspec

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

data/.ruby-gemset

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

data/.travis.yml

@@ -1,28 +1,12 @@
 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:
-  - 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#datamapper
-    on_success: never
-    on_failure: change
-  email:
-    recipients:
-      - dan.kubb@gmail.com
-    on_success: never
-    on_failure: change
 matrix:
   include:
     - rvm: jruby-19mode
@@ -30,6 +14,13 @@ matrix:
     - rvm: jruby-head
       env: JRUBY_OPTS="$JRUBY_OPTS --debug"
   allow_failures:
-    # mutant fails
-    - rvm: 1.9.3
-    - rvm: rbx-19mode
+    - 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/datamapper/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

@@ -1,48 +1,46 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.0.4'
-  gem 'rspec', '~> 2.13.0'
-  gem 'yard',  '~> 0.8.5.2'
+  gem 'rake',  '~> 10.1.0'
+  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.7.0'
+  gem 'guard',         '~> 1.8.1'
   gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 2.5.2'
+  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',     '~> 0.7.3'
-  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.0'
-  gem 'coveralls',       '~> 0.6.4'
-  gem 'flay',            '~> 2.1.0'
-  gem 'flog',            '~> 3.2.3'
-  gem 'reek',            '~> 1.3.1', :git => 'https://github.com/troessner/reek.git'
-  gem 'simplecov',       '~> 0.7.1'
-  gem 'yardstick',       '~> 0.9.5'
-  gem 'yard-spellcheck', '~> 0.1.5'
-
-  platforms :mri_19, :rbx do
-    gem 'mutant', '~> 0.2.20'
-  end
-
-  platforms :rbx do
-    gem 'pelusa', '~> 0.2.2'
+  gem 'coveralls', '~> 0.6.7'
+  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.7', git: 'https://github.com/dkubb/yardstick.git'
+
+  platforms :ruby_19, :ruby_20 do
+    gem 'mutant', git: 'https://github.com/mbj/mutant.git'
+    gem 'yard-spellcheck', '~> 0.1.5'
   end
 end
 

data/Guardfile

@@ -2,22 +2,31 @@
 
 guard :bundler do
   watch('Gemfile')
+  watch('Gemfile.lock')
+  watch(%w{.+.gemspec\z})
 end
 
-guard :rspec, :cli => File.read('.rspec').split.join(' '), :keep_failed => false do
-  # run all specs if configuration is modified
+guard :rspec, cli: File.read('.rspec').split.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 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

@@ -15,53 +15,30 @@ Simplifies querying of structured data using relational algebra.
 [codeclimate]: https://codeclimate.com/github/dkubb/axiom
 [coveralls]: https://coveralls.io/r/dkubb/axiom
 
-Installation
-------------
-
-With Rubygems:
-
-```bash
-$ gem install axiom
-$ irb -rubygems
->> require 'axiom'
-=> true
-```
-
-With git and local working copy:
-
-```bash
-$ git clone git://github.com/dkubb/axiom.git
-$ cd axiom
-$ rake install
-$ irb -rubygems
->> require 'axiom'
-=> true
-```
-
-Usage
------
+Examples
+--------
 
 ```ruby
 relation = Axiom::Relation.new(
-  [ [ :id, String ], [ :name, String ], [ :color, String ], [ :weight, Float ], [ :city, String ] ],
+  [[:id, String], [:name, String], [:color, String], [:weight, Float], [:city, String]],
   [
-    [ 'P1', 'Nut',   'Red',   12.0, 'London' ],
-    [ 'P2', 'Bolt',  'Green', 17.0, 'Paris'  ],
-    [ 'P3', 'Screw', 'Blue',  17.0, 'Oslo'   ],
-    [ 'P4', 'Screw', 'Red',   14.0, 'London' ],
-    [ 'P5', 'Cam',   'Blue',  12.0, 'Paris'  ],
-    [ 'P6', 'Cog',   'Red',   19.0, 'London' ],
-  ]
+    ['P1', 'Nut',   'Red',   12.0, 'London'],
+    ['P2', 'Bolt',  'Green', 17.0, 'Paris' ],
+    ['P3', 'Screw', 'Blue',  17.0, 'Oslo'  ],
+    ['P4', 'Screw', 'Red',   14.0, 'London'],
+    ['P5', 'Cam',   'Blue',  12.0, 'Paris' ],
+    ['P6', 'Cog',   'Red',   19.0, 'London'],
+ ]
 )
 
 # Relational Operators
 # --------------------
 
 # projection
-new_relation = relation.project([ :id ])
+new_relation = relation.project([:id])
 
 # removal
-new_relation = relation.remove([ :name ])
+new_relation = relation.remove([:name])
 
 # rename
 new_relation = relation.rename(id: :other_id, name: :other_name)
@@ -70,7 +47,7 @@ new_relation = relation.rename(id: :other_id, name: :other_name)
 new_relation = relation.restrict { |r| r.name.eq('Screw').or(r.city.eq('London')) }
 new_relation = relation.restrict(relation.name.eq('Screw'))
 new_relation = relation.restrict(name: 'Screw')
-new_relation = relation.restrict([ [ :name, 'Screw' ] ])
+new_relation = relation.restrict([[:name, 'Screw']])
 
 # natural join
 new_relation = relation.join(other)        # OR relation + other
@@ -97,8 +74,8 @@ new_relation = relation.extend { |r| r.add(:pounds, r.weight * 2.2) }
 new_relation = relation.extend { |r| r.add(:pounds) { |t| t[:weight] * 2.2 } }
 
 # summarize
-new_relation = relation.summarize(relation.project([ :city ])) { |r| r.add(:count, r.id.count) }
-new_relation = relation.summarize(relation.project([ :city ])) { |r| r.add(:count) { |acc, t| acc.to_i + 1 } }
+new_relation = relation.summarize(relation.project([:city])) { |r| r.add(:count, r.id.count) }
+new_relation = relation.summarize(relation.project([:city])) { |r| r.add(:count) { |acc, t| acc.to_i + 1 } }
 
 # Non-Relational Operators
 # ------------------------
@@ -109,8 +86,11 @@ header = relation.header
 # a relation is Enumerable
 relation = relation.each { |tuple| ... }
 
+# order by attributes in the header
+ordered = relation.sort
+
 # order by attribute and direction
-ordered = relation.sort_by { |r| [ r.city.desc, r.name, r.color, r.id, r.weight ] }
+ordered = relation.sort_by { |r| [r.city.desc, r.name, r.color, r.id, r.weight] }
 
 # reverse the relation (only allowed if ordered)
 new_relation = ordered.reverse
@@ -131,6 +111,7 @@ new_relation = ordered.last(5)
 
 # get a tuple from a relation containing exactly one tuple
 tuple = relation.one
+tuple = relation.one { ... }
 
 # Updatable Views
 # ---------------

data/axiom.gemspec

@@ -3,26 +3,25 @@
 require File.expand_path('../lib/axiom/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name             = 'axiom'
-  gem.version          = Axiom::VERSION.dup
-  gem.authors          = ['Dan Kubb']
-  gem.email            = 'dan.kubb@gmail.com'
-  gem.description      = 'Simplifies querying of structured data using relational algebra'
-  gem.summary          = 'Ruby Relational Algebra'
-  gem.homepage         = 'https://github.com/dkubb/axiom'
+  gem.name        = 'axiom'
+  gem.version     = Axiom::VERSION.dup
+  gem.authors     = ['Dan Kubb']
+  gem.email       = 'dan.kubb@gmail.com'
+  gem.description = 'Simplifies querying of structured data using relational algebra'
+  gem.summary     = 'Ruby Relational Algebra'
+  gem.homepage    = 'https://github.com/dkubb/axiom'
+  gem.licenses    = 'MIT'
 
   gem.require_paths    = %w[lib]
-  gem.files            = `git ls-files`.split($/)
-  gem.test_files       = `git ls-files -- spec/{unit,integration}`.split($/)
-  gem.extra_rdoc_files = %w[LICENSE README.md TODO]
+  gem.files            = `git ls-files`.split("\n")
+  gem.test_files       = `git ls-files -- spec/{unit,integration}`.split("\n")
+  gem.extra_rdoc_files = %w[LICENSE README.md CONTRIBUTING.md TODO]
 
-  gem.add_runtime_dependency('backports',           '~> 3.1', '>= 3.1.1')
-  gem.add_runtime_dependency('adamantium',          '~> 0.0.7')
-  gem.add_runtime_dependency('descendants_tracker', '~> 0.0.1')
-  gem.add_runtime_dependency('equalizer',           '~> 0.0.5')
-  gem.add_runtime_dependency('abstract_type',       '~> 0.0.5')
+  gem.add_dependency('abstract_type',       '~> 0.0.5')
+  gem.add_dependency('adamantium',          '~> 0.1')
+  gem.add_dependency('axiom-types',         '~> 0.0.3')
+  gem.add_dependency('descendants_tracker', '~> 0.0.1')
+  gem.add_dependency('equalizer',           '~> 0.0.7')
 
-  gem.add_development_dependency('rake',  '~> 10.0.4')
-  gem.add_development_dependency('rspec', '~> 2.13.0')
-  gem.add_development_dependency('yard',  '~> 0.8.5.2')
+  gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')
 end

data/benchmarks/memory.rb

@@ -11,7 +11,7 @@ unless GC.respond_to?(:enable_stats)
   exit 1
 end
 
-COUNTS    = [ 1, 10, 100, 1_000, 10_000, 100_000 ].freeze
+COUNTS    = [1, 10, 100, 1_000, 10_000, 100_000].freeze
 NAME      = 'Dan Kubb'.freeze
 RELATIONS = {}
 
@@ -43,12 +43,12 @@ include Axiom
 
 puts '-' * 80
 gc_statistics 'header' do
-  HEADER = Relation::Header.new([ [ :id, Integer ], [ :name, String ] ])
+  HEADER = Relation::Header.new([[:id, Integer], [:name, String]])
 end
 
 puts '-' * 80
 gc_statistics 'tuple' do
-  TUPLE = Tuple.new(HEADER, [ 1, NAME ])
+  TUPLE = Tuple.new(HEADER, [1, NAME])
 end
 
 puts '-' * 80
@@ -60,7 +60,7 @@ end
 COUNTS.each do |count|
   RELATIONS[count] = Relation.new(
     HEADER,
-    (1..count).map { |n| Tuple.new(HEADER, [ n, NAME ]) }
+    (1..count).map { |n| Tuple.new(HEADER, [n, NAME]) }
   )
 end
 
@@ -80,13 +80,13 @@ end
 
 each_count do |array, relation, count|
   gc_statistics "projection (#{count} tuples)" do
-    relation.project([ :id ]).each {}
+    relation.project([:id]).each {}
   end
 end
 
 each_count do |array, relation, count|
   gc_statistics "removal (#{count} tuples)" do
-    relation.remove([ :name ]).each {}
+    relation.remove([:name]).each {}
   end
 end
 
@@ -98,13 +98,13 @@ end
 
 each_count do |array, relation, count|
   gc_statistics "join (#{count} tuples)" do
-    relation.join(Relation.new([ [ :id, Integer, ], [ :age, Integer ] ], [ [ 1, 35 ] ])).each {}
+    relation.join(Relation.new([[:id, Integer], [:age, Integer]], [[1, 35]])).each {}
   end
 end
 
 each_count do |array, relation, count|
   gc_statistics "product (#{count} tuples)" do
-    relation.product(Relation.new([ [ :age, Integer ] ], [ [ 35 ] ])).each {}
+    relation.product(Relation.new([[:age, Integer]], [[35]])).each {}
   end
 end
 
@@ -128,12 +128,12 @@ end
 
 each_count do |array, relation, count|
   gc_statistics "order (#{count} tuples)" do
-    relation.sort_by { |r| [ r.id.desc, r.name ] }.each {}
+    relation.sort_by { |r| [r.id.desc, r.name] }.each {}
   end
 end
 
 each_count do |array, relation, count|
-  relation = relation.sort_by { |r| [ r.id, r.name ] }
+  relation = relation.sort_by { |r| [r.id, r.name] }
 
   gc_statistics "take (#{count} tuples)" do
     relation.take(count).each {}
@@ -141,7 +141,7 @@ each_count do |array, relation, count|
 end
 
 each_count do |array, relation, count|
-  relation = relation.sort_by { |r| [ r.id, r.name ] }
+  relation = relation.sort_by { |r| [r.id, r.name] }
 
   gc_statistics "drop (#{count} tuples)" do
     relation.drop(1).each {}
@@ -149,7 +149,7 @@ each_count do |array, relation, count|
 end
 
 each_count do |array, relation, count|
-  relation = relation.sort_by { |r| [ r.id, r.name ] }
+  relation = relation.sort_by { |r| [r.id, r.name] }
 
   gc_statistics "first (#{count} tuples)" do
     relation.first(count).each {}
@@ -157,7 +157,7 @@ each_count do |array, relation, count|
 end
 
 each_count do |array, relation, count|
-  relation = relation.sort_by { |r| [ r.id, r.name ] }
+  relation = relation.sort_by { |r| [r.id, r.name] }
 
   gc_statistics "last (#{count} tuples)" do
     relation.last(count).each {}
@@ -165,7 +165,7 @@ each_count do |array, relation, count|
 end
 
 each_count do |array, relation, count|
-  relation = relation.sort_by { |r| [ r.id, r.name ] }
+  relation = relation.sort_by { |r| [r.id, r.name] }
 
   gc_statistics "reverse (#{count} tuples)" do
     relation.reverse.each {}