has_enum 0.7.3 → 0.8.0

data/lib/has_enum/class_methods.rb

@@ -15,7 +15,7 @@ module HasEnum::ClassMethods
 
   def has_enum(*params)
     options = params.extract_options!
-    options.assert_valid_keys(:query_methods, :scopes, :presence)
+    options.assert_valid_keys(:query_methods, :scopes, :presence, :multiple)
 
     raise ArgumentError, "Empty arguments list for has_enum call" if params.empty?
 
@@ -35,7 +35,12 @@ module HasEnum::ClassMethods
 
       enums[attribute] = values
 
-      validates attribute, :inclusion => { :in => values + [nil]}
+      if options[:multiple]
+        serialize attribute, Array
+      else
+        validates attribute, :inclusion => { :in => values + [nil]}
+      end
+
       validates attribute, :presence => options[:presence] if options[:presence]
 
       values.each do |val|
@@ -48,14 +53,33 @@ module HasEnum::ClassMethods
         end
       end if options[:query_methods] != false
 
-      define_method "human_#{attribute}" do
-        self.class.human_enums[attribute][self[attribute]]
+      if options[:multiple]
+        define_method "human_#{attribute}" do
+          return nil if self.send(attribute).empty?
+          self.send(attribute).map{|v| self.class.human_enums[attribute][v]}
+        end
+      else
+        define_method "human_#{attribute}" do
+          self.class.human_enums[attribute][self[attribute]]
+        end
+      end
+
+      if options[:multiple]
+        define_method "#{attribute}=" do | values |
+          self[attribute] = [*values].compact.delete_if{|v| v.blank?}
+        end
+      else
+        define_method "#{attribute}=" do | value |
+          value = value.to_s
+          value = nil if value == ''
+          self[attribute] = value
+        end
       end
 
-      define_method "#{attribute}=" do | value |
-        value = value.to_s
-        value = nil if value == ''
-        self[attribute] = value
+      if options[:multiple]
+       define_method attribute do
+         self[attribute] ||= []
+       end
       end
     end
   end

data/lib/has_enum/version.rb

@@ -1,3 +1,3 @@
 module HasEnum
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

data/spec/has_enum_spec.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe HasEnum do
   let :model do
-    TestModel.new(:category => :stuff, :status => :pending, :state => :done)
+    TestModel.new(:category => :stuff, :status => :pending, :state => :done, :speed => :slow)
   end
 
   let :human_enums do
@@ -34,6 +34,11 @@ describe HasEnum do
         :failed   => 'Failed',
         :done     => 'Done'
       },
+      :speed => {
+        :slow     => 'Медленный',
+        :normal   => 'Нормальный',
+        :fast     => 'Быстрый'
+      }
     }.with_indifferent_access
   end
 
@@ -195,4 +200,32 @@ describe HasEnum do
       model.should_not be_valid
     end
   end
+
+  describe "speed enum" do
+    it "should return empty array for nil speed" do
+      model.speed = nil
+      model.speed.should eql []
+      model.should_not be_valid
+    end
+
+    it "empty array is not valid value for speed" do
+      model.speed = []
+      model.should_not be_valid
+    end
+
+    it "should support multiple values for attribute" do
+      model.speed = [:normal, :fast]
+      model.should be_valid
+    end
+
+    it "should return nil for human_speed if speed not initialized" do
+      model.speed = []
+      model.human_speed.should be_nil
+    end
+
+    it "should return array of translated values for human_speed" do
+      model.speed = [:normal, :fast]
+      model.human_speed.should eql %w[Нормальный Быстрый]
+    end
+  end
 end

data/spec/ru.yml

@@ -4,6 +4,10 @@ ru:
       small: "Маленький"
       medium: "Средний"
       large: "Большой"
+    speed_enum:
+      slow:   Медленный
+      normal: Нормальный
+      fast:   Быстрый
 
   activerecord:
     attributes:

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string "size"
     t.string "status"
     t.string "state"
+    t.string "speed"
   end
 
   create_table "schema_info", :id => false, :force => true do |t|

data/spec/test_model.rb

@@ -8,5 +8,7 @@ class TestModel < ActiveRecord::Base
 
   has_enum ["status", :state],  [:pending, :failed, :done], :presence       => true
 
+  has_enum :speed,              %w[slow normal fast],       :multiple       => true, :presence => true
+
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 3
-  version: 0.7.3
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Andreas Korth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +07:00
+date: 2011-04-11 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency