rom 0.6.2 → 0.7.0

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

@@ -4,7 +4,8 @@ require 'virtus'
 describe ROM::Processor::Transproc do
   subject(:transproc) { ROM::Processor::Transproc.build(header) }
 
-  let(:header) { ROM::Header.coerce(attributes) }
+  let(:header) { ROM::Header.coerce(attributes, options) }
+  let(:options) { {} }
 
   context 'no mapping' do
     let(:attributes) { [[:name]] }
@@ -27,7 +28,7 @@ describe ROM::Processor::Transproc do
   end
 
   context 'mapping to object' do
-    let(:header) { ROM::Header.coerce(attributes, model) }
+    let(:options) { { model: model } }
 
     let(:model) do
       Class.new do
@@ -47,14 +48,53 @@ describe ROM::Processor::Transproc do
   end
 
   context 'renaming keys' do
-    let(:attributes) { [[:name, from: 'name']] }
-    let(:relation) { [{ 'name' => 'Jane' }, { 'name' => 'Joe' }] }
+    let(:attributes) do
+      [[:name, from: 'name']]
+    end
+
+    let(:options) do
+      { reject_keys: true }
+    end
+
+    let(:relation) do
+      [
+        { 'name' => 'Jane', 'age' => 21 }, { 'name' => 'Joe', age: 22 }
+      ]
+    end
 
-    it 'returns tuples with renamed keys' do
+    it 'returns tuples with rejected keys' do
       expect(transproc[relation]).to eql([{ name: 'Jane' }, { name: 'Joe' }])
     end
   end
 
+  describe 'rejecting keys' do
+    let(:options) { { reject_keys: true } }
+
+    let(:attributes) do
+      [
+        ['name'],
+        ['tasks', type: :array, group: true, header: [['title']]]
+      ]
+    end
+
+    let(:relation) do
+      [
+        { 'name' => 'Jane', 'age' => 21, 'title' => 'Task One' },
+        { 'name' => 'Jane', 'age' => 21, 'title' => 'Task Two' },
+        { 'name' => 'Joe', 'age' => 22, 'title' => 'Task One' }
+      ]
+    end
+
+    it 'returns tuples with unknown keys rejected' do
+      expect(transproc[relation]).to eql([
+        { 'name' => 'Jane',
+          'tasks' => [{ 'title' => 'Task One' }, { 'title' => 'Task Two' }] },
+        { 'name' => 'Joe',
+          'tasks' => [{ 'title' => 'Task One' }] }
+      ])
+    end
+  end
+
   context 'mapping nested hash' do
     let(:relation) do
       [
@@ -234,7 +274,8 @@ describe ROM::Processor::Transproc do
       [
         { 'name' => 'Jane', 'title' => 'Task One' },
         { 'name' => 'Jane', 'title' => 'Task Two' },
-        { 'name' => 'Joe', 'title' => 'Task One' }
+        { 'name' => 'Joe', 'title' => 'Task One' },
+        { 'name' => 'Joe', 'title' => nil }
       ]
     end
 

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

@@ -46,7 +46,9 @@ describe ROM::Relation::Composite do
 
     it 'calls and iterates' do
       result = []
-      relation.each { |object| result << object }
+      relation.each do |object|
+        result << object
+      end
       expect(result).to match_array(%w(JANE JOE))
     end
 

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

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe ROM::Relation::Graph do
+  subject(:graph) { ROM::Relation::Graph.new(users, [tasks.for_users]) }
+
+  include_context 'users and tasks'
+
+  it_behaves_like 'materializable relation' do
+    let(:mapper) do
+      Transproc(:combine, [[:tasks, name: :name]])
+    end
+
+    let(:relation) do
+      ROM::Relation::Graph.new(users.by_name('Jane'), [tasks.for_users]) >> mapper
+    end
+  end
+
+  before do
+    setup.relation(:users) do
+      def by_name(name)
+        restrict(name: name)
+      end
+    end
+
+    setup.relation(:tasks) do
+      def for_users(users)
+        self
+      end
+    end
+  end
+
+  let(:users) { rom.relation(:users) }
+  let(:tasks) { rom.relation(:tasks) }
+
+  describe '#method_missing' do
+    it 'responds to the root methods' do
+      expect(graph).to respond_to(:by_name)
+    end
+
+    it 'forwards methods to the root and decorates response' do
+      expect(graph.by_name('Jane')).to be_instance_of(ROM::Relation::Graph)
+    end
+
+    it 'returns original response from the root' do
+      expect(graph.mappers).to eql(users.mappers)
+    end
+
+    it 'raises method error' do
+      expect { graph.not_here }.to raise_error(NoMethodError, /not_here/)
+    end
+  end
+
+  describe '#call' do
+    it 'materializes relations' do
+      expect(graph.call).to match_array([
+        rom.relations.users,
+        [rom.relations.tasks]
+      ])
+    end
+  end
+
+  describe '#to_a' do
+    it 'coerces to an array' do
+      expect(graph).to match_array([
+        users.to_a,
+        [tasks.for_users(users).to_a]
+      ])
+    end
+
+    it 'returns empty arrays when left was empty' do
+      graph = ROM::Relation::Graph.new(users.by_name('Not here'), [tasks.for_users])
+
+      expect(graph).to match_array([
+        [], [ROM::Relation::Loaded.new(tasks.for_users, [])]
+      ])
+    end
+  end
+end

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

@@ -0,0 +1,130 @@
+require 'spec_helper'
+
+describe ROM::Relation::Lazy, '#combine' do
+  include_context 'users and tasks'
+
+  before do
+    setup.relation(:users) do
+      def by_name(name)
+        restrict(name: name)
+      end
+    end
+
+    setup.relation(:tasks) do
+      def for_users(users)
+        names = users.map { |user| user[:name] }
+        restrict { |task| names.include?(task[:name]) }
+      end
+    end
+
+    setup.relation(:tags) do
+      forward :map
+
+      def for_tasks(tasks)
+        titles = tasks.map { |task| task[:title] }
+        restrict { |tag| titles.include?(tag[:task]) }
+      end
+
+      def for_users(users)
+        user_tasks = tasks.for_users(users)
+
+        for_tasks(user_tasks).map { |tag|
+          tag.merge(user: user_tasks.detect { |task|
+            task[:title] == tag[:task]
+          } [:name])
+        }
+      end
+    end
+
+    setup.repositories[:default].dataset(:tags).insert(task: 'be cool', name: 'red')
+    setup.repositories[:default].dataset(:tags).insert(task: 'be cool', name: 'green')
+  end
+
+  let(:users) { rom.relation(:users) }
+  let(:tasks) { rom.relation(:tasks) }
+  let(:tags) { rom.relation(:tags) }
+
+  let(:map_users) {
+    proc { |users, tasks|
+      users.map { |user|
+        user.merge(tasks: tasks.select { |task| task[:name] == user[:name] })
+      }
+    }
+  }
+
+  let(:map_tasks) {
+    proc { |(tasks, children)|
+      tags = children.first
+
+      tasks.map { |task|
+        task.merge(tags: tags.select { |tag| tag[:task] == task[:title] })
+      }
+    }
+  }
+
+  let(:map_user_with_tasks_and_tags) {
+    proc { |users, (tasks, tags)|
+      users.map { |user|
+        user_tasks = tasks.select { |task| task[:name] == user[:name] }
+
+        user_tags = tasks.flat_map { |task|
+          tags.select { |tag| tag[:task] == task[:title] }
+        }
+
+        user.merge(
+          tasks: user_tasks,
+          tags: user_tags
+        )
+      }
+    }
+  }
+
+  let(:map_user_with_tasks) {
+    proc { |users, children|
+      map_users[users, map_tasks[children.first]]
+    }
+  }
+
+  it 'supports more than one eagerly-loaded relation' 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, tags.for_users)
+
+    result = user_with_tasks_and_tags >> map_user_with_tasks_and_tags
+
+    expect(result).to match_array(expected)
+  end
+
+  it 'supports nested eager-loading' do
+    expected = [
+      {
+        name: 'Jane', email: 'jane@doe.org', tasks: [
+          { name: 'Jane', title: 'be cool', priority: 2, tags: [
+            { task: 'be cool', name: 'red' },
+            { task: 'be cool', name: 'green' }
+          ] }
+        ]
+      }
+    ]
+
+    user_with_tasks = users.by_name('Jane')
+                      .combine(tasks.for_users.combine(tags.for_tasks))
+
+    result = user_with_tasks >> map_user_with_tasks
+
+    expect(result).to match_array(expected)
+  end
+end

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

@@ -138,7 +138,9 @@ describe ROM::Relation::Lazy do
   describe '#each' do
     it 'yields relation tuples' do
       result = []
-      users.each { |tuple| result << tuple }
+      users.each do |tuple|
+        result << tuple
+      end
       expect(result).to match_array([
         { name: 'Jane', email: 'jane@doe.org' },
         { name: 'Joe', email: 'joe@doe.org' }

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

@@ -10,7 +10,9 @@ describe ROM::Relation::Loaded do
   describe '#each' do
     it 'yields tuples from relation' do
       result = []
-      users.each { |tuple| result << tuple }
+      users.each do |tuple|
+        result << tuple
+      end
       expect(result).to match_array([
         { name: 'Jane', email: 'jane@doe.org' },
         { name: 'Joe', email: 'joe@doe.org' }

data/spec/unit/rom/setup_spec.rb

@@ -36,23 +36,23 @@ describe ROM::Setup do
       it 'can register multiple relations with same dataset' do
         setup = ROM.setup(:memory)
 
-        Class.new(ROM::Relation[:memory]) {
+        Class.new(ROM::Relation[:memory]) do
           dataset :fruits
           register_as :apples
 
           def apple?
             true
           end
-        }
+        end
 
-        Class.new(ROM::Relation[:memory]) {
+        Class.new(ROM::Relation[:memory]) do
           dataset :fruits
           register_as :oranges
 
           def orange?
             true
           end
-        }
+        end
 
         rom = setup.finalize
 
@@ -64,15 +64,15 @@ describe ROM::Setup do
       it "raises an error when registering relations with the same `register_as`" do
         setup = ROM.setup(:memory)
 
-        Class.new(ROM::Relation[:memory]) {
+        Class.new(ROM::Relation[:memory]) do
           dataset :guests
           register_as :users
-        }
+        end
 
-        Class.new(ROM::Relation[:memory]) {
+        Class.new(ROM::Relation[:memory]) do
           dataset :admins
           register_as :users
-        }
+        end
 
         expect { setup.finalize }.to raise_error(
           ROM::RelationAlreadyDefinedError, /register_as :users/

data/spec/unit/rom/support/array_dataset_spec.rb

@@ -27,7 +27,9 @@ describe ROM::ArrayDataset do
     describe '#map!' do
       context 'with a block' do
         it 'returns a new dataset with mapped data' do
-          dataset.map! { |row| row.merge(age: 21) }
+          dataset.map! do |row|
+            row.merge(age: 21)
+          end
 
           expect(dataset).to match_array([
             { name: 'Jane', age: 21 }, { name: 'Joe', age: 21 }

data/spec/unit/rom/support/class_builder_spec.rb

@@ -30,11 +30,11 @@ describe ROM::ClassBuilder do
     end
 
     it 'yields created class' do
-      klass = builder.call do |yielded_class|
+      klass = builder.call { |yielded_class|
         yielded_class.class_eval do
           def self.testing; end
         end
-      end
+      }
 
       expect(klass).to respond_to(:testing)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-05-17 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.0
+        version: 0.2.1
   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.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -137,6 +138,7 @@ files:
 - lib/rom/constants.rb
 - lib/rom/env.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
@@ -156,15 +158,20 @@ files:
 - lib/rom/memory/repository.rb
 - lib/rom/memory/storage.rb
 - lib/rom/model_builder.rb
+- lib/rom/pipeline.rb
+- lib/rom/plugin.rb
+- lib/rom/plugin_registry.rb
+- lib/rom/plugins/relation/registry_reader.rb
 - lib/rom/processor.rb
 - lib/rom/processor/transproc.rb
 - lib/rom/relation.rb
 - lib/rom/relation/class_interface.rb
 - lib/rom/relation/composite.rb
 - lib/rom/relation/curried.rb
+- lib/rom/relation/graph.rb
 - lib/rom/relation/lazy.rb
 - lib/rom/relation/loaded.rb
-- lib/rom/relation/registry_reader.rb
+- lib/rom/relation/materializable.rb
 - lib/rom/repository.rb
 - lib/rom/setup.rb
 - lib/rom/setup/finalize.rb
@@ -178,6 +185,7 @@ files:
 - lib/rom/support/class_builder.rb
 - lib/rom/support/class_macros.rb
 - lib/rom/support/data_proxy.rb
+- lib/rom/support/deprecations.rb
 - lib/rom/support/enumerable_dataset.rb
 - lib/rom/support/inflector.rb
 - lib/rom/support/options.rb
@@ -191,13 +199,17 @@ files:
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/error_handling_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/group_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/symbolizing_attributes_spec.rb
+- spec/integration/mappers/unwrap_spec.rb
 - spec/integration/mappers/wrap_spec.rb
 - spec/integration/multi_repo_spec.rb
 - spec/integration/relations/reading_spec.rb
@@ -206,7 +218,9 @@ files:
 - spec/integration/repositories/setting_logger_spec.rb
 - spec/integration/setup_spec.rb
 - spec/shared/enumerable_dataset.rb
+- spec/shared/materializable.rb
 - spec/shared/one_behavior.rb
+- spec/shared/proxy.rb
 - spec/shared/users_and_tasks.rb
 - spec/spec_helper.rb
 - spec/support/constant_leak_finder.rb
@@ -222,12 +236,16 @@ files:
 - spec/unit/rom/mapper_registry_spec.rb
 - spec/unit/rom/mapper_spec.rb
 - spec/unit/rom/memory/dataset_spec.rb
+- spec/unit/rom/memory/relation_spec.rb
 - spec/unit/rom/memory/repository_spec.rb
 - spec/unit/rom/memory/storage_spec.rb
 - spec/unit/rom/model_builder_spec.rb
+- spec/unit/rom/plugin_spec.rb
 - spec/unit/rom/processor/transproc_spec.rb
 - spec/unit/rom/registry_spec.rb
 - spec/unit/rom/relation/composite_spec.rb
+- spec/unit/rom/relation/graph_spec.rb
+- spec/unit/rom/relation/lazy/combine_spec.rb
 - spec/unit/rom/relation/lazy_spec.rb
 - spec/unit/rom/relation/loaded_spec.rb
 - spec/unit/rom/relation_spec.rb
@@ -258,9 +276,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby Object Mapper
 test_files: []
-has_rdoc: