axiom-do-adapter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed1710fbd739ac85f9d3b0df14915062a10b88ed
-  data.tar.gz: 228074550829123b935ab2daf643d0fc79896bd3
+  metadata.gz: 270901849bbfcdf472e90a23f7af192de8066de4
+  data.tar.gz: 8b92a29aaeaddae594887efe1d6c917fe10b6c1a
 SHA512:
-  metadata.gz: ec7449b950c3f710b2718d3ead6275b86529fdc372e3db25ab02c89ef701cb07f050fa81a85f0342d7fe0610b31891612a5ad472baab9c3dfc2e6dea16802f09
-  data.tar.gz: ed431cca2abaa3126f61726686a788775c11c1752dc0c127332338da9b518b92487cc15c52a7fdbf7bb8a9a5c5e0623457cc13287cac3ef7038af33fbff6ab5d
+  metadata.gz: 1251cd36d581ca65b99692e266869f9f1f76b7bb9a4273027a54e7b82c5f68015aacea4c5ad05f610f1b0100570e2e266787f0b71f0c53ff2344e6f7456dc272
+  data.tar.gz: 5164f07072d6cc73038eb2da479ffd3eb0e065ee251438823e5762310da90b4462acb370fd2f2b233b4aaae1bd86118401d329e14140c166205978130727c733

data/.rubocop.yml

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

data/.ruby-gemset

@@ -0,0 +1 @@
+axiom-do-adapter

data/.travis.yml

@@ -1,35 +1,29 @@
 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
+  - 2.1.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
+  - 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:
-    # mutant fails
-    - rvm: 1.9.3
-    - rvm: rbx-19mode
+    - rvm: 2.1.0  # buggy runtime
+  fast_finish: true
+notifications:
+  irc:
+    channels:
+      - irc.freenode.org#rom-rb
+    on_success: never
+    on_failure: change

data/CONTRIBUTING.md

@@ -1,5 +1,4 @@
-Contributing
-------------
+# 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.

data/Gemfile

@@ -2,9 +2,14 @@
 
 source 'https://rubygems.org'
 
-gem 'data_objects',        '~> 0.10.12', :git => 'https://github.com/datamapper/do.git'
-gem 'axiom',               '~> 0.1.0',   :git => 'https://github.com/dkubb/axiom.git'
-gem 'axiom-sql-generator', '~> 0.1.0',   :git => 'https://github.com/dkubb/axiom-sql-generator.git'
+gemspec
 
-gem 'devtools', :git => 'https://github.com/datamapper/devtools.git'
-eval File.read('Gemfile.devtools')
+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
+
+eval_gemfile 'Gemfile.devtools'

data/Gemfile.devtools

@@ -1,48 +1,60 @@
 # 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'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.0.1'
+  gem 'kramdown', '~> 1.3.0'
 end
 
 group :guard do
-  gem 'guard',         '~> 1.7.0'
-  gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 2.5.2'
+  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',     '~> 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',     '~> 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
 
   # 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.7.0'
+  gem 'flay',      '~> 2.4.0'
+  gem 'flog',      '~> 4.2.0'
+  gem 'reek',      '~> 1.3.2'
+  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 'yard-spellcheck', '~> 0.1.5'
   end
 
-  platforms :rbx do
-    gem 'pelusa', '~> 0.2.2'
+  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
 

data/README.md

@@ -1,5 +1,4 @@
-axiom-do-adapter
-================
+# axiom-do-adapter
 
 Use Axiom relations with an SQL based RDBMS
 
@@ -15,12 +14,10 @@ Use Axiom relations with an SQL based RDBMS
 [codeclimate]: https://codeclimate.com/github/dkubb/axiom-do-adapter
 [coveralls]: https://coveralls.io/r/dkubb/axiom-do-adapter
 
-Contributing
-------------
+## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
 
-Copyright
----------
+## Copyright
 
 Copyright © 2011-2013 Dan Kubb. See LICENSE for details.

data/axiom-do-adapter.gemspec

@@ -10,18 +10,16 @@ Gem::Specification.new do |gem|
   gem.description = 'Use Axiom relations with an RDBMS'
   gem.summary     = 'Vertias DataObjects adapter'
   gem.homepage    = 'https://github.com/dkubb/axiom-do-adapter'
-  gem.licenses    = %w[MIT]
+  gem.license     = '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 CONTRIBUTING.md TODO]
 
-  gem.add_runtime_dependency('data_objects',        '~> 0.10.12')
-  gem.add_runtime_dependency('axiom',               '~> 0.1.0')
-  gem.add_runtime_dependency('axiom-sql-generator', '~> 0.1.0')
+  gem.add_runtime_dependency('axiom',               '~> 0.2.0')
+  gem.add_runtime_dependency('axiom-sql-generator', '~> 0.2.0')
+  gem.add_runtime_dependency('data_objects',        '~> 0.10.13')
 
-  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.5', '>= 1.5.2')
 end

data/config/devtools.yml

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

data/config/reek.yml

@@ -67,13 +67,8 @@ TooManyMethods:
   max_methods: 10
 TooManyStatements:
   enabled: true
-  exclude:
-  - Axiom::Adapter::DataObjects#read
-  - Axiom::Adapter::DataObjects::Statement#command
-  - Axiom::Relation::Gateway#forward
-  - Axiom::Relation::Gateway#tuples
-  - each
-  max_statements: 2
+  exclude: []
+  max_statements: 5
 UncommunicativeMethodName:
   enabled: true
   exclude: []

data/config/rubocop.yml

@@ -0,0 +1,59 @@
+inherit_from: ../.rubocop.yml
+
+# 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.
+AccessModifierIndentation:
+  Enabled: false
+
+# Limit line length
+LineLength:
+  Max: 114  # TODO: lower to 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
+
+# Allow empty lines around body
+EmptyLinesAroundBody:
+  Enabled: false

data/lib/axiom/adapter/data_objects/statement.rb

@@ -6,7 +6,7 @@ module Axiom
 
       # Executes generated SQL statements
       class Statement
-        include Enumerable, Adamantium
+        include Enumerable, Adamantium::Flat
 
         # Initialize a statement
         #
@@ -24,7 +24,6 @@ module Axiom
           @connection = connection
           @relation   = relation
           @visitor    = visitor
-          freeze
         end
 
         # Iterate over each row in the results
@@ -73,9 +72,7 @@ module Axiom
         # @api private
         def each_row
           reader = command.execute_reader
-          while reader.next!
-            yield reader.values
-          end
+          yield reader.values while reader.next!
         ensure
           reader.close if reader
         end
@@ -97,11 +94,11 @@ module Axiom
         #
         # @api private
         def column_types
-          @relation.header.map { |attribute| attribute.class.primitive }
+          @relation.header.map { |attribute| attribute.type.primitive }
         end
 
         memoize :to_s
-        memoize :command, :freezer => :flat
+        memoize :command, freezer: :flat
 
       end # class Statement
     end # class DataObjects

data/lib/axiom/adapter/data_objects/version.rb

@@ -5,7 +5,7 @@ module Axiom
     class DataObjects
 
       # Gem version
-      VERSION = '0.1.0'.freeze
+      VERSION = '0.2.0'.freeze
 
     end # class DataObjects
   end # module Adapter

data/lib/axiom/relation/gateway.rb

@@ -9,8 +9,8 @@ module Axiom
       DECORATED_CLASS = superclass
 
       # remove methods so they can be proxied
-      undef_method *DECORATED_CLASS.public_instance_methods(false).map(&:to_s) - %w[ materialize ]
-      undef_method :project, :remove, :extend, :rename, :restrict, :sort_by, :reverse, :drop, :take
+      undef_method(*DECORATED_CLASS.public_instance_methods(false).map(&:to_s) - %w[materialize])
+      undef_method(:project, :remove, :extend, :rename, :restrict, :sort_by, :reverse, :drop, :take)
 
       # The adapter the gateway will use to fetch results
       #
@@ -184,7 +184,7 @@ module Axiom
       #   end
       #
       # @example with a header
-      #   summarization = gateway.summarize([ :name ]) do |context|
+      #   summarization = gateway.summarize([:name]) do |context|
       #     context.add(:count, context[:id].count)
       #   end
       #

data/spec/shared/binary_relation_method_behaviour.rb

@@ -2,49 +2,49 @@
 
 shared_examples_for 'a binary relation method' do
   describe 'when other has the same adapter' do
-    let(:other_relation) { mock('Other Relation')                       }
+    let(:other_relation) { double('Other Relation')                     }
     let(:other)          { described_class.new(adapter, other_relation) }
-    let(:gateway)        { mock('Other Gateway')                        }
+    let(:gateway)        { double('Other Gateway')                      }
 
     before do
-      relation.stub!(operation).and_return(gateway)
+      allow(relation).to receive(operation).and_return(gateway)
     end
 
     it { should equal(gateway) }
 
     it 'passes the other relation to the binary operation' do
-      relation.should_receive(operation).with(other_relation)
+      expect(relation).to receive(operation).with(other_relation)
       subject
     end
   end
 
   describe 'when other has a different adapter' do
-    let(:other_adapter) { mock('Other Adapter')                    }
-    let(:other)         { described_class.new(other_adapter, stub) }
+    let(:other_adapter) { double('Other Adapter')                    }
+    let(:other)         { described_class.new(other_adapter, double) }
 
     before do
-      factory.stub!(:new).and_return(binary_relation)
+      allow(factory).to receive(:new).and_return(binary_relation)
     end
 
     it { should equal(binary_relation) }
 
     it 'initializes the binary operation with the gateways' do
-      factory.should_receive(:new).with(object, other)
+      expect(factory).to receive(:new).with(object, other)
       subject
     end
   end
 
   describe 'when other has no adapter' do
-    let(:other) { mock('Other Relation') }
+    let(:other) { double('Other Relation') }
 
     before do
-      factory.stub!(:new).and_return(binary_relation)
+      allow(factory).to receive(:new).and_return(binary_relation)
     end
 
     it { should equal(binary_relation) }
 
     it 'initializes the binary operation with the gateway and other relation' do
-      factory.should_receive(:new).with(object, other)
+      expect(factory).to receive(:new).with(object, other)
       subject
     end
   end