assignable_values 0.8.1 → 0.9.0

data/.ruby-version

@@ -0,0 +1 @@
+1.8.7

data/.travis.yml

@@ -5,11 +5,11 @@ rvm:
   - ree
 services:
   - mysql
-before_script: rake travis_ci:prepare
-script: rake all:bundle:install all:spec
+script: rake travis:run
 notifications:
   email:
     - fail@makandra.de
 branches:
   only:
     - master
+    - travis-testing

data/Rakefile

@@ -5,22 +5,16 @@ desc 'Default: Run all specs.'
 task :default => 'all:spec'
 
 
-namespace :travis_ci do
-
-  desc 'Things to do before Travis CI begins'
-  task :prepare => [:disable_rubygems_bundler, :slimgems] do
-  end
+namespace :travis do
+  
+  desc 'Run tests on Travis CI'
+  task :run => ['slimgems', 'all:bundle:install', 'all:spec']
 
   desc 'Install slimgems'
   task :slimgems do
     system('gem install slimgems')
   end
 
-  desc 'Disable rubygems-bundler magic'
-  task :disable_rubygems_bundler do
-    ENV['NOEXEC_DISABLE'] = '1'
-  end
-
 end
 
 namespace :all do
@@ -40,14 +34,18 @@ namespace :all do
     desc "Bundle all spec apps"
     task :install do
       for_each_directory_of('spec/**/Gemfile') do |directory|
-        system("cd #{directory} && bundle install")
+        Bundler.with_clean_env do
+          system("cd #{directory} && bundle install")
+        end
       end
     end
 
     desc "Update all gems, or a list of gem given by the GEM environment variable"
     task :update do
       for_each_directory_of('spec/**/Gemfile') do |directory|
-        system("cd #{directory} && bundle update #{ENV['GEM']}")
+        Bundler.with_clean_env do
+          system("cd #{directory} && bundle update #{ENV['GEM']}")
+        end
       end
     end
 

data/assignable_values.gemspec

@@ -11,9 +11,8 @@ Gem::Specification.new do |s|
   s.description = s.summary
   s.license = 'MIT'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = `git ls-files`.split($\)
+  s.test_files    = s.files.grep(%r{^spec/})
   s.require_paths = ["lib"]
 
   s.add_dependency('activerecord')

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

@@ -92,7 +92,7 @@ module AssignableValues
         end
 
         def parse_values(values)
-          { :values => values.to_a }
+          { :values => Array(values) }
         end
 
         def current_value(record)

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

@@ -89,7 +89,10 @@ module AssignableValues
         end
 
         def previously_saved_value(record)
-          record.send("#{property}_was")
+          was_method_name = "#{property}_was"
+          if record.respond_to?(was_method_name)
+            record.send(was_method_name)
+          end
         end
 
       end

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

data/spec/rails-2.3/Gemfile

@@ -7,6 +7,5 @@ gem 'rails', '~>2.3.10'
 gem 'rspec', '<2'
 gem 'rspec-rails', '<2'
 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,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.8.1)
+    assignable_values (0.9.0)
       activerecord
 
 GEM
@@ -18,12 +18,6 @@ GEM
       activesupport (= 2.3.17)
     activesupport (2.3.17)
     columnize (0.3.6)
-    debugger (1.6.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
     hoe (2.8.0)
       rake (>= 0.8.7)
     linecache (0.46)
@@ -61,7 +55,6 @@ PLATFORMS
 
 DEPENDENCIES
   assignable_values!
-  debugger
   hoe (= 2.8.0)
   rails (~> 2.3.10)
   rspec (< 2)

data/spec/rails-3.0/Gemfile

@@ -5,7 +5,6 @@ gem 'rails', '~>3.0.3'
 gem 'rspec'
 gem 'rspec-rails'
 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,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.8.1)
+    assignable_values (0.9.0)
       activerecord
 
 GEM
@@ -37,12 +37,6 @@ GEM
     arel (2.0.10)
     builder (2.1.2)
     columnize (0.3.6)
-    debugger (1.6.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -117,7 +111,6 @@ PLATFORMS
 
 DEPENDENCIES
   assignable_values!
-  debugger
   rails (~> 3.0.3)
   rspec
   rspec-rails

data/spec/rails-3.2/Gemfile

@@ -5,7 +5,6 @@ gem 'rails', '~>3.2'
 gem 'rspec'
 gem 'rspec-rails'
 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,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.8.1)
