[D-391] Fehler in assignable_values für nicht pluralisierbare Attribute

Issue: https://linear.app/makandra/issue/D-391/fehler-in-assignable-values-fur-nicht-pluralisierbare-attribute

Author: FLeinzi

lib/assignable_values.rb

@@ -7,4 +7,3 @@
 require 'assignable_values/active_record/restriction/scalar_attribute'
 require 'assignable_values/active_record/restriction/store_accessor_attribute'
 require 'assignable_values/humanized_value'
-require 'assignable_values/humanizable_string'

lib/assignable_values/active_record/restriction/base.rb

@@ -7,7 +7,6 @@ class Base
 
         SUPPORTED_OPTIONS = [
           :allow_blank,
-          :decorate,
           :default,
           :include_old_value,
           :message,
@@ -75,11 +74,6 @@ def assignable_values(record, options = {})
             end
           end
 
-          if options[:decorate]
-            current_values = decorate_values(current_values, record.class)
-            additional_assignable_values = decorate_values(additional_assignable_values, record.class)
-          end
-
           if additional_assignable_values.present?
             # will not keep current_values scoped
             additional_assignable_values | current_values
@@ -159,10 +153,6 @@ def previously_saved_value(record)
           raise NotImplementedError
         end
 
-        def decorate_values(values, _klass)
-          values
-        end
-
         def delegate?
           @options.has_key?(:through)
         end
@@ -242,7 +232,6 @@ def define_assignable_values_method
             define_method assignable_values_method do |*args|
               # Ruby 1.8.7 does not support optional block arguments :(
               options = args.first || {}
-              options.merge!({:decorate => true})
               restriction.assignable_values(self, options)
             end
           end

lib/assignable_values/active_record/restriction/scalar_attribute.rb

@@ -80,29 +80,10 @@ def define_humanized_value_instance_method
 
         def define_humanized_assignable_values_instance_method
           restriction = self
-          multiple = @options[:multiple]
           enhance_model do
             define_method :"humanized_assignable_#{restriction.property.to_s.pluralize}" do |*args|
               restriction.humanized_assignable_values(self, *args)
             end
-
-            unless multiple
-              define_method :"humanized_#{restriction.property.to_s.pluralize}" do
-                ActiveSupport::Deprecation.new.warn("humanized_<value>s is deprecated, use humanized_assignable_<value>s instead", caller)
-                restriction.humanized_assignable_values(self)
-              end
-            end
-          end
-        end
-
-        def decorate_values(values, klass)
-          restriction = self
-          values.collect do |value|
-            if value.is_a?(String)
-              humanization = restriction.humanized_value(klass, value)
-              value = HumanizableString.new(value, humanization)
-            end
-            value
           end
         end
 

lib/assignable_values/humanizable_string.rb

@@ -1269,58 +1269,6 @@ def genres
 
         end
 
-        context 'legacy methods for API compatibility' do
-
-          it 'should define a method that return pairs of values and their humanization' do
-            klass = Song.disposable_copy do
-              assignable_values_for :genre do
-                %w[pop rock]
-              end
-            end
-            deprecation_instance = instance_double(ActiveSupport::Deprecation)
-            allow(ActiveSupport::Deprecation).to receive(:new).and_return(deprecation_instance)
-            allow(deprecation_instance).to receive(:warn)
-
-            genres = klass.new.humanized_genres
-            genres.collect(&:humanized).should == ['Pop music', 'Rock music']
-
-            expect(deprecation_instance).to have_received(:warn).with(
-              "humanized_<value>s is deprecated, use humanized_assignable_<value>s instead",
-              instance_of(Array)
-            )
-          end
-
-          it "should define a method #humanized on assignable string values, which return up the value's' translation" do
-            klass = Song.disposable_copy do
-              assignable_values_for :genre do
-                %w[pop rock]
-              end
-            end
-            deprecation_instance = instance_double(ActiveSupport::Deprecation)
-            allow(ActiveSupport::Deprecation).to receive(:new).and_return(deprecation_instance)
-            allow(deprecation_instance).to receive(:warn)
-
-            klass.new.assignable_genres.collect(&:humanized).should == ['Pop music', 'Rock music']
-
-            expect(deprecation_instance).to have_received(:warn).with(
-              "assignable_<value>.humanized is deprecated, use humanized_assignable_<value>s.humanized instead",
-              instance_of(Array)
-            ).at_least(:once)
-          end
-
-          it 'should not define a method #humanized on values that are not strings' do
-            klass = Song.disposable_copy do
-              assignable_values_for :year do
-                [1999, 2000, 2001]
-              end
-            end
-            years = klass.new.assignable_years
-            years.should == [1999, 2000, 2001]
-            years.first.should_not respond_to(:humanized)
-          end
-
-        end
-
       end
 
       context 'with :through option' do