assignable_values 0.12.1 → 0.13.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 862c6116c78266cdb897dccb736eb3a8f52c1059
+  data.tar.gz: b7824b4245a5a1bd369ff4ed1e30bcacb64d47f9
+SHA512:
+  metadata.gz: a6107dd6fb457c1a7d862086858d5d32b91432102738695f258f646f851143e7d4111c9dfa424de0ada4cc4689443e488555ad7ab6d76a777118e9328513b07f
+  data.tar.gz: 573fb9aae2cfa6331328f7953c02e5ed8deae65e8633c50c9af05295da428df0a9fb24025491056c4ee17cdd15e938617cf5cd4b7d1cbe824fb629a31668c8dd

data/.travis.yml

@@ -36,6 +36,7 @@ notifications:
 
 before_script:
   - mysql -e 'create database IF NOT EXISTS assignable_values_test;'
+  - mysql -e "GRANT ALL PRIVILEGES ON assignable_values_test.* TO 'travis'@'%';"
 
 install:
   # Old Travis CI bundler explodes when lockfile version doesn't match recently bumped version

data/Gemfile

@@ -0,0 +1 @@
+./gemfiles/Gemfile.4.2

data/Gemfile.lock

@@ -0,0 +1 @@
+./gemfiles/Gemfile.4.2.lock

data/README.md

@@ -73,16 +73,6 @@ A good way to populate a `<select>` tag with pairs of internal values and human
 
     form.collection_select :genre, form.object.humanized_genres, :value, :humanized
 
-If you don't like to use your I18n dictionary for humanizations, you can also declare them directly in your model like this:
-
-    class Song < ActiveRecord::Base
-      assignable_values_for :genre do
-        { 'pop' => 'Pop music',
-          'rock' => 'Rock music',
-          'electronic' => 'Electronic music' }
-      end
-    end
-
 
 ### Defining default values
 

data/gemfiles/Gemfile.2.3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    assignable_values (0.12.1)
+    assignable_values (0.13.0)
       activerecord (>= 2.3)
 
 GEM
@@ -37,4 +37,4 @@ DEPENDENCIES
   rspec_candy
 
 BUNDLED WITH
-   1.12.5
+   1.15.4

data/gemfiles/Gemfile.3.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    assignable_values (0.12.1)
+    assignable_values (0.13.0)
       activerecord (>= 2.3)
 
 GEM
@@ -62,4 +62,4 @@ DEPENDENCIES
   rspec_candy
 
 BUNDLED WITH
-   1.12.5
+   1.15.4

data/gemfiles/Gemfile.4.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    assignable_values (0.12.1)
+    assignable_values (0.13.0)
       activerecord (>= 2.3)
 
 GEM
@@ -67,4 +67,4 @@ DEPENDENCIES
   rspec_candy
 
 BUNDLED WITH
-   1.12.5
+   1.15.4

data/gemfiles/Gemfile.5.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    assignable_values (0.12.1)
+    assignable_values (0.13.0)
       activerecord (>= 2.3)
 
 GEM
@@ -64,4 +64,4 @@ DEPENDENCIES
   rspec_candy
 
 BUNDLED WITH
-   1.12.5
+   1.15.4

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

@@ -49,8 +49,7 @@ module AssignableValues
 
         def assignable_values(record, options = {})
           assignable_values = []
-          parsed_values = parsed_assignable_values(record)
-          current_values = parsed_values.delete(:values)
+          current_values = assignable_values_from_record_or_delegate(record)
 
           if options.fetch(:include_old_value, true) && has_previously_saved_value?(record)
             old_value = previously_saved_value(record)
@@ -60,9 +59,6 @@ module AssignableValues
           end
 
           assignable_values += current_values
-          parsed_values.each do |meta_name, meta_content|
-            assignable_values.singleton_class.send(:define_method, meta_name) { meta_content }
-          end
           if options[:decorate]
             assignable_values = decorate_values(assignable_values)
           end
@@ -97,10 +93,6 @@ module AssignableValues
           end
         end
 
-        def parse_values(values)
-          { :values => Array(values) }
-        end
-
         def current_value(record)
           record.send(property)
         end
@@ -202,13 +194,12 @@ module AssignableValues
           end
         end
 
-        def parsed_assignable_values(record)
+        def assignable_values_from_record_or_delegate(record)
           if delegate?
-            values = assignable_values_from_delegate(record)
+            assignable_values_from_delegate(record).to_a
           else
-            values = record.instance_exec(&@values)
+            record.instance_exec(&@values).to_a
           end
-          parse_values(values)
         end
 
         def delegate(record)

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

@@ -10,21 +10,17 @@ module AssignableValues
           define_humanized_values_instance_method
         end
 
-        def humanized_value(values, value) # we take the values because that contains the humanizations in case humanizations are hard-coded as a hash
+        def humanized_value(value)
           if value.present?
