rom-relation 0.1.1 → 0.1.2

data/Changelog.md

@@ -1,3 +1,8 @@
+# v0.1.2 2013-09-02
+
+* [feature] Adapter is now auto-loaded based on uri scheme (solnic)
+
+[Compare v0.1.1..v0.1.2](https://github.com/rom-rb/rom-relation/compare/v0.1.1...v0.1.2)
 # v0.1.1 2013-08-30
 
 * [feature] Integration with axiom-optimizer (solnic)

data/Gemfile

@@ -6,14 +6,14 @@ gemspec
 
 gem 'rom-relation', path: '.'
 
-gem 'axiom',      git: 'https://github.com/dkubb/axiom.git'
+gem 'axiom',      git: 'https://github.com/dkubb/axiom.git', branch: 'master'
 gem 'rom-mapper', git: 'https://github.com/rom-rb/rom-mapper.git'
 
 group :test do
   gem 'bogus', '~> 0.1'
   gem 'randexp'
   gem 'ruby-graphviz'
-  gem 'axiom-memory-adapter', git: 'https://github.com/dkubb/axiom-memory-adapter.git'
+  gem 'axiom-memory-adapter', git: 'https://github.com/dkubb/axiom-memory-adapter.git', branch: 'master'
 end
 
 group :development do

data/lib/rom-relation.rb

@@ -33,6 +33,8 @@ module ROM
 
 end # module ROM
 
+require 'rom/support/axiom/adapter'
+
 require 'rom/repository'
 require 'rom/environment'
 require 'rom/relation'

data/lib/rom/relation/version.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+module ROM
+  class Relation
+
+    VERSION = '0.1.2'.freeze
+
+  end # Relation
+end # Relation

data/lib/rom/support/axiom/adapter.rb

@@ -39,6 +39,8 @@ module Axiom
     #
     # @api private
     def self.build(uri)
+      require_adapter(uri)
+
       klass = get(uri)
 
       if klass.name == 'Axiom::Adapter::Memory'
@@ -71,6 +73,15 @@ module Axiom
       }
     end
 
+    # Try to load an adapter using a standard path
+    #
+    # @api private
+    def self.require_adapter(uri)
+      require "rom/support/axiom/adapter/#{uri.scheme}"
+    rescue LoadError
+    end
+    private_class_method :require_adapter
+
     # Set the uri scheme for an adapter class
     #
     # @example for a DataObjects adapter

data/rom-relation.gemspec

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.expand_path('../lib/rom/version', __FILE__)
+require File.expand_path('../lib/rom/relation/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = 'rom-relation'
@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = 'piotr.solnica@gmail.com'
   gem.homepage      = 'http://rom-rb.org'
   gem.require_paths = ['lib']
-  gem.version       = ROM::Relation::VERSION
+  gem.version       = ROM::Relation::VERSION.dup
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.license       = 'MIT'

data/spec/integration/environment_setup_spec.rb

@@ -17,6 +17,6 @@ describe 'Setting up environment' do
       end
     end
 
-    expect(schema[:users]).to be_instance_of(Axiom::Relation::Variable)
+    expect(schema[:users]).to be_instance_of(Axiom::Relation::Variable::Materialized)
   end
 end

data/spec/spec_helper.rb

@@ -22,15 +22,13 @@ end
 
 require 'rom-relation'
 require 'rom-mapper'
-require 'rom/support/axiom/adapter/memory'
 
 require 'devtools/spec_helper'
 require 'bogus/rspec'
 
 include ROM
 
-ROM_ENV     = Environment.setup(test: 'memory://test')
-ROM_ADAPTER = ENV.fetch('ROM_ADAPTER', :in_memory).to_sym
+ROM_ENV = Environment.setup(test: 'memory://test')
 
 Bogus.configure do |config|
   config.search_modules << ROM

data/spec/unit/rom/repository/element_writer_spec.rb

@@ -14,5 +14,5 @@ describe Repository, '#[]=' do
 
   it { should eq(relation) }
 
-  it { should be_instance_of(Axiom::Relation::Variable) }
+  it { should be_instance_of(Axiom::Relation::Variable::Materialized) }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rom-relation
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -176,6 +176,7 @@ files:
 - lib/rom/mapping.rb
 - lib/rom/mapping/definition.rb
 - lib/rom/relation.rb
+- lib/rom/relation/version.rb
 - lib/rom/repository.rb
 - lib/rom/schema.rb
 - lib/rom/schema/definition.rb
@@ -186,7 +187,6 @@ files:
 - lib/rom/support/axiom/adapter/memory.rb
 - lib/rom/support/axiom/adapter/postgres.rb
 - lib/rom/support/axiom/adapter/sqlite3.rb
-- lib/rom/version.rb
 - rom-relation.gemspec
 - spec/integration/environment_setup_spec.rb
 - spec/integration/mapping_relations_spec.rb

data/lib/rom/version.rb

@@ -1,7 +0,0 @@
-# encoding: utf-8
-
-module ROM
-  class Relation
-    VERSION = '0.1.1'
-  end
-end