assignable_values 0.1.0 → 0.1.1

data/README.md

@@ -48,7 +48,7 @@ This is useful for populating <select> tags in web forms:
 
     form.select :genre, form.object.assignable_genres
 
-### Human labels
+### Humanized labels
 
 You will often want to present internal values in a humanized form. E.g. `"pop"` should be presented as `"Pop music"`.
 
@@ -64,12 +64,12 @@ You can define human labels in your I18n dictionary:
             
 When obtaining a list of assignable values, each value will have a method `#human` that returns the translation:
 
-    song.assignable_genres.first       # => 'pop'
-    song.assignable_genres.first.human # => 'Pop music'
+    song.assignable_genres.first           # => 'pop'
+    song.assignable_genres.first.humanized # => 'Pop music'
 
 You can populate a <select> tag with pairs of internal values and human labels like this:
 
-    form.collection_select :genre, form.object.assignable_genres, :to_s, :human
+    form.collection_select :genre, form.object.assignable_genres, :to_s, :humanized
 
 ## Restricting belongs_to associations
 

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

@@ -46,10 +46,6 @@ module AssignableValues
           true
         end
 
-        def humanize_string_value(value)
-          I18n.t("assignable_values.#{model.name.underscore}.#{property}.#{value}", :default => value.humanize)
-        end
-
         private
 
         def current_value(record)

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

@@ -3,14 +3,36 @@ module AssignableValues
     module Restriction
       class ScalarAttribute < Base
 
+        def initialize(*args)
+          super
+          define_humanized_method
+        end
+
+        def humanize_string_value(value)
+          if value.present?
+            dictionary_key = "assignable_values.#{model.name.underscore}.#{property}.#{value}"
+            I18n.t(dictionary_key, :default => value.humanize)
+          end
+        end
+
         private
 
+        def define_humanized_method
+          restriction = self
+          enhance_model do
+            define_method "humanized_#{restriction.property}" do
+              value = send(restriction.property)
+              restriction.humanize_string_value(value)
+            end
+          end
+        end
+
         def decorate_values(values)
           restriction = self
           values.collect do |value|
             if value.is_a?(String)
               value = value.dup
-              value.singleton_class.send(:define_method, :human) do
+              value.singleton_class.send(:define_method, :humanized) do
                 restriction.humanize_string_value(value)
               end
             end
@@ -22,6 +44,7 @@ module AssignableValues
           record.send("#{property}_was")
         end
 
+
       end
     end
   end

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/assignable_values/active_record_spec.rb

@@ -57,6 +57,19 @@ describe AssignableValues::ActiveRecord do
           song.should be_valid
         end
 
+        it 'should generate a method returning the humanized value' do
+          song = @klass.new(:genre => 'pop')
+          song.humanized_genre.should == 'Pop music'
+        end
+
+        it 'should generate a method returning the humanized value, which is nil when the value is blank' do
+          song = @klass.new
+          song.genre = nil
+          song.humanized_genre.should be_nil
+          song.genre = ''
+          song.humanized_genre.should be_nil
+        end
+
       end
 
       context 'if the :allow_blank option is set' do
@@ -253,13 +266,13 @@ describe AssignableValues::ActiveRecord do
         @klass.new.assignable_genres.should == %w[pop rock]
       end
 
-      it "should define a method #human on strings in that list, which return up the value's' translation" do
+      it "should define a method #humanized on strings in that list, which return up the value's' translation" do
         @klass = disposable_song_class do
           assignable_values_for :genre do
             %w[pop rock]
           end
         end
-        @klass.new.assignable_genres.collect(&:human).should == ['Pop music', 'Rock music']
+        @klass.new.assignable_genres.collect(&:humanized).should == ['Pop music', 'Rock music']
       end
 
       it 'should use String#humanize as a default translation' do
@@ -268,10 +281,10 @@ describe AssignableValues::ActiveRecord do
             %w[electronic]
           end
         end
-        @klass.new.assignable_genres.collect(&:human).should == ['Electronic']
+        @klass.new.assignable_genres.collect(&:humanized).should == ['Electronic']
       end
 
-      it 'should not define a method #human on values that are not strings' do
+      it 'should not define a method #humanized on values that are not strings' do
         @klass = disposable_song_class do
           assignable_values_for :year do
             [1999, 2000, 2001]
@@ -279,7 +292,7 @@ describe AssignableValues::ActiveRecord do
         end
         years = @klass.new.assignable_years
         years.should == [1999, 2000, 2001]
-        years.first.should_not respond_to(:human)
+        years.first.should_not respond_to(:humanized)
       end
 
       it 'should call #to_a on the list of assignable values, allowing ranges and scopes to be passed as allowed value descriptors' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assignable_values
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Henning Koch