rom 0.7.1 → 0.8.0

data/spec/unit/rom/memory/repository_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 require 'rom/lint/spec'
 require 'rom/memory'
 
-describe ROM::Memory::Repository do
-  let(:repository) { ROM::Memory::Repository }
+describe ROM::Memory::Gateway do
+  let(:gateway) { ROM::Memory::Gateway }
   let(:uri) { nil }
 
-  it_behaves_like "a rom repository" do
+  it_behaves_like "a rom gateway" do
     let(:identifier) { :memory }
   end
 end

data/spec/unit/rom/processor/transproc_spec.rb

@@ -269,6 +269,81 @@ describe ROM::Processor::Transproc do
     end
   end
 
+  context 'unwrapping tuples' do
+    let(:relation) do
+      [
+        { 'user' => { 'name' => 'Leo', 'task' => { 'title' => 'Task 1' } } },
+        { 'user' => { 'name' => 'Joe', 'task' => { 'title' => 'Task 2' } } }
+      ]
+    end
+
+    context 'when no mapping is needed' do
+      let(:attributes) do
+        [
+          ['user', type: :hash, unwrap: true, header: [['name'], ['task']]]
+        ]
+      end
+
+      it 'returns unwrapped tuples' do
+        expect(transproc[relation]).to eql([
+          { 'name' => 'Leo', 'task' => { 'title' => 'Task 1' } },
+          { 'name' => 'Joe', 'task' => { 'title' => 'Task 2' } }
+        ])
+      end
+    end
+
+    context 'partially' do
+      context 'without renaming the rest of the wrap' do
+        let(:attributes) do
+          [
+            ['user', type: :hash, unwrap: true, header: [['task']]]
+          ]
+        end
+
+        it 'returns unwrapped tuples' do
+          expect(transproc[relation]).to eql([
+            { 'user' => { 'name' => 'Leo' }, 'task' => { 'title' => 'Task 1' } },
+            { 'user' => { 'name' => 'Joe' }, 'task' => { 'title' => 'Task 2' } }
+          ])
+        end
+      end
+
+      context 'with renaming the rest of the wrap' do
+        let(:attributes) do
+          [
+            ['man', from: 'user', type: :hash, unwrap: true, header: [['task']]]
+          ]
+        end
+
+        it 'returns unwrapped tuples' do
+          expect(transproc[relation]).to eql([
+            { 'man' => { 'name' => 'Leo' }, 'task' => { 'title' => 'Task 1' } },
+            { 'man' => { 'name' => 'Joe' }, 'task' => { 'title' => 'Task 2' } }
+          ])
+        end
+      end
+    end
+
+    context 'deeply' do
+      let(:attributes) do
+        [
+          ['user', type: :hash, unwrap: true, header: [
+            ['name'],
+            ['title'],
+            ['task', type: :hash, unwrap: true, header: [['title']]]
+          ]]
+        ]
+      end
+
+      it 'returns unwrapped tuples' do
+        expect(transproc[relation]).to eql([
+          { 'name' => 'Leo', 'title' => 'Task 1' },
+          { 'name' => 'Joe', 'title' => 'Task 2' }
+        ])
+      end
+    end
+  end
+
   context 'grouping tuples' do
     let(:relation) do
       [

data/spec/unit/rom/relation/lazy/combine_spec.rb

@@ -36,8 +36,8 @@ describe ROM::Relation::Lazy, '#combine' do
       end
     end
 
-    setup.repositories[:default].dataset(:tags).insert(task: 'be cool', name: 'red')
-    setup.repositories[:default].dataset(:tags).insert(task: 'be cool', name: 'green')
+    setup.gateways[:default].dataset(:tags).insert(task: 'be cool', name: 'red')
+    setup.gateways[:default].dataset(:tags).insert(task: 'be cool', name: 'green')
   end
 
   let(:users) { rom.relation(:users) }
@@ -85,6 +85,12 @@ describe ROM::Relation::Lazy, '#combine' do
     }
   }
 
+  it 'raises error when composite relation is passed as a node' do
+    expect {
+      users.combine(tasks >> proc {})
+    }.to raise_error(ROM::UnsupportedRelationError)
+  end
+
   it 'supports more than one eagerly-loaded relation' do
     expected = [
       {
@@ -101,7 +107,30 @@ describe ROM::Relation::Lazy, '#combine' do
     ]
 
     user_with_tasks_and_tags = users.by_name('Jane')
-                               .combine(tasks.for_users, tags.for_users)
+      .combine(tasks.for_users, tags.for_users)
+
+    result = user_with_tasks_and_tags >> map_user_with_tasks_and_tags
+
+    expect(result).to match_array(expected)
+  end
+
+  it 'supports more than one eagerly-loaded relation via chaining' do
+    expected = [
+      {
+        name: 'Jane',
+        email: 'jane@doe.org',
+        tasks: [
+          { name: 'Jane', title: 'be cool', priority: 2 }
+        ],
+        tags: [
+          { task: 'be cool', name: 'red', user: 'Jane' },
+          { task: 'be cool', name: 'green', user: 'Jane' }
+        ]
+      }
+    ]
+
+    user_with_tasks_and_tags = users.by_name('Jane')
+      .combine(tasks.for_users).combine(tags.for_users)
 
     result = user_with_tasks_and_tags >> map_user_with_tasks_and_tags
 
@@ -121,7 +150,7 @@ describe ROM::Relation::Lazy, '#combine' do
     ]
 
     user_with_tasks = users.by_name('Jane')
-                      .combine(tasks.for_users.combine(tags.for_tasks))
+      .combine(tasks.for_users.combine(tags.for_tasks))
 
     result = user_with_tasks >> map_user_with_tasks
 

data/spec/unit/rom/relation/lazy_spec.rb

@@ -49,6 +49,14 @@ describe ROM::Relation::Lazy do
     let(:relation) { users }
   end
 
+  describe '#map_with' do
+    it 'raises error when unknown mapper was selected' do
+      expect {
+        users.as(:not_here)
+      }.to raise_error(ROM::MapperMissingError, /not_here/)
+    end
+  end
+
   describe '#method_missing' do
     it 'forwards to relation and auto-curries' do
       relation = users.by_name_and_email_sorted('Jane')
@@ -80,7 +88,7 @@ describe ROM::Relation::Lazy do
     end
 
     it 'returns original response if it is not a relation' do
-      expect(users.repository).to be(:default)
+      expect(users.gateway).to be(:default)
     end
 
     it 'raises NoMethodError when relation does not respond to a method' do

data/spec/unit/rom/repository_spec.rb

@@ -1,71 +1,12 @@
 require 'spec_helper'
 
 describe ROM::Repository do
-  describe '.setup' do
-    it 'sets up a repository based on a type' do
-      repository_class = Class.new(ROM::Repository) do
-        attr_reader :args
 
-        def initialize(*args)
-          @args = args
-        end
-      end
-
-      allow(ROM::Repository).to receive(:class_from_symbol)
-        .with(:wormhole).and_return(repository_class)
-
-      args = %w(hello world)
-      repository = ROM::Repository.setup(:wormhole, *args)
-
-      expect(repository).to be_instance_of(repository_class)
-      expect(repository.args).to eq(args)
-    end
-
-    it 'raises an exception if the type is not supported' do
-      expect {
-        ROM::Repository.setup(:bogus, "memory://test")
-      }.to raise_error(ROM::AdapterLoadError, /bogus/)
-    end
-
-    it 'accepts a repository instance' do
-      repository = ROM::Repository.new
-      expect(ROM::Repository.setup(repository)).to be(repository)
-    end
-
-    it 'raises an exception if instance and arguments are passed' do
-      repository = ROM::Repository.new
-
-      expect { ROM::Repository.setup(repository, 'foo://bar') }.to raise_error(
-        ArgumentError,
-        "Can't accept arguments when passing an instance"
-      )
-    end
-
-    it 'raises an exception if a URI string is passed' do
-      expect { ROM::Repository.setup('memory://test') }.to raise_error(
-        ArgumentError,
-        /URIs without an explicit scheme are not supported anymore/
-      )
-    end
+  it "warns when inherited from" do
+    expect {
+      Class.new(ROM::Repository)
+    }.to output(/inherit from ROM::Gateway/).to_stderr
   end
 
-  describe '.class_from_symbol' do
-    it 'instantiates a repository based on type' do
-      klass = ROM::Repository.class_from_symbol(:memory)
-      expect(klass).to be(ROM::Memory::Repository)
-    end
 
-    it 'raises an exception if the type is not supported' do
-      expect { ROM::Repository.class_from_symbol(:bogus) }
-        .to raise_error(ROM::AdapterLoadError, /bogus/)
-    end
-  end
-
-  describe '#disconnect' do
-    it 'does nothing' do
-      repository_class = Class.new(ROM::Repository)
-      repository = repository_class.new
-      expect(repository.disconnect).to be(nil)
-    end
-  end
 end

data/spec/unit/rom/setup_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ROM::Setup do
   describe '#finalize' do
-    context 'with repository that supports schema inferring' do
+    context 'with gateway that supports schema inferring' do
       it 'builds relation from inferred schema' do
         setup = ROM.setup(:memory)
         repo = setup.default
@@ -93,8 +93,8 @@ describe ROM::Setup do
       let(:setup) { ROM::Setup.new({}) }
       let(:env) { setup.finalize }
 
-      it 'builds empty repositories' do
-        expect(env.repositories).to eql({})
+      it 'builds empty gateways' do
+        expect(env.gateways).to eql({})
       end
 
       it 'builds empty relations' do
@@ -112,7 +112,7 @@ describe ROM::Setup do
   end
 
   describe '#method_missing' do
-    it 'returns a repository if it is defined' do
+    it 'returns a gateway if it is defined' do
       repo = double('repo')
       setup = ROM::Setup.new(repo: repo)
 
@@ -127,7 +127,7 @@ describe ROM::Setup do
   end
 
   describe '#[]' do
-    it 'returns a repository if it is defined' do
+    it 'returns a gateway if it is defined' do
       repo = double('repo')
       setup = ROM::Setup.new(repo: repo)
 
@@ -140,4 +140,18 @@ describe ROM::Setup do
       expect { setup[:not_here] }.to raise_error(KeyError, /not_here/)
     end
   end
+
+  describe 'defining components when adapter was not registered' do
+    it 'raises error when trying to define a relation' do
+      expect {
+        Class.new(ROM::Relation[:not_here])
+      }.to raise_error(ROM::AdapterNotPresentError, /not_here/)
+    end
+
+    it 'raises error when trying to define a command' do
+      expect {
+        Class.new(ROM::Commands::Create[:not_here])
+      }.to raise_error(ROM::AdapterNotPresentError, /not_here/)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transproc
@@ -19,7 +19,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -65,47 +65,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 description: Persistence and mapping toolkit for Ruby
 email: piotr.solnica@gmail.com
 executables: []
@@ -116,9 +88,9 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -133,17 +105,21 @@ files:
 - lib/rom/commands/composite.rb
 - lib/rom/commands/create.rb
 - lib/rom/commands/delete.rb
+- lib/rom/commands/graph.rb
+- lib/rom/commands/graph/class_interface.rb
+- lib/rom/commands/lazy.rb
 - lib/rom/commands/result.rb
 - lib/rom/commands/update.rb
 - lib/rom/constants.rb
 - lib/rom/env.rb
+- lib/rom/gateway.rb
 - lib/rom/global.rb
 - lib/rom/global/plugin_dsl.rb
 - lib/rom/header.rb
 - lib/rom/header/attribute.rb
 - lib/rom/lint/enumerable_dataset.rb
+- lib/rom/lint/gateway.rb
 - lib/rom/lint/linter.rb
-- lib/rom/lint/repository.rb
 - lib/rom/lint/spec.rb
 - lib/rom/lint/test.rb
 - lib/rom/mapper.rb
@@ -154,8 +130,8 @@ files:
 - lib/rom/memory.rb
 - lib/rom/memory/commands.rb
 - lib/rom/memory/dataset.rb
+- lib/rom/memory/gateway.rb
 - lib/rom/memory/relation.rb
-- lib/rom/memory/repository.rb
 - lib/rom/memory/storage.rb
 - lib/rom/model_builder.rb
 - lib/rom/pipeline.rb
@@ -198,19 +174,26 @@ files:
 - spec/integration/commands/create_spec.rb
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/error_handling_spec.rb
+- spec/integration/commands/graph_spec.rb
 - spec/integration/commands/update_spec.rb
 - spec/integration/mappers/combine_spec.rb
 - spec/integration/mappers/deep_embedded_spec.rb
 - spec/integration/mappers/definition_dsl_spec.rb
 - spec/integration/mappers/embedded_spec.rb
+- spec/integration/mappers/exclude_spec.rb
 - spec/integration/mappers/fold_spec.rb
 - spec/integration/mappers/group_spec.rb
 - spec/integration/mappers/overwrite_attributes_value_spec.rb
+- spec/integration/mappers/prefix_separator_spec.rb
+- spec/integration/mappers/prefix_spec.rb
 - spec/integration/mappers/prefixing_attributes_spec.rb
 - spec/integration/mappers/registering_custom_mappers_spec.rb
 - spec/integration/mappers/renaming_attributes_spec.rb
 - spec/integration/mappers/reusing_mappers_spec.rb
+- spec/integration/mappers/step_spec.rb
 - spec/integration/mappers/symbolizing_attributes_spec.rb
+- spec/integration/mappers/unfold_spec.rb
+- spec/integration/mappers/ungroup_spec.rb
 - spec/integration/mappers/unwrap_spec.rb
 - spec/integration/mappers/wrap_spec.rb
 - spec/integration/multi_repo_spec.rb
@@ -219,6 +202,7 @@ files:
 - spec/integration/repositories/extending_relations_spec.rb
 - spec/integration/repositories/setting_logger_spec.rb
 - spec/integration/setup_spec.rb
+- spec/shared/command_behavior.rb
 - spec/shared/enumerable_dataset.rb
 - spec/shared/materializable.rb
 - spec/shared/one_behavior.rb
@@ -229,14 +213,20 @@ files:
 - spec/support/mutant.rb
 - spec/test/memory_repository_lint_test.rb
 - spec/unit/rom/command_registry_spec.rb
+- spec/unit/rom/commands/graph_spec.rb
+- spec/unit/rom/commands/lazy_spec.rb
 - spec/unit/rom/commands/result_spec.rb
 - spec/unit/rom/commands_spec.rb
 - spec/unit/rom/env_spec.rb
+- spec/unit/rom/gateway_spec.rb
 - spec/unit/rom/global_spec.rb
 - spec/unit/rom/header_spec.rb
 - spec/unit/rom/mapper/dsl_spec.rb
 - spec/unit/rom/mapper_registry_spec.rb
 - spec/unit/rom/mapper_spec.rb
+- spec/unit/rom/memory/commands/create_spec.rb
+- spec/unit/rom/memory/commands/delete_spec.rb
+- spec/unit/rom/memory/commands/update_spec.rb
 - spec/unit/rom/memory/dataset_spec.rb
 - spec/unit/rom/memory/relation_spec.rb
 - spec/unit/rom/memory/repository_spec.rb