assignable_values 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 977d6a6005a660c922f2ceb114f0d0e9ca187312
-  data.tar.gz: 93af552eef243da11888c86be25e595242d67b65
+SHA256:
+  metadata.gz: b9fa8864bca68f5d9a2c7199bd08a2c3f97bb46cc3e40b0b7860c62d9bb563bb
+  data.tar.gz: fe00de9f990305f33905cbd8b0dcaf9fc318521b4378c344aa33bc94a536b63b
 SHA512:
-  metadata.gz: d8a4a8064ed9a7b68639212901128814f083651af7628645fa8275968f20ae78920459397efa0ece9755d78ce659054745c7baf3e2aef3a891aa34b6436119c2
-  data.tar.gz: 4ee5bbd8c8a9137bd0f3b55cbfab07d104c0a5cc21817818ba21b2ceca48e0f5c4d42297778a4c23a4fe66399f3e8eda1d4ba98e357445b48734fea96990628f
+  metadata.gz: 815643f34c5d95f2ed47ae5ebdec2dd31c7da83ae1ded589efebf6409789bf30f002315d94468a5e8c14f2f64412fbae025f8a0dec7c057a66826417282a0ca9
+  data.tar.gz: 500c291826c51db9bfad4d3f222052a1b0e3c2cd59260a7db2f9ee58368d5574734cf58db92c42ec6aa34f1c5a5657d57919e8e1df2c97b05da4b4e69bb9d384

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.3.8

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 
+dist: trusty
+
 rvm:
   - 1.8.7
   - 2.1.8
-  - 2.3.1
+  - 2.3.8
   - 2.4.2
   - 2.5.3
 
@@ -21,13 +23,13 @@ matrix:
     - gemfile: Gemfile.2.3
       rvm: 2.1.8
     - gemfile: Gemfile.2.3
-      rvm: 2.3.1
+      rvm: 2.3.8
     - gemfile: Gemfile.2.3
       rvm: 2.4.2
     - gemfile: Gemfile.2.3
       rvm: 2.5.3
     - gemfile: Gemfile.3.2
-      rvm: 2.3.1
+      rvm: 2.3.8
     - gemfile: Gemfile.3.2
       rvm: 2.4.2
     - gemfile: Gemfile.3.2
@@ -55,7 +57,7 @@ matrix:
     - gemfile: Gemfile.6.0.pg
       rvm: 2.1.8
     - gemfile: Gemfile.6.0.pg
-      rvm: 2.3.1
+      rvm: 2.3.8
     - gemfile: Gemfile.6.0.pg
       rvm: 2.4.2
 
@@ -66,17 +68,13 @@ sudo: false
 
 cache: bundler
 
-notifications:
-  email:
-    - fail@makandra.de
-
 before_script:
   - psql -c 'create database assignable_values_test;' -U postgres
   - mysql -e 'create database IF NOT EXISTS assignable_values_test;'
 
 install:
   # Old Travis CI bundler explodes when lockfile version doesn't match recently bumped version
-  - gem install bundler --version='=1.12.5'
+  - gem install bundler --version='=1.17.3'
   # This is the default Travis CI install step
   - bundle install --jobs=3 --retry=3 --deployment --path=${BUNDLE_PATH:-vendor/bundle}
 

data/CHANGELOG.md

@@ -8,6 +8,11 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Compatible changes
 
+## 0.16.2 - 2020-10-06
+
+### Compatible changes
+
+- when given a scope, do not load all records to memory during validation
 
 ## 0.16.1 - 2019-05-14
 
@@ -28,7 +33,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Compatible changes
 
-- Add `#humanized_values` for the `mutliple: true` case.
+- Add `#humanized_values` for the `multiple: true` case.
 
 
 ## 0.15.0 - 2018-10-26

data/Gemfile

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

data/Gemfile.2.3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.1)
+    assignable_values (0.16.2)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.3.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.1)
+    assignable_values (0.16.2)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.4.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.1)
+    assignable_values (0.16.2)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.5.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.1)
+    assignable_values (0.16.2)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.5.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.1)
+    assignable_values (0.16.2)
       activerecord (>= 2.3)
 
 GEM
@@ -65,4 +65,4 @@ DEPENDENCIES
   rspec_candy
 
 BUNDLED WITH
-   1.16.4
+   1.17.3

data/Gemfile.5.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.1)
+    assignable_values (0.16.2)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.6.0.pg

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Runtime dependencies
-gem 'activerecord', '~>6.0.0beta'
+gem 'activerecord', '~>6.0.0'
 gem 'i18n'
 gem 'pg', '<1'
 

data/Gemfile.6.0.pg.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.1)
+    assignable_values (0.16.2)
       activerecord (>= 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.0.beta3)
-      activesupport (= 6.0.0.beta3)
-    activerecord (6.0.0.beta3)
-      activemodel (= 6.0.0.beta3)
-      activesupport (= 6.0.0.beta3)
-    activesupport (6.0.0.beta3)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 1.3, >= 1.3.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
     concurrent-ruby (1.1.5)
     database_cleaner (1.7.0)
     diff-lcs (1.3)
@@ -48,13 +48,13 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    zeitwerk (1.4.3)
+    zeitwerk (2.1.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 6.0.0beta)
+  activerecord (~> 6.0.0)
   assignable_values!
   database_cleaner
   gemika

data/Gemfile.lock

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

data/README.md

@@ -91,7 +91,7 @@ The default is applied to new records:
 Defaults can be procs:
 
     class Song < ActiveRecord::Base
-      assignable_values_for :genre, default: proc { Date.today.year } do
+      assignable_values_for :year, default: proc { Date.today.year } do
         1980 .. 2011
       end
     end
@@ -205,7 +205,7 @@ You can restrict `belongs_to` associations in the same manner as scalar attribut
 
     end
 
-Listing and validating als works the same:
+Listing and validating also works the same:
 
     chicane = Artist.create!(name: 'Chicane', signed: true)
     lt2 = Artist.create!(name: 'LT2', signed: false)
@@ -349,9 +349,12 @@ Development
 
 There are tests in `spec`. We only accept PRs with tests. To run tests:
 
-- Install Ruby 2.1.8
-- 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 Ruby 2.3.8
+- Create a local test database `assignable_values_test` in both MySQL and PostgreSQL (see
+  `.travis.yml` for commands to do so)
+- Copy `spec/support/database.sample.yml` to `spec/support/database.yml` and enter your local
+  credentials for the test databases (postgres entry is not required if you are using a socket
+  connection)
 - Install development dependencies using `bundle install`
 - Run tests using `bundle exec rake current_rspec`
 

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

@@ -48,25 +48,31 @@ module AssignableValues
         end
 
         def assignable_values(record, options = {})
-          assignable_values = []
+          additional_assignable_values = []
           current_values = assignable_values_from_record_or_delegate(record)
 
           if options.fetch(:include_old_value, true) && has_previously_saved_value?(record)
             old_value = previously_saved_value(record)
             if @options[:multiple]
               if old_value.is_a?(Array)
-                assignable_values |= old_value
+                additional_assignable_values |= old_value
               end
             elsif !old_value.blank? && !current_values.include?(old_value)
-              assignable_values << old_value
+              additional_assignable_values << old_value
             end
           end
 
-          assignable_values += current_values
           if options[:decorate]
-            assignable_values = decorate_values(assignable_values)
+            current_values = decorate_values(current_values)
+            additional_assignable_values = decorate_values(additional_assignable_values)
+          end
+
+          if additional_assignable_values.present?
+            # will not keep current_values scoped
+            additional_assignable_values + current_values
+          else
+            current_values
           end
-          assignable_values
         end
 
         private
@@ -94,7 +100,21 @@ module AssignableValues
         def assignable_single_value?(record, value)
           (has_previously_saved_value?(record) && value == previously_saved_value(record)) ||
             (value.blank? && allow_blank?(record)) ||
-            assignable_values(record, :include_old_value => false).include?(value)
+            included_in_assignable_values?(record, value)
+        end
+
+        def included_in_assignable_values?(record, value)
+          values_or_scope = assignable_values(record, :include_old_value => false)
+
+          if is_scope?(values_or_scope)
+            values_or_scope.exists?(value.id)
+          else
+            values_or_scope.include?(value)
+          end
+        end
+
+        def is_scope?(object)
+          object.respond_to?(:scoped) || object.respond_to?(:all)
         end
 
         def assignable_multi_value?(record, value)
@@ -217,9 +237,9 @@ module AssignableValues
 
         def assignable_values_from_record_or_delegate(record)
           if delegate?
-            assignable_values_from_delegate(record).to_a
+            assignable_values_from_delegate(record)
           else
-            record.instance_exec(&@values).to_a
+            record.instance_exec(&@values)
           end
         end
 

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.16.1'
+  VERSION = '0.16.2'
 end

data/spec/assignable_values/active_record_spec.rb

@@ -448,7 +448,7 @@ describe AssignableValues::ActiveRecord do
         record.should be_valid
       end
 
-      it 'sould not allow nil for an association (the "previously saved value") if the record is new' do
+      it 'should not allow nil for an association (the "previously saved value") if the record is new' do
         allowed_association = Artist.create!
         klass = Song.disposable_copy
         record = klass.new(:artist => nil)
@@ -510,6 +510,47 @@ describe AssignableValues::ActiveRecord do
         record.valid?
       end
 
+      it 'should not load all records to memory when assignable values are scoped' do
+        unless ::ActiveRecord::VERSION::MAJOR < 3 # somehow rails 2 still initializes Objects during the scope.exists?-call
+          initialized_artists_count = 0
+          MyArtist = Artist.disposable_copy
+
+          MyArtist.class_eval do
+            after_initialize :increase_initialized_count
+
+            define_method :increase_initialized_count do
+              initialized_artists_count += 1
+            end
+          end
+
+          klass = Song.disposable_copy
+
+          klass.class_eval do
+            assignable_values_for :artist do
+              if ::ActiveRecord::VERSION::MAJOR < 4
+                MyArtist.scoped
+              else
+                MyArtist.all
+              end
+            end
+          end
+
+          artist = MyArtist.create!
+          initialized_artists_count.should == 1
+
+          song = klass.new(:artist => artist)
+
+          song.valid?
+          initialized_artists_count.should == 1
+
+          song.assignable_artists
+          initialized_artists_count.should == 1
+
+          song.assignable_artists.to_a
+          initialized_artists_count.should == 2
+        end
+      end
+
     end
 
     context 'when delegating using the :through option' do
@@ -730,7 +771,7 @@ describe AssignableValues::ActiveRecord do
         klass.new.assignable_genres.should == %w[pop rock]
       end
 
-      it 'should call #to_a on the list of assignable values, allowing ranges and scopes to be passed as allowed value descriptors' do
+      it 'should work with ranges' do
         klass = Song.disposable_copy do
           assignable_values_for :year do
             1999..2001

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assignable_values
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -91,8 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Restrict the values assignable to ActiveRecord attributes or associations