assignable_values 0.10.0 → 0.11.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmQwMjA2ZmZiMjQyOTRhOWMwNWViYTI4OTg4NTljMWFjMTRhNDUyYg==
+  data.tar.gz: !binary |-
+    NDM4YzA1NTk3ZGU2NjNiMmUyNjZiNDI2MWIwYTIxMTdkZTNjZmU1NA==
+SHA512:
+  metadata.gz: !binary |-
+    ZWFkZTk3NzkyMjk5ZjA3MmM0NDA3ZGQwMDA0ZTc0MDc3NjFjYjgzYzMyNjg2
+    ODQ2YWE1YTI0ZjNhZmQ5NDc2YjNjOTUxMWQ0ZjhjM2U4MzhjMDIxYmI5ZGNk
+    MzM4OWUyMTY5MTIwZGE0YTZmMTRiMjY0MDBlZDkyYjNkMWY3NGI=
+  data.tar.gz: !binary |-
+    OGEyZWQ2OTBhN2ZhMTNjNDg3ZTFhNzdmNzcyNDQ1NmIyNTJiZTQwNzEwNmZh
+    ZDdiYTQ2OWFlYTQ2NTYwMzA2ZmNhM2EyNjdjYmRlMzRhMTRhNjQ1OWFkYWZm
+    ZTNlMDViOTNmZmQ4Mjg4ZmE0YzQxYTQ5NTZhNmNmNmE5MzNlOWY=

data/README.md

@@ -158,11 +158,15 @@ If a value has been saved before, it will remain valid, even if it is no longer
 
 It will also be returned when obtaining the list of assignable values:
 
-    song.assignable_genres # => [2010, 2011, 2012, 1985]
+    song.assignable_years # => [2010, 2011, 2012, 1985]
+
+However, if you want only those values that are actually intended to be assignable, e.g. when updating a `<select>` via AJAX, pass an option:
+
+    song.assignable_years(include_stored_value: false) # => [2010, 2011, 2012]
 
 Once a changed value has been saved, the previous value disappears from the list of assignable values:
 
-    song.genre = 'pop'
+    song.year = '2010'
     song.save!
     song.assignable_years # => [2010, 2011, 2012]
     song.year = 1985
@@ -176,7 +180,7 @@ Restricting belongs_to associations
 
 You can restrict `belongs_to` associations in the same manner as scalar attributes:
 
-    class Song
+    class Song < ActiveRecord::Base
 
       belongs_to :artist
 
@@ -202,7 +206,7 @@ Listing and validating als works the same:
     song.valid? # => false
 
 Similiar to scalar attributes, associations are only validated when the foreign key (`artist_id` in the example above) changes.
-Previously saved values will remain assignable until another association has been saved.
+Values stored in the database will remain assignable until they are changed, and you can query actually assignable values with `song.assignable_artists(include_stored_value: false)`.
 
 Validation errors will be attached to the association's foreign key (`artist_id` in the example above).
 

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

@@ -45,19 +45,23 @@ module AssignableValues
           assignable_values(record).include?(value)
         end
 
-        def assignable_values(record, decorate = false)
+        def assignable_values(record, options = {})
           assignable_values = []
           parsed_values = parsed_assignable_values(record)
           current_values = parsed_values.delete(:values)
-          old_value = previously_saved_value(record)
-          if old_value.present? && !current_values.include?(old_value)
-            assignable_values << old_value
+
+          if options.fetch(:include_old_value, true)
+            old_value = previously_saved_value(record)
+            if old_value.present? && !current_values.include?(old_value)
+              assignable_values << old_value
+            end
           end
+
           assignable_values += current_values
           parsed_values.each do |meta_name, meta_content|
             assignable_values.singleton_class.send(:define_method, meta_name) { meta_content }
           end
-          if decorate
+          if options[:decorate]
             assignable_values = decorate_values(assignable_values)
           end
           assignable_values
