rom 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 721bf4200ba43797d78160490085ab5f545c4845
-  data.tar.gz: b0931e08715301413a9f21ab95694dee5a1d1074
+  metadata.gz: 728df93bc1b41195f801808c3849bc5012575181
+  data.tar.gz: be8e7364087eb867e25f2c0347fde4f7eb0dd4db
 SHA512:
-  metadata.gz: 829fd23000ae2dc4f88a05462285f34e47ce2aa288c14d93bd86385bc5ea8d4c281cfd579690f802911b644c49fc756a0fa37428a5429c8ce1427733c7dbbe51
-  data.tar.gz: 6a4513c5fe5f436ada0045ce4a9b7933d5c2a6f6f58a546d013ec8f7e5dc9719dace3cfdb89b75fbc8769f22cb9fd988225eaae1f080d6e2c6cd94718dcc4782
+  metadata.gz: b72abeba04fcdfe33de4562a2d81aa1a0b6297dbbee46c9cbe45f13d4e06788c34af039cafb1b741e1a0e7ae6b865bc0f347823edf0735d57b54f57f3e1908ef
+  data.tar.gz: a14e740c4769a9cc6929bee634eaffdfed36d08e58c7c79aa136849387c6e8ed8cfda7bcb9f3e4f4d1ce2ca7e658fb5fc6a6fbaea8b8d2e6fb8f2f535d68cd22

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 env:
   - CODECLIMATE_REPO_TOKEN=f7c652b65a700fcf1032174afc5ea243b991e48bf73077cc34c148e1c800a2f7
-bundler_args: --without sql benchmarks
+bundler_args: --without sql benchmarks console
 script: "bundle exec rake spec"
 rvm:
   - 2.0

data/CHANGELOG.md

@@ -1,15 +1,30 @@
-# v0.3.0 2014-11-24
+## v0.3.1 2014-11-25
+
+### Added
+
+* attributes for `group` mapping operation can be specified without options (solnic)
+* attributes for `wrap` mapping operation can be specified without options (solnic)
+* `Env` uses Equalizer (solnic)
+* boot dsl methods return self (solnic)
+
+### Fixed
+
+* when schema is missing booting will gracefuly skip building relations and mappers (solnic)
+* in-memory join handles one-to-many and many-to-one correctly (solnic)
+
+[Compare v0.3.0...v0.3.1](https://github.com/rom-rb/rom/compare/v0.3.0...v0.3.1)
+
+## v0.3.0 2014-11-24
 
 This version is a rewrite that introduces a new, simplified architecture based
 on a new adapter interface.
 
 [Compare v0.2.0...v0.3.0](https://github.com/rom-rb/rom/compare/v0.2.0...v0.3.0)
 
-# v0.2.0 2014-04-06
+## v0.2.0 2014-04-06
+
+### Added
 
-* [BREAKING] rom-relation, rom-mapper and rom-session were merged into rom project (solnic)
-* [BREAKING] changed mapping DSL (users do...end => relation(:users) do...end) (solnic)
-* [BREAKING] added :from option to mapping DSL which replaced :to (solnic)
 * [feature] added :rename option to schema attribute DSL (solnic)
 * [feature] added support for join, group, wrap, project and rename operations (solnic)
 * [feature] added support for setting domain object loading strategy (solnic)
@@ -17,25 +32,31 @@ on a new adapter interface.
 * [feature] added public interface for building mappers (see Mapper.build) (solnic)
 * [feature] added support for mapping embedded objects using wrap/group (solnic)
 * [feature] environment exposes mapper registry via Environment#mappers (solnic)
+
+### Changed
+
+* [BREAKING] rom-relation, rom-mapper and rom-session were merged into rom project (solnic)
+* [BREAKING] changed mapping DSL (users do...end => relation(:users) do...end) (solnic)
+* [BREAKING] added :from option to mapping DSL which replaced :to (solnic)
 * [internal] mappers are now backed by [morpher](https://github.com/mbj/morpher) (solnic)
 * [internal] renaming and optimizing relations happens on the schema level now (solnic)
 * [internal] environment will raise if unknown relation is referenced via `Environment#[]` (solnic)
 
 [Compare v0.1.2...v0.2.0](https://github.com/rom-rb/rom/compare/v0.1.2...v0.2.0)
 
-# v0.1.2 2013-09-02
+## v0.1.2 2013-09-02
 
 * [updated] [rom-relation](https://github.com/rom-rb/rom-relation/blob/v0.1.2/Changelog.md#v012-2013-09-02)
 
 [Compare v0.1.1...v0.1.2](https://github.com/rom-rb/rom/compare/v0.1.1...v0.1.2)
 
-# v0.1.1 2013-08-30
+## v0.1.1 2013-08-30
 
 * [updated] [rom-relation](https://github.com/rom-rb/rom-relation/blob/v0.1.1/Changelog.md#v011-2013-08-30)
 * [updated] [rom-session](https://github.com/rom-rb/rom-session/blob/v0.1.1/Changelog.md#v011-2013-08-30)
 
 [Compare v0.1.0...v0.1.1](https://github.com/rom-rb/rom/compare/v0.1.0...v0.1.1)
 
-# v0.1.0 2013-08-23
+## v0.1.0 2013-08-23
 
 First public release

data/Gemfile

@@ -2,6 +2,11 @@ source 'https://rubygems.org'
 
 gemspec
 
+group :console do
+  gem 'pry'
+  gem 'pg'
+end
+
 group :test do
   gem 'mutant'
   gem 'mutant-rspec'

data/lib/rom/adapter/memory.rb

@@ -11,6 +11,11 @@ module ROM
       class Dataset
         include Charlatan.new(:data)
 
+        def to_ary
+          data
+        end
+        alias_method :to_a, :to_ary
+
         def each(&block)
           return to_enum unless block
           data.each(&block)

data/lib/rom/boot.rb

@@ -8,6 +8,8 @@ module ROM
   #
   # @api public
   class Boot
+    include Equalizer.new(:repositories, :env)
+
     attr_reader :repositories, :adapter_relation_map, :env
 
     # @api private
@@ -36,6 +38,7 @@ module ROM
     # @api public
     def schema(&block)
       @schema = DSL.new(self).schema(&block)
+      self
     end
 
     # Relation definition DSL
@@ -51,6 +54,7 @@ module ROM
     # @api public
     def relation(name, &block)
       @relations.update(name => block)
+      self
     end
 
     # Mapper definition DSL
@@ -70,6 +74,7 @@ module ROM
     # @api public
     def mappers(&block)
       @mappers.concat(DSL.new(self).mappers(&block))
+      self
     end
 
     # Finalize the setup
@@ -122,6 +127,8 @@ module ROM
 
     # @api private
     def load_relations(schema)
+      return RelationRegistry.new unless adapter_relation_map.any?
+
       builder = RelationBuilder.new(schema)
 
       relations = @relations.each_with_object({}) do |(name, block), h|
@@ -144,13 +151,15 @@ module ROM
 
     # @api private
     def load_readers(relations)
+      return ReaderRegistry.new unless adapter_relation_map.any?
+
       reader_builder = ReaderBuilder.new(relations)
 
       readers = @mappers.each_with_object({}) do |(name, options, block), h|
         h[name] = reader_builder.call(name, options, &block)
       end
 
-      RelationRegistry.new(readers)
+      ReaderRegistry.new(readers)
     end
 
   end

data/lib/rom/env.rb

@@ -5,6 +5,7 @@ module ROM
   # @api public
   class Env
     include Adamantium::Flat
+    include Equalizer.new(:repositories, :schema, :relations, :mappers)
 
     attr_reader :repositories, :schema, :relations, :mappers
 

data/lib/rom/mapper_builder.rb

@@ -16,7 +16,7 @@ module ROM
         Header.coerce(attributes)
       end
 
-      def attribute(name, options)
+      def attribute(name, options = {})
         attributes << [name, options]
       end
     end

data/lib/rom/ra/operation/join.rb

@@ -20,15 +20,13 @@ module ROM
         def each(&block)
           return to_enum unless block
 
-          join_map = right.each_with_object({}) { |tuple, h|
-            other = left.detect { |t| (tuple.to_a & t.to_a).any?  }
-            (h[other] ||= []) << tuple if other
+          join_map = left.each_with_object({}) { |tuple, h|
+            others = right.find_all { |t| (tuple.to_a & t.to_a).any? }
+            (h[tuple] ||= []).concat(others)
           }
 
           tuples = left.map { |tuple|
-            others = join_map[tuple]
-            next unless others.any?
-            others.map { |other| tuple.merge(other) }
+            join_map[tuple].map { |other| tuple.merge(other) }
           }.flatten
 
           tuples.each(&block)

data/lib/rom/support/registry.rb

@@ -3,6 +3,7 @@ module ROM
   # @api private
   class Registry
     include Enumerable
+    include Equalizer.new(:elements)
 
     attr_reader :elements
 

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/spec/integration/mappers/definition_dsl_spec.rb

@@ -79,4 +79,161 @@ describe 'Mapper definition DSL' do
 
   end
 
+  describe 'grouped relation mapper' do
+    before do
+      setup.relation(:tasks)
+
+      setup.relation(:users) do
+        def with_tasks
+          in_memory { group(join(tasks), tasks: [:title, :priority]) }
+        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
+
+  end
+
+  describe 'wrapped relation mapper' do
+    before do
+      setup.relation(:tasks) do
+        def with_user
+          in_memory { wrap(join(users), user: [:email]) }
+        end
+      end
+
+      setup.relation(:users)
+
+      setup.mappers do
+        define(:tasks) do
+          model name: 'Task'
+
+          attribute :title
+          attribute :priority
+        end
+      end
+    end
+
+    it 'allows defining wrapped attributes via options hash' do
+      setup.mappers do
+        define(:with_user, parent: :tasks) do
+          model name: 'TaskWithUser'
+
+          attribute :title
+          attribute :priority
+
+          wrap user: [:email]
+        end
+      end
+
+      rom = setup.finalize
+
+      TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
+
+      jane = rom.read(:tasks).with_user.to_a.last
+
+      expect(jane).to eql(
+        TaskWithUser.new(
+          title: 'be cool',
+          priority: 2,
+          user: { email: 'jane@doe.org' }
+        )
+      )
+    end
+
+    it 'allows defining wrapped attributes via options block' do
+      setup.mappers do
+        define(:with_user, parent: :tasks) do
+          model name: 'TaskWithUser'
+
+          attribute :title
+          attribute :priority
+
+          wrap :user do
+            attribute :email
+          end
+        end
+      end
+
+      rom = setup.finalize
+
+      TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
+
+      jane = rom.read(:tasks).with_user.to_a.last
+
+      expect(jane).to eql(
+        TaskWithUser.new(
+          title: 'be cool',
+          priority: 2,
+          user: { email: 'jane@doe.org' }
+        )
+      )
+    end
+
+  end
+
 end

data/spec/integration/ra/join_spec.rb

@@ -3,13 +3,15 @@ require "spec_helper"
 describe 'Join operation' do
   include_context 'users and tasks'
 
-  specify 'defining a joined relation' do
+  specify 'defining a joined one-to-many relation' do
     setup.relation(:users) do
       def with_tasks
         in_memory { join(tasks) }
       end
     end
 
+    setup.relation(:tasks)
+
     users = rom.relations.users
 
     expect(users.with_tasks.to_a).to eql(
@@ -21,4 +23,24 @@ describe 'Join operation' do
     )
   end
 
+  specify 'defining a joined many-to-one relation' do
+    setup.relation(:users)
+
+    setup.relation(:tasks) do
+      def with_user
+        in_memory { join(users) }
+      end
+    end
+
+    tasks = rom.relations.tasks
+
+    expect(tasks.with_user.to_a).to eql(
+      [
+        { title: 'be nice', priority: 1, name: 'Joe', email: 'joe@doe.org' },
+        { title: 'sleep well', priority: 2, name: 'Joe', email: 'joe@doe.org' },
+        { title: 'be cool', priority: 2, name: 'Jane', email: 'jane@doe.org' }
+      ]
+    )
+  end
+
 end

data/spec/integration/setup_spec.rb

@@ -1,18 +1,33 @@
 require 'spec_helper'
 
 describe 'Setting up ROM' do
-  include_context 'users and tasks'
+  context 'with existing schema' do
+    include_context 'users and tasks'
 
-  let(:jane) { { name: 'Jane', email: 'jane@doe.org' } }
-  let(:joe) { { name: 'Joe', email: 'joe@doe.org' } }
+    let(:jane) { { name: 'Jane', email: 'jane@doe.org' } }
+    let(:joe) { { name: 'Joe', email: 'joe@doe.org' } }
 
-  it 'configures relations' do
-    expect(rom.memory.users).to match_array([joe, jane])
+    it 'configures relations' do
+      expect(rom.memory.users).to match_array([joe, jane])
+    end
+
+    it 'raises on double-finalize' do
+      expect {
+        2.times { setup.finalize }
+      }.to raise_error(ROM::EnvAlreadyFinalizedError)
+    end
   end
 
-  it 'raises on double-finalize' do
-    expect {
-      2.times { setup.finalize }
-    }.to raise_error(ROM::EnvAlreadyFinalizedError)
+  context 'without schema' do
+    it 'builds empty registries if there is no schema' do
+      setup = ROM.setup(memory: 'memory://test')
+
+      setup.relation(:users)
+
+      rom = setup.finalize
+
+      expect(rom.relations).to eql(ROM::RelationRegistry.new)
+      expect(rom.mappers).to eql(ROM::ReaderRegistry.new)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Piotr Solnica
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable