rom 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e937480122a0f25c272a123788205fca636c3914
-  data.tar.gz: 14f714ced390387ee4e3008c6ac7028ec3ffb342
+  metadata.gz: 21823f588a092ca791957a4d3bdb1ca3a78fed7e
+  data.tar.gz: b779976efe0eb2d4ec2e7af273cd67782def6120
 SHA512:
-  metadata.gz: f88ca6fd4d17cce1332c5005f422e4b8fbbfa86e4acd72e602b89322b1a35f22ab8a176fa1dd5e497de78e32432e133b6cc9ba8e08b9d4ac6bf54e65dd0feccd
-  data.tar.gz: b2e112e5baaa3d27b035ef18143b81576c1a86fda420e2ad8d96e350f4b7ad7a8328f03c8edc12b6b1f927af3d9d1f3d210eb048c7c5e5733c08a67d466c8b0c
+  metadata.gz: e5f1e53320f6da430fed29b9c0619847c47b6e34808445852c362216a04a5354384af47b07b946410aa4fbd51c4925f753ef372c9d1485454c00337fc5ff973f
+  data.tar.gz: 610cc7feec934fb6550b371218d5ebbc901417bfcd25b7d1d6709f8ef91684435b16b4d1da5d5e5405284ed14d0ad8a968a1e0f61e5d30582b17a0afea17d098

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v3.0.3 2017-02-24
+
+## Fixed
+
+* Curried relations when called without args while having some args filled in will return itself (solnic)
+
+[Compare v3.0.2...v3.0.3](https://github.com/rom-rb/rom/compare/v3.0.2...v3.0.3)
+
 # v3.0.2 2017-02-24
 
 ## Added
@@ -6,6 +14,7 @@
 
 ## Fixed
 
+* Fix output_schema to use Attribute#key rather than canonical names (solnic)
 * Fix the error message for missing association (flash-gordon)
 * Curried relation called without any arguments will raise an ArgumentError (solnic)
 

data/lib/rom/relation/curried.rb

@@ -28,18 +28,21 @@ module ROM
 
       # Load relation if args match the arity
       #
-      # @return [Loaded,Lazy,Curried]
-      # @see Lazy#call
+      # @return [Loaded,Curried]
       #
       # @api public
       def call(*args)
         if arity != -1
           all_args = curry_args + args
 
-          if arity == all_args.size
-            Loaded.new(relation.__send__(name.relation, *all_args))
-          elsif args.empty?
+          if all_args.empty?
             raise ArgumentError, "curried #{relation.class}##{name.to_sym} relation was called without any arguments"
+          end
+
+          if args.empty?
+            self
+          elsif arity == all_args.size
+            Loaded.new(relation.__send__(name.relation, *all_args))
           else
             __new__(relation, curry_args: all_args)
           end

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end

data/spec/unit/rom/relation/curried_spec.rb

@@ -10,6 +10,10 @@ RSpec.describe ROM::Relation::Curried do
         restrict(name: name)
       end
 
+      def by_name_and_age(name, age)
+        restrict(name: name, age: age)
+      end
+
       def find(criteria)
         restrict(criteria)
       end
@@ -33,6 +37,12 @@ RSpec.describe ROM::Relation::Curried do
              ArgumentError,
              "curried #{users_relation.class}#by_name relation was called without any arguments")
     end
+
+    it 'returns self when has curried args and no additional args were provided' do
+      curried = users_relation.by_name_and_age.('Jane')
+
+      expect(curried.().__id__).to be(curried.__id__)
+    end
   end
 
   describe '#respond_to?' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Piotr Solnica