+    assignable_values (0.9.0)
       activerecord
 
 GEM
@@ -37,12 +37,6 @@ GEM
     arel (3.0.2)
     builder (3.0.4)
     columnize (0.3.6)
-    debugger (1.6.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.1)
     erubis (2.7.0)
     hike (1.2.1)
@@ -127,7 +121,6 @@ PLATFORMS
 
 DEPENDENCIES
   assignable_values!
-  debugger
   rails (~> 3.2)
   rspec
   rspec-rails

data/spec/shared/app_root/app/models/song.rb

@@ -2,4 +2,6 @@ class Song < ActiveRecord::Base
 
   belongs_to :artist
 
+  attr_accessor :sub_genre
+
 end

data/spec/shared/app_root/config/locales/en.yml

@@ -12,6 +12,9 @@ en:
       genre:
         pop: 'Pop music'
         rock: 'Rock music'
+      sub_genre:
+        pop: 'Pop music'
+        rock: 'Rock music'
       year:
         '1977': 'The year a new hope was born'
         '1980': 'The year the Empire stroke back'

data/spec/shared/assignable_values/active_record_spec.rb

@@ -13,6 +13,32 @@ describe AssignableValues::ActiveRecord do
       end.to raise_error(AssignableValues::NoValuesGiven)
     end
 
+    context 'when validation virtual attributes' do
+
+      before :each do
+        @klass = Song.disposable_copy do
+          assignable_values_for :sub_genre do
+            %w[pop rock]
+          end
+        end
+      end
+
+      it 'should validate that the attribute is allowed' do
+        @klass.new(:sub_genre => 'pop').should be_valid
+        @klass.new(:sub_genre => 'disallowed value').should_not be_valid
+      end
+
+      it 'should not allow nil for the attribute value' do
+        @klass.new(:sub_genre => nil).should_not be_valid
+      end
+
+      it 'should generate a method returning the humanized value' do
+        song = @klass.new(:sub_genre => 'pop')
+        song.humanized_sub_genre.should == 'Pop music'
+      end
+
+    end
+
     context 'when validating scalar attributes' do
 
       context 'without options' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assignable_values
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-03 00:00:00 +01:00
+date: 2014-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .ruby-version
 - .travis.yml
 - LICENSE
 - README.md
@@ -218,5 +219,72 @@ rubygems_version: 1.3.9.5
 signing_key: 
 specification_version: 3
 summary: Restrict the values assignable to ActiveRecord attributes or associations. Or enums on steroids.
-test_files: []
-
+test_files: 
+- spec/rails-2.3/Gemfile
+- spec/rails-2.3/Gemfile.lock
+- spec/rails-2.3/Rakefile
+- spec/rails-2.3/app_root/config/boot.rb
+- spec/rails-2.3/app_root/config/database.yml
+- spec/rails-2.3/app_root/config/environment.rb
+- spec/rails-2.3/app_root/config/environments/test.rb
+- spec/rails-2.3/app_root/config/preinitializer.rb
+- spec/rails-2.3/app_root/config/routes.rb
+- spec/rails-2.3/app_root/lib/console_with_fixtures.rb
+- spec/rails-2.3/app_root/log/.gitignore
+- 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/spec_helper.rb
+- 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/.rspec
+- spec/rails-3.2/Gemfile
+- spec/rails-3.2/Gemfile.lock
+- spec/rails-3.2/Rakefile
+- spec/rails-3.2/app_root/.gitignore
+- spec/rails-3.2/app_root/config/application.rb
+- spec/rails-3.2/app_root/config/boot.rb
+- spec/rails-3.2/app_root/config/database.yml
+- spec/rails-3.2/app_root/config/environment.rb
+- spec/rails-3.2/app_root/config/environments/test.rb
+- spec/rails-3.2/app_root/config/initializers/backtrace_silencers.rb
+- spec/rails-3.2/app_root/config/initializers/inflections.rb
+- spec/rails-3.2/app_root/config/initializers/mime_types.rb
+- spec/rails-3.2/app_root/config/initializers/secret_token.rb
+- spec/rails-3.2/app_root/config/initializers/session_store.rb
+- spec/rails-3.2/app_root/config/routes.rb
+- spec/rails-3.2/app_root/lib/tasks/.gitkeep
+- 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/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
+- spec/shared/app_root/config/locales/en.yml
+- spec/shared/app_root/db/migrate/001_create_artists.rb
+- spec/shared/app_root/db/migrate/002_create_songs.rb
+- 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