axiom-optimizer 0.1.0 → 0.1.1

data/.rspec

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

data/.ruby-gemset

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

data/.travis.yml

@@ -3,19 +3,14 @@ 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#datamapper"
+      - irc.freenode.org#rom-rb
     on_success: never
     on_failure: change
   email:
@@ -32,4 +27,7 @@ matrix:
   allow_failures:
     # mutant fails
     - rvm: 1.9.3
+    - rvm: 2.0.0
     - rvm: rbx-19mode
+    # broken on travis
+    - rvm: ruby-head

data/Gemfile

@@ -4,7 +4,10 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'axiom', '~> 0.1.0', :git => 'https://github.com/dkubb/axiom.git'
+gem 'axiom', '~> 0.1.1', git: 'https://github.com/dkubb/axiom.git'
 
-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,44 +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.6.2'
 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.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
 
   # 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'
+  gem 'coveralls', '~> 0.6.7'
+  gem 'flay',      '~> 2.3.1'
+  gem 'flog',      '~> 4.1.1'
+  gem 'reek',      '~> 1.3.1',  git: 'https://github.com/troessner/reek.git'
+  gem 'rubocop',   '~> 0.10.0', git: 'https://github.com/bbatsov/rubocop.git'
+  gem 'simplecov', '~> 0.7.1'
+  gem 'yardstick', '~> 0.9.6'
+
+  platforms :ruby_19, :ruby_20 do
+    gem 'mutant', git: 'https://github.com/mbj/mutant.git'
+    gem 'yard-spellcheck', '~> 0.1.5'
   end
 
   platforms :rbx do

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 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 app or 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,31 +15,8 @@ Relational algebra optimizer
 [codeclimate]: https://codeclimate.com/github/dkubb/axiom-optimizer
 [coveralls]: https://coveralls.io/r/dkubb/axiom-optimizer
 
-Installation
-------------
-
-With Rubygems:
-
-```bash
-$ gem install axiom-optimizer
-$ irb -rubygems
->> require 'axiom-optimizer'
-=> true
-```
-
-With git and local working copy:
-
-```bash
-$ git clone git://github.com/dkubb/axiom-optimizer.git
-$ cd axiom-optimizer
-$ rake install
-$ irb -rubygems
->> require 'axiom-optimizer'
-=> true
-```
-
-Usage
------
+Examples
+--------
 
 ```ruby
 # optimize a relation

data/axiom-optimizer.gemspec

@@ -19,7 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency('axiom', '~> 0.1.0')
 
-  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/config/devtools.yml

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

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 66
-total_score: 913
+total_score: 910

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 19.4
+threshold: 18.2

data/config/rubocop.yml

@@ -0,0 +1,53 @@
+AllCops:
+  Includes:
+    - '**/*.rake'
+    - 'Gemfile'
+    - 'Gemfile.devtools'
+  Excludes:
+    - '**/vendor/**'
+
+# 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: 167  # TODO: lower to 79
+
+# Disable documentation checking until a class needs to be documented once
+Documentation:
+  Enabled: false
+
+# Do not favor modifier if/unless usage when you have a single-line body
+IfUnlessModifier:
+  Enabled: false
+
+# Constants do not always have to use SCREAMING_SNAKE_CASE
+ConstantName:
+  Enabled: false
+
+# Do not check formatting of special comments like "TODO" or "OPTIMIZE"
+CommentAnnotation:
+  Enabled: false

data/lib/axiom/optimizer.rb

@@ -9,7 +9,7 @@ module Axiom
     include AbstractType, Adamantium
 
     # An optimizer that returns the operation
-    Identity = lambda { |operation| operation }.freeze
+    Identity = ->(operation) { operation }.freeze
 
     # The operation to optimize
     #

data/lib/axiom/optimizer/algebra/difference.rb

@@ -17,7 +17,7 @@ module Axiom
           #
           # @api private
           def optimize
-            Axiom::Relation::Empty.new(operation.header, operation)
+            Axiom::Relation::Empty.new(operation.header)
           end
 
         end # class EqualOperands

data/lib/axiom/optimizer/algebra/join.rb

@@ -28,7 +28,9 @@ module Axiom
         #
         # @api private
         def materialized_predicate
-          matching_projection.reduce(CONTRADICTION) { |predicate, tuple| predicate.or(tuple.predicate) }.optimize
+          matching_projection.reduce(CONTRADICTION) do |accumulator, element|
+            accumulator.or(element.predicate)
+          end.optimize
         end
 
         # Optimize when operands' headers are equal

data/lib/axiom/optimizer/algebra/projection.rb

@@ -175,7 +175,7 @@ module Axiom
           #
           # @api private
           def optimize
-            Axiom::Relation::Empty.new(header, operation)
+            Axiom::Relation::Empty.new(header)
           end
 
         end # class EmptyOperand

data/lib/axiom/optimizer/algebra/rename.rb

@@ -339,7 +339,7 @@ module Axiom
           #
           # @api private
           def optimize
-            Axiom::Relation::Empty.new(header, operation)
+            Axiom::Relation::Empty.new(header)
           end
 
         end # class EmptyOperand

data/lib/axiom/optimizer/algebra/restriction.rb

@@ -98,7 +98,7 @@ module Axiom
           #
           # @api private
           def optimize
-            Axiom::Relation::Empty.new(operation.header, operation)
+            Axiom::Relation::Empty.new(operation.header)
           end
 
         end # class Contradiction

data/lib/axiom/optimizer/algebra/summarization.rb

@@ -130,7 +130,7 @@ module Axiom
           #
           # @api private
           def optimize
-            Axiom::Relation::Empty.new(operation.header, operation)
+            Axiom::Relation::Empty.new(operation.header)
           end
 
         end # class EmptySummarizePer

data/lib/axiom/optimizer/function/connective/binary.rb

@@ -147,7 +147,7 @@ module Axiom
           #
           # @api private
           def merged_right_enumerables
-            [ left.right, right.right ].flatten
+            [left.right, right.right].flatten
           end
 
           # Optimize when the operands are constants

data/lib/axiom/optimizer/optimizable.rb

@@ -34,9 +34,11 @@ module Axiom
       def optimize
         optimizer = self.class.optimizer || Optimizer::Identity
         optimized = optimizer.call(self)
-        equal?(optimized)                ? self               :
-        optimized.respond_to?(:optimize) ? optimized.optimize :
-                                           optimized
+        if equal?(optimized)                   then self
+        elsif optimized.respond_to?(:optimize) then optimized.optimize
+        else
+          optimized
+        end
       end
 
       memoize :optimize

data/lib/axiom/optimizer/relation/materialized.rb

@@ -25,7 +25,7 @@ module Axiom
           #
           # @api private
           def optimize
-            Axiom::Relation::Empty.new(operation.header, operation)
+            Axiom::Relation::Empty.new(operation.header)
           end
 
         end # class EmptyOperand

data/lib/axiom/optimizer/relation/operation/combination.rb

@@ -14,7 +14,7 @@ module Axiom
           #
           # @api private
           def optimize
-            Axiom::Relation::Empty.new(operation.header, operation)
+            Axiom::Relation::Empty.new(operation.header)
           end
 
           # Optimize when the left operand is Empty

data/lib/axiom/optimizer/relation/operation/limit.rb

@@ -37,7 +37,7 @@ module Axiom
             #
             # @api private
             def optimize
-              Axiom::Relation::Empty.new(operation.header, operation)
+              Axiom::Relation::Empty.new(operation.header)
             end
 
           end # class ZeroLimit
@@ -105,7 +105,7 @@ module Axiom
             #
             # @api private
             def min_limit
-              [ limit, operand.limit ].min
+              [limit, operand.limit].min
             end
 
           end # class LimitOperand

data/lib/axiom/optimizer/support/predicate_partition.rb

@@ -84,10 +84,7 @@ module Axiom
       #
       # @api private
       def partition_binary!(function)
-        operands = [ function.left, function.right ].select do |operand|
-          operand.kind_of?(Axiom::Attribute)
-        end
-
+        operands       = [function.left, function.right].grep(Axiom::Attribute)
         left_operands  = @left_header  & operands
         right_operands = @right_header & operands
 

data/lib/axiom/optimizer/version.rb

@@ -4,7 +4,7 @@ module Axiom
   class Optimizer
 
     # Gem version
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
 
   end # class Optimizer
 end # module Axiom