assignable_values 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a7a9d96e5e738273b161df4a8cf85c5871122f909b6e50aad62fde7e7a21f14
-  data.tar.gz: 9b09dd1a6d0e1270876676442eeda26ca6f03650954b104efc9738aba80b0770
+  metadata.gz: cc767440e4e60cd5e1d090edf24bbbe5750072010d72f8d871ff2fb3c5963aed
+  data.tar.gz: b50641114a05d2c0a25c969e5b845a952e84944b65f1664b4c77e446f209d096
 SHA512:
-  metadata.gz: 3c040fd853c739f57b23698124e5e0087ddfdc3a40f0eb26b6162089ed740888c325248cb49c69d7bee230a4df2817c094f2179f72ae5b284a844a2a1cb34239
-  data.tar.gz: 161e04475ee56b531af8ad5b1b8dc65ebc601ad3c2dbd02cc833b87e78d3efe7d595d9bf3b3165da771eec12fc25283be935247ed1e1c6d0eeaded4f9c725d0e
+  metadata.gz: 4b1825671839986101ae0068bee450028f40c77c58acb0b4972e9b37c75485d3e0cbbfb979edcee3d7430cc1e3ee16e1b70aa1d50288cabd5e27cf9250a0f7c5
+  data.tar.gz: 8b7fe509733f0f42b59726a29bcf21d26da7618b41c1295cb4d3830b57cd8fe7493323f89786c5623a7e5b86baa9e20931d199b89b2865e82c162aed0403c3ba

data/.travis.yml

@@ -7,40 +7,40 @@ rvm:
   - 2.4.2
 
 gemfile:
-  - gemfiles/Gemfile.2.3
-  - gemfiles/Gemfile.3.2
-  - gemfiles/Gemfile.4.2
-  - gemfiles/Gemfile.5.0
-  - gemfiles/Gemfile.5.1
-  - gemfiles/Gemfile.5.1.pg
+  - Gemfile.2.3
+  - Gemfile.3.2
+  - Gemfile.4.2
+  - Gemfile.5.0
+  - Gemfile.5.1
+  - Gemfile.5.1.pg
 
 matrix:
   exclude:
-    - gemfile: gemfiles/Gemfile.2.3
+    - gemfile: Gemfile.2.3
       rvm: 2.1.8
-    - gemfile: gemfiles/Gemfile.2.3
+    - gemfile: Gemfile.2.3
       rvm: 2.3.1
-    - gemfile: gemfiles/Gemfile.2.3
+    - gemfile: Gemfile.2.3
       rvm: 2.4.2
-    - gemfile: gemfiles/Gemfile.3.2
+    - gemfile: Gemfile.3.2
       rvm: 2.3.1
-    - gemfile: gemfiles/Gemfile.3.2
+    - gemfile: Gemfile.3.2
       rvm: 2.4.2
-    - gemfile: gemfiles/Gemfile.4.2
+    - gemfile: Gemfile.4.2
       rvm: 1.8.7
-    - gemfile: gemfiles/Gemfile.4.2
+    - gemfile: Gemfile.4.2
       rvm: 2.4.2
-    - gemfile: gemfiles/Gemfile.5.0
+    - gemfile: Gemfile.5.0
       rvm: 2.1.8
-    - gemfile: gemfiles/Gemfile.5.0
+    - gemfile: Gemfile.5.0
       rvm: 1.8.7
-    - gemfile: gemfiles/Gemfile.5.1
+    - gemfile: Gemfile.5.1
       rvm: 2.1.8
-    - gemfile: gemfiles/Gemfile.5.1
+    - gemfile: Gemfile.5.1
       rvm: 1.8.7
-    - gemfile: gemfiles/Gemfile.5.1.pg
+    - gemfile: Gemfile.5.1.pg
       rvm: 2.1.8
-    - gemfile: gemfiles/Gemfile.5.1.pg
+    - gemfile: Gemfile.5.1.pg
       rvm: 1.8.7
 
 sudo: false

data/Gemfile

@@ -1 +1 @@
-./gemfiles/Gemfile.4.2
+./Gemfile.4.2

data/{gemfiles/Gemfile.2.3 → Gemfile.2.3}

@@ -13,4 +13,4 @@ gem 'rspec_candy'
 gem 'gemika'
 
 # Gem under test
-gem 'assignable_values', :path => '..'
+gem 'assignable_values', :path => '.'

data/{gemfiles/Gemfile.2.3.lock → Gemfile.2.3.lock}

@@ -1,5 +1,5 @@
 PATH
-  remote: ..
+  remote: .
   specs:
     assignable_values (0.15.1)
       activerecord (>= 2.3)

data/{gemfiles/Gemfile.3.2 → Gemfile.3.2}

@@ -13,4 +13,4 @@ gem 'rspec_candy'
 gem 'gemika'
 
 # Gem under test
-gem 'assignable_values', :path => '..'
+gem 'assignable_values', :path => '.'

data/{gemfiles/Gemfile.3.2.lock → Gemfile.3.2.lock}

@@ -1,5 +1,5 @@
 PATH
-  remote: ..
+  remote: .
   specs:
     assignable_values (0.15.1)
       activerecord (>= 2.3)

data/{gemfiles/Gemfile.4.2 → Gemfile.4.2}

@@ -13,4 +13,4 @@ gem 'rspec_candy'
 gem 'gemika'
 
 # Gem under test
-gem 'assignable_values', :path => '..'
+gem 'assignable_values', :path => '.'

data/{gemfiles/Gemfile.4.2.lock → Gemfile.4.2.lock}

@@ -1,5 +1,5 @@
 PATH
-  remote: ..
+  remote: .
   specs:
     assignable_values (0.15.1)
       activerecord (>= 2.3)

data/{gemfiles/Gemfile.5.0 → Gemfile.5.0}

@@ -13,4 +13,4 @@ gem 'rspec_candy'
 gem 'gemika'
 
 # Gem under test
-gem 'assignable_values', :path => '..'
+gem 'assignable_values', :path => '.'

data/{gemfiles/Gemfile.5.0.lock → Gemfile.5.0.lock}

@@ -1,5 +1,5 @@
 PATH
-  remote: ..
+  remote: .
   specs:
     assignable_values (0.15.1)
       activerecord (>= 2.3)

data/{gemfiles/Gemfile.5.1 → Gemfile.5.1}

@@ -13,4 +13,4 @@ gem 'rspec_candy'
 gem 'gemika'
 
 # Gem under test
-gem 'assignable_values', :path => '..'
+gem 'assignable_values', :path => '.'

data/{gemfiles/Gemfile.5.1.lock → Gemfile.5.1.lock}

@@ -1,5 +1,5 @@
 PATH
-  remote: ..
+  remote: .
   specs:
     assignable_values (0.15.1)
       activerecord (>= 2.3)

data/{gemfiles/Gemfile.5.1.pg → Gemfile.5.1.pg}

@@ -13,4 +13,4 @@ gem 'rspec_candy'
 gem 'gemika'
 
 # Gem under test
-gem 'assignable_values', :path => '..'
+gem 'assignable_values', :path => '.'

data/{gemfiles/Gemfile.5.1.pg.lock → Gemfile.5.1.pg.lock}

@@ -1,5 +1,5 @@
 PATH
-  remote: ..
+  remote: .
   specs:
     assignable_values (0.15.1)
       activerecord (>= 2.3)

data/Gemfile.lock

@@ -1 +1 @@
-./gemfiles/Gemfile.4.2.lock
+./Gemfile.4.2.lock

data/README.md

@@ -353,12 +353,12 @@ There are tests in `spec`. We only accept PRs with tests. To run tests:
 - Create a local test database `assignable_values_test` in both MySQL and PostgreSQL
 - Copy `spec/support/database.sample.yml` to `spec/support/database.yml` and enter your local credentials for the test database
 - Install development dependencies using `bundle install`
-- Run tests using `bundle exec rspec`
+- Run tests using `bundle exec current_rspec`
 
 We recommend to test large changes against multiple versions of Ruby and multiple dependency sets. Supported combinations are configured in `.travis.yml`. We provide some rake tasks to help with this:
 
-- Install development dependencies using `bundle matrix:install`
-- Run tests using `bundle matrix:spec`
+- Install development dependencies using `bundle exec rake matrix:install`
+- Run tests using `bundle exec rake matrix:spec`
 
 Note that we have configured Travis CI to automatically run tests in all supported Ruby versions and dependency sets after each push. We will only merge pull requests after a green Travis build.
 

data/lib/assignable_values/active_record/restriction/base.rb

@@ -240,7 +240,7 @@ module AssignableValues
           delegate = delegate(record)
           delegate.present? or raise DelegateUnavailable, "Cannot query a nil delegate for assignable values"
           delegate_query_method = :"assignable_#{model.name.underscore.gsub('/', '_')}_#{property.to_s.pluralize}"
-          args = delegate.method(delegate_query_method).arity == 1 ? [record] : []
+          args = delegate.method(delegate_query_method).arity == 0 ? [] : [record]
           delegate.send(delegate_query_method, *args)
         end
 

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.15.1'
+  VERSION = '0.16.0'
 end

data/spec/assignable_values/active_record_spec.rb

@@ -255,11 +255,11 @@ describe AssignableValues::ActiveRecord do
       context 'if the :message option is set to a string' do
 
         before :each do
-           @klass = Song.disposable_copy do
-             assignable_values_for :genre, :message => 'should be something different' do
-               %w[pop rock]
-             end
-           end
+          @klass = Song.disposable_copy do
+            assignable_values_for :genre, :message => 'should be something different' do
+              %w[pop rock]
+            end
+          end
         end
 
         it 'should use this string as a custom error message' do
@@ -514,7 +514,11 @@ describe AssignableValues::ActiveRecord do
         klass = Song.disposable_copy do
           assignable_values_for :genre, :through => :delegate
           def delegate
-            OpenStruct.new(:assignable_song_genres => %w[pop rock])
+            Class.new do
+              def assignable_song_genres
+                %w[pop rock]
+              end
+            end.new
           end
         end
         klass.new(:genre => 'pop').should be_valid
@@ -525,9 +529,14 @@ describe AssignableValues::ActiveRecord do
         klass = Song.disposable_copy do
           assignable_values_for :genre, :through => lambda { delegate }
           def delegate
-            OpenStruct.new(:assignable_song_genres => %w[pop rock])
+            Class.new do
+              def assignable_song_genres
+                %w[pop rock]
+              end
+            end.new
           end
         end
+
         klass.new(:genre => 'pop').should be_valid
         klass.new(:genre => 'disallowed value').should_not be_valid
       end
@@ -536,7 +545,11 @@ describe AssignableValues::ActiveRecord do
         klass = Recording::Vinyl.disposable_copy do
           assignable_values_for :year, :through => :delegate
           def delegate
-            OpenStruct.new(:assignable_recording_vinyl_years => [1977, 1980, 1983])
+            Class.new do
+              def assignable_recording_vinyl_years
+                [1977, 1980, 1983]
+              end
+            end.new
           end
         end
         klass.new.assignable_years.should == [1977, 1980, 1983]
@@ -926,7 +939,41 @@ describe AssignableValues::ActiveRecord do
           delegate = Object.new
           def delegate.assignable_song_genres(record)
             record_received(record)
-             %w[pop rock]
+            %w[pop rock]
+          end
+          klass = Song.disposable_copy do
+            assignable_values_for :genre, :through => :delegate
+            define_method :delegate do
+              delegate
+            end
+          end
+          record = klass.new
+          delegate.should_receive(:record_received).with(record)
+          record.assignable_genres.should ==  %w[pop rock]
+        end
+
+        it "should call the given method on the delegate if the delegate's query method takes no arguments" do
+          delegate = Object.new
+          def delegate.assignable_song_genres
+            no_record_received
+            %w[pop rock]
+          end
+          klass = Song.disposable_copy do
+            assignable_values_for :genre, :through => :delegate
+            define_method :delegate do
+              delegate
+            end
+          end
+          record = klass.new
+          delegate.should_receive(:no_record_received)
+          record.assignable_genres.should ==  %w[pop rock]
+        end
+
+        it "should pass the record to the given method if the delegate's query method takes variable arguments" do
+          delegate = Object.new
+          def delegate.assignable_song_genres(*records)
+            record_received(*records)
+            %w[pop rock]
           end
           klass = Song.disposable_copy do
             assignable_values_for :genre, :through => :delegate
@@ -939,6 +986,21 @@ describe AssignableValues::ActiveRecord do
           record.assignable_genres.should ==  %w[pop rock]
         end
 
+        it "should raise an error if the delegate's query method takes more than one argument" do
+          delegate = Object.new
+          def delegate.assignable_song_genres(record, other_arg)
+            %w[pop rock]
+          end
+          klass = Song.disposable_copy do
+            assignable_values_for :genre, :through => :delegate
+            define_method :delegate do
+              delegate
+            end
+          end
+          record = klass.new
+          expect{record.assignable_genres}.to raise_error(ArgumentError)
+        end
+
         it 'should raise an error if the given method returns nil' do
           klass = Song.disposable_copy do
             assignable_values_for :genre, :through => :delegate
@@ -948,11 +1010,7 @@ describe AssignableValues::ActiveRecord do
           end
           expect { klass.new.assignable_genres }.to raise_error(AssignableValues::DelegateUnavailable)
         end
-
       end
-
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assignable_values
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,23 +36,23 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.2.3
+- Gemfile.2.3.lock
+- Gemfile.3.2
+- Gemfile.3.2.lock
+- Gemfile.4.2
+- Gemfile.4.2.lock
+- Gemfile.5.0
+- Gemfile.5.0.lock
+- Gemfile.5.1
+- Gemfile.5.1.lock
+- Gemfile.5.1.pg
+- Gemfile.5.1.pg.lock
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - assignable_values.gemspec
-- gemfiles/Gemfile.2.3
-- gemfiles/Gemfile.2.3.lock
-- gemfiles/Gemfile.3.2
-- gemfiles/Gemfile.3.2.lock
-- gemfiles/Gemfile.4.2
-- gemfiles/Gemfile.4.2.lock
-- gemfiles/Gemfile.5.0
-- gemfiles/Gemfile.5.0.lock
-- gemfiles/Gemfile.5.1
-- gemfiles/Gemfile.5.1.lock
-- gemfiles/Gemfile.5.1.pg
-- gemfiles/Gemfile.5.1.pg.lock
 - lib/assignable_values.rb
 - lib/assignable_values/active_record.rb
 - lib/assignable_values/active_record/restriction/base.rb