@@ -179,8 +183,11 @@ module AssignableValues
           restriction = self
           enhance_model do
             assignable_values_method = "assignable_#{restriction.property.to_s.pluralize}"
-            define_method assignable_values_method do
-              restriction.assignable_values(self, true)
+            define_method assignable_values_method do |*args|
+              # Ruby 1.8.7 does not support optional block arguments :(
+              options = args.first || {}
+              options.merge!({:decorate => true})
+              restriction.assignable_values(self, options)
             end
           end
         end

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/spec/rails-3.0/Gemfile.lock

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

data/spec/rails-3.2/Gemfile.lock

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

data/spec/rails-4.1/Gemfile.lock

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

data/spec/rails-4.1/Rakefile

@@ -8,5 +8,5 @@ desc "Run all specs for a specific rails version"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = defined?(SPEC) ? SPEC : ['**/*_spec.rb', '../shared/**/*_spec.rb']
   t.verbose = false
-  t.rspec_opts = '--backtrace'
+  # t.rspec_opts = '--backtrace'
 end

data/spec/shared/assignable_values/active_record_spec.rb

@@ -13,7 +13,7 @@ describe AssignableValues::ActiveRecord do
       end.to raise_error(AssignableValues::NoValuesGiven)
     end
 
-    context 'when validation virtual attributes' do
+    context 'when validating virtual attributes' do
 
       before :each do
         @klass = Song.disposable_copy do
@@ -71,7 +71,7 @@ describe AssignableValues::ActiveRecord do
 
         it 'should allow a previously saved value even if that value is no longer allowed' do
           record = @klass.create!(:genre => 'pop')
-          @klass.update_all(:genre => 'disallowed value') # update without validations for the sake of this test
+          @klass.update_all(:genre => 'pretend previously valid value') # update without validations for the sake of this test
           record.reload.should be_valid
         end
 
@@ -516,6 +516,31 @@ describe AssignableValues::ActiveRecord do
         record.assignable_genres.should == %w[pop rock]
       end
 
+      it 'should allow omitting a previously saved value' 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 => 'ballad') # update without validation for the sake of this test
+        record.reload.assignable_genres(:include_old_value => false).should == %w[pop rock]
+      end
+
+      it 'should allow omitting a previously saved association' do
+        allowed_association = Artist.create!
+        disallowed_association = Artist.create!
+        klass = Song.disposable_copy
+
+        record = klass.create!(:artist => disallowed_association)
+        klass.class_eval do
+          assignable_values_for :artist do
+            [allowed_association]
+          end
+        end
+        record.assignable_artists(:include_old_value => false).should =~ [allowed_association]
+      end
+
       context 'humanization' do
 
         it 'should define a method that return pairs of values and their humanization' do

metadata

@@ -1,104 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: assignable_values
-version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 0
-  version: 0.10.0
+version: !ruby/object:Gem::Version
+  version: 0.11.0
 platform: ruby
-authors: 
+authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-06-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-06-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 8
-        version: "2.8"
+      - !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'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 8
-        version: "2.8"
+      - !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'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    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'
   type: :development
-  version_requirements: *id005
-description: Restrict the values assignable to ActiveRecord attributes or associations. Or enums on steroids.
+  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.
 email: henning.koch@makandra.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .ruby-version
@@ -214,39 +202,31 @@ files:
 - spec/shared/assignable_values/active_record_spec.rb
 - spec/shared/assignable_values/humanized_value_spec.rb
 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 
-  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"
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
-summary: Restrict the values assignable to ActiveRecord attributes or associations. Or enums on steroids.
-test_files: 
+specification_version: 4
+summary: Restrict the values assignable to ActiveRecord attributes or associations.
+  Or enums on steroids.
+test_files:
 - spec/rails-2.3/Gemfile
 - spec/rails-2.3/Gemfile.lock
 - spec/rails-2.3/Rakefile
@@ -344,4 +324,3 @@ test_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: