rom-repository 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362832c67aba16f8f9a1dd37eac6d361b39e2344
-  data.tar.gz: bedb0cd2de862f654a709becc55095240a50dcb2
+  metadata.gz: c74e20a5f12fce2888ae33bfeba0f4ff2baa9546
+  data.tar.gz: 816d5902836dfe8ab67f785c448c7e1b33b42853
 SHA512:
-  metadata.gz: 2dfc1e26fd3ee71949cae67a87657b35e876588f930e00023c5fbf69a216882f35058b7f3c9038975ef619d972bc25b91f39bf8a7a69c3670923d649daf989fa
-  data.tar.gz: '02393346642d169103689807063b580ff765de616ffac3b15babdb757fef60bef91fe0bd27127bdb9720a07d296e0afdbf78a07b54b17fe75f62db9055ba8865'
+  metadata.gz: 9b8dac9fd33b64b269353b52dc6d01a5f2d65a6f97376d2df322ea9bb64fa1a31850100b2080e8b69b89c15a84227cb6e6f02913fcfda673554f1cbb2f0f8539
+  data.tar.gz: a8355e2936bf75d78ce989337815b0a5446aa532e2fa5e93e359cc87bb920db82afecd3f6a899306d3994e0aab75956a17adda086bb8909075849911eea11da5

data/.travis.yml

@@ -5,6 +5,7 @@ cache: bundler
 bundler_args: --without yard guard benchmarks tools
 before_script:
   - psql -c 'create database rom_repository' -U postgres
+  - rvm get master
 script: "bundle exec rake ci"
 after_success:
   - '[ "${TRAVIS_JOB_NUMBER#*.}" = "1" ] && [ "$TRAVIS_BRANCH" = "master" ] && bundle exec codeclimate-test-reporter'

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v1.3.1 2017-03-25
+
+### Fixed
+
+* Support for using custom mappers inside `#node` (flash-gordon)
+
+### Changed
+
+* Updated `dry-initializer` (flash-gordon)
+
+[Compare v1.3.0...v1.3.1](https://github.com/rom-rb/rom-repository/compare/v1.3.0...v1.3.1)
+
 # v1.3.0 2017-03-07
 
 ### Added

data/lib/rom/repository.rb

@@ -86,9 +86,9 @@ module ROM
     #   @return [ROM::Container] The container used to set up a repo
     param :container, allow: ROM::Container
 
-    # @!attribute [r] container
-    #   @return [ROM::Container] The container used to set up a repo
-    option :auto_struct, optional: true, default: -> repo { repo.class.auto_struct }
+    # @!attribute [r] auto_struct
+    #   @return [Boolean] The container used to set up a repo
+    option :auto_struct, default: -> { self.class.auto_struct }
 
     # @!attribute [r] relations
     #   @return [RelationRegistry] The relation proxy registry used by a repo

data/lib/rom/repository/changeset.rb

@@ -53,11 +53,11 @@ module ROM
 
     # @!attribute [r] command_compiler
     #   @return [Proc] a proc that can compile a command (typically provided by a repo)
-    option :command_compiler, reader: true, optional: true
+    option :command_compiler, optional: true
 
     # @!attribute [r] command_type
     #   @return [Symbol] a custom command identifier
-    option :command_type, reader: true, default: -> changeset { changeset.class.command_type }
+    option :command_type, default: -> { self.class.command_type }
 
     # Create a changeset class preconfigured for a specific relation
     #
@@ -78,7 +78,7 @@ module ROM
     #
     # @example
     #   class NewUser < ROM::Changeset::Create[:users]
-    #     option :token_generator, reader: true
+    #     option :token_generator
     #   end
     #
     #   changeset = user_repo.changeset(NewUser).with(token_generator: my_token_gen)

data/lib/rom/repository/changeset/associated.rb

@@ -12,9 +12,9 @@ module ROM
       #   @return [Changeset::Create] Child changeset
       param :left
 
-      # @!attribute [r] association
-      #   @return [Symbol] Association identifier from relation schema
-      option :associations, reader: true
+      # @!attribute [r] associations
+      #   @return [Array] List of association identifiers from relation schema
+      option :associations
 
       # Infer association name from an object with a schema
       #

data/lib/rom/repository/changeset/stateful.rb

@@ -13,14 +13,12 @@ module ROM
       # @!attribute [r] __data__
       #   @return [Hash] The relation data
       #   @api private
-      option :__data__, reader: true, optional: true, default: proc { nil }
+      option :__data__, optional: true
 
       # @!attribute [r] pipe
       #   @return [Changeset::Pipe] data transformation pipe
       #   @api private
-      option :pipe, reader: true, accept: [Proc, Pipe], default: -> changeset {
-        changeset.class.default_pipe(changeset)
-      }
+      option :pipe, accept: [Proc, Pipe], default: -> { self.class.default_pipe(self) }
 
       # Define a changeset mapping
       #

data/lib/rom/repository/class_interface.rb

@@ -51,18 +51,11 @@ module ROM
       #
       # @api public
       def relations(*names)
-        if names.any?
-          attr_reader(*names)
-
-          if defined?(@relations)
-            @relations.concat(names).uniq!
-          else
-            @relations = names
-          end
-
-          @relations
+        if names.empty?
+          @relations ||= []
         else
-          @relations
+          attr_reader(*(names - relations))
+          @relations = relations | names
         end
       end
 
@@ -104,7 +97,7 @@ module ROM
             end
           end
         else
-          @commands || []
+          @commands ||= []
         end
       end
 

data/lib/rom/repository/relation_proxy.rb

@@ -27,10 +27,10 @@ module ROM
       param :relation
 
       option :name, type:  Types::Strict::Symbol
-      option :mappers, reader: true, default: proc { MapperBuilder.new }
-      option :meta, reader: true, default: proc { EMPTY_HASH }
-      option :registry, type: RelationRegistryType, default: proc { RelationRegistry.new }, reader: true
-      option :auto_struct, optional: true
+      option :mappers, default: -> { MapperBuilder.new }
+      option :meta, default: -> { EMPTY_HASH }
+      option :registry, type: RelationRegistryType, default: -> { RelationRegistry.new }
+      option :auto_struct, default: -> { true }
 
       # Relation name
       #
@@ -38,7 +38,7 @@ module ROM
       #
       # @api public
       def name
-        @name == Dry::Initializer::UNDEFINED ? relation.name : relation.name.with(@name)
+        @name ? relation.name.with(@name) : relation.name
       end
 
       # Materializes wrapped relation and sends it through a mapper
@@ -91,7 +91,7 @@ module ROM
         elsif names.size > 1 && names.any? { |name| name.is_a?(Class) }
           raise ArgumentError, 'using custom mappers and a model is not supported'
         else
-          if opts[:auto_map]
+          if opts[:auto_map] && !meta[:combine_type]
             mappers = [mapper, *names.map { |name| relation.mappers[name] }]
             mappers.reduce(self) { |a, e| a >> e }
           else

data/lib/rom/repository/version.rb

@@ -1,5 +1,5 @@
 module ROM
   class Repository
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.3.1'.freeze
   end
 end

data/rom-repository.gemspec

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require File.expand_path('../lib/rom/repository/version', __FILE__)
 
 Gem::Specification.new do |gem|
@@ -15,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'rom', '~> 3.1'
+  gem.add_runtime_dependency 'rom', '~> 3.2'
   gem.add_runtime_dependency 'rom-mapper', '~> 0.5'
   gem.add_runtime_dependency 'dry-core', '~> 0.2', '>= 0.2.1'
   gem.add_runtime_dependency 'dry-struct', '~> 0.1'

data/spec/integration/multi_adapter_spec.rb

@@ -1,12 +1,10 @@
-# encoding: utf-8
-
 RSpec.describe 'Repository with multi-adapters configuration' do
-  include_context 'database'
-
-  let(:configuration) {
-    ROM::Configuration.new(default: [:sql, uri], memory: [:memory])
+  let!(:configuration) {
+    ROM::Configuration.new(default: [:sql, DB_URI], memory: [:memory])
   }
 
+  let(:rom) { ROM.container(configuration) }
+
   let(:users) { rom.relation(:sql_users) }
   let(:tasks) { rom.relation(:memory_tasks) }
 

data/spec/integration/repository_spec.rb

@@ -1,8 +1,9 @@
 RSpec.describe 'ROM repository' do
   include_context 'database'
   include_context 'relations'
-  include_context 'seeds'
+  include_context 'repo'
   include_context 'structs'
+  include_context 'seeds'
 
   it 'loads a single relation' do
     expect(repo.all_users.to_a).to match_array([jane, joe])
@@ -301,6 +302,14 @@ RSpec.describe 'ROM repository' do
             rel.map { |tuple| Hash(tuple).merge(mapped: true) }
           end
         end
+
+        define(:posts) do
+          register_as :nested_mapper
+
+          def call(rel)
+            rel.map { |tuple| Hash(tuple).tap { |h| h[:title] = h[:title].upcase } }
+          end
+        end
       end
     end
 
@@ -308,7 +317,20 @@ RSpec.describe 'ROM repository' do
       jane = repo.users.combine(:posts).map_with(:embed_address, auto_map: true).to_a.first
 
       expect(jane).
-        to eql(id:1, name: 'Jane', mapped: true, posts: [{ id: 1, author_id: 1, title: 'Hello From Jane', body: 'Jane Post' }])
+        to eql(id:1, name: 'Jane', mapped: true, posts: [
+                 { id: 1, author_id: 1, title: 'Hello From Jane', body: 'Jane Post' }
+               ])
+    end
+
+    it 'applies a custom mapper inside #node' do
+      jane = repo.aggregate(:posts).node(:posts) { |posts| posts.as(:nested_mapper, auto_map: true) }.to_a.first
+
+      expect(jane).to be_a ROM::Struct
+
+      expect(jane.to_h).
+        to eql(id:1, name: 'Jane', posts: [
+                 { id: 1, author_id: 1, title: 'HELLO FROM JANE', body: 'Jane Post' }
+               ])
     end
   end
 

data/spec/shared/database.rb

@@ -1,18 +1,10 @@
 RSpec.shared_context 'database setup' do
-  let(:configuration) { ROM::Configuration.new(:sql, uri) }
+  let(:configuration) { ROM::Configuration.new(:sql, DB_URI) }
 
   let(:conn) { configuration.gateways[:default].connection }
 
   let(:rom) { ROM.container(configuration) }
 
-  let(:uri) do
-    if defined? JRUBY_VERSION
-      'jdbc:postgresql://localhost/rom_repository'
-    else
-      'postgres://localhost/rom_repository'
-    end
-  end
-
   before do
     conn.loggers << LOGGER
   end

data/spec/shared/mappers.rb

@@ -1,7 +1,7 @@
 RSpec.shared_context 'mappers' do
-  let(:users) { rom.relation(:users).mappers[:user] }
-  let(:tasks) { rom.relation(:tasks).mappers[:task] }
-  let(:tags) { rom.relation(:tags).mappers[:tag] }
+  let(:user_mappers) { users.mappers[:user] }
+  let(:task_mappers) { tasks.mappers[:task] }
+  let(:tag_mappers) { tags.mappers[:tag] }
 
   before do
     configuration.mappers do

data/spec/shared/structs.rb

@@ -1,6 +1,4 @@
 RSpec.shared_context 'structs' do
-  include_context 'repo'
-
   let(:user_struct) do
     repo.users.mapper.model
   end

data/spec/spec_helper.rb

@@ -22,14 +22,6 @@ end
 root = Pathname(__FILE__).dirname
 LOGGER = Logger.new(File.open('./log/test.log', 'a'))
 
-Dir[root.join('support/*.rb').to_s].each do |f|
-  require f
-end
-
-Dir[root.join('shared/*.rb').to_s].each do |f|
-  require f
-end
-
 require 'dry/core/deprecations'
 Dry::Core::Deprecations.set_logger!(root.join('../log/deprecations.log'))
 
@@ -47,12 +39,41 @@ module Test
   end
 end
 
+warning_api_available = RUBY_VERSION >= '2.4.0'
+
+module SileneceWarnings
+  def warn(str)
+    if str['/sequel/'] || str['/rspec-core']
+      nil
+    else
+      super
+    end
+  end
+end
+
+DB_URI = if defined? JRUBY_VERSION
+           'jdbc:postgresql://localhost/rom_repository'
+         else
+           'postgres://localhost/rom_repository'
+         end
+
+Warning.extend(SileneceWarnings) if warning_api_available
+
 RSpec.configure do |config|
+  config.disable_monkey_patching!
+  config.warnings = true
+
   config.after do
     Test.remove_constants
   end
 
-  config.include(MapperRegistry)
+  Dir[root.join('support/*.rb').to_s].each do |f|
+    require f
+  end
 
-  config.disable_monkey_patching!
+  Dir[root.join('shared/*.rb').to_s].each do |f|
+    require f
+  end
+
+  config.include(MapperRegistry)
 end

data/spec/unit/relation_proxy_spec.rb

@@ -7,21 +7,21 @@ RSpec.describe 'loading proxy' do
   include_context 'structs'
   include_context 'seeds'
 
-  let(:users) do
-    ROM::Repository::RelationProxy.new(rom.relation(:users), name: :users)
+  let(:users_proxy) do
+    ROM::Repository::RelationProxy.new(users, name: :users)
   end
 
-  let(:tasks) do
-    ROM::Repository::RelationProxy.new(rom.relation(:tasks), name: :tasks)
+  let(:tasks_proxy) do
+    ROM::Repository::RelationProxy.new(tasks, name: :tasks)
   end
 
-  let(:tags) do
-    ROM::Repository::RelationProxy.new(rom.relation(:tags), name: :tags)
+  let(:tags_proxy) do
+    ROM::Repository::RelationProxy.new(tags, name: :tags)
   end
 
   describe '#inspect' do
     specify do
-      expect(users.inspect).
+      expect(users_proxy.inspect).
         to eql("#<ROM::Relation[Users] name=users dataset=#{users.dataset.inspect}>")
     end
   end
@@ -30,13 +30,13 @@ RSpec.describe 'loading proxy' do
     it 'yields loaded structs' do
       result = []
 
-      users.each { |user| result << user }
+      users_proxy.each { |user| result << user }
 
       expect(result).to eql([jane, joe])
     end
 
     it 'returns an enumerator when block is not given' do
-      expect(users.each.to_a).to eql([jane, joe])
+      expect(users_proxy.each.to_a).to eql([jane, joe])
     end
   end
 
@@ -53,17 +53,17 @@ RSpec.describe 'loading proxy' do
       end
 
       it 'sends the relation through custom mappers' do
-        expect(users.map_with(:name_list, :upcase_names).to_a).to match_array(%w(JANE JOE))
+        expect(users_proxy.map_with(:name_list, :upcase_names).to_a).to match_array(%w(JANE JOE))
       end
 
       it 'does not use the default(ROM::Struct) mapper' do
-        expect(users.map_with(:identity).to_a).to match_array(
+        expect(users_proxy.map_with(:identity).to_a).to match_array(
           [{ id: 1, name: 'Jane' }, {id: 2, name: 'Joe' }]
         )
       end
 
       it 'raises error when custom mapper is used with a model class' do
-        expect { users.map_with(:name_list, Class.new) }.
+        expect { users_proxy.map_with(:name_list, Class.new) }.
           to raise_error(ArgumentError, 'using custom mappers and a model is not supported')
       end
     end
@@ -76,7 +76,7 @@ RSpec.describe 'loading proxy' do
         end
       end
 
-      let(:custom_users) { users.as(user_type) }
+      let(:custom_users) { users_proxy.as(user_type) }
 
       it 'instantiates custom model' do
         expect(custom_users.where(name: 'Jane').one).to be_instance_of(user_type)
@@ -87,59 +87,59 @@ RSpec.describe 'loading proxy' do
   describe 'retrieving a single struct' do
     describe '#first' do
       it 'returns exactly one struct' do
-        expect(users.first).to eql(jane)
+        expect(users_proxy.first).to eql(jane)
       end
     end
 
     describe '#one' do
       it 'returns exactly one struct' do
-        expect(users.find(id: 1).one).to eql(jane)
+        expect(users_proxy.find(id: 1).one).to eql(jane)
 
-        expect(users.find(id: 3).one).to be(nil)
+        expect(users_proxy.find(id: 3).one).to be(nil)
 
-        expect { users.find(id: [1,2]).one }.to raise_error(ROM::TupleCountMismatchError)
+        expect { users_proxy.find(id: [1,2]).one }.to raise_error(ROM::TupleCountMismatchError)
       end
     end
 
     describe '#one!' do
       it 'returns exactly one struct' do
-        expect(users.find(id: 1).one!).to eql(jane)
+        expect(users_proxy.find(id: 1).one!).to eql(jane)
 
-        expect { users.find(id: [1, 2]).one! }.to raise_error(ROM::TupleCountMismatchError)
-        expect { users.find(id: [3]).one! }.to raise_error(ROM::TupleCountMismatchError)
+        expect { users_proxy.find(id: [1, 2]).one! }.to raise_error(ROM::TupleCountMismatchError)
+        expect { users_proxy.find(id: [3]).one! }.to raise_error(ROM::TupleCountMismatchError)
       end
     end
   end
 
   describe '#to_ast' do
     it 'returns valid ast for a single relation' do
-      expect(users.to_ast).to eql(
+      expect(users_proxy.to_ast).to eql(
         [:relation, [
           :users,
           { dataset: :users },
-          [:header, [[:attribute, users.schema[:id]], [:attribute, users.schema[:name]]]]]
+          [:header, [[:attribute, users_proxy.schema[:id]], [:attribute, users_proxy.schema[:name]]]]]
         ]
       )
     end
 
     it 'returns valid ast for a combined relation' do
-      relation = users.combine(many: { user_tasks: [tasks, id: :user_id] })
+      relation = users_proxy.combine(many: { user_tasks: [tasks_proxy, id: :user_id] })
 
       expect(relation.to_ast).to eql(
         [:relation, [
           :users,
           { dataset: :users },
           [:header, [
-            [:attribute, users.schema[:id]],
-            [:attribute, users.schema[:name]],
+            [:attribute, users_proxy.schema[:id]],
+            [:attribute, users_proxy.schema[:name]],
             [:relation, [
               :tasks,
               { dataset: :tasks, keys: { id: :user_id },
                 combine_type: :many, combine_name: :user_tasks },
               [:header, [
-                 [:attribute, tasks.schema[:id]],
-                 [:attribute, tasks.schema[:user_id]],
-                 [:attribute, tasks.schema[:title]]]]
+                 [:attribute, tasks_proxy.schema[:id]],
+                 [:attribute, tasks_proxy.schema[:user_id]],
+                 [:attribute, tasks_proxy.schema[:title]]]]
             ]]
           ]
         ]]]
@@ -147,10 +147,10 @@ RSpec.describe 'loading proxy' do
     end
 
     it 'returns valid ast for a wrapped relation' do
-      relation = tags.wrap_parent(task: tasks)
+      relation = tags_proxy.wrap_parent(task: tasks_proxy)
 
-      tags_schema = tags.schema.qualified
-      tasks_schema = tasks.schema.wrap
+      tags_schema = tags_proxy.schema.qualified
+      tasks_schema = tasks_proxy.schema.wrap
 
       expect(relation.to_ast).to eql(
         [:relation, [
@@ -177,19 +177,19 @@ RSpec.describe 'loading proxy' do
 
   describe '#method_missing' do
     it 'proxies to the underlying relation' do
-      expect(users.gateway).to be(:default)
+      expect(users_proxy.gateway).to be(:default)
     end
 
     it 'returns proxy when response was not materialized' do
-      expect(users.by_pk(1)).to be_instance_of(ROM::Repository::RelationProxy)
+      expect(users_proxy.by_pk(1)).to be_instance_of(ROM::Repository::RelationProxy)
     end
 
     it 'returns curried proxy when response was curried' do
-      expect(users.by_pk).to be_instance_of(ROM::Repository::RelationProxy)
+      expect(users_proxy.by_pk).to be_instance_of(ROM::Repository::RelationProxy)
     end
 
     it 'raises when method is missing' do
-      expect { users.not_here }.to raise_error(NoMethodError, "undefined method `not_here' for ROM::Relation[Users]")
+      expect { users_proxy.not_here }.to raise_error(NoMethodError, "undefined method `not_here' for ROM::Relation[Users]")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rom-mapper
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Repository abstraction for rom-rb