rom-repository 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6bc1f6b343814740048fa138304b11012da7116
-  data.tar.gz: f61f8773af19190816e3d372fb44f3c94e6b5cef
+  metadata.gz: abd8ee5d8b4132b20ab01c4fc4ee586c26b0e7ac
+  data.tar.gz: c4f4b25f08b77773c33b585e41cf20b7725f324f
 SHA512:
-  metadata.gz: 57f9e84fa9ed7296a5d792c4d887777083c01685f63f80fe94f22ee50ed0f12f82b06ebfe8f48930a4a1c42aa7004a85e75fa38c2d330419636a26ce14b17a1a
-  data.tar.gz: cbf38fe68a94152d598025f496061f2d25cfcea5670712e426b47325b12bb9bafeaf6ea34b410931949f41ed56d9aaa4bb5f5c73a478e5c78d4a1525be33f82c
+  metadata.gz: cb3fe13af29c34580949161270134dfcc53a80fe083948bde31c0eb8126b710c962df8b76a5d0fb371f5e5ae776eafc7df036dc151038220af812036d713c72b
+  data.tar.gz: 788fa703d7e283afbf330059ce7466b8882ed907ecc8e8ca65ff90a297f0f710167afe4e13d7d7e14d27b9fe5697ee1d3b28bc34c5b51f2443092b35b3d29e2a

data/CHANGELOG.md

@@ -24,6 +24,7 @@
 ### Fixed
 
 * FKs are always included in auto-generated structs used in aggregates (solnic)
+* Calling undefined methods on repo relations raises a nicer error (solnic)
 
 [Compare v0.3.1...v1.0.0](https://github.com/rom-rb/rom-repository/compare/v0.3.1...v1.0.0)
 

data/lib/rom/repository/changeset.rb

@@ -9,11 +9,8 @@ module ROM
   # If you inherit from this class you need to configure additional settings
   #
   # @example define a custom changeset using :upsert command
-  #
   #   class NewTag < ROM::Changeset[:tags]
-  #     def default_command_type
-  #       :upsert
-  #     end
+  #     command_type :upsert
   #   end
   #
   # @abstract

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

@@ -2,6 +2,8 @@ module ROM
   class Changeset
     # Changeset specialization for create commands
     #
+    # @see Changeset::Stateful
+    #
     # @api public
     class Create < Stateful
       command_type :create

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

@@ -52,7 +52,9 @@ module ROM
       #     end
       #   end
       #
-      # @return [Array<Pipe, Transproc::Function>]
+      # @return [Array<Pipe>, Transproc::Function>]
+      #
+      # @see https://github.com/solnic/transproc Transproc
       #
       # @api public
       def self.map(&block)
@@ -100,8 +102,6 @@ module ROM
       #   @example
       #     changeset.map { |tuple| tuple.merge(created_at: Time.now) }
       #
-      #   @param [Array<Symbol>] steps A list of mapping steps
-      #
       # @overload map(*steps, &block)
       #   Apply mapping using built-in transformations and a custom block
       #

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

@@ -9,6 +9,8 @@ module ROM
     # you need to implement it yourself in your relations if you want to
     # use Update changesets.
     #
+    # @see Changeset::Stateful
+    #
     # @api public
     class Update < Stateful
       command_type :update
@@ -65,7 +67,7 @@ module ROM
 
       # Calculate the diff between the original and changeset data
       #
-      # @return [Hash, Array]
+      # @return [Hash]
       #
       # @api public
       def diff

data/lib/rom/repository/class_interface.rb

@@ -112,11 +112,12 @@ module ROM
 
       # @api private
       def define_command_method(type, **opts)
-        define_method(type) do |input|
-          if input.respond_to?(:commit)
-            map_tuple(input.relation, input.commit)
+        define_method(type) do |*input|
+          if input.size == 1 && input[0].respond_to?(:commit)
+            changeset = input[0]
+            map_tuple(changeset.relation, changeset.commit)
           else
-            command(type => self.class.root, **opts).call(input)
+            command(type => self.class.root, **opts).call(*input)
           end
         end
       end

data/lib/rom/repository/command_compiler.rb

@@ -117,13 +117,33 @@ module ROM
         if type
           register_command(name, type, meta, parent_relation)
 
-          mapping =
+          default_mapping =
             if meta[:combine_type] == :many
               name
-            else
+            else meta[:combine_type] == :one
               { Dry::Core::Inflector.singularize(name).to_sym => name }
             end
 
+          mapping =
+            if parent_relation
+              associations = container.relations[parent_relation].associations
+
+              assoc =
+                if associations.key?(meta[:combine_name])
+                  associations[meta[:combine_name]]
+                elsif associations.key?(name)
+                  associations[name]
+                end
+
+              if assoc
+                { assoc.target.key => assoc.target.dataset }
+              else
+                default_mapping
+              end
+            else
+              default_mapping
+            end
+
           if other.size > 0
             [mapping, [type, other]]
           else

data/lib/rom/repository/relation_proxy.rb

@@ -64,7 +64,7 @@ module ROM
       #   Map tuples using registered mappers
       #
       #   @example
-      #     users.as(MyUserModel)
+      #     users.map_with(:my_mapper, :my_other_mapper)
       #
       #   @param [Array<Symbol>] mappers A list of mapper identifiers
       #
@@ -74,6 +74,8 @@ module ROM
       def map_with(*names)
         if names.size == 1 && names[0].is_a?(Class)
           with(meta: meta.merge(model: names[0]))
+        elsif names.size > 1 && names.any? { |name| name.is_a?(Class) }
+          raise ArgumentError, 'using custom mappers and a model is not supported'
         else
           names.reduce(self) { |a, e| a >> relation.mappers[e] }
         end
@@ -225,7 +227,7 @@ module ROM
             result
           end
         else
-          super
+          raise NoMethodError, "undefined method `#{meth}' for #{relation.class.name}"
         end
       end
     end

data/lib/rom/repository/version.rb

@@ -1,5 +1,5 @@
 module ROM
   class Repository
-    VERSION = '1.0.0.rc1'.freeze
+    VERSION = '1.0.0.rc2'.freeze
   end
 end

data/spec/integration/command_macros_spec.rb

@@ -58,6 +58,19 @@ RSpec.describe ROM::Repository, '.command' do
     expect(updated_user.name).to eql('Jane Doe')
   end
 
+  it 'allows to configure :delete command without args' do
+    repo = Class.new(ROM::Repository[:users]) do
+      commands :delete
+    end.new(rom)
+
+    repo.users.insert(name: 'Jane')
+    repo.users.insert(name: 'John')
+
+    repo.delete
+
+    expect(repo.users.count).to be_zero
+  end
+
   it 'allows defining a single command with multiple views' do
     repo = Class.new(ROM::Repository[:users]) do
       commands :create, update: [:by_pk, :by_name]

data/spec/integration/command_spec.rb

@@ -92,6 +92,16 @@ RSpec.describe ROM::Repository, '#command' do
       expect(user.tasks.first.title).to eql('Task one')
     end
 
+    it 'builds Create command for a relation graph with one-to-many with aliased association' do
+      create_user = repo.command(:create, repo.users.combine(:aliased_posts))
+
+      user = create_user.call(name: 'Jane Doe', aliased_posts: [{ title: 'Post one' }, { title: 'Post two' }])
+
+      expect(user.id).to_not be(nil)
+      expect(user.name).to eql('Jane Doe')
+      expect(user.aliased_posts.size).to be(2)
+    end
+
     it 'builds Create command for a deeply nested graph with one-to-many' do
       create_user = repo.command(
         :create,

data/spec/shared/relations.rb

@@ -19,6 +19,7 @@ RSpec.shared_context 'relations' do
       schema(infer: true) do
         associations do
           has_many :posts
+          has_many :posts, as: :aliased_posts
           has_many :labels, through: :posts
         end
       end

data/spec/spec_helper.rb

@@ -33,6 +33,13 @@ end
 require 'dry/core/deprecations'
 Dry::Core::Deprecations.set_logger!(root.join('../log/deprecations.log'))
 
+# Make inference errors quiet
+class ROM::SQL::Schema::Inferrer
+  def self.on_error(*args)
+    # shush
+  end
+end
+
 # Namespace holding all objects created during specs
 module Test
   def self.remove_constants

data/spec/unit/relation_proxy_spec.rb

@@ -61,6 +61,11 @@ RSpec.describe 'loading proxy' do
           [{ 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) }.
+          to raise_error(ArgumentError, 'using custom mappers and a model is not supported')
+      end
     end
 
     context 'setting custom model type' do
@@ -182,7 +187,7 @@ RSpec.describe 'loading proxy' do
     end
 
     it 'raises when method is missing' do
-      expect { users.not_here }.to raise_error(NoMethodError, /not_here/)
+      expect { users.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.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom