assignable_values 0.7.2 → 0.8.0

data/README.md

@@ -1,4 +1,4 @@
-assignable_values - Enums on vitamins [![Build Status](https://secure.travis-ci.org/makandra/assignable_values.png?branch=master)](https://travis-ci.org/makandra/assignable_values)
+assignable_values - Enums on vitamins [![Build Status](https://secure.travis-ci.org/makandra/assignable_values.png?branch=master)](https://travis-ci.org/makandra/assignable_values) [![Code Climate](https://codeclimate.com/github/makandra/assignable_values.png)](https://codeclimate.com/github/makandra/assignable_values)
 =====================================
 
 `assignable_values` lets you restrict the values that can be assigned to attributes or associations of ActiveRecord models. You can think of it as enums where the list of allowed values is generated at runtime and the value is checked during validation.
@@ -56,9 +56,10 @@ You can access the humanized version for the current value like this:
     song = Song.new(:genre => 'pop')
     song.humanized_genre # => 'Pop music'
 
-Or you can retrieve the humanized version of any given value by passing it as an argument:
+Or you can retrieve the humanized version of any given value by passing it as an argument to either instance or class:
 
     song.humanized_genre('rock') # => 'Rock music'
+    Song.humanized_genre('rock') # => 'Rock music'
 
 You can obtain a list of all assignable values with their humanizations:
 

data/lib/assignable_values.rb

@@ -4,4 +4,5 @@ require 'assignable_values/active_record/restriction/base'
 require 'assignable_values/active_record/restriction/belongs_to_association'
 require 'assignable_values/active_record/restriction/scalar_attribute'
 require 'assignable_values/humanized_value'
+require 'assignable_values/humanizable_string'
 

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

@@ -127,6 +127,10 @@ module AssignableValues
           options[:through]
         end
 
+        def enhance_model_singleton(&block)
+          @model.singleton_class.class_eval(&block)
+        end
+
         def enhance_model(&block)
           @model.class_eval(&block)
         end

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

@@ -5,13 +5,14 @@ module AssignableValues
 
         def initialize(*args)
           super
-          define_humanized_value_method
-          define_humanized_values_method
+          define_humanized_value_instance_method
+          define_humanized_value_class_method
+          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
           if value.present?
-            if values.respond_to?(:humanizations)
+            if values && values.respond_to?(:humanizations)
               values.humanizations[value]
             else
               dictionary_scope = "assignable_values.#{model.name.underscore}.#{property}"
@@ -41,22 +42,21 @@ module AssignableValues
           if values.is_a?(Hash)
             { :values => values.keys,
               :humanizations => values }
-            #puts "----"
-            #puts "HAS HUMANIZATIONS"
-            #humanizations = values
-            #values = values.keys.dup
-            #values.singleton_class.send(:define_method, :humanizations) do
-            #  puts "----"
-            #  puts "HUMANIZATIONS used"
-            #  humanizations
-            #end
-            #values
           else
             super
           end
         end
 
-        def define_humanized_value_method
+        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)
+            end
+          end
+        end
+
+        def define_humanized_value_instance_method
           restriction = self
           enhance_model do
             define_method "humanized_#{restriction.property}" do |*args|
@@ -68,7 +68,7 @@ module AssignableValues
           end
         end
 
-        def define_humanized_values_method
+        def define_humanized_values_instance_method
           restriction = self
           enhance_model do
             define_method "humanized_#{restriction.property.to_s.pluralize}" do
@@ -81,10 +81,8 @@ module AssignableValues
           restriction = self
           values.collect do |value|
             if value.is_a?(String)
-              value = value.dup
-              value.singleton_class.send(:define_method, :humanized) do
-                restriction.humanized_value(values, value)
-              end
+              humanization = restriction.humanized_value(values, value)
+              value = HumanizableString.new(value, humanization)
             end
             value
           end

data/lib/assignable_values/humanizable_string.rb

@@ -0,0 +1,14 @@
+# A String that responds to #humanized.
+# Earlier versions of assignable_values dependent on such an API.
+class HumanizableString < String
+
+  def initialize(string, humanization)
+    super(string)
+    @humanization = humanization
+  end
+
+  def humanized
+    @humanization
+  end
+
+end

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 end

data/spec/rails-2.3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.7.1)
+    assignable_values (0.7.2)
       activerecord
 
 GEM
@@ -18,13 +18,12 @@ GEM
       activesupport (= 2.3.17)
     activesupport (2.3.17)
     columnize (0.3.6)
-    debugger (1.3.3)
+    debugger (1.6.1)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.2.0)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
     hoe (2.8.0)
       rake (>= 0.8.7)
     linecache (0.46)

data/spec/rails-3.0/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.7.1)
+    assignable_values (0.7.2)
       activerecord
 
 GEM
@@ -37,13 +37,12 @@ GEM
     arel (2.0.10)
     builder (2.1.2)
     columnize (0.3.6)
-    debugger (1.3.3)
+    debugger (1.6.1)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.2.0)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)

data/spec/rails-3.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.7.1)
+    assignable_values (0.7.2)
       activerecord
 
 GEM
@@ -37,13 +37,12 @@ GEM
     arel (3.0.2)
     builder (3.0.4)
     columnize (0.3.6)
-    debugger (1.3.3)
+    debugger (1.6.1)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.2.0)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.1)
     erubis (2.7.0)
     hike (1.2.1)

data/spec/shared/assignable_values/active_record_spec.rb

@@ -62,11 +62,15 @@ describe AssignableValues::ActiveRecord do
           song.humanized_genre.should be_nil
         end
 
-        it 'should generate a method to retrieve the humanization of any given value' do
+        it 'should generate an instance method to retrieve the humanization of any given value' do
           song = @klass.new(:genre => 'pop')
           song.humanized_genre('rock').should == 'Rock music'
         end
 
+        it 'should generate a class method to retrieve the humanization of any given value' do
+          @klass.humanized_genre('rock').should == 'Rock music'
+        end
+
       end
 
       context 'if the :allow_blank option is set to true' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assignable_values
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-26 00:00:00 +02:00
+date: 2013-11-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,7 @@ files:
 - lib/assignable_values/active_record/restriction/belongs_to_association.rb
 - lib/assignable_values/active_record/restriction/scalar_attribute.rb
 - lib/assignable_values/errors.rb
+- lib/assignable_values/humanizable_string.rb
 - lib/assignable_values/humanized_value.rb
 - lib/assignable_values/version.rb
 - spec/rails-2.3/Gemfile