assignable_values 0.6.1 → 0.7.1

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.3"
+  - ree
+services:
+  - mysql
+before_script: rake travis_ci:prepare
+script: rake all:bundle:install all:spec
+notifications:
+  email:
+    - fail@makandra.de
+branches:
+  only:
+    - master

data/README.md

@@ -1,9 +1,9 @@
-assignable_values - Enums on vitamins
+assignable_values - Enums on vitamins [![Build Status](https://secure.travis-ci.org/makandra/assignable_values.png?branch=master)](https://travis-ci.org/makandra/assignable_values)
 =====================================
 
 `assignable_values` lets you restrict the values that can be assigned to attributes or associations of ActiveRecord models. You can think of it as enums where the list of allowed values is generated at runtime and the value is checked during validation.
 
-We carefully enhanced the cure enum functionality with small tweaks that are useful for web forms, internationalized applications and common authorization patterns.
+We carefully enhanced the core enum functionality with small tweaks that are useful for web forms, internationalized applications and common authorization patterns.
 
 
 Restricting scalar attributes
@@ -23,6 +23,7 @@ The assigned value is checked during validation:
     Song.new(:genre => 'elephant').valid? # => false
 
 The validation error message is the same as the one from `validates_inclusion_of` (`errors.messages.inclusion` in your I18n dictionary).
+You can also set a custom error message with the `:message` option.
 
 
 ### Listing assignable values

data/Rakefile

@@ -4,14 +4,25 @@ require 'bundler/gem_tasks'
 desc 'Default: Run all specs.'
 task :default => 'all:spec'
 
+
+namespace :travis_ci do
+
+  desc 'Things to do before Travis CI begins'
+  task :prepare do
+  end
+
+end
+
 namespace :all do
 
   desc "Run specs on all spec apps"
   task :spec do
+    success = true
     for_each_directory_of('spec/**/Rakefile') do |directory|
       env = "SPEC=../../#{ENV['SPEC']} " if ENV['SPEC']
-      system("cd #{directory} && #{env} bundle exec rake spec")
+      success &= system("cd #{directory} && #{env} bundle exec rake spec")
     end
+    fail "Tests failed" unless success
   end
 
   namespace :bundle do

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

@@ -34,7 +34,11 @@ module AssignableValues
         end
 
         def not_included_error_message
-          I18n.t('errors.messages.inclusion', :default => 'is not included in the list')
+          if @options[:message]
+            @options[:message]
+          else
+            I18n.t('errors.messages.inclusion', :default => 'is not included in the list')
+          end
         end
 
         def assignable_value?(record, value)
@@ -81,7 +85,7 @@ module AssignableValues
 
         def evaluate_default(record, value_or_proc)
           if value_or_proc.is_a?(Proc)
-            record.instance_eval(&value_or_proc)
+            record.instance_exec(&value_or_proc)
           else
             value_or_proc
           end
@@ -181,7 +185,7 @@ module AssignableValues
           if delegate?
             values = assignable_values_from_delegate(record)
           else
-            values = record.instance_eval(&@values)
+            values = record.instance_exec(&@values)
           end
           parse_values(values)
         end
@@ -194,7 +198,7 @@ module AssignableValues
           case option
           when NilClass, TrueClass, FalseClass then option
           when Symbol then record.send(option)
-          when Proc then record.instance_eval(&option)
+          when Proc then record.instance_exec(&option)
           else raise "Illegal option type: #{option.inspect}"
           end
         end

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.6.1'
+  VERSION = '0.7.1'
 end

data/spec/rails-2.3/Gemfile

@@ -1,9 +1,11 @@
 source 'http://rubygems.org'
 
 gem 'sqlite3'
-gem 'rails', '=2.3.10'
+gem 'test-unit', '=1.2.3', :platforms => :ruby_19
+gem 'rails', '~>2.3.10'
 gem 'rspec', '<2'
 gem 'rspec-rails', '<2'
-gem 'ruby-debug'
+gem 'ruby-debug', :platforms => :ruby_18
+gem 'debugger', :platforms => :ruby_19
 gem 'rspec_candy'
 gem 'assignable_values', :path => '../..'

data/spec/rails-2.3/Gemfile.lock

@@ -1,56 +1,72 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.6.1)
+    assignable_values (0.7.1)
       activerecord
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.10)
-      actionpack (= 2.3.10)
-    actionpack (2.3.10)
-      activesupport (= 2.3.10)
+    actionmailer (2.3.17)
+      actionpack (= 2.3.17)
+    actionpack (2.3.17)
+      activesupport (= 2.3.17)
       rack (~> 1.1.0)
-    activerecord (2.3.10)
-      activesupport (= 2.3.10)
-    activeresource (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
+    activerecord (2.3.17)
+      activesupport (= 2.3.17)
+    activeresource (2.3.17)
+      activesupport (= 2.3.17)
+    activesupport (2.3.17)
     columnize (0.3.6)
+    debugger (1.3.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.2.0)
+    hoe (3.5.1)
+      rake (>= 0.8, < 11.0)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    rack (1.1.3)
-    rails (2.3.10)
-      actionmailer (= 2.3.10)
-      actionpack (= 2.3.10)
-      activerecord (= 2.3.10)
-      activeresource (= 2.3.10)
-      activesupport (= 2.3.10)
+    rack (1.1.6)
+    rails (2.3.17)
+      actionmailer (= 2.3.17)
+      actionpack (= 2.3.17)
+      activerecord (= 2.3.17)
+      activeresource (= 2.3.17)
+      activesupport (= 2.3.17)
       rake (>= 0.8.3)
-    rake (10.0.2)
+    rake (10.0.3)
     rbx-require-relative (0.0.9)
     rspec (1.3.2)
     rspec-rails (1.3.4)
       rack (>= 1.0.0)
       rspec (~> 1.3.1)
-    rspec_candy (0.2.1)
+    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)
-    sqlite3 (1.3.6)
+    sneaky-save (0.0.2)
+      activerecord (>= 2.3.2)
+    sqlite3 (1.3.7)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   assignable_values!
-  rails (= 2.3.10)
+  debugger
+  rails (~> 2.3.10)
   rspec (< 2)
   rspec-rails (< 2)
   rspec_candy
   ruby-debug
   sqlite3
+  test-unit (= 1.2.3)

data/spec/rails-2.3/{spec_helper.rb → spec/spec_helper.rb}

@@ -1,10 +1,10 @@
-$: << File.join(File.dirname(__FILE__), "/../lib" )
+$: << File.join(File.dirname(__FILE__), "/../../lib" )
 
-# Set the default environment to sqlite3's in_memory database
-ENV['RAILS_ENV'] ||= 'test'
+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 "#{File.dirname(__FILE__)}/../app_root/config/environment"
 require 'spec/rails'
 require 'rspec_candy/all'
 

data/spec/rails-3.0/Gemfile

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

data/spec/rails-3.0/Gemfile.lock

@@ -1,46 +1,54 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.6.1)
+    assignable_values (0.7.1)
       activerecord
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    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.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.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.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.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.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
+    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.1.3)
+    debugger (1.3.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.2.0)
+    diff-lcs (1.2.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.6.1)
+    i18n (0.5.0)
+    json (1.7.7)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     mail (2.2.19)
@@ -48,51 +56,57 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
+    mime-types (1.21)
     polyglot (0.3.3)
-    rack (1.2.5)
+    rack (1.2.8)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    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.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      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.2)
+    rake (10.0.3)
     rbx-require-relative (0.0.9)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    rspec-rails (2.12.0)
+    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.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec_candy (0.2.1)
+      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)
-    sqlite3 (1.3.6)
+    sneaky-save (0.0.2)
+      activerecord (>= 2.3.2)
+    sqlite3 (1.3.7)
     thor (0.14.6)
     treetop (1.4.12)
       polyglot
@@ -104,7 +118,8 @@ PLATFORMS
 
 DEPENDENCIES
   assignable_values!
-  rails (= 3.0.3)
+  debugger
+  rails (~> 3.0.3)
   rspec
   rspec-rails
   rspec_candy

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

@@ -7,7 +7,7 @@ require 'rails/all'
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
 
-module HasDefaultSpecApp
+module SpecApp
   class Application < Rails::Application
     config.encoding = "utf-8"
 

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

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-HasDefaultSpecApp::Application.initialize!
+SpecApp::Application.initialize!

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

@@ -1,4 +1,4 @@
-HasDefaultSpecApp::Application.configure do
+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

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

@@ -4,4 +4,4 @@
 # 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.
-HasDefaultSpecApp::Application.config.secret_token = 'cb014a08a45243e7143f31e04774c342c1fba329fd594ae1a480d8283b1a851f425dc08044311fb4be6d000b6e6681de7c76d19148419a5ffa0a9f84556d3b33'
+SpecApp::Application.config.secret_token = 'cb014a08a45243e7143f31e04774c342c1fba329fd594ae1a480d8283b1a851f425dc08044311fb4be6d000b6e6681de7c76d19148419a5ffa0a9f84556d3b33'

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

@@ -1,8 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-HasDefaultSpecApp::Application.config.session_store :cookie_store, :key => '_app_root_session'
+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")
-# HasDefaultSpecApp::Application.config.session_store :active_record_store
+# SpecApp::Application.config.session_store :active_record_store

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

@@ -1,4 +1,4 @@
-HasDefaultSpecApp::Application.routes.draw do
+SpecApp::Application.routes.draw do
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/spec/rails-3.0/{spec_helper.rb → spec/spec_helper.rb}

@@ -1,11 +1,10 @@
-$: << File.join(File.dirname(__FILE__), "/../lib" )
+$: << File.join(File.dirname(__FILE__), "/../../lib" )
 
-# Set the default environment to sqlite3's in_memory database
-ENV['RAILS_ENV'] ||= 'test'
+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 "#{File.dirname(__FILE__)}/../app_root/config/environment"
 require 'rspec/rails'
 require 'rspec_candy/all'
 

data/spec/rails-3.2/Gemfile

@@ -4,7 +4,8 @@ gem 'sqlite3'
 gem 'rails', '~>3.2'
 gem 'rspec'
 gem 'rspec-rails'
-gem 'ruby-debug'
+gem 'ruby-debug', :platforms => :ruby_18
+gem 'debugger', :platforms => :ruby_19
 gem 'rspec_candy'
 gem 'assignable_values', :path => '../..'
 

data/spec/rails-3.2/Gemfile.lock

@@ -1,113 +1,123 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.6.1)
+    assignable_values (0.7.1)
       activerecord
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
       mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
     columnize (0.3.6)
-    diff-lcs (1.1.3)
+    debugger (1.3.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.2.0)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.1)
+    i18n (0.6.4)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.7.7)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.7)
+    mime-types (1.21)
+    multi_json (1.6.1)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.2)
+    rake (10.0.3)
     rbx-require-relative (0.0.9)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    rspec-rails (2.12.0)
+    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.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec_candy (0.2.1)
+      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.4)
+      activerecord (>= 3.2.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
+    sqlite3 (1.3.7)
+    thor (0.17.0)
+    tilt (1.3.4)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -118,6 +128,7 @@ PLATFORMS
 
 DEPENDENCIES
   assignable_values!
+  debugger
   rails (~> 3.2)
   rspec
   rspec-rails

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

@@ -7,7 +7,7 @@ require 'rails/all'
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
 
-module HasDefaultSpecApp
+module SpecApp
   class Application < Rails::Application
     config.encoding = "utf-8"
 

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

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-HasDefaultSpecApp::Application.initialize!
+SpecApp::Application.initialize!

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

@@ -1,4 +1,4 @@
-HasDefaultSpecApp::Application.configure do
+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

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

@@ -4,4 +4,4 @@
 # 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.
-HasDefaultSpecApp::Application.config.secret_token = 'cb014a08a45243e7143f31e04774c342c1fba329fd594ae1a480d8283b1a851f425dc08044311fb4be6d000b6e6681de7c76d19148419a5ffa0a9f84556d3b33'
+SpecApp::Application.config.secret_token = 'cb014a08a45243e7143f31e04774c342c1fba329fd594ae1a480d8283b1a851f425dc08044311fb4be6d000b6e6681de7c76d19148419a5ffa0a9f84556d3b33'

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

@@ -1,8 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-HasDefaultSpecApp::Application.config.session_store :cookie_store, :key => '_app_root_session'
+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")
-# HasDefaultSpecApp::Application.config.session_store :active_record_store
+# SpecApp::Application.config.session_store :active_record_store

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

@@ -1,4 +1,4 @@
-HasDefaultSpecApp::Application.routes.draw do
+SpecApp::Application.routes.draw do
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/spec/rails-3.2/{spec_helper.rb → spec/spec_helper.rb}

@@ -1,11 +1,10 @@
-$: << File.join(File.dirname(__FILE__), "/../lib" )
+$: << File.join(File.dirname(__FILE__), "/../../lib" )
 
-# Set the default environment to sqlite3's in_memory database
-ENV['RAILS_ENV'] ||= 'test'
+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 "#{File.dirname(__FILE__)}/../app_root/config/environment"
 require 'rspec/rails'
 require 'rspec_candy/all'
 

data/spec/shared/app_root/app/helpers/application_helper.rb

@@ -0,0 +1,3 @@
+module ApplicationHelper
+
+end

data/spec/shared/assignable_values/active_record_spec.rb

@@ -112,7 +112,6 @@ describe AssignableValues::ActiveRecord do
 
       context 'if the :allow_blank option is set to a lambda ' do
 
-
         before :each do
           @klass = Song.disposable_copy do
 
@@ -132,6 +131,26 @@ describe AssignableValues::ActiveRecord do
 
       end
 
+      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
+        end
+
+        it 'should use this string as a custom error message' do
+          record = @klass.new(:genre => 'disallowed value')
+          record.valid?
+          errors = record.errors[:genre]
+          error = errors.is_a?(Array) ? errors.first : errors # the return value sometimes was a string, sometimes an Array in Rails
+          error.should == 'should be something different'
+        end
+
+      end
+
     end
 
     context 'when validating belongs_to associations' do

metadata

@@ -1,107 +1,106 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: assignable_values
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.7.1
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
 platform: ruby
-authors: 
+authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-15 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    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 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    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
+    none: false
+    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 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    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
+    none: false
+    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 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    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
+    none: false
+    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
+- .travis.yml
 - README.md
 - Rakefile
 - assignable_values.gemspec
@@ -127,7 +126,7 @@ files:
 - spec/rails-2.3/app_root/script/console
 - spec/rails-2.3/rcov.opts
 - spec/rails-2.3/spec.opts
-- spec/rails-2.3/spec_helper.rb
+- spec/rails-2.3/spec/spec_helper.rb
 - spec/rails-3.0/.rspec
 - spec/rails-3.0/Gemfile
 - spec/rails-3.0/Gemfile.lock
@@ -148,7 +147,7 @@ files:
 - 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_helper.rb
+- spec/rails-3.0/spec/spec_helper.rb
 - spec/rails-3.2/.rspec
 - spec/rails-3.2/Gemfile
 - spec/rails-3.2/Gemfile.lock
@@ -169,8 +168,9 @@ files:
 - spec/rails-3.2/app_root/log/.gitkeep
 - spec/rails-3.2/app_root/script/rails
 - spec/rails-3.2/rcov.opts
-- spec/rails-3.2/spec_helper.rb
+- spec/rails-3.2/spec/spec_helper.rb
 - spec/shared/app_root/app/controllers/application_controller.rb
+- spec/shared/app_root/app/helpers/application_helper.rb
 - spec/shared/app_root/app/models/artist.rb
 - spec/shared/app_root/app/models/recording/vinyl.rb
 - spec/shared/app_root/app/models/song.rb
@@ -180,39 +180,29 @@ 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: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Restrict the values assignable to ActiveRecord attributes or associations. Or enums on steroids.
+summary: Restrict the values assignable to ActiveRecord attributes or associations.
+  Or enums on steroids.
 test_files: []
-