assignable_values 0.11.2 → 0.11.3

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 rvm:
   - "1.8.7"
-  - "1.9.3"
   - "2.1.0"
-  - ree
 services:
   - mysql
 script: rake travis:run

data/README.md

@@ -5,7 +5,7 @@ assignable_values - Enums on vitamins [![Build Status](https://secure.travis-ci.
 
 We carefully enhanced the core enum functionality with small tweaks that are useful for web forms, internationalized applications and common authorization patterns.
 
-`assignable_values` is tested with Rails 2.3, 3.0, 3.2 and 4.1 on Ruby 1.8.7, 1.9.3 and 2.1.0.
+`assignable_values` is tested with Rails 2.3, 3.2 and 4.1 on Ruby 1.8.7 and 2.1.0.
 
 
 Restricting scalar attributes

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

@@ -42,7 +42,9 @@ module AssignableValues
         end
 
         def assignable_value?(record, value)
-          assignable_values(record).include?(value)
+          (has_previously_saved_value?(record) && value == previously_saved_value(record))  ||
+            (value.blank? && allow_blank?(record)) ||
+            assignable_values(record).include?(value)
         end
 
         def assignable_values(record, options = {})
@@ -52,7 +54,7 @@ module AssignableValues
 
           if options.fetch(:include_old_value, true) && has_previously_saved_value?(record)
             old_value = previously_saved_value(record)
-            unless current_values.include?(old_value)
+            unless old_value.blank? || current_values.include?(old_value)
               assignable_values << old_value
             end
           end

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

@@ -27,11 +27,11 @@ module AssignableValues
         end
 
         def has_previously_saved_value?(record)
-          !record.new_record? && record.respond_to?(value_was_method)
+          !record.new_record? && record.respond_to?(association_id_was_method)
         end
 
         def previously_saved_value(record)
-          if old_id = record.send(value_was_method).presence
+          if old_id = record.send(association_id_was_method).presence
             if old_id == association_id(record)
               current_value(record) # no need to query the database if nothing changed
             else
@@ -48,7 +48,7 @@ module AssignableValues
 
         private
 
-        def value_was_method
+        def association_id_was_method
           "#{association_id_method}_was"
         end
 

data/lib/assignable_values/version.rb

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

data/spec/rails-2.3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.11.1)
+    assignable_values (0.11.2)
       activerecord
 
 GEM
@@ -63,3 +63,6 @@ DEPENDENCIES
   ruby-debug
   sqlite3
   test-unit (= 1.2.3)
+
+BUNDLED WITH
+   1.12.5

data/spec/rails-3.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.11.1)
+    assignable_values (0.11.2)
       activerecord
 
 GEM
@@ -127,3 +127,6 @@ DEPENDENCIES
   rspec_candy
   ruby-debug
   sqlite3
+
+BUNDLED WITH
+   1.12.5

data/spec/rails-4.1/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.11.1)
+    assignable_values (0.11.2)
       activerecord
 
 GEM
@@ -141,3 +141,6 @@ DEPENDENCIES
   rspec_candy
   ruby-debug
   sqlite3
+
+BUNDLED WITH
+   1.12.5

data/spec/shared/assignable_values/active_record_spec.rb

@@ -552,7 +552,7 @@ describe AssignableValues::ActiveRecord do
         record.assignable_genres.should == %w[pop rock]
       end
 
-      it 'should prepend a previously saved blank value to the top of the list, even if is no longer allowed' do
+      it "should not prepend a previously saved blank value to the top of the list (because our forms already have collection_select with include_blank: '<prompt>')" do
         klass = Song.disposable_copy do
           assignable_values_for :genre do
             %w[pop rock]
@@ -560,7 +560,7 @@ describe AssignableValues::ActiveRecord do
         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']
+        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
@@ -599,6 +599,23 @@ describe AssignableValues::ActiveRecord do
         record.assignable_artists(:include_old_value => false).should =~ [allowed_association]
       end
 
+      context 'if the :allow_blank option is set to true' do
+
+        before :each do
+          @klass = Song.disposable_copy do
+            assignable_values_for :genre, :allow_blank => true do
+              %w[pop rock]
+            end
+          end
+        end
+
+        it "should not prepend nil to the list for an unsaved record (because we'd rather use include_blank: '<prompt>' in collection_select)" do
+          record = @klass.new
+          record.assignable_genres.should == ['pop', 'rock']
+        end
+
+      end
+
       context 'humanization' do
 
         it 'should define a method that return pairs of values and their humanization' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assignable_values
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 11
-  - 2
-  version: 0.11.2
+  - 3
+  version: 0.11.3
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-09-24 00:00:00 +02:00
-default_executable: 
+date: 2016-11-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -133,28 +132,6 @@ 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
-- spec/rails-3.0/Rakefile
-- spec/rails-3.0/app_root/.gitignore
-- spec/rails-3.0/app_root/config/application.rb
-- spec/rails-3.0/app_root/config/boot.rb
-- spec/rails-3.0/app_root/config/database.yml
-- spec/rails-3.0/app_root/config/environment.rb
-- spec/rails-3.0/app_root/config/environments/test.rb
-- spec/rails-3.0/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-3.0/app_root/config/initializers/inflections.rb
-- spec/rails-3.0/app_root/config/initializers/mime_types.rb
-- spec/rails-3.0/app_root/config/initializers/secret_token.rb
-- spec/rails-3.0/app_root/config/initializers/session_store.rb
-- spec/rails-3.0/app_root/config/routes.rb
-- spec/rails-3.0/app_root/lib/tasks/.gitkeep
-- spec/rails-3.0/app_root/log/.gitkeep
-- 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
@@ -218,7 +195,6 @@ 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: 
 - MIT
@@ -248,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Restrict the values assignable to ActiveRecord attributes or associations. Or enums on steroids.
@@ -269,28 +245,6 @@ 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
-- spec/rails-3.0/Rakefile
-- spec/rails-3.0/app_root/.gitignore
-- spec/rails-3.0/app_root/config/application.rb
-- spec/rails-3.0/app_root/config/boot.rb
-- spec/rails-3.0/app_root/config/database.yml
-- spec/rails-3.0/app_root/config/environment.rb
-- spec/rails-3.0/app_root/config/environments/test.rb
-- spec/rails-3.0/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-3.0/app_root/config/initializers/inflections.rb
-- spec/rails-3.0/app_root/config/initializers/mime_types.rb
-- spec/rails-3.0/app_root/config/initializers/secret_token.rb
-- spec/rails-3.0/app_root/config/initializers/session_store.rb
-- spec/rails-3.0/app_root/config/routes.rb
-- spec/rails-3.0/app_root/lib/tasks/.gitkeep
-- spec/rails-3.0/app_root/log/.gitkeep
-- 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
@@ -354,3 +308,4 @@ 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: 

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

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

data/spec/rails-3.0/.rspec

@@ -1,2 +0,0 @@
---colour
---format progress

data/spec/rails-3.0/Gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'sqlite3'
-gem 'rails', '~>3.0.3'
-gem 'rspec'
-gem 'rspec-rails'
-gem 'ruby-debug', :platforms => :ruby_18
-gem 'rspec_candy'
-gem 'assignable_values', :path => '../..'
-

data/spec/rails-3.0/Gemfile.lock

@@ -1,119 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    assignable_values (0.11.1)
-      activerecord
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.20)
-      actionpack (= 3.0.20)
-      mail (~> 2.2.19)
-    actionpack (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-    activesupport (3.0.20)
-    arel (2.0.10)
-    builder (2.1.2)
-    columnize (0.3.6)
-    diff-lcs (1.2.1)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    json (1.7.7)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.21)
-    polyglot (0.3.3)
-    rack (1.2.8)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.20)
-      actionmailer (= 3.0.20)
-      actionpack (= 3.0.20)
-      activerecord (= 3.0.20)
-      activeresource (= 3.0.20)
-      activesupport (= 3.0.20)
-      bundler (~> 1.0)
-      railties (= 3.0.20)
-    railties (3.0.20)
-      actionpack (= 3.0.20)
-      activesupport (= 3.0.20)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (10.0.3)
-    rbx-require-relative (0.0.9)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec_candy (0.2.8)
-      rspec
-      sneaky-save
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    sneaky-save (0.0.2)
-      activerecord (>= 2.3.2)
-    sqlite3 (1.3.7)
-    thor (0.14.6)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  assignable_values!
-  rails (~> 3.0.3)
-  rspec
-  rspec-rails
-  rspec_candy
-  ruby-debug
-  sqlite3

data/spec/rails-3.0/Rakefile

@@ -1,10 +0,0 @@
-require 'rake'
-require 'rspec/core/rake_task'
-
-desc 'Default: Run all specs for a specific rails version.'
-task :default => :spec
-
-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']
-end

data/spec/rails-3.0/app_root/.gitignore

@@ -1,4 +0,0 @@
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/**/*

data/spec/rails-3.0/app_root/config/application.rb

@@ -1,32 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
-
-
-module SpecApp
-  class Application < Rails::Application
-    config.encoding = "utf-8"
-
-    config.cache_classes = true
-    config.whiny_nils = true
-
-    config.consider_all_requests_local       = true
-    config.action_controller.perform_caching = false
-
-    config.action_dispatch.show_exceptions = false
-
-    config.action_controller.allow_forgery_protection    = false
-
-    config.action_mailer.delivery_method = :test
-
-    config.active_support.deprecation = :stderr
-
-    config.root = File.expand_path('../..', __FILE__)
-
-    # railties.plugins << Rails::Plugin.new(File.expand_path('../../../../..', __FILE__))
-  end
-end

data/spec/rails-3.0/app_root/config/boot.rb

@@ -1,13 +0,0 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)

data/spec/rails-3.0/app_root/config/database.yml

@@ -1,4 +0,0 @@
-test:
-  adapter: sqlite3
-  database: ":memory:"
-  verbosity: quiet

data/spec/rails-3.0/app_root/config/environment.rb

@@ -1,5 +0,0 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
-
-# Initialize the rails application
-SpecApp::Application.initialize!

data/spec/rails-3.0/app_root/config/environments/test.rb

@@ -1,35 +0,0 @@
-SpecApp::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
-
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
-
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  # Print deprecation notices to the stderr
-  config.active_support.deprecation = :stderr
-end

data/spec/rails-3.0/app_root/config/initializers/backtrace_silencers.rb

@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
-
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!

data/spec/rails-3.0/app_root/config/initializers/inflections.rb

@@ -1,10 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end

data/spec/rails-3.0/app_root/config/initializers/mime_types.rb

@@ -1,5 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone

data/spec/rails-3.0/app_root/config/initializers/secret_token.rb

@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-SpecApp::Application.config.secret_token = 'cb014a08a45243e7143f31e04774c342c1fba329fd594ae1a480d8283b1a851f425dc08044311fb4be6d000b6e6681de7c76d19148419a5ffa0a9f84556d3b33'

data/spec/rails-3.0/app_root/config/initializers/session_store.rb

@@ -1,8 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-SpecApp::Application.config.session_store :cookie_store, :key => '_app_root_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# SpecApp::Application.config.session_store :active_record_store

data/spec/rails-3.0/app_root/config/routes.rb

@@ -1,58 +0,0 @@
-SpecApp::Application.routes.draw do
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => "welcome#index"
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  match ':controller(/:action(/:id(.:format)))'
-end

data/spec/rails-3.0/app_root/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby1.8
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'

data/spec/rails-3.0/rcov.opts

@@ -1,2 +0,0 @@
---exclude "spec/*,gems/*"
---rails

data/spec/rails-3.0/spec/spec_helper.rb

@@ -1,25 +0,0 @@
-$: << File.join(File.dirname(__FILE__), "/../../lib" )
-
-ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] = 'app_root'
-
-# Load the Rails environment and testing framework
-require "#{File.dirname(__FILE__)}/../app_root/config/environment"
-require 'rspec/rails'
-require 'rspec_candy/all'
-
-# Load dependencies
-# require 'has_defaults'
-
-# Require support code
-# Dir["../shared/support/**/*.rb"].each {|f| require f}
-
-# Run the migrations
-print "\033[30m" # dark gray text
-ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
-print "\033[0m"
-
-RSpec.configure do |config|
-  config.use_transactional_fixtures = true
-  config.use_instantiated_fixtures  = false
-end