assignable_values 0.11.3 → 0.12.0

data/gemfiles/Gemfile.4.2.lock

@@ -0,0 +1,70 @@
+PATH
+  remote: ..
+  specs:
+    assignable_values (0.11.3)
+      activerecord (>= 2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      arel (~> 6.0)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    builder (3.2.2)
+    database_cleaner (1.5.3)
+    diff-lcs (1.2.5)
+    gemika (0.3.2)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.9.1)
+    mysql2 (0.3.20)
+    rake (10.3.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rspec_candy (0.3.1)
+      rspec
+      sneaky-save
+    sneaky-save (0.0.5)
+      activerecord (>= 3.2.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.2.0)
+  assignable_values!
+  database_cleaner
+  gemika
+  i18n (~> 0.7.0)
+  mysql2 (~> 0.3.17)
+  rake
+  rspec (~> 3.4)
+  rspec_candy
+
+BUNDLED WITH
+   1.12.5

data/gemfiles/Gemfile.5.0

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'activerecord', '~>5.0.0'
+gem 'i18n'
+gem 'mysql2'
+
+# Development dependencies
+gem 'rake'
+gem 'database_cleaner'
+gem 'rspec'
+gem 'rspec_candy'
+gem 'gemika'
+
+# Gem under test
+gem 'assignable_values', :path => '..'

data/gemfiles/Gemfile.5.0.lock

@@ -0,0 +1,67 @@
+PATH
+  remote: ..
+  specs:
+    assignable_values (0.11.3)
+      activerecord (>= 2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.4)
+    concurrent-ruby (1.0.2)
+    database_cleaner (1.5.3)
+    diff-lcs (1.2.5)
+    gemika (0.3.2)
+    i18n (0.7.0)
+    minitest (5.9.1)
+    mysql2 (0.4.5)
+    rake (11.3.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rspec_candy (0.4.1)
+      rspec
+      sneaky-save
+    sneaky-save (0.1.2)
+      activerecord (>= 3.2.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.0.0)
+  assignable_values!
+  database_cleaner
+  gemika
+  i18n
+  mysql2
+  rake
+  rspec
+  rspec_candy
+
+BUNDLED WITH
+   1.12.5

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

@@ -152,7 +152,7 @@ module AssignableValues
             ensure_after_initialize_callback_enabled
             restriction = self
             enhance_model do
-              set_default_method = "set_default_#{restriction.property}"
+              set_default_method = :"set_default_#{restriction.property}"
               define_method set_default_method do
                 restriction.set_default(self)
               end
@@ -164,7 +164,7 @@ module AssignableValues
         end
 
         def ensure_after_initialize_callback_enabled
-          if Rails.version < '3'
+          if Gemika::Env.gem?('activerecord', '<3')
             enhance_model do
               # Old ActiveRecord version only call after_initialize callbacks only if this method is defined in a class.
               unless method_defined?(:after_initialize)
@@ -177,7 +177,7 @@ module AssignableValues
         def setup_validation
           restriction = self
           enhance_model do
-            validate_method = "validate_#{restriction.property}_assignable"
+            validate_method = :"validate_#{restriction.property}_assignable"
             define_method validate_method do
               restriction.validate_record(self)
             end
@@ -188,7 +188,7 @@ module AssignableValues
         def define_assignable_values_method
           restriction = self
           enhance_model do
-            assignable_values_method = "assignable_#{restriction.property.to_s.pluralize}"
+            assignable_values_method = :"assignable_#{restriction.property.to_s.pluralize}"
             define_method assignable_values_method do |*args|
               # Ruby 1.8.7 does not support optional block arguments :(
               options = args.first || {}
@@ -223,7 +223,7 @@ module AssignableValues
         def assignable_values_from_delegate(record)
           delegate = delegate(record)
           delegate.present? or raise DelegateUnavailable, "Cannot query a nil delegate for assignable values"
-          delegate_query_method = "assignable_#{model.name.underscore.gsub('/', '_')}_#{property.to_s.pluralize}"
+          delegate_query_method = :"assignable_#{model.name.underscore.gsub('/', '_')}_#{property.to_s.pluralize}"
           args = delegate.method(delegate_query_method).arity == 1 ? [record] : []
           delegate.send(delegate_query_method, *args)
         end

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

@@ -49,7 +49,7 @@ module AssignableValues
         private
 
         def association_id_was_method
-          "#{association_id_method}_was"
+          :"#{association_id_method}_was"
         end
 
       end

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

@@ -50,7 +50,7 @@ module AssignableValues
         def define_humanized_value_class_method
           restriction = self
           enhance_model_singleton do
-            define_method "humanized_#{restriction.property}" do |given_value|
+            define_method :"humanized_#{restriction.property}" do |given_value|
               restriction.humanized_value(nil, given_value)
             end
           end
@@ -59,7 +59,7 @@ module AssignableValues
         def define_humanized_value_instance_method
           restriction = self
           enhance_model do
-            define_method "humanized_#{restriction.property}" do |*args|
+            define_method :"humanized_#{restriction.property}" do |*args|
               values = restriction.assignable_values(self)
               given_value = args[0]
               value = given_value || send(restriction.property)
@@ -71,7 +71,7 @@ module AssignableValues
         def define_humanized_values_instance_method
           restriction = self
           enhance_model do
-            define_method "humanized_#{restriction.property.to_s.pluralize}" do
+            define_method :"humanized_#{restriction.property.to_s.pluralize}" do
               restriction.humanized_values(self)
             end
           end
@@ -99,7 +99,7 @@ module AssignableValues
         private
 
         def value_was_method
-          "#{property}_was"
+          :"#{property}_was"
         end
 
       end

data/lib/assignable_values/version.rb

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

data/spec/{shared/assignable_values → assignable_values}/active_record_spec.rb

@@ -233,7 +233,9 @@ describe AssignableValues::ActiveRecord do
           end
         end
 
-        klass.new(:creator => Artist.new).should have(1).error_on(:artist_id)
+        song = klass.new(:creator => Artist.new)
+        song.valid?
+        song.errors[:artist_id].should be_present
       end
 
       it 'should allow a nil association if the :allow_blank option is set' do

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+$: << File.join(File.dirname(__FILE__), "/../../lib" )
+
+require 'i18n'
+require 'mysql2'
+require 'active_record'
+require 'assignable_values'
+require 'rspec_candy/all'
+require 'gemika'
+
+I18n.enforce_available_locales = true
+I18n.load_path = [File.join(File.dirname(__FILE__), 'support/i18n.yml')]
+I18n.default_locale = :en
+
+ActiveRecord::Base.default_timezone = :local
+
+Dir["#{File.dirname(__FILE__)}/support/*.rb"].sort.each {|f| require f}
+
+Gemika::RSpec.configure_clean_database_before_example
+Gemika::RSpec.configure_should_syntax

data/spec/support/database.rb

@@ -0,0 +1,16 @@
+Gemika::Database.new.rewrite_schema! do
+
+  create_table :artists
+
+  create_table :songs do |t|
+    t.integer :artist_id
+    t.string :genre
+    t.integer :year
+    t.integer :duration
+  end
+
+  create_table :vinyl_recordings do |t|
+    t.integer :year
+  end
+
+end

data/spec/support/database.sample.yml

@@ -0,0 +1,5 @@
+mysql:
+  database: assignable_values_test
+  host: localhost
+  username: root
+  password: secret

data/spec/support/database.travis.yml

@@ -0,0 +1,4 @@
+mysql:
+  database: assignable_values_test
+  username: travis
+  password:

data/spec/support/models.rb

@@ -0,0 +1,20 @@
+class Artist < ActiveRecord::Base
+
+  has_many :songs
+
+end
+
+
+class Song < ActiveRecord::Base
+
+  belongs_to :artist
+
+  attr_accessor :sub_genre
+
+end
+
+module Recording
+  class Vinyl < ActiveRecord::Base
+    self.table_name = 'vinyl_recordings'
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assignable_values
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 47
   prerelease: 
   segments: 
   - 0
-  - 11
-  - 3
-  version: 0.11.3
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -24,73 +24,15 @@ dependencies:
     none: false
     requirements: 
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
-        - 3
-        - 1
-        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: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
         - 2
-        - 8
-        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: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 8
-        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"
-  type: :development
-  version_requirements: *id005
-description: Restrict the values assignable to ActiveRecord attributes or associations. Or enums on steroids.
+        - 3
+        version: "2.3"
+  type: :runtime
+  version_requirements: *id001
+description: Restrict the values assignable to ActiveRecord attributes or associations
 email: henning.koch@makandra.de
 executables: []
 
@@ -103,10 +45,20 @@ files:
 - .rspec
 - .ruby-version
 - .travis.yml
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - assignable_values.gemspec
+- gemfiles/Gemfile.2.3
+- gemfiles/Gemfile.2.3.lock
+- gemfiles/Gemfile.3.2
+- gemfiles/Gemfile.3.2.lock
+- gemfiles/Gemfile.4.2
+- gemfiles/Gemfile.4.2.lock
+- gemfiles/Gemfile.5.0
+- gemfiles/Gemfile.5.0.lock
 - lib/assignable_values.rb
 - lib/assignable_values/active_record.rb
 - lib/assignable_values/active_record/restriction/base.rb
@@ -116,85 +68,14 @@ files:
 - lib/assignable_values/humanizable_string.rb
 - lib/assignable_values/humanized_value.rb
 - lib/assignable_values/version.rb
-- spec/rails-2.3/.bundle/config
-- 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.2/.bundle/config
-- 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/rails-4.1/.bundle/config
-- spec/rails-4.1/.rspec
-- spec/rails-4.1/.ruby-version
-- spec/rails-4.1/Gemfile
-- spec/rails-4.1/Gemfile.lock
-- spec/rails-4.1/Rakefile
-- spec/rails-4.1/app_root/.gitignore
-- spec/rails-4.1/app_root/bin/bundle
-- spec/rails-4.1/app_root/bin/rails
-- spec/rails-4.1/app_root/bin/rake
-- spec/rails-4.1/app_root/bin/spring
-- spec/rails-4.1/app_root/config/application.rb
-- spec/rails-4.1/app_root/config/boot.rb
-- spec/rails-4.1/app_root/config/database.yml
-- spec/rails-4.1/app_root/config/environment.rb
-- spec/rails-4.1/app_root/config/environments/development.rb
-- spec/rails-4.1/app_root/config/environments/production.rb
-- spec/rails-4.1/app_root/config/environments/test.rb
-- spec/rails-4.1/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-4.1/app_root/config/initializers/cookies_serializer.rb
-- spec/rails-4.1/app_root/config/initializers/filter_parameter_logging.rb
-- spec/rails-4.1/app_root/config/initializers/inflections.rb
-- spec/rails-4.1/app_root/config/initializers/mime_types.rb
-- spec/rails-4.1/app_root/config/initializers/session_store.rb
-- spec/rails-4.1/app_root/config/initializers/wrap_parameters.rb
-- spec/rails-4.1/app_root/config/routes.rb
-- spec/rails-4.1/app_root/config/secrets.yml
-- spec/rails-4.1/rcov.opts
-- spec/rails-4.1/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/database.yml
-- 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
+- spec/assignable_values/active_record_spec.rb
+- spec/assignable_values/humanized_value_spec.rb
+- spec/spec_helper.rb
+- spec/support/database.rb
+- spec/support/database.sample.yml
+- spec/support/database.travis.yml
+- spec/support/i18n.yml
+- spec/support/models.rb
 homepage: https://github.com/makandra/assignable_values
 licenses: 
 - MIT
@@ -227,85 +108,14 @@ rubyforge_project:
 rubygems_version: 1.8.29
 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
 test_files: 
-- spec/rails-2.3/.bundle/config
-- 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.2/.bundle/config
-- 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/rails-4.1/.bundle/config
-- spec/rails-4.1/.rspec
-- spec/rails-4.1/.ruby-version
-- spec/rails-4.1/Gemfile
-- spec/rails-4.1/Gemfile.lock
-- spec/rails-4.1/Rakefile
-- spec/rails-4.1/app_root/.gitignore
-- spec/rails-4.1/app_root/bin/bundle
-- spec/rails-4.1/app_root/bin/rails
-- spec/rails-4.1/app_root/bin/rake
-- spec/rails-4.1/app_root/bin/spring
-- spec/rails-4.1/app_root/config/application.rb
-- spec/rails-4.1/app_root/config/boot.rb
-- spec/rails-4.1/app_root/config/database.yml
-- spec/rails-4.1/app_root/config/environment.rb
-- spec/rails-4.1/app_root/config/environments/development.rb
-- spec/rails-4.1/app_root/config/environments/production.rb
-- spec/rails-4.1/app_root/config/environments/test.rb
-- spec/rails-4.1/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-4.1/app_root/config/initializers/cookies_serializer.rb
-- spec/rails-4.1/app_root/config/initializers/filter_parameter_logging.rb
-- spec/rails-4.1/app_root/config/initializers/inflections.rb
-- spec/rails-4.1/app_root/config/initializers/mime_types.rb
-- spec/rails-4.1/app_root/config/initializers/session_store.rb
-- spec/rails-4.1/app_root/config/initializers/wrap_parameters.rb
-- spec/rails-4.1/app_root/config/routes.rb
-- spec/rails-4.1/app_root/config/secrets.yml
-- spec/rails-4.1/rcov.opts
-- spec/rails-4.1/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/database.yml
-- 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
+- spec/assignable_values/active_record_spec.rb
+- spec/assignable_values/humanized_value_spec.rb
+- spec/spec_helper.rb
+- spec/support/database.rb
+- spec/support/database.sample.yml
+- spec/support/database.travis.yml
+- spec/support/i18n.yml
+- spec/support/models.rb
 has_rdoc: