rom 0.4.2 → 0.5.0

data/lib/rom/{boot → setup}/relation_dsl.rb

@@ -1,6 +1,5 @@
 module ROM
-  class Boot
-
+  class Setup
     class RelationDSL
       attr_reader :schema, :relations
 
@@ -16,8 +15,6 @@ module ROM
       def call
         relations
       end
-
     end
-
   end
 end

data/lib/rom/setup/schema_dsl.rb

@@ -0,0 +1,33 @@
+require 'rom/setup/base_relation_dsl'
+
+module ROM
+  class Setup
+    # @private
+    class SchemaDSL
+      attr_reader :env, :schema
+
+      # @api private
+      def initialize(env, schema, &block)
+        @env = env
+        @schema = schema
+        initialize_schema
+        instance_exec(&block)
+      end
+
+      # @api public
+      def base_relation(name, &block)
+        dsl = BaseRelationDSL.new(env, name, &block)
+        schema[dsl.repository] << dsl.call
+      end
+
+      private
+
+      # @api private
+      def initialize_schema
+        env.repositories.each_value do |repository|
+          schema[repository] ||= []
+        end
+      end
+    end
+  end
+end

data/lib/rom/support/registry.rb

@@ -1,14 +1,20 @@
 module ROM
-
   # @api private
   class Registry
     include Enumerable
     include Equalizer.new(:elements)
 
-    attr_reader :elements
+    class ElementNotFoundError < KeyError
+      def initialize(key, name)
+        super("#{key.inspect} doesn't exist in #{name} registry")
+      end
+    end
+
+    attr_reader :elements, :name
 
     def initialize(elements = {})
       @elements = elements
+      @name = self.class.name
     end
 
     def each(&block)
@@ -16,8 +22,8 @@ module ROM
       elements.each(&block)
     end
 
-    def [](name)
-      elements.fetch(name)
+    def [](key)
+      elements.fetch(key) { raise ElementNotFoundError.new(key, name) }
     end
 
     def respond_to_missing?(name, include_private = false)
@@ -33,7 +39,5 @@ module ROM
         super
       end
     end
-
   end
-
 end

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/rom.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.name          = 'rom'
   gem.summary       = 'Ruby Object Mapper'
   gem.description   = 'Persistence and mapping toolkit for Ruby'
-  gem.authors       = 'Piotr Solnica',
+  gem.author        = 'Piotr Solnica'
   gem.email         = 'piotr.solnica@gmail.com'
   gem.homepage      = 'http://rom-rb.org'
   gem.require_paths = ['lib']
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_runtime_dependency 'addressable', '~> 2.3'
+  gem.add_runtime_dependency 'transproc',   '~> 0.1'
   gem.add_runtime_dependency 'equalizer',   '~> 0.0', '>= 0.0.9'
   gem.add_runtime_dependency 'concord',     '~> 0.1', '>= 0.1.4'
   gem.add_runtime_dependency 'charlatan',   '~> 0.1', '>= 0.1'
@@ -23,5 +24,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'rspec-core', '~> 3.1'
+  gem.add_development_dependency 'rspec-mocks', '~> 3.1'
   gem.add_development_dependency 'rspec-expectations', '~> 3.1'
 end

data/spec/integration/adapters/extending_relations_spec.rb

@@ -23,8 +23,6 @@ describe "Adapter" do
             end
           end
         end
-
-        ROM::Adapter.register(self)
       end
     end
   end

data/spec/integration/commands/create_spec.rb

@@ -29,7 +29,6 @@ describe 'Commands / Create' do
     setup.commands(:tasks) do
       define(:create)
     end
-
   end
 
   it 'inserts user on successful validation' do
@@ -47,7 +46,8 @@ describe 'Commands / Create' do
       }
     }
 
-    expect(result).to match_array([{ name: 'Piotr', title: 'Finish command-api' }])
+    expect(result)
+      .to match_array([{ name: 'Piotr', title: 'Finish command-api' }])
   end
 
   it 'returns validation object with errors on failed validation' do
@@ -59,14 +59,11 @@ describe 'Commands / Create' do
   end
 
   describe '"result" option' do
-
     it 'returns a single tuple when set to :one' do
       setup.commands(:users) do
-
         define(:create_one, type: :create) do
           result :one
         end
-
       end
 
       tuple = { name: 'Piotr', email: 'piotr@solnic.eu' }
@@ -80,17 +77,13 @@ describe 'Commands / Create' do
 
     it 'allows only valid result types' do
       expect {
-
         setup.commands(:users) do
           define(:create_one, type: :create) do
             result :invalid_type
           end
         end
         setup.finalize
-
       }.to raise_error(ROM::InvalidOptionError)
     end
-
   end
-
 end

data/spec/integration/commands/delete_spec.rb

@@ -27,13 +27,13 @@ describe 'Commands / Delete' do
   end
 
   it 'deletes tuples matching restriction' do
-    result = users.try { delete(:by_name, 'Joe').call }
+    result = users.try { delete(:by_name, 'Joe') }
 
     expect(result).to match_array([{ name: 'Joe', email: 'joe@doe.org' }])
   end
 
   it 'returns untouched relation if there are no tuples to delete' do
-    result = users.try { delete(:by_name, 'Not here').call }
+    result = users.try { delete(:by_name, 'Not here') }
 
     expect(result).to match_array([])
   end
@@ -45,12 +45,12 @@ describe 'Commands / Delete' do
       end
     end
 
-    result = users.try { delete_one(:by_name, 'Jane').call }
+    result = users.try { delete_one(:by_name, 'Jane') }
 
     expect(result.value).to eql(name: 'Jane', email: 'jane@doe.org')
   end
 
-  it 'raises error when result is set to :one and relation contains more tuples' do
+  it 'raises when result is set to :one and relation contains more tuples' do
     setup.commands(:users) do
       define(:delete) do
         result :one
@@ -66,5 +66,4 @@ describe 'Commands / Delete' do
       { name: 'Joe', email: 'joe@doe.org' }
     ])
   end
-
 end

data/spec/integration/commands/error_handling_spec.rb

@@ -12,12 +12,13 @@ describe 'Commands / Error handling'  do
 
   it 'rescues from ROM::CommandError' do
     result = false
-    expect(users.try { raise ROM::CommandError } >-> test { result = true }).
-      to be_instance_of(ROM::Result::Failure)
+    expect(users.try { raise ROM::CommandError } >-> _test { result = true })
+      .to be_instance_of(ROM::Commands::Result::Failure)
     expect(result).to be(false)
   end
 
   it 'raises other errors' do
-    expect { users.try { raise ArgumentError, 'test' } }.to raise_error(ArgumentError, 'test')
+    expect { users.try { raise ArgumentError, 'test' } }
+      .to raise_error(ArgumentError, 'test')
   end
 end

data/spec/integration/commands/update_spec.rb

@@ -31,7 +31,6 @@ describe 'Commands / Update' do
         validator UserValidator
       end
     end
-
   end
 
   it 'update tuples on successful validation' do
@@ -39,7 +38,8 @@ describe 'Commands / Update' do
       update(:all, name: 'Jane').set(email: 'jane.doe@test.com')
     }
 
-    expect(result).to match_array([{ name: 'Jane', email: 'jane.doe@test.com' }])
+    expect(result)
+      .to match_array([{ name: 'Jane', email: 'jane.doe@test.com' }])
   end
 
   it 'returns validation object with errors on failed validation' do
@@ -54,7 +54,6 @@ describe 'Commands / Update' do
   end
 
   describe '"result" option' do
-
     it 'returns a single tuple when set to :one' do
       setup.commands(:users) do
         define(:update_one, type: :update) do
@@ -69,7 +68,7 @@ describe 'Commands / Update' do
       expect(result.value).to eql(name: 'Jane', email: 'jane.doe@test.com')
     end
 
-    it 'raises error when there is more than one tuple and result is set to :one' do
+    it 'raises when there is more than one tuple and result is set to :one' do
       setup.commands(:users) do
         define(:update_one, type: :update) do
           result :one
@@ -90,17 +89,13 @@ describe 'Commands / Update' do
 
     it 'allows only valid result types' do
       expect {
-
         setup.commands(:users) do
           define(:create_one, type: :create) do
             result :invalid_type
           end
         end
         setup.finalize
-
       }.to raise_error(ROM::InvalidOptionError)
     end
-
   end
-
 end

data/spec/integration/mappers/deep_embedded_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe 'Mappers / deeply embedded tuples' do
+  let(:setup) { ROM.setup('memory://test') }
+  let(:rom) { setup.finalize }
+
+  it 'allows mapping embedded tuples' do
+    setup.schema do
+      base_relation(:users) do
+        repository :default
+        attribute 'name'
+        attribute 'tasks'
+      end
+    end
+
+    setup.relation(:users)
+
+    setup.mappers do
+      define(:users) do
+        model name: 'User'
+
+        attribute :name, from: 'name'
+
+        embedded :tasks, from: 'tasks' do
+          attribute :title, from: 'title'
+
+          embedded :priority, from: 'priority', type: :hash do
+            attribute :value, from: 'value'
+            attribute :desc, from: 'desc'
+          end
+        end
+      end
+    end
+
+    rom.schema.users << {
+      'name' => 'Jane',
+      'tasks' => [
+        { 'title' => 'Task One', 'priority' => { 'value' => 1, 'desc' => 'high' } },
+        { 'title' => 'Task Two', 'priority' => { 'value' => 3, 'desc' => 'low' } }
+      ]
+    }
+
+    jane = rom.read(:users).to_a.first
+
+    expect(jane.name).to eql('Jane')
+
+    expect(jane.tasks).to eql([
+      { title: 'Task One', priority: { value: 1, desc: 'high' } },
+      { title: 'Task Two', priority: { value: 3, desc: 'low' } }
+    ])
+  end
+end

data/spec/integration/mappers/definition_dsl_spec.rb

@@ -101,125 +101,9 @@ describe 'Mapper definition DSL' do
     end
   end
 
-  describe 'grouped relation mapper' do
-    before do
-      setup.relation(:tasks)
-
-      setup.relation(:users) do
-        include ROM::RA
-
-        def with_tasks
-          join(tasks)
-        end
-      end
-
-      setup.mappers do
-        define(:users) do
-          model name: 'User'
-
-          attribute :name
-          attribute :email
-        end
-      end
-    end
-
-    it 'allows defining grouped attributes via options hash' do
-      setup.mappers do
-        define(:with_tasks, parent: :users) do
-          model name: 'UserWithTasks'
-
-          attribute :name
-          attribute :email
-
-          group tasks: [:title, :priority]
-        end
-      end
-
-      rom = setup.finalize
-
-      UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
-
-      jane = rom.read(:users).with_tasks.to_a.last
-
-      expect(jane).to eql(
-        UserWithTasks.new(
-          name: 'Jane',
-          email: 'jane@doe.org',
-          tasks: [{ title: 'be cool', priority: 2 }]
-        )
-      )
-    end
-
-    it 'allows defining grouped attributes via block' do
-      setup.mappers do
-        define(:with_tasks, parent: :users) do
-          model name: 'UserWithTasks'
-
-          attribute :name
-          attribute :email
-
-          group :tasks do
-            attribute :title
-            attribute :priority
-          end
-        end
-      end
-
-      rom = setup.finalize
-
-      UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
-
-      jane = rom.read(:users).with_tasks.to_a.last
-
-      expect(jane).to eql(
-        UserWithTasks.new(
-          name: 'Jane',
-          email: 'jane@doe.org',
-          tasks: [{ title: 'be cool', priority: 2 }]
-        )
-      )
-    end
-
-    it 'allows defining grouped attributes mapped to a model via block' do
-      setup.mappers do
-        define(:with_tasks, parent: :users) do
-          model name: 'UserWithTasks'
-
-          attribute :name
-          attribute :email
-
-          group :tasks do
-            model name: 'Task'
-
-            attribute :title
-            attribute :priority
-          end
-        end
-      end
-
-      rom = setup.finalize
-
-      UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
-      Task.send(:include, Equalizer.new(:title, :priority))
-
-      jane = rom.read(:users).with_tasks.to_a.last
-
-      expect(jane).to eql(
-        UserWithTasks.new(
-          name: 'Jane',
-          email: 'jane@doe.org',
-          tasks: [Task.new(title: 'be cool', priority: 2)]
-        )
-      )
-    end
-
-  end
-
   describe 'wrapped relation mapper' do
     before do
       setup.relation(:tasks) do
-        include ROM::RA
-
         def with_user
           join(users)
         end
@@ -323,7 +207,5 @@ describe 'Mapper definition DSL' do
         )
       )
     end
-
   end
-
 end