-            if values && values.respond_to?(:humanizations)
-              values.humanizations[value]
-            else
-              dictionary_scope = "assignable_values.#{model.name.underscore}.#{property}"
-              I18n.t(value, :scope => dictionary_scope, :default => default_humanization_for_value(value))
-            end
+            dictionary_scope = "assignable_values.#{model.name.underscore}.#{property}"
+            I18n.t(value, :scope => dictionary_scope, :default => default_humanization_for_value(value))
           end
         end
 
         def humanized_values(record)
           values = assignable_values(record)
           values.collect do |value|
-            HumanizedValue.new(value, humanized_value(values, value))
+            HumanizedValue.new(value, humanized_value(value))
           end
         end
 
@@ -38,20 +34,11 @@ module AssignableValues
           end
         end
 
-        def parse_values(values)
-          if values.is_a?(Hash)
-            { :values => values.keys,
-              :humanizations => values }
-          else
-            super
-          end
-        end
-
         def define_humanized_value_class_method
           restriction = self
           enhance_model_singleton do
             define_method :"humanized_#{restriction.property}" do |given_value|
-              restriction.humanized_value(nil, given_value)
+              restriction.humanized_value(given_value)
             end
           end
         end
@@ -60,10 +47,9 @@ module AssignableValues
           restriction = self
           enhance_model do
             define_method :"humanized_#{restriction.property}" do |*args|
-              values = restriction.assignable_values(self)
               given_value = args[0]
               value = given_value || send(restriction.property)
-              restriction.humanized_value(values, value)
+              restriction.humanized_value(value)
             end
           end
         end
@@ -81,7 +67,7 @@ module AssignableValues
           restriction = self
           values.collect do |value|
             if value.is_a?(String)
-              humanization = restriction.humanized_value(values, value)
+              humanization = restriction.humanized_value(value)
               value = HumanizableString.new(value, humanization)
             end
             value

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.12.1'
+  VERSION = '0.13.0'
 end

data/spec/assignable_values/active_record_spec.rb

@@ -373,14 +373,20 @@ describe AssignableValues::ActiveRecord do
         klass.new.assignable_years.should == [1977, 1980, 1983]
       end
 
-      it 'should skip the validation if that method returns nil' do
-        klass = Song.disposable_copy do
-          assignable_values_for :genre, :through => :delegate
-          def delegate
-            nil
+      context 'when the delegation method returns nil' do
+        let(:klass) do
+          Song.disposable_copy do
+            assignable_values_for :genre, :through => proc { nil }
           end
         end
-        klass.new(:genre => 'pop').should be_valid
+
+        it 'should skip the validation' do
+          klass.new(:genre => 'pop').should be_valid
+        end
+
+        it 'should still be able to humanize values on the instance' do
+          klass.new(:genre => 'pop').humanized_genre.should == 'Pop music'
+        end
       end
 
     end
@@ -652,30 +658,6 @@ describe AssignableValues::ActiveRecord do
           years.collect(&:humanized).should == ['The year a new hope was born', 'The year the Empire stroke back', 'The year the Jedi returned']
         end
 
-        context 'hardcoded humanizations' do
-
-          it 'should allow to directly declare humanized values by passing a hash to assignable_values_for' do
-            klass = Song.disposable_copy do
-              assignable_values_for :genre do
-                { 'pop' => 'Pop music', 'rock' => 'Rock music' }
-              end
-            end
-            klass.new.humanized_genres.collect(&:humanized).sort.should =~ ['Pop music', 'Rock music']
-          end
-
-          it "should correctly humanize values if the humanizations were declared using a hash, the values are not strings, and the list of humanized values hasn't been called before (bugfix)" do
-            klass = Song.disposable_copy do
-              assignable_values_for :duration do
-                { 60 => '1:00',
-                  90 => '1:30' }
-              end
-            end
-            klass.new(:duration => 60).humanized_duration.should == '1:00'
-            klass.new(:duration => 90).humanized_duration.should == '1:30'
-          end
-
-        end
-
         it 'should properly look up humanizations for namespaced models' do
           klass = Recording::Vinyl.disposable_copy do
             assignable_values_for :year do

metadata

@@ -1,50 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: assignable_values
-version: !ruby/object:Gem::Version 
-  hash: 45
-  prerelease: 
-  segments: 
-  - 0
-  - 12
-  - 1
-  version: 0.12.1
+version: !ruby/object:Gem::Version
+  version: 0.13.0
 platform: ruby
-authors: 
+authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-11-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2017-09-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: Restrict the values assignable to ActiveRecord attributes or associations
 email: henning.koch@makandra.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -77,39 +66,30 @@ files:
 - spec/support/i18n.yml
 - spec/support/models.rb
 homepage: https://github.com/makandra/assignable_values
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.6.13
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Restrict the values assignable to ActiveRecord attributes or associations
-test_files: 
+test_files:
 - spec/assignable_values/active_record_spec.rb
 - spec/assignable_values/humanized_value_spec.rb
 - spec/spec_helper.rb
@@ -118,4 +98,3 @@ test_files:
 - spec/support/database.travis.yml
 - spec/support/i18n.yml
 - spec/support/models.rb
-has_rdoc: 

data/Gemfile

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

data/Gemfile.lock

@@ -1,70 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    assignable_values (0.12.1)
-      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