assignable_values 0.11.1 → 0.11.2

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

@@ -50,9 +50,9 @@ module AssignableValues
           parsed_values = parsed_assignable_values(record)
           current_values = parsed_values.delete(:values)
 
-          if options.fetch(:include_old_value, true)
+          if options.fetch(:include_old_value, true) && has_previously_saved_value?(record)
             old_value = previously_saved_value(record)
-            if old_value.present? && !current_values.include?(old_value)
+            unless current_values.include?(old_value)
               assignable_values << old_value
             end
           end
@@ -103,8 +103,12 @@ module AssignableValues
           record.send(property)
         end
 
+        def has_previously_saved_value?(record)
+          raise NotImplementedError
+        end
+
         def previously_saved_value(record)
-          nil
+          raise NotImplementedError
         end
 
         def decorate_values(values)

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

@@ -26,8 +26,12 @@ module AssignableValues
           record.send(association_id_method)
         end
 
+        def has_previously_saved_value?(record)
+          !record.new_record? && record.respond_to?(value_was_method)
+        end
+
         def previously_saved_value(record)
-          if old_id = record.send("#{association_id_method}_was")
+          if old_id = record.send(value_was_method).presence
             if old_id == association_id(record)
               current_value(record) # no need to query the database if nothing changed
             else
@@ -42,6 +46,12 @@ module AssignableValues
           value
         end
 
+        private
+
+        def value_was_method
+          "#{association_id_method}_was"
+        end
+
       end
     end
   end

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

@@ -88,11 +88,18 @@ module AssignableValues
           end
         end
 
+        def has_previously_saved_value?(record)
+          !record.new_record? && record.respond_to?(value_was_method)
+        end
+
         def previously_saved_value(record)
-          was_method_name = "#{property}_was"
-          if record.respond_to?(was_method_name)
-            record.send(was_method_name)
-          end
+          record.send(value_was_method)
+        end
+
+        private
+
+        def value_was_method
+          "#{property}_was"
         end
 
       end

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

data/spec/rails-2.3/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_WITHOUT: development

data/spec/rails-2.3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.10.0)
+    assignable_values (0.11.1)
       activerecord
 
 GEM

data/spec/rails-3.0/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_WITHOUT: development

data/spec/rails-3.0/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.11.0)
+    assignable_values (0.11.1)
       activerecord
 
 GEM

data/spec/rails-3.2/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_WITHOUT: development

data/spec/rails-3.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.11.0)
+    assignable_values (0.11.1)
       activerecord
 
 GEM

data/spec/rails-4.1/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_WITHOUT: development

data/spec/rails-4.1/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.11.0)
+    assignable_values (0.11.1)
       activerecord
 
 GEM

data/spec/shared/assignable_values/active_record_spec.rb

@@ -75,6 +75,18 @@ describe AssignableValues::ActiveRecord do
           record.reload.should be_valid
         end
 
+        it 'should allow a previously saved, blank value even if that value is no longer allowed' do
+          record = @klass.create!(:genre => 'pop')
+          @klass.update_all(:genre => '') # update without validations for the sake of this test
+          record.reload.should be_valid
+        end
+
+        it 'should not allow nil (the "previous value") if the record was never saved' do
+          record = @klass.new(:genre => nil)
+          # Show that nil is not assignable, even though `record.genre_was` is nil.
+          record.should_not be_valid
+        end
+
         it 'should generate a method returning the humanized value' do
           song = @klass.new(:genre => 'pop')
           song.humanized_genre.should == 'Pop music'
@@ -235,7 +247,7 @@ describe AssignableValues::ActiveRecord do
         record.should be_valid
       end
 
-      it 'should allow a previously saved association even if that association is no longer allowed' do
+      it 'should allow a previously saved association, even if that association is no longer allowed' do
         allowed_association = Artist.create!
         disallowed_association = Artist.create!
         klass = Song.disposable_copy
@@ -248,6 +260,30 @@ describe AssignableValues::ActiveRecord do
         record.should be_valid
       end
 
+      it 'should allow nil for an association if the record was saved before with a nil association' do
+        allowed_association = Artist.create!
+        klass = Song.disposable_copy
+        record = klass.create!(:artist => nil)
+        klass.class_eval do
+          assignable_values_for :artist do
+            [allowed_association]
+          end
+        end
+        record.should be_valid
+      end
+
+      it 'sould 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)
+        klass.class_eval do
+          assignable_values_for :artist do
+            [allowed_association]
+          end
+        end
+        record.should_not be_valid
+      end
+
       it "should not load a previously saved association if the association's foreign key hasn't changed" do
         association = Artist.create!
         klass = Song.disposable_copy do
@@ -516,7 +552,29 @@ describe AssignableValues::ActiveRecord do
         record.assignable_genres.should == %w[pop rock]
       end
 
-      it 'should allow omitting a previously saved value' do
+      it 'should prepend a previously saved blank value to the top of the list, even if is no longer allowed' do
+        klass = Song.disposable_copy do
+          assignable_values_for :genre do
+            %w[pop rock]
+          end
+        end
+        record = klass.create!(:genre => 'pop')
+        klass.update_all(:genre => '') # update without validation for the sake of this test
+        record.reload.assignable_genres.should == ['', 'pop', 'rock']
+      end
+
+      it 'should not prepend nil to the top of the list if the record was never saved' do
+        klass = Song.disposable_copy do
+          assignable_values_for :genre do
+            %w[pop rock]
+          end
+        end
+        record = klass.new(:genre => 'pop')
+        record.genre_was.should be_nil
+        record.assignable_genres.should == ['pop', 'rock']
+      end
+
+      it 'should allow omitting a previously saved value with :include_old_value => false option' do
         klass = Song.disposable_copy do
           assignable_values_for :genre do
             %w[pop rock]

metadata

@@ -1,92 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: assignable_values
-version: !ruby/object:Gem::Version
-  version: 0.11.1
+version: !ruby/object:Gem::Version 
+  hash: 55
+  prerelease: 
+  segments: 
+  - 0
+  - 11
+  - 2
+  version: 0.11.2
 platform: ruby
-authors:
+authors: 
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2015-09-24 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 8
+        version: "2.8"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 8
+        version: "2.8"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Restrict the values assignable to ActiveRecord attributes or associations.
-  Or enums on steroids.
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+description: Restrict the values assignable to ActiveRecord attributes or associations. Or enums on steroids.
 email: henning.koch@makandra.de
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .ruby-version
@@ -104,6 +117,7 @@ files:
 - lib/assignable_values/humanizable_string.rb
 - lib/assignable_values/humanized_value.rb
 - lib/assignable_values/version.rb
+- spec/rails-2.3/.bundle/config
 - spec/rails-2.3/Gemfile
 - spec/rails-2.3/Gemfile.lock
 - spec/rails-2.3/Rakefile
@@ -119,6 +133,7 @@ files:
 - spec/rails-2.3/rcov.opts
 - spec/rails-2.3/spec.opts
 - spec/rails-2.3/spec/spec_helper.rb
+- spec/rails-3.0/.bundle/config
 - spec/rails-3.0/.rspec
 - spec/rails-3.0/Gemfile
 - spec/rails-3.0/Gemfile.lock
@@ -140,6 +155,7 @@ files:
 - spec/rails-3.0/app_root/script/rails
 - spec/rails-3.0/rcov.opts
 - spec/rails-3.0/spec/spec_helper.rb
+- spec/rails-3.2/.bundle/config
 - spec/rails-3.2/.rspec
 - spec/rails-3.2/Gemfile
 - spec/rails-3.2/Gemfile.lock
@@ -161,6 +177,7 @@ files:
 - spec/rails-3.2/app_root/script/rails
 - spec/rails-3.2/rcov.opts
 - spec/rails-3.2/spec/spec_helper.rb
+- spec/rails-4.1/.bundle/config
 - spec/rails-4.1/.rspec
 - spec/rails-4.1/.ruby-version
 - spec/rails-4.1/Gemfile
@@ -201,32 +218,42 @@ files:
 - spec/shared/app_root/db/migrate/003_create_recordings.rb
 - spec/shared/assignable_values/active_record_spec.rb
 - spec/shared/assignable_values/humanized_value_spec.rb
+has_rdoc: true
 homepage: https://github.com/makandra/assignable_values
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.3.9.5
 signing_key: 
-specification_version: 4
-summary: Restrict the values assignable to ActiveRecord attributes or associations.
-  Or enums on steroids.
-test_files:
+specification_version: 3
+summary: Restrict the values assignable to ActiveRecord attributes or associations. Or enums on steroids.
+test_files: 
+- spec/rails-2.3/.bundle/config
 - spec/rails-2.3/Gemfile
 - spec/rails-2.3/Gemfile.lock
 - spec/rails-2.3/Rakefile
@@ -242,6 +269,7 @@ test_files:
 - spec/rails-2.3/rcov.opts
 - spec/rails-2.3/spec.opts
 - spec/rails-2.3/spec/spec_helper.rb
+- spec/rails-3.0/.bundle/config
 - spec/rails-3.0/.rspec
 - spec/rails-3.0/Gemfile
 - spec/rails-3.0/Gemfile.lock
@@ -263,6 +291,7 @@ test_files:
 - spec/rails-3.0/app_root/script/rails
 - spec/rails-3.0/rcov.opts
 - spec/rails-3.0/spec/spec_helper.rb
+- spec/rails-3.2/.bundle/config
 - spec/rails-3.2/.rspec
 - spec/rails-3.2/Gemfile
 - spec/rails-3.2/Gemfile.lock
@@ -284,6 +313,7 @@ test_files:
 - spec/rails-3.2/app_root/script/rails
 - spec/rails-3.2/rcov.opts
 - spec/rails-3.2/spec/spec_helper.rb
+- spec/rails-4.1/.bundle/config
 - spec/rails-4.1/.rspec
 - spec/rails-4.1/.ruby-version
 - spec/rails-4.1/Gemfile

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDE4NmE4ZGNlYWVkMDFjYWVkYzYyNTlhNTQ5NGQ3NGFhOTZkYzg5ZA==
-  data.tar.gz: !binary |-
-    MGU2OGRjNjliYTM2ZjU0ODY5MzljY2ZiMWYwY2ViN2FjMDViM2QyNQ==
-SHA512:
-  metadata.gz: !binary |-
-    NWJkZjEyYzhmNGZiZWJiYjZmMTAwZTJhYmY0NjU4ZjVlZjFhMTBkYTQ0NDc5
-    ZTZlNTU3Y2Y3NWNjZmU3YWE4YjQ2MDBhNGQ4Nzg1NmYyN2ZmYzhkN2UxMGEy
-    MTUwYmYzM2I5YTcwYmYxMzUxZDk3NjU2MjczZjlkZTRmMTBkYmY=
-  data.tar.gz: !binary |-
-    MGFmZDgzMmUzZjZiMzdkOTlmNTg4ZjdiN2QxNTY5ODk0ZGQ4NzFhMDA4ZDZh
-    MzEyODllMjFjMDgzZTc5NDMzYzg3M2U0NzkyMTQ4ZTk4OGUzZjM5NzNmYTMz
-    MDkxYjI2NDUwN2M1Njg1ZjQyYzRhOTRmYmYyOGZhYTEyMmQ5MDY=