enumerate_it 0.7.7 → 0.7.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enumerate_it (0.7.6)
+    enumerate_it (0.7.7)
       activesupport (>= 2.3.2)
 
 GEM

data/lib/enumerate_it.rb

@@ -127,14 +127,14 @@
 #  p.divorced? #=> false
 #
 # - If you pass the :create_scopes option as 'true', it will create a scope method for each enumeration option (this option defaults to false):
-# 
+#
 #   class Person < ActiveRecord::Base
 #     has_enumeration_for :relationship_status, :with => RelationshipStatus, :create_scopes => true
 #   end
-# 
+#
 #   Person.married.to_sql # => SELECT "people".* FROM "people" WHERE "people"."relationship_status" = 1
-# 
-# NOTE: The :create_scopes option can only be used for Rails.version >= 3.0.0. 
+#
+# NOTE: The :create_scopes option can only be used for Rails.version >= 3.0.0.
 #
 # - If your class can manage validations and responds to :validates_inclusion_of, it will create this
 # validation:
@@ -309,7 +309,11 @@ module EnumerateIt
 
     def set_validations(attribute, options)
       validates_inclusion_of(attribute, :in => options[:with].list, :allow_blank => true) if self.respond_to?(:validates_inclusion_of)
-      validates_presence_of(attribute) if options[:required] and self.respond_to?(:validates_presence_of)
+
+      if options[:required] && respond_to?(:validates_presence_of)
+        opts = options[:required].is_a?(Hash) ? options[:required] : {}
+        validates_presence_of(attribute, opts)
+      end
     end
   end
 

data/lib/version.rb

@@ -1,4 +1,4 @@
 module EnumerateIt
-  VERSION = "0.7.7"
+  VERSION = "0.7.8"
 end
 

data/spec/enumerate_it_spec.rb

@@ -173,7 +173,7 @@ describe EnumerateIt do
         end
       end
 
-      it "when called, the scopes create the correct query" do          
+      it "when called, the scopes create the correct query" do
         TestEnumeration.enumeration do |symbol, pair|
           TestClass.should_receive(:where).with(:foobar => pair.firs)
           TestClass.send symbol
@@ -279,6 +279,13 @@ describe EnumerateIt::Base do
         end
       end
 
+      it "passes the given options to the validation method" do
+        ActiveRecordStub.should_receive(:validates_presence_of).with(:bla, :if => :some_method)
+        class ActiveRecordStub
+          has_enumeration_for :bla, :with => TestEnumeration, :required => { :if => :some_method }
+        end
+      end
+
       it "do not require the attribute by default" do
         ActiveRecordStub.should_not_receive(:validates_presence_of)
         class ActiveRecordStub

metadata

@@ -2,7 +2,7 @@
 name: enumerate_it
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors: 
 - "C\xC3\xA1ssio Marques"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -03:00
+date: 2011-05-10 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency