rom-repository 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf55be4802e4f11c814bf9452e1fcb6e02a71a6
-  data.tar.gz: 9de11b947549b756500724055a45e73723d4cab6
+  metadata.gz: 69a0d338b66452b9d5434b08129f04c7ce0a260a
+  data.tar.gz: 98e1038b529b861828284565d6e7fa59f3da5fbc
 SHA512:
-  metadata.gz: 155c3435da829762d9d10a15f5baf688f6bb4313ffef93ffee9b4d7e9d341c667c4d49dbb41145e6e53efa44e0cfbe592bac6522e08da457b95f16200703a3cd
-  data.tar.gz: a4c944bf075bbb56f3afaa74bfd5e53c5393b38261c191af05ce69dc12f42e4c0ae19e4e3a805dacab1d8fcfb5625bca2a1d618f141018ad5bf0eb2d7ca64929
+  metadata.gz: 0bde95e0e0fda272e1737e6eda953896f8fb5f3ce9a52620bcf41b469ef0f796dd05e11d2f05d6ed1fc1fd81004bb87fe7f2685e1151bc9414735f3d19c9b527
+  data.tar.gz: b1b0a57585cc0cd60dfd3be82fc51e75ccdfacca7d6cdfa580d2216d2fe1358d018e68838a25ed6fa13eb909fbf3544a578ad6e0981d6ebf731440b45cbf0c5d

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 cache: bundler
 bundler_args: --without yard guard benchmarks tools
 before_script:
-  - psql -c 'create database rom;' -U postgres
+  - psql -c 'create database rom_repository' -U postgres
 script: "bundle exec rake ci"
 rvm:
   - 2.0

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+# v0.1.0 2015-08-19
+
+This release ensures that relations from different adapters can be composed
+together :tada:
+
+### Fixed
+
+- Plugins are registered correctly for multi-env setups (AMHOL)
+- multi-block `view` syntax works correctly when header is not provided as options (solnic)
+
+[Compare v0.0.2...v0.1.0](https://github.com/rom-rb/rom-repository/compare/v0.0.2...v0.1.0)
+
+# v0.0.2 2015-08-10
+
+### Added
+
+- `view` relation plugin (solnic)
+- `key_inference` relation plugin (solnic)
+- `base_view` sql relation plugin (solnic)
+- `auto_combine` sql relation plugin (solnic)
+- `auto_wrap` sql relation plugin (solnic)
+
+### Changed
+
+- Switched to extracted `rom-mapper` gem (solnic)
+
+[Compare v0.0.1...v0.0.2](https://github.com/rom-rb/rom-repository/compare/v0.0.1...v0.0.2)
+
 # v0.0.1 2015-08-05
 
 First public release \o/

data/lib/rom/plugins/relation/key_inference.rb

@@ -24,8 +24,8 @@ module ROM
       end
     end
   end
+end
 
-  plugins do
-    register :key_inference, Plugins::Relation::KeyInference, type: :relation
-  end
+ROM.plugins do
+  register :key_inference, ROM::Plugins::Relation::KeyInference, type: :relation
 end

data/lib/rom/plugins/relation/sql/auto_combine.rb

@@ -36,10 +36,10 @@ module ROM
       end
     end
   end
+end
 
-  plugins do
-    adapter :sql do
-      register :auto_combine, Plugins::Relation::SQL::AutoCombine, type: :relation
-    end
+ROM.plugins do
+  adapter :sql do
+    register :auto_combine, ROM::Plugins::Relation::SQL::AutoCombine, type: :relation
   end
 end

data/lib/rom/plugins/relation/sql/auto_wrap.rb

@@ -39,10 +39,10 @@ module ROM
       end
     end
   end
+end
 
-  plugins do
-    adapter :sql do
-      register :auto_wrap, Plugins::Relation::SQL::AutoWrap, type: :relation
-    end
+ROM.plugins do
+  adapter :sql do
+    register :auto_wrap, ROM::Plugins::Relation::SQL::AutoWrap, type: :relation
   end
 end

data/lib/rom/plugins/relation/sql/base_view.rb

@@ -20,10 +20,10 @@ module ROM
       end
     end
   end
+end
 
-  plugins do
-    adapter :sql do
-      register :base_view, Plugins::Relation::SQL::BaseView, type: :relation
-    end
+ROM.plugins do
+  adapter :sql do
+    register :base_view, ROM::Plugins::Relation::SQL::BaseView, type: :relation
   end
 end

data/lib/rom/plugins/relation/view.rb

@@ -53,8 +53,12 @@ module ROM
           #
           # @api public
           def view(*args, &block)
+            if args.size == 1 && block.arity > 0
+              raise ArgumentError, "header must be set as second argument"
+            end
+
             name, names, relation_block =
-              if block.arity == 0
+              if args.size == 1
                 DSL.new(*args, &block).call
               else
                 [*args, block]
@@ -68,8 +72,8 @@ module ROM
       end
     end
   end
+end
 
-  plugins do
-    register :view, Plugins::Relation::View, type: :relation
-  end
+ROM.plugins do
+  register :view, ROM::Plugins::Relation::View, type: :relation
 end

data/lib/rom/repository/version.rb

@@ -4,6 +4,6 @@ module ROM
   end
 
   class Repository < Gateway
-    VERSION = '0.0.2'.freeze
+    VERSION = '0.1.0'.freeze
   end
 end

data/rom-repository.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_runtime_dependency 'anima', '~> 0.2', '>= 0.2'
-  gem.add_runtime_dependency 'rom', '~> 0.9.0.beta1'
+  gem.add_runtime_dependency 'rom', '~> 0.9', '>= 0.9.0'
   gem.add_runtime_dependency 'rom-support', '~> 0.1', '>= 0.1.0'
   gem.add_runtime_dependency 'rom-mapper', '~> 0.2', '>= 0.2.0'
 

data/spec/integration/multi_adapter_spec.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+
+RSpec.describe 'Repository with multi-adapters setup' do
+  include_context 'database'
+
+  let(:setup) {
+    ROM.setup(default: [:sql, uri], memory: [:memory])
+  }
+
+  let(:users) { rom.relation(:sql_users) }
+  let(:tasks) { rom.relation(:memory_tasks) }
+
+  let(:repo) { Test::Repository.new(rom) }
+
+  before do
+    module Test
+      class Users < ROM::Relation[:sql]
+        dataset :users
+        register_as :sql_users
+        gateway :default
+      end
+
+      class Tasks < ROM::Relation[:memory]
+        dataset :tasks
+        register_as :memory_tasks
+        gateway :memory
+
+        use :view
+        use :key_inference
+
+        view(:base, [:user_id, :title]) do
+          project(:user_id, :title)
+        end
+
+        def for_users(users)
+          restrict(user_id: users.map { |u| u[:id] })
+        end
+      end
+
+      class Repository < ROM::Repository::Base
+        relations :sql_users, :memory_tasks
+
+        def users_with_tasks(id)
+          sql_users.where(id: id).combine_children(many: { tasks: memory_tasks })
+        end
+      end
+    end
+
+    user_id = setup.gateways[:default].dataset(:users).insert(name: 'Jane')
+    setup.gateways[:memory].dataset(:tasks).insert(user_id: user_id, title: 'Jane Task')
+  end
+
+  specify 'ᕕ⁞ ᵒ̌ 〜 ᵒ̌ ⁞ᕗ' do
+    user = repo.users_with_tasks(users.last[:id]).first
+
+    expect(user.name).to eql('Jane')
+
+    expect(user.tasks[0].user_id).to eql(user.id)
+    expect(user.tasks[0].title).to eql('Jane Task')
+  end
+end

data/spec/shared/database.rb

@@ -1,7 +1,8 @@
 RSpec.shared_context 'database' do
-  let(:setup) { ROM.setup(:sql, 'postgres://localhost/rom') }
+  let(:setup) { ROM.setup(:sql, uri) }
   let(:conn) { setup.gateways[:default].connection }
   let(:rom) { setup.finalize }
+  let(:uri) { 'postgres://localhost/rom_repository' }
 
   before do
     [:tags, :tasks, :users].each { |table| conn.drop_table?(table) }

data/spec/unit/sql/relation_spec.rb

@@ -40,5 +40,15 @@ RSpec.describe 'SQL Relation extensions' do
 
       include_context 'valid view'
     end
+
+    context 'with multi-block when first block has args' do
+      it 'raises error' do
+        expect {
+          setup.relation(:users) do
+            view(:by_id) { |args| }
+          end
+        }.to raise_error(ArgumentError)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anima
@@ -36,14 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0.beta1
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0.beta1
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rom-support
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +151,7 @@ files:
 - lib/rom/repository/version.rb
 - lib/rom/struct.rb
 - rom-repository.gemspec
+- spec/integration/multi_adapter_spec.rb
 - spec/integration/repository_spec.rb
 - spec/shared/database.rb
 - spec/shared/relations.rb