rom-repository 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d274cac190d09e34254d67581d2cd8647e30301
-  data.tar.gz: 39db9816c2762e1c47422df900b85d4d82b91556
+  metadata.gz: 2939fe9e61cbec70da58fe863b4c49384feabf57
+  data.tar.gz: 7cf8ca8cfc9acb006d2065bcdfcd6fcac6c4531e
 SHA512:
-  metadata.gz: 55676bbb6a54903a047c3218334038039e8a26d3239ddec34011cef262450f6ed56a63bc0074c1094ebc5d547a845f8ffa20c0ad8ec9b4d5feed2c1eabcb7e09
-  data.tar.gz: 9e04a30eecd17b3741f22c3efac94f7a643d73b68dd781bf15e80f37a00be65eb2c5cdb13214ad0b3016e0fe877df7478c6a1c958dd08af654d345ca27880e4e
+  metadata.gz: 8ee593244830ea931207b4acd726c9475543e6f8dd1bf65a3741c51f75bc1eee9fee974509fc4298005e2958500c38e2e313ed639b63f564de178cb4eb5bdb08
+  data.tar.gz: e3c05763d9d382a268ee5d29af29472826c86ac538b3b4364b80a36379ecb5d822aa5ced697fb836a111a212c700c24694c13f73f6acd0de6c04dcdd5dac145f

data/.travis.yml

@@ -13,11 +13,7 @@ rvm:
   - 2.2.7
   - 2.3.4
   - 2.4.1
-  - rbx-3
   - jruby-9.1.8.0
-matrix:
-  allow_failures:
-    - rvm: rbx-3
 env:
   global:
     - JRUBY_OPTS='--dev -J-Xmx1024M'

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# v1.3.3 2017-05-31
+
+### Added
+
+* `Changeset#extend` to exclude steps from the `#diff` output, this allows
+  to filter out timestamp changes prior to updates so that we can avoid
+  hitting the database in case of timestamp-only changes. You still can call `.map(:touch)`
+  if you want to have `updated_at` refreshed unconditionally (flash-gordon)
+  
+## Fixed
+
+* `aggregate` and `combine` works correctly with nested graph options where associations are aliased (solnic)
+* Auto-mapping no longer creates intermediate struct objects for combined relations (which caused massive performance degradation in some cases) (solnic)
+* Aliased associations no longer cause mapping to intermediate structs (solnic)
+
+[Compare v1.3.2...v1.3.3](https://github.com/rom-rb/rom-repository/compare/v1.3.2...v1.3.3)
+
 # v1.3.2 2017-05-02
 
 ### Fixed

data/Gemfile

@@ -11,8 +11,8 @@ group :development do
 end
 
 group :test do
-  gem 'rom', git: 'https://github.com/rom-rb/rom.git', branch: 'master'
-  gem 'rom-sql', git: 'https://github.com/rom-rb/rom-sql.git', branch: 'master'
+  gem 'rom', git: 'https://github.com/rom-rb/rom.git', branch: 'release-3.0'
+  gem 'rom-sql', git: 'https://github.com/rom-rb/rom-sql.git', branch: 'release-1.0'
   gem 'rspec'
   gem 'dry-struct'
   gem 'byebug', platforms: :mri

data/README.md

@@ -1,25 +1 @@
-[gem]: https://rubygems.org/gems/rom-repository
-[travis]: https://travis-ci.org/rom-rb/rom-repository
-[gemnasium]: https://gemnasium.com/rom-rb/rom-repository
-[codeclimate]: https://codeclimate.com/github/rom-rb/rom-repository
-[inchpages]: http://inch-ci.org/github/rom-rb/rom-repository
-
-# rom-repository
-
-[![Gem Version](https://badge.fury.io/rb/rom-repository.svg)][gem]
-[![Build Status](https://travis-ci.org/rom-rb/rom-repository.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/rom-rb/rom-repository.svg)][gemnasium]
-[![Code Climate](https://codeclimate.com/github/rom-rb/rom-repository/badges/gpa.svg)][codeclimate]
-[![Test Coverage](https://codeclimate.com/github/rom-rb/rom-repository/badges/coverage.svg)][codeclimate]
-[![Inline docs](http://inch-ci.org/github/rom-rb/rom-repository.svg?branch=master)][inchpages]
-
-Repositories for [rom-rb](https://github.com/rom-rb/rom) with auto-mapping, changesets and commands.
-
-Resources:
-
-* [User documentation](http://rom-rb.org/learn/repositories)
-* [API documentation](http://rubydoc.info/gems/rom-repository)
-
-## License
-
-See `LICENSE` file.
+# This project was moved to [rom-rb/rom](https://github.com/rom-rb/rom/tree/master/repository)

data/lib/rom/repository.rb

@@ -82,10 +82,20 @@ module ROM
 
     auto_struct true
 
+    # @!method self.auto_struct
+    #   Get or set struct namespace
+    defines :struct_namespace
+
+    struct_namespace ROM::Struct
+
     # @!attribute [r] container
     #   @return [ROM::Container] The container used to set up a repo
     param :container, allow: ROM::Container
 
+    # @!attribute [r] struct_namespace
+    #   @return [Module,Class] The namespace for auto-generated structs
+    option :struct_namespace, default: -> { self.class.struct_namespace }
+
     # @!attribute [r] auto_struct
     #   @return [Boolean] The container used to set up a repo
     option :auto_struct, default: -> { self.class.auto_struct }
@@ -111,7 +121,7 @@ module ROM
     def initialize(container, opts = EMPTY_HASH)
       super
 
-      @mappers = MapperBuilder.new
+      @mappers = MapperBuilder.new(struct_namespace: struct_namespace)
 
       @relations = RelationRegistry.new do |registry, relations|
         self.class.relations.each do |name|
@@ -272,7 +282,7 @@ module ROM
     #   end
     #
     #   user
-    #   # => #<ROM::Struct[User] id=1 name="Jane">
+    #   # => #<ROM::Struct::User id=1 name="Jane">
     #
     # @example with a rollback
     #   user = transaction do |t|

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

@@ -25,11 +25,11 @@ module ROM
     #
     # @api private
     class Pipe < Transproc::Transformer[PipeRegistry]
-      attr_reader :processor
+      extend Initializer
 
-      def initialize(processor = self.class.transproc)
-        @processor = processor
-      end
+      param :processor, default: -> { self.class.transproc }
+      option :use_for_diff, optional: true, default: -> { true }
+      option :diff_processor, optional: true, default: -> { use_for_diff ? processor : nil }
 
       def self.[](name)
         container[name]
@@ -40,20 +40,22 @@ module ROM
       end
 
       def bind(context)
-        if processor.is_a?(Proc)
-          self.class.new(Pipe[-> *args { context.instance_exec(*args, &processor) }])
-        else
-          self
-        end
+        return self unless processor.is_a?(Proc) || diff_processor.is_a?(Proc)
+
+        new(bind_processor(processor, context), diff_processor: bind_processor(diff_processor, context))
       end
 
-      def >>(other)
-        if processor
-          Pipe.new(processor >> other)
+      def compose(other, use_for_diff: other.is_a?(Pipe) ? other.use_for_diff : false)
+        new_proc = processor ? processor >> other : other
+
+        if use_for_diff
+          diff_proc = diff_processor ? diff_processor >> other : other
+          new(new_proc, diff_processor: diff_proc)
         else
-          Pipe.new(other)
+          new(new_proc)
         end
       end
+      alias_method :>>, :compose
 
       def call(data)
         if processor
@@ -62,6 +64,34 @@ module ROM
           data
         end
       end
+
+      def for_diff(data)
+        if diff_processor
+          diff_processor.call(data)
+        else
+          data
+        end
+      end
+
+      def with(opts)
+        if opts.empty?
+          self
+        else
+          Pipe.new(processor, options.merge(opts))
+        end
+      end
+
+      def new(processor, opts = EMPTY_HASH)
+        Pipe.new(processor, options.merge(opts))
+      end
+
+      def bind_processor(processor, context)
+        if processor.is_a?(Proc)
+          self[-> *args { context.instance_exec(*args, &processor) }]
+        else
+          processor
+        end
+      end
     end
   end
 end

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

@@ -55,11 +55,27 @@ module ROM
       # @see https://github.com/solnic/transproc Transproc
       #
       # @api public
-      def self.map(&block)
+      def self.map(options = EMPTY_HASH, &block)
         if block.parameters.empty?
-          pipes << Class.new(Pipe, &block).new
+          pipes << Class.new(Pipe, &block).new(options)
         else
-          pipes << Pipe.new(block)
+          pipes << Pipe.new(block, options)
+        end
+      end
+
+      # Define a changeset mapping excluded from diffs
+      #
+      # @see Changeset::Stateful.map
+      # @see Changeset::Stateful#extend
+      #
+      # @return [Array<Pipe>, Transproc::Function>]
+      #
+      # @api public
+      def self.extend(*, &block)
+        if block
+          map(use_for_diff: false, &block)
+        else
+          super
         end
       end
 
@@ -104,7 +120,7 @@ module ROM
       #   Apply mapping using built-in transformations and a custom block
       #
       #   @example
-      #     changeset.map(:touch) { |tuple| tuple.merge(status: 'published') }
+      #     changeset.map(:add_timestamps) { |tuple| tuple.merge(status: 'published') }
       #
       #   @param [Array<Symbol>] steps A list of mapping steps
       #
@@ -112,14 +128,33 @@ module ROM
       #
       # @api public
       def map(*steps, &block)
+        extend(*steps, use_for_diff: true, &block)
+      end
+
+      # Pipe changeset's data using custom steps define on the pipe.
+      # You should use #map instead except updating timestamp fields.
+      # Calling changeset.extend builds a pipe that excludes certain
+      # steps for generating the diff. Currently the only place where
+      # it is used is update changesets with the `:touch` step, i.e.
+      # `changeset.extend(:touch).diff` will exclude `:updated_at`
+      # from the diff.
+      #
+      # @see Changeset::Stateful#map
+      #
+      # @return [Changeset]
+      #
+      # @api public
+      def extend(*steps, use_for_diff: false, **opts, &block)
+        options = { use_for_diff: use_for_diff, **opts }
+
         if block
           if steps.size > 0
-            map(*steps).map(&block)
+            extend(*steps, options).extend(options, &block)
           else
-            with(pipe: pipe >> Pipe.new(block).bind(self))
+            with(pipe: pipe.compose(Pipe.new(block).bind(self), options))
           end
         else
-          with(pipe: steps.reduce(pipe) { |a, e| a >> pipe[e] })
+          with(pipe: steps.reduce(pipe.with(options)) { |a, e| a.compose(pipe[e], options) })
         end
       end
 

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

@@ -41,16 +41,6 @@ module ROM
         @original ||= Hash(relation.one)
       end
 
-      # Return diff hash sent through the pipe
-      #
-      # @return [Hash]
-      #
-      # @api public
-      def to_h
-        pipe.call(diff)
-      end
-      alias_method :to_hash, :to_h
-
       # Return true if there's a diff between original and changeset data
       #
       # @return [TrueClass, FalseClass]
@@ -77,8 +67,9 @@ module ROM
       def diff
         @diff ||=
           begin
-            data_tuple = __data__.to_a
-            data_keys = __data__.keys & original.keys
+            data = pipe.for_diff(__data__)
+            data_tuple = data.to_a
+            data_keys = data.keys & original.keys
 
             new_tuple = data_tuple.to_a.select { |(k, _)| data_keys.include?(k) }
             ori_tuple = original.to_a.select { |(k, _)| data_keys.include?(k) }

data/lib/rom/repository/header_builder.rb

@@ -7,8 +7,8 @@ module ROM
     class HeaderBuilder
       attr_reader :struct_builder
 
-      def initialize(options = EMPTY_HASH)
-        @struct_builder = StructBuilder.new
+      def initialize(struct_namespace: nil, **options)
+        @struct_builder = StructBuilder.new(struct_namespace)
       end
 
       def call(ast)
@@ -28,7 +28,11 @@ module ROM
         name = meta[:combine_name] || relation_name
 
         model = meta.fetch(:model) do
-          struct_builder[meta.fetch(:dataset), header]
+          if meta[:combine_name]
+            false
+          else
+            struct_builder[name, header]
+          end
         end
 
         options = [visit(header), model: model]

data/lib/rom/repository/mapper_builder.rb

@@ -10,8 +10,8 @@ module ROM
 
       attr_reader :header_builder
 
-      def initialize
-        @header_builder = HeaderBuilder.new
+      def initialize(options = EMPTY_HASH)
+        @header_builder = HeaderBuilder.new(options)
       end
 
       def call(ast)

data/lib/rom/repository/relation_proxy.rb

@@ -17,6 +17,8 @@ module ROM
       extend Initializer
       include Relation::Materializable
 
+      (Kernel.private_instance_methods - %i(raise)).each(&method(:undef_method))
+
       include RelationProxy::Combine
       include RelationProxy::Wrap
 

data/lib/rom/repository/relation_proxy/combine.rb

@@ -73,7 +73,13 @@ module ROM
               end
             else
               if value.is_a?(Array)
-                curried = combine_from_assoc(key, registry[key]).combine(*value)
+                other =
+                  if registry.key?(key)
+                    registry[key]
+                  else
+                    registry[associations[key].target]
+                  end
+                curried = combine_from_assoc(key, other).combine(*value)
                 result, _, keys = combine_opts_for_assoc(key)
                 combine_opts[result][key] = [curried, keys]
               else
@@ -89,7 +95,7 @@ module ROM
             }
           end
 
-          __new__(relation.combine(*nodes))
+          __new__(relation.graph(*nodes))
         end
 
         # Shortcut for combining with parents which infers the join keys

data/lib/rom/repository/struct_builder.rb

@@ -30,6 +30,12 @@ module ROM
       end
       alias_method :[], :call
 
+      attr_reader :namespace
+
+      def initialize(namespace = nil)
+        @namespace = namespace || ROM::Struct
+      end
+
       private
 
       def visit(ast)
@@ -66,11 +72,11 @@ module ROM
       end
 
       def build_class(name, parent, &block)
-        Dry::Core::ClassBuilder.new(name: class_name(name), parent: parent).call(&block)
+        Dry::Core::ClassBuilder.new(name: class_name(name), parent: parent, namespace: namespace).call(&block)
       end
 
       def class_name(name)
-        "ROM::Struct[#{Dry::Core::Inflector.classify(Dry::Core::Inflector.singularize(name))}]"
+        Dry::Core::Inflector.classify(Dry::Core::Inflector.singularize(name))
       end
     end
   end

data/lib/rom/repository/version.rb

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

data/lib/rom/struct.rb

@@ -7,14 +7,21 @@ module ROM
   # They implement Hash protocol which means that they can be used
   # in places where Hash-like objects are supported.
   #
-  # Repositories define subclasses of ROM::Struct automatically, they are not
-  # defined as constants in any module, instead, generated mappers are configured
-  # to use anonymous struct classes as models.
+  # Repositories define subclasses of ROM::Struct automatically, they are
+  # defined in the ROM::Struct namespace by default, but you set it up
+  # to use your namespace/module as well.
   #
   # Structs are based on dry-struct gem, they include `schema` with detailed information
   # about attribute types returned from relations, thus can be introspected to build
   # additional functionality when desired.
   #
+  # There is a caveat you should know about when working with structs. Struct classes
+  # have names but at the same time they're anonymous, i.e. you can't get the User struct class
+  # with ROM::Struct::User. ROM will create as many struct classes for User as needed,
+  # they all will have the same name and ROM::Struct::User will be the common parent class for
+  # them. Combined with the ability to provide your own namespace for structs this enables to
+  # pre-define the parent class.
+  #
   # @example accessing relation struct model
   #   rom = ROM.container(:sql, 'sqlite::memory') do |conf|
   #     conf.default.create_table(:users) do
@@ -30,7 +37,7 @@ module ROM
   #
   #   # get auto-generated User struct
   #   model = user_repo.users.mapper.model
-  #   # => ROM::Struct[User]
+  #   # => ROM::Struct::User
   #
   #   # see struct's schema attributes
   #
@@ -40,11 +47,31 @@ module ROM
   #   model.schema[:name]
   #   # => #<Dry::Types::Sum left=#<Dry::Types::Constrained type=#<Dry::Types::Definition primitive=NilClass options={}> options={:rule=>#<Dry::Logic::Rule::Predicate predicate=#<Method: Module(Dry::Logic::Predicates::Methods)#type?> options={:args=>[NilClass]}>} rule=#<Dry::Logic::Rule::Predicate predicate=#<Method: Module(Dry::Logic::Predicates::Methods)#type?> options={:args=>[NilClass]}>> right=#<Dry::Types::Definition primitive=String options={}> options={:meta=>{:name=>:name, :source=>ROM::Relation::Name(users)}}>
   #
+  # @example passing a namespace with an existing parent class
+  #   module Entities
+  #     class User < ROM::Struct
+  #       def upcased_name
+  #         name.upcase
+  #       end
+  #     end
+  #   end
+  #
+  #   class UserRepo < ROM::Repository[:users]
+  #     struct_namespace Entities
+  #   end
+  #
+  #   user_repo = UserRepo.new(rom)
+  #   user = user_repo.users.by_pk(1).one!
+  #   user.name # => "Jane"
+  #   user.upcased_name # => "JANE"
+  #
   # @see http://dry-rb.org/gems/dry-struct dry-struct
   # @see http://dry-rb.org/gems/dry-types dry-types
   #
   # @api public
   class Struct < Dry::Struct
+    MissingAttribute = Class.new(NameError)
+
     # Returns a short string representation
     #
     # @return [String]
@@ -65,15 +92,11 @@ module ROM
 
     private
 
-    def method_missing(m, *args)
-      inspected = inspect
-      trace = caller
-
-      # This is how MRI currently works
-      # see func name_err_mesg_to_str in error.c
-      name = inspected.size > 65 ? to_s : inspected
-
-      raise NoMethodError.new("undefined method `#{ m }' for #{ name }", m, args).tap { |e| e.set_backtrace(trace) }
+    def method_missing(method, *)
+      super
+    rescue NameError => error
+      raise if method == :to_ary
+      raise MissingAttribute.new("#{ error.message } (not loaded attribute?)")
     end
   end
 end

data/rom-repository.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'rom', '~> 3.2'
+  gem.add_runtime_dependency 'rom', '~> 3.2', '>= 3.2.3'
   gem.add_runtime_dependency 'rom-mapper', '~> 0.5'
-  gem.add_runtime_dependency 'dry-core', '~> 0.2', '>= 0.2.1'
+  gem.add_runtime_dependency 'dry-core', '~> 0.3', '>= 0.3.1'
   gem.add_runtime_dependency 'dry-struct', '~> 0.1'
 
   gem.add_development_dependency 'rake', '~> 11.2'

data/spec/integration/changeset_spec.rb

@@ -88,7 +88,7 @@ RSpec.describe 'Using changesets' do
     it 'preprocesses data using built-in steps and custom block' do
       changeset = repo.
                     changeset(:books, title: "rom-rb is awesome").
-                    map(:touch) { |tuple| tuple.merge(created_at: Time.now) }
+                    extend(:touch) { |tuple| tuple.merge(created_at: Time.now) }
 
       command = repo.command(:create, repo.books)
       result = command.(changeset)
@@ -134,7 +134,7 @@ RSpec.describe 'Using changesets' do
 
       changeset = repo
         .changeset(book.id, title: 'rom-rb is awesome for real')
-        .map(:touch)
+        .extend(:touch)
 
       expect(changeset.diff).to eql(title: 'rom-rb is awesome for real')
 
@@ -150,6 +150,7 @@ RSpec.describe 'Using changesets' do
 
       changeset = repo
         .changeset(book.id, title: 'rom-rb is awesome')
+        .extend(:touch)
 
       expect(changeset).to_not be_diff
 
@@ -159,5 +160,34 @@ RSpec.describe 'Using changesets' do
       expect(result.title).to eql('rom-rb is awesome')
       expect(result.updated_at).to be(nil)
     end
+
+    it 'works with mixed several class-level pipes' do
+      book = repo.create(title: 'rom-rb is awesome')
+
+      changeset_class = Class.new(ROM::Changeset::Update[:books]) do
+        map { |title: | { title: title.upcase } }
+        extend { |title: | { title: title.reverse } }
+      end
+
+      changeset = repo
+                    .changeset(changeset_class)
+                    .by_pk(book.id)
+                    .data(title: 'rom-rb is really awesome')
+
+      expect(changeset.diff).to eql(title: 'ROM-RB IS REALLY AWESOME')
+      expect(changeset.to_h).to eql(title: 'EMOSEWA YLLAER SI BR-MOR')
+    end
+
+    it 'works with mixed several instance-level pipes' do
+      book = repo.create(title: 'rom-rb is awesome')
+
+      changeset = repo.
+                    changeset(book.id, title: 'rom-rb is really awesome').
+                    map { |title: | { title: title.upcase } }.
+                    extend { |title: | { title: title.reverse } }
+
+      expect(changeset.diff).to eql(title: 'ROM-RB IS REALLY AWESOME')
+      expect(changeset.to_h).to eql(title: 'EMOSEWA YLLAER SI BR-MOR')
+    end
   end
 end

data/spec/integration/repository/aggregate_spec.rb

@@ -9,6 +9,15 @@ RSpec.describe ROM::Repository::Root, '#aggregate' do
   include_context 'relations'
   include_context 'seeds'
 
+  it 'loads a graph with aliased children and its parents' do
+    user = repo.aggregate(aliased_posts: :author).first
+
+    expect(user.aliased_posts.count).to be(1)
+    expect(user.aliased_posts[0].author.id).to be(user.id)
+    expect(user.aliased_posts[0].author.name).to eql(user.name)
+  end
+
+
   it 'exposes nodes via `node` method' do
     jane = repo.
              aggregate(:posts).

data/spec/integration/repository_spec.rb

@@ -238,17 +238,45 @@ RSpec.describe 'ROM repository' do
   end
 
   describe 'projecting virtual attributes' do
-    it 'loads auto-mapped structs' do
-      user = repo.users.
-               inner_join(:posts, author_id: :id).
-               select_group { [id.qualified, name.qualified] }.
-               select_append { int::count(:posts).as(:post_count) }.
-               having { count(id.qualified) >= 1 }.
-               first
-
-      expect(user.id).to be(1)
-      expect(user.name).to eql('Jane')
-      expect(user.post_count).to be(1)
+    before do
+      ROM::Repository::StructBuilder.cache.clear
+      ROM::Repository::MapperBuilder.cache.clear
+    end
+
+    shared_context 'auto-mapping' do
+      it 'loads auto-mapped structs' do
+        user = repo.users.
+                 inner_join(:posts, author_id: :id).
+                 select_group { [id.qualified, name.qualified] }.
+                 select_append { int::count(:posts).as(:post_count) }.
+                 having { count(id.qualified) >= 1 }.
+                 first
+
+        expect(user.id).to be(1)
+        expect(user.name).to eql('Jane')
+        expect(user.post_count).to be(1)
+      end
+    end
+
+    context 'with default namespace' do
+      include_context 'auto-mapping'
+    end
+
+    context 'with custom struct namespace' do
+      before do
+        repo_class.struct_namespace(Test)
+      end
+
+      include_context 'auto-mapping'
+
+      it 'uses custom namespace' do
+        expect(Test.const_defined?(:User)).to be(false)
+        user = repo.users.limit(1).one!
+
+        expect(user.name).to eql('Jane')
+        expect(user.class).to be < Test::User
+        expect(user.class.name).to eql(Test::User.name)
+      end
     end
   end
 

data/spec/shared/relations.rb

@@ -51,6 +51,7 @@ RSpec.shared_context 'relations' do
       schema(infer: true) do
         associations do
           belongs_to :user
+          belongs_to :users, as: :assignee
         end
       end
 

data/spec/unit/changeset_spec.rb

@@ -66,6 +66,14 @@ RSpec.describe ROM::Changeset do
 
       expect(changeset).to_not be_diff
     end
+
+    it 'uses piped data for diff' do
+      expect(relation).to receive(:one).and_return(jane)
+
+      changeset = ROM::Changeset::Update.new(relation).data(name: "Jane").map { |name: | { name: name.upcase } }
+
+      expect(changeset).to be_diff
+    end
   end
 
   describe '#clean?' do

data/spec/unit/relation_proxy_spec.rb

@@ -191,5 +191,12 @@ RSpec.describe 'loading proxy' do
     it 'raises when method is missing' do
       expect { users_proxy.not_here }.to raise_error(NoMethodError, "undefined method `not_here' for ROM::Relation[Users]")
     end
+
+    it 'proxies Kernel methods when using with SimpleDelegator' do
+      proxy = Class.new(SimpleDelegator).new(users_proxy)
+
+      expect(users_proxy.select(:name)).to be_instance_of(ROM::Repository::RelationProxy)
+      expect(proxy.select(:name)).to be_instance_of(ROM::Repository::RelationProxy)
+    end
   end
 end

data/spec/unit/struct_builder_spec.rb

@@ -18,81 +18,111 @@ RSpec.describe 'struct builder', '#call' do
                 [:attribute, attr_double(:name, :String)]]]]
   end
 
-  before { builder[*input] }
+  context 'ROM::Struct' do
+    before { builder[*input] }
 
-  it 'generates a struct for a given relation name and columns' do
-    struct = builder.class.cache[input.hash]
+    it 'generates a struct for a given relation name and columns' do
+      struct = builder.class.cache[input.hash]
 
-    user = struct.new(id: 1, name: 'Jane')
+      user = struct.new(id: 1, name: 'Jane')
 
-    expect(user.id).to be(1)
-    expect(user.name).to eql('Jane')
+      expect(user.id).to be(1)
+      expect(user.name).to eql('Jane')
 
-    expect(user[:id]).to be(1)
-    expect(user[:name]).to eql('Jane')
+      expect(user[:id]).to be(1)
+      expect(user[:name]).to eql('Jane')
 
-    expect(Hash[user]).to eql(id: 1, name: 'Jane')
+      expect(Hash[user]).to eql(id: 1, name: 'Jane')
 
-    expect(user.inspect).to eql('#<ROM::Struct[User] id=1 name="Jane">')
-    expect(user.to_s).to match(/\A#<ROM::Struct\[User\]:0x[0-9a-f]+>\z/)
-  end
+      expect(user.inspect).to eql('#<ROM::Struct::User id=1 name="Jane">')
+      expect(user.to_s).to match(/\A#<ROM::Struct::User:0x[0-9a-f]+>\z/)
+    end
 
-  it 'stores struct in the cache' do
-    expect(builder.class.cache[input.hash]).to be(builder[*input])
-  end
+    it 'stores struct in the cache' do
+      expect(builder.class.cache[input.hash]).to be(builder[*input])
+    end
 
-  context 'with reserved keywords as attribute names' do
-    let(:input) do
-      [:users, [:header, [
-                  [:attribute, attr_double(:id, :Int)],
-                  [:attribute, attr_double(:name, :String)],
-                  [:attribute, attr_double(:alias, :String)],
-                  [:attribute, attr_double(:until, :Time)]]]]
+    context 'with reserved keywords as attribute names' do
+      let(:input) do
+        [:users, [:header, [
+                    [:attribute, attr_double(:id, :Int)],
+                    [:attribute, attr_double(:name, :String)],
+                    [:attribute, attr_double(:alias, :String)],
+                    [:attribute, attr_double(:until, :Time)]]]]
+      end
+
+      it 'allows to build a struct class without complaining' do
+        struct = builder.class.cache[input.hash]
+
+        user = struct.new(id: 1, name: 'Jane', alias: 'JD', until: Time.new(2030))
+
+        expect(user.id).to be(1)
+        expect(user.name).to eql('Jane')
+        expect(user.alias).to eql('JD')
+        expect(user.until).to eql(Time.new(2030))
+      end
     end
 
-    it 'allows to build a struct class without complaining' do
+    it 'raise a friendly error on missing keys' do
       struct = builder.class.cache[input.hash]
 
-      user = struct.new(id: 1, name: 'Jane', alias: 'JD', until: Time.new(2030))
-
-      expect(user.id).to be(1)
-      expect(user.name).to eql('Jane')
-      expect(user.alias).to eql('JD')
-      expect(user.until).to eql(Time.new(2030))
+      expect { struct.new(id: 1) }.to raise_error(
+                                        Dry::Struct::Error, /:name is missing/
+                                      )
     end
   end
 
-  it 'raise a friendly error on missing keys' do
-    struct = builder.class.cache[input.hash]
+  context 'custom entity container' do
+    before do
+      module Test
+        module Custom
+        end
+      end
+    end
 
-    expect { struct.new(id: 1) }.to raise_error(
-      Dry::Struct::Error, /:name is missing/
-    )
-  end
+    let(:struct) { builder[*input] }
+    subject(:builder) { ROM::Repository::StructBuilder.new(Test::Custom) }
 
-  context 'name errors' do
-    let(:struct) { builder.class.cache[input.hash] }
+    it 'generates a struct class inside a given module' do
+      expect(struct.name).to eql('Test::Custom::User')
+      user = struct.new(id: 1, name: 'Jane')
 
-    context 'missing method on instance' do
-      it 'uses inspect and class name for small structs' do
-        user = struct.new(id: 1, name: 'Jane')
+      expect(user.inspect).to eql(%q{#<Test::Custom::User id=1 name="Jane">})
+    end
 
-        expect { user.missing }.
-          to raise_error(
-               NoMethodError,
-               %r{undefined method `missing' for #<ROM::Struct\[User\] id=1 name="Jane">}
-             )
+    it 'uses the existing class as a parent' do
+      class Test::Custom::User < ROM::Struct
+        def upcased_name
+          name.upcase
+        end
       end
 
-      it 'uses class name in name errors' do
-        user = struct.new(id: 1, name: 'J' * 50)
+      user = struct.new(id: 1, name: 'Jane')
 
-        expect { user.missing }.
-          to raise_error(
-               NoMethodError,
-               %r{undefined method `missing' for #<ROM::Struct\[User\]:0x\h+>}
-             )
+      expect(user.upcased_name).to eql('JANE')
+    end
+
+    it 'raises a nice error on missing attributes' do
+      class Test::Custom::User < ROM::Struct
+        def upcased_middle_name
+          middle_name.upcase
+        end
       end
+
+      user = struct.new(id: 1, name: 'Jane')
+
+      expect {
+        user.upcased_middle_name
+      }.to raise_error(
+             ROM::Struct::MissingAttribute,
+             /not loaded attribute\?/
+           )
+    end
+
+    it 'works with implicit coercions' do
+      user = struct.new(id: 1, name: 'Jane')
+
+      expect([user].flatten).to eql([user])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: rom-mapper
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +50,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement