assignable_values 0.8.0 → 0.8.1

data/Rakefile

@@ -8,7 +8,7 @@ task :default => 'all:spec'
 namespace :travis_ci do
 
   desc 'Things to do before Travis CI begins'
-  task :prepare => :slimgems do
+  task :prepare => [:disable_rubygems_bundler, :slimgems] do
   end
 
   desc 'Install slimgems'
@@ -16,6 +16,11 @@ namespace :travis_ci 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

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

@@ -10,7 +10,12 @@ module AssignableValues
         end
 
         def association_id_method
-          "#{property}_id"
+          association = model.reflect_on_association(property)
+          if association.respond_to?(:foreign_key)
+            association.foreign_key # Rails >= 3.1
+          else
+            association.primary_key_name # Rails 2 + 3.0
+          end
         end
 
         def error_property

data/lib/assignable_values/version.rb

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

data/spec/rails-2.3/Gemfile.lock

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

data/spec/rails-3.0/Gemfile.lock

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

data/spec/rails-3.2/Gemfile.lock

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

data/spec/shared/assignable_values/active_record_spec.rb

@@ -186,6 +186,18 @@ describe AssignableValues::ActiveRecord do
         error.should == I18n.t('errors.messages.inclusion')
       end
 
+      it 'uses the defined foreign key of the association' do
+        klass = Song.disposable_copy do
+          belongs_to :creator, :foreign_key => 'artist_id', :class_name => 'Artist'
+
+          assignable_values_for :creator do
+            []
+          end
+        end
+
+        klass.new(:creator => Artist.new).should have(1).error_on(:artist_id)
+      end
+
       it 'should allow a nil association if the :allow_blank option is set' do
         klass = Song.disposable_copy do
           assignable_values_for :artist, :allow_blank => true do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assignable_values
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-27 00:00:00 +01:00
+date: 2013-12-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency