axiom 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0a046d8b1a86773086ceafa33a98e3452cb18d8c
+  data.tar.gz: d6c790c41ba483ddbc51d84ab134e2779b0fd649
+SHA512:
+  metadata.gz: 3a05d7872883d188be08181ea674b519e325ac044d9fc5ba83709830c07e1a50d6f4bf5752cee6df795a0b7eab941ca8ca95d4e538728529ef7d964229ff1230
+  data.tar.gz: afa76b69d11b0a9e52b856a3818ad3538bfd2575a548ab8a22ad7be4abe4c3114f290b4ffd78e51938d631a7222d71d3017cbd442f6fcbb8890eb4392b695f58

data/.rspec

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

data/.rubocop.yml

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

data/.travis.yml

@@ -5,19 +5,22 @@ 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
 
+platform :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.1.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.11.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/Guardfile

@@ -6,14 +6,14 @@ guard :bundler do
   watch(%w{.+.gemspec\z})
 end
 
-guard :rspec, cli: File.read('.rspec').split.join(' '), keep_failed: false do
+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 are modified
+  # 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

data/README.md

@@ -1,5 +1,4 @@
-axiom
-=====
+# axiom
 
 Simplifies querying of structured data using relational algebra.
 
@@ -15,8 +14,7 @@ Simplifies querying of structured data using relational algebra.
 [codeclimate]: https://codeclimate.com/github/dkubb/axiom
 [coveralls]: https://coveralls.io/r/dkubb/axiom
 
-Examples
---------
+## Examples
 
 ```ruby
 relation = Axiom::Relation.new(
@@ -65,9 +63,21 @@ new_relation = relation.union(other)       # OR relation | other
 new_relation = relation.difference(other)  # OR relation - other
 
 # theta-join
+#
+# NOTE: theta-join is effectively restricting a product of the relations
 new_relation = relation.join(other) { |r| r.id.gte(r.other_id) }
 
-# NOTE: theta-join is effectively restricting a product of the relations
+# group
+grouped = relation.group(products: [:product_name])
+
+# ungroup
+ungrouped = relation.ungroup(:products)
+
+# wrap
+wrapped = relation.wrap(address: [:street, :city, :state, :zip, :country])
+
+# unwrap
+unwrapped = relation.unwrap(:address)
 
 # extend
 new_relation = relation.extend { |r| r.add(:pounds, r.weight * 2.2) }
@@ -83,31 +93,34 @@ new_relation = relation.summarize(relation.project([:city])) { |r| r.add(:count)
 # returns a set that represents the relation header
 header = relation.header
 
+# each subset of unique keys as header objects
+key_headers = header.keys
+
 # a relation is Enumerable
 relation = relation.each { |tuple| ... }
 
 # order by attributes in the header
-ordered = relation.sort
+sorted = relation.sort
 
 # order by attribute and direction
-ordered = relation.sort_by { |r| [r.city.desc, r.name, r.color, r.id, r.weight] }
+sorted = 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
+# reverse the relation (only allowed if sorted)
+new_relation = sorted.reverse
 
-# offset (only allowed if ordered)
-new_relation = ordered.drop(5)
+# offset (only allowed if sorted)
+new_relation = sorted.drop(5)
 
-# limiting (only allowed if ordered)
-new_relation = ordered.take(10)
+# limiting (only allowed if sorted)
+new_relation = sorted.take(10)
 
-# get the first n tuples (only allowed if ordered)
-new_relation = ordered.first     # default is 1
-new_relation = ordered.first(5)
+# get the first n tuples (only allowed if sorted)
+new_relation = sorted.first     # default is 1
+new_relation = sorted.first(5)
 
-# get the last n tuples (only allowed if ordered)
-new_relation = ordered.last      # default is 1
-new_relation = ordered.last(5)
+# get the last n tuples (only allowed if sorted)
+new_relation = sorted.last      # default is 1
+new_relation = sorted.last(5)
 
 # get a tuple from a relation containing exactly one tuple
 tuple = relation.one
@@ -124,13 +137,9 @@ new_relation = relation.delete(other)
 
 # replace a relation variable with another set
 new_relation = relation.replace(other)
-
-# each subset of unique keys as header objects
-keys = header.keys
 ```
 
-Goals
------
+## Goals
 
 The purpose of this project is to expand my knowledge of relational algebra by attempting to implement a simple query system using the primitive operations defined in relational algebra.
 
@@ -142,8 +151,7 @@ The ability to join data from multiple datastores and have it presented in a con
 
 Not only does this work nicely with associations, but it will allow DataMapper to perform mapping in a more powerful way. You'll be able to construct a join from multiple datastores, and set that as the base for your model. Each DM Resource would work as normal, but again writes could be propagated back to the appropriate datastore. You'd be able to split your data up between different datastores, but assemble it into one coherent view.
 
-Related Projects
-----------------
+## Related Projects
 
 * [axiom-optimizer](https://github.com/dkubb/axiom-optimizer)
 
@@ -157,12 +165,10 @@ This is a visitor class that takes a Axiom relation and generates valid SQL from
 
 This is a system that manages the database connections and executes the SQL generated from the relations.
 
-Contributing
-------------
+## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
 
-Copyright
----------
+## Copyright
 
 Copyright © 2009-2013 Dan Kubb. See LICENSE for details.

data/TODO

@@ -1,5 +1,15 @@
 * TODO:
 
+* Create a module to allow methods to be added to existing Attribute objects
+  in such a way that the same methods can be easily mixed into other
+  things, like functions or relations.
+  * Replace the explicit mix-into-relation with something that adds the
+    methods to Axiom::Attribute::Relation, and then have Axiom::Relation
+    "inherit" those by declaring it's own relation methods as being of that
+    type.
+
+* Move all Axiom::Algebra classes under Axiom::Relation::Operation
+
 * Change Algebra::Extension#extensions to be a non-primtive
   * May also change EvaluationContext#functions to return a set of functions.
 
@@ -7,10 +17,6 @@
   * When unioning two keys together it is really simple to end up
     with indexes that overlap and cause an exception.
 
-* Add Header#size
-  * Replace code that coerces the Header to an Array in order to get the size
-    with Header#size.
-
 * Make Equalizer handle subclasses without having to specify the attribtues
   again in each descendant.
 
@@ -34,11 +40,7 @@
     * Use a class variable to store each "Tuple class" so that anything with a
       similar header will be reused.
 
-* Remove mean/variance/stddev modules from Virtus::Attribute::Comparable
-  * It makes no sense for comparable objects to be "averaged", what would it
-    mean to get the average string?
-
-* Remove Order, Reverse, Limit and Offset from the Relation inheritance chain
+* Remove Sorted, Reverse, Limit and Offset from the Relation inheritance chain
   * Instead make it so they are proxy classes that wrap Relations, but
     proxy method calls to the Relation methods, and then wrap the return
     value (assuming it's a Relation) in a copy of itself.
@@ -46,14 +48,12 @@
     all the Relation classes. Only the Ranking classes will need to know
     about directions.
   * The Reverse class will probably not be needed either. All we need is
-    for the #reverse method to create a new Order with the directions
+    for the #reverse method to create a new Sorted with the directions
     reversed.
   * Remove the knowledge of directions from materialized relations
-    and instead wrap materialized relations in the Order object
+    and instead wrap materialized relations in the Sorted object
     if any.
 
-* Add Relation#group and Relation#ungroup
-
 * Update Attributes so that constraints are modelled using predicates,
   so that when "join-ability" is tested, the predicates can just be
   compared for equality.
@@ -62,13 +62,6 @@
     caller. This will allow a "complex" predicate to set the errors
     on tuples, while still allowing all the same objects to be used.
 
-* Update memoization to take into account the arguments passed into
-  the method. It should memoize differently for different
-  methods. Perhaps it could have a special case for methods
-  with a 0-arity vs n-arity methods, but it needs to handle cases
-  like with #hash that accept no args, and #optimize that accepts
-  1 arg.
-
 * Within the restriction context, make sure the attributes have aliases for:
   * Alias #== to #eq (may break alot)
   * Alias #!= to #ne (in 1.9 only)
@@ -101,7 +94,12 @@
   * include? / member?
   * min / max / minmax (when the tuples are sorted)
 
-* Rename Order to Sorted
-  * In other languages, "ordered" implies that the order tuples are added to the
-    relation is tracked, while "sorted" means that they are sorted according to
-    some criteria. The latter is closer to what is meant.
+* Add Axiom::Relation aggregate methods:
+  * count
+  * count(attribute)
+  * sum(attribute)
+  * minimum(attribute)
+  * maximum(attribute)
+  * mean(attribute)
+  * standard_deviation(attribute)
+  * variance(attribute)

data/axiom.gemspec

@@ -10,18 +10,18 @@ Gem::Specification.new do |gem|
   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.license     = 'MIT'
 
   gem.require_paths    = %w[lib]
-  gem.files            = `git ls-files`.split("\n")
-  gem.test_files       = `git ls-files -- spec/{unit,integration}`.split("\n")
+  gem.files            = `git ls-files`.split($/)
+  gem.test_files       = `git ls-files -- spec/{unit,integration}`.split($/)
   gem.extra_rdoc_files = %w[LICENSE README.md CONTRIBUTING.md TODO]
 
-  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_runtime_dependency('abstract_type',       '~> 0.0.7')
+  gem.add_runtime_dependency('adamantium',          '~> 0.2.0')
+  gem.add_runtime_dependency('axiom-types',         '~> 0.1.0')
+  gem.add_runtime_dependency('descendants_tracker', '~> 0.0.3')
+  gem.add_runtime_dependency('equalizer',           '~> 0.0.9')
 
-  gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')
+  gem.add_development_dependency('bundler', '~> 1.5', '>= 1.5.2')
 end

data/benchmarks/memory.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby -Ku
-
 # encoding: utf-8
 
 # benchmark memory usage of lib, core object init and relation operations
@@ -127,7 +126,7 @@ each_count do |array, relation, count|
 end
 
 each_count do |array, relation, count|
-  gc_statistics "order (#{count} tuples)" do
+  gc_statistics "sort_by (#{count} tuples)" do
     relation.sort_by { |r| [r.id.desc, r.name] }.each {}
   end
 end

data/benchmarks/speed.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby -Ku
-
 # encoding: utf-8
 
 # benchmark speed of relation operations
@@ -17,7 +16,7 @@ array    = (1..100).map { |n| Tuple.new(header, [n, 'Dan Kubb']) }
 relation = Relation.new(header, array)
 join     = Relation.new([[:id, Integer], [:age, Integer]], [[1, 35]])
 product  = Relation.new([[:age, Integer]], [[35]])
-ordered  = relation.sort_by { |r| [r.id, r.name] }
+sorted   = relation.sort_by { |r| [r.id, r.name] }
 
 RBench.run(TIMES) do
   column :ruby,  title: 'Ruby'
@@ -68,33 +67,33 @@ RBench.run(TIMES) do
     axiom { relation.difference(relation).each {} }
   end
 
-  report 'order' do
+  report 'sort_by' do
     ruby  { array.sort_by { |tuple| [-tuple[:id], tuple[:name]] }.each {} }
     axiom { relation.sort_by { |r| [r.id.desc, r.name] }.each {}          }
   end
 
   report 'take' do
     ruby  { array.take(1).each {}   }
-    axiom { ordered.take(1).each {} }
+    axiom { sorted.take(1).each {} }
   end
 
   report 'drop' do
     ruby  { array.drop(1).each {}   }
-    axiom { ordered.drop(1).each {} }
+    axiom { sorted.drop(1).each {} }
   end
 
   report 'first' do
     ruby  { array.first(1).each {}   }
-    axiom { ordered.first(1).each {} }
+    axiom { sorted.first(1).each {} }
   end
 
   report 'last' do
     ruby  { array.last(1).each {}   }
-    axiom { ordered.last(1).each {} }
+    axiom { sorted.last(1).each {} }
   end
 
   report 'reverse' do
     ruby  { array.reverse.each {}   }
-    axiom { ordered.reverse.each {} }
+    axiom { sorted.reverse.each {} }
   end
 end