assignable_values 0.16.6 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b8661c6374664b624b4fd0a3e54529ac3783fff619a7d846b9c2836e8839608
-  data.tar.gz: 2c72259b1eee2a767778975f95a6ac4f08ed02bbda8056426d7e7bca19e004da
+  metadata.gz: 8059afed1809ca7277b0db60d77f076f92746d3558bf06ed1713feb6961b053e
+  data.tar.gz: 11c933835b82953cc8576c99f23eebf6d686406be75a8566e27a067bb8dd0686
 SHA512:
-  metadata.gz: 774ebe2bd0bbee83b66ab01a4a8358068c86688a543fdaea24b8f54220b7b9533de93d163c8d263a35dd33e6cd5855f9eeb4132e9b83a1e2d71f6fbb5bb647ce
-  data.tar.gz: 1a7e51073af59fe8bcaf86537de1ba7d7c33fd116f5573c0a171915cc00ad975b16062d1e327caeee7f38afc21baee695dbd2a8e7cf09d573d0512f80201be65
+  metadata.gz: 6aa60676ebd5d1d21d6b64b0f1df342d3e1cafc540671d0321ed3f0d599b57a5b982d3a736d6b2922c263af5bb362da0e4ffecdb438ec5c547e755ecd36e6c4b
+  data.tar.gz: b67a535cb382ffe4f1996b919fc91440a97e758a839d87be98b6df50bffdb6bbf258b733fbceae5c888f05eecfe2327adc41690e101dc6e8a02c9220b4779386

data/CHANGELOG.md

@@ -12,11 +12,18 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 -
 
+## 0.17.0 - 2022-07-27
+
+### Compatible changes
+
+- Allow to override humanization for inherited assignable_values
+
 ## 0.16.6 - 2022-03-16
 
 ### Breaking changes
 
 - Remove no longer supported ruby versions (2.3.8, 2.4.2)
+- Activate rubygems MFA
 
 ### Compatible changes
 

data/Gemfile.5.0

@@ -10,7 +10,7 @@ gem 'rake'
 gem 'database_cleaner'
 gem 'rspec'
 gem 'rspec_candy'
-gem 'gemika', '>= 0.5.0'
+gem 'gemika'
 
 # Gem under test
 gem 'assignable_values', :path => '.'

data/Gemfile.5.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.5)
+    assignable_values (0.17.0)
       activerecord (>= 2.3)
 
 GEM
@@ -22,7 +22,7 @@ GEM
     concurrent-ruby (1.1.7)
     database_cleaner (1.8.5)
     diff-lcs (1.4.4)
-    gemika (0.5.0)
+    gemika (0.7.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     minitest (5.14.2)
@@ -57,7 +57,7 @@ DEPENDENCIES
   activerecord (~> 5.0.0)
   assignable_values!
   database_cleaner
-  gemika (>= 0.5.0)
+  gemika
   i18n
   mysql2
   rake

data/Gemfile.5.1

@@ -10,7 +10,7 @@ gem 'rake'
 gem 'database_cleaner'
 gem 'rspec'
 gem 'rspec_candy'
-gem 'gemika', '>= 0.5.0'
+gem 'gemika'
 
 # Gem under test
 gem 'assignable_values', :path => '.'

data/Gemfile.5.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.5)
+    assignable_values (0.17.0)
       activerecord (>= 2.3)
 
 GEM
@@ -22,7 +22,7 @@ GEM
     concurrent-ruby (1.1.7)
     database_cleaner (1.8.5)
     diff-lcs (1.4.4)
-    gemika (0.5.0)
+    gemika (0.7.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     minitest (5.14.2)
@@ -57,7 +57,7 @@ DEPENDENCIES
   activerecord (~> 5.1.0)
   assignable_values!
   database_cleaner
-  gemika (>= 0.5.0)
+  gemika
   i18n
   mysql2
   rake

data/Gemfile.5.1.pg

@@ -10,7 +10,7 @@ gem 'rake'
 gem 'database_cleaner'
 gem 'rspec'
 gem 'rspec_candy'
-gem 'gemika', '>= 0.5.0'
+gem 'gemika'
 
 # Gem under test
 gem 'assignable_values', :path => '.'

data/Gemfile.5.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.5)
+    assignable_values (0.17.0)
       activerecord (>= 2.3)
 
 GEM
@@ -22,7 +22,7 @@ GEM
     concurrent-ruby (1.0.5)
     database_cleaner (1.6.1)
     diff-lcs (1.3)
-    gemika (0.5.0)
+    gemika (0.7.1)
     i18n (0.9.0)
       concurrent-ruby (~> 1.0)
     minitest (5.10.3)
@@ -57,7 +57,7 @@ DEPENDENCIES
   activerecord (~> 5.1.0)
   assignable_values!
   database_cleaner
-  gemika (>= 0.5.0)
+  gemika
   i18n
   pg (< 1)
   rake

data/Gemfile.6.1.pg

@@ -10,7 +10,7 @@ gem 'rake'
 gem 'database_cleaner'
 gem 'rspec'
 gem 'rspec_candy'
-gem 'gemika', '>= 0.5.0'
+gem 'gemika'
 
 # Gem under test
 gem 'assignable_values', :path => '.'

data/Gemfile.6.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.5)
+    assignable_values (0.17.0)
       activerecord (>= 2.3)
 
 GEM
@@ -21,7 +21,7 @@ GEM
     concurrent-ruby (1.1.5)
     database_cleaner (1.7.0)
     diff-lcs (1.3)
-    gemika (0.5.0)
+    gemika (0.7.1)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     minitest (5.14.4)
@@ -56,7 +56,7 @@ DEPENDENCIES
   activerecord (~> 6.1.3)
   assignable_values!
   database_cleaner
-  gemika (>= 0.5.0)
+  gemika
   i18n
   pg (= 1.1)
   rake

data/Gemfile.7.0.pg

@@ -10,7 +10,7 @@ gem 'rake'
 gem 'database_cleaner'
 gem 'rspec'
 gem 'rspec_candy'
-gem 'gemika', '>= 0.5.0'
+gem 'gemika'
 
 # Gem under test
 gem 'assignable_values', :path => '.'

data/Gemfile.7.0.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.6)
+    assignable_values (0.17.0)
       activerecord (>= 2.3)
 
 GEM
@@ -20,7 +20,7 @@ GEM
     concurrent-ruby (1.1.5)
     database_cleaner (1.7.0)
     diff-lcs (1.3)
-    gemika (0.5.0)
+    gemika (0.7.1)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     minitest (5.15.0)
@@ -54,7 +54,7 @@ DEPENDENCIES
   activerecord (~> 7.0.0)
   assignable_values!
   database_cleaner
-  gemika (>= 0.5.0)
+  gemika
   i18n
   pg (= 1.1)
   rake

data/README.md

@@ -73,6 +73,24 @@ A good way to populate a `<select>` tag with pairs of internal values and human
 
     form.collection_select :genre, form.object.humanized_assignable_genres, :value, :humanized
 
+#### Humanized labels and inheritance
+
+For models that inherit assignable values you can override the humanized labels:
+
+    class FunnySong < Song
+      ...
+    end
+
+    en:
+      assignable_values:
+        funny_song:
+          genre:
+            pop: 'The stuff you hear on mainstream radio all day long'
+            rock: 'A lot of electric guitars and drums'
+            electronic: 'Whatever David Guetta does'
+
+If no humanization is provided for the child model (i.e. the `funny_song.genre` key) humanization will fall back to the
+parent model (`song`).
 
 ### Defining default values
 

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

@@ -63,8 +63,8 @@ module AssignableValues
           end
 
           if options[:decorate]
-            current_values = decorate_values(current_values)
-            additional_assignable_values = decorate_values(additional_assignable_values)
+            current_values = decorate_values(current_values, record.class)
+            additional_assignable_values = decorate_values(additional_assignable_values, record.class)
           end
 
           if additional_assignable_values.present?
@@ -146,7 +146,7 @@ module AssignableValues
           raise NotImplementedError
         end
 
-        def decorate_values(values)
+        def decorate_values(values, _klass)
           values
         end
 

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

@@ -10,22 +10,29 @@ module AssignableValues
           define_humanized_assignable_values_instance_method
         end
 
-        def humanized_value(value)
+        def humanized_value(klass, value)
           if value.present?
-            dictionary_scope = "assignable_values.#{model.name.underscore}.#{property}"
-            I18n.t(value, :scope => dictionary_scope, :default => default_humanization_for_value(value))
+            humanization_from_i18n(klass, value) || default_humanization_for_value(value)
           end
         end
 
         def humanized_assignable_values(record, options = {})
           values = assignable_values(record, options)
           values.collect do |value|
-            HumanizedValue.new(value, humanized_value(value))
+            HumanizedValue.new(value, humanized_value(record.class, value))
           end
         end
 
         private
 
+        def humanization_from_i18n(klass, value)
+          klass.lookup_ancestors.select(&:name).find do |klass|
+            dictionary_scope = :"assignable_values.#{klass.model_name.i18n_key}.#{property}"
+            translation = I18n.translate(value, scope: dictionary_scope, default: nil)
+            break translation unless translation.nil?
+          end
+        end
+
         def default_humanization_for_value(value)
           if value.is_a?(String)
             value.humanize
@@ -38,7 +45,7 @@ module AssignableValues
           restriction = self
           enhance_model_singleton do
             define_method :"humanized_#{restriction.property.to_s.singularize}" do |given_value|
-              restriction.humanized_value(given_value)
+              restriction.humanized_value(self, given_value)
             end
           end
         end
@@ -53,7 +60,7 @@ module AssignableValues
               end
               given_value = args[0]
               value = given_value || send(restriction.property)
-              restriction.humanized_value(value)
+              restriction.humanized_value(self.class, value)
             end
 
             if multiple
@@ -61,7 +68,7 @@ module AssignableValues
                 values = send(restriction.property)
                 if values.respond_to?(:map)
                   values.map do |value|
-                    restriction.humanized_value(value)
+                    restriction.humanized_value(self.class, value)
                   end
                 else
                   values
@@ -88,11 +95,11 @@ module AssignableValues
           end
         end
 
-        def decorate_values(values)
+        def decorate_values(values, klass)
           restriction = self
           values.collect do |value|
             if value.is_a?(String)
-              humanization = restriction.humanized_value(value)
+              humanization = restriction.humanized_value(klass, value)
               value = HumanizableString.new(value, humanization)
             end
             value
@@ -111,8 +118,6 @@ module AssignableValues
           value_was(record)
         end
 
-        private
-
         def value_was(record)
           if record.respond_to?(:attribute_in_database)
             record.attribute_in_database(:"#{property}") # Rails >= 5.1

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.16.6'
+  VERSION = '0.17.0'
 end

data/spec/assignable_values/active_record_spec.rb

@@ -1011,7 +1011,7 @@ describe AssignableValues::ActiveRecord do
           end
           years = klass.new.humanized_assignable_years
           years.collect(&:value).should == [1977, 1980, 1983]
-          years.collect(&:humanized).should == ['The year a new hope was born', 'The year the Empire stroke back', 'The year the Jedi returned']
+          years.collect(&:humanized).should == ['The year a new hope was born', 'The year the Empire struck back', 'The year the Jedi returned']
         end
 
         it 'should properly look up humanizations for namespaced models' do
@@ -1021,7 +1021,37 @@ describe AssignableValues::ActiveRecord do
             end
           end
           years = klass.new.humanized_assignable_years
-          years.collect(&:humanized).should == ['The year a new hope was born', 'The year the Empire stroke back', 'The year the Jedi returned']
+          years.collect(&:humanized).should == ['The year a new hope was born', 'The year the Empire struck back', 'The year the Jedi returned']
+        end
+
+        context 'when inheriting from a model with defined assignable_values' do
+
+          let(:base_class) do
+            Class.new(Song) do
+              assignable_values_for :year do
+                [1977, 1980, 1983]
+              end
+            end
+          end
+
+          it 'allows to override humanization for inherited values' do
+            Song::SeriousRepresentation = Class.new(base_class)
+
+            years = Song::SeriousRepresentation.new.humanized_assignable_years
+            years.collect(&:humanized).should == ['year 1977', 'year 1980', 'year 1983']
+          end
+
+          it 'looks up humanization in parent classes if the translation is not overridden' do
+            Song::Extension = Class.new(base_class)
+            Song::ExtendedExtension = Class.new(Song::Extension)
+
+            years_1 = Song::Extension.new.humanized_assignable_years
+            years_1.collect(&:humanized).should == ['The year a new hope was born', 'The year the Empire struck back', 'The year the Jedi returned']
+
+            years_2 = Song::ExtendedExtension.new.humanized_assignable_years
+            years_2.collect(&:humanized).should == ['The year a new hope was born', 'The year the Empire struck back', 'The year the Jedi returned']
+          end
+
         end
 
         context 'legacy methods for API compatibility' do

data/spec/support/i18n.yml

@@ -23,10 +23,15 @@ en:
         rock: 'Rock music'
       year:
         '1977': 'The year a new hope was born'
-        '1980': 'The year the Empire stroke back'
+        '1980': 'The year the Empire struck back'
         '1983': 'The year the Jedi returned'
+    song/serious_representation:
+      year:
+        '1977': 'year 1977'
+        '1980': 'year 1980'
+        '1983': 'year 1983'
     recording/vinyl:
       year:
         '1977': 'The year a new hope was born'
-        '1980': 'The year the Empire stroke back'
+        '1980': 'The year the Empire struck back'
         '1983': 'The year the Jedi returned'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assignable_values
 version: !ruby/object:Gem::Version
-  version: 0.16.6
+  version: 0.17.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord