flexible_date 0.4.1 → 0.4.2

data/lib/flexible_date.rb

@@ -6,25 +6,27 @@ module FlexibleDate
     condition = options[:if]
 
     fields.each do |field|
+      normalized_field = normalize(field, suffix)
+
       unless methods.include?(:flexible_date_validations)
         validate :flexible_date_validations
 
         define_method :flexible_date_validations do
           if @flexible_date_errors
-            @flexible_date_errors.each do |field, message|
-              errors.add(field, message)
+            @flexible_date_errors.each do |f, message|
+              errors.add(f, message)
             end
           end
         end
       end
 
-      define_method "#{field}_#{suffix}" do
+      define_method "#{normalized_field}_#{suffix}" do
         format = I18n.t("flexible_date.configuration.format")
-        date = self.send("#{field}")
+        date = self.send("#{normalized_field}")
         date.try(:strftime, format)
       end
 
-      define_method "#{field}_#{suffix}=" do |value|
+      define_method "#{normalized_field}_#{suffix}=" do |value|
         try_t = lambda do |option1, option2|
           begin
             I18n.t option1, :raise => true
@@ -35,22 +37,22 @@ module FlexibleDate
 
         @flexible_date_errors ||= {}
         if condition and not condition.call(self)
-          @flexible_date_errors["#{field}".to_sym] = try_t.call(
+          @flexible_date_errors["#{normalized_field}".to_sym] = try_t.call(
             "flexible_date.messages.without_suffix.invalid",
             "flexible_date.messages.invalid")
-          @flexible_date_errors["#{field}_#{suffix}".to_sym] = try_t.call(
+          @flexible_date_errors["#{normalized_field}_#{suffix}".to_sym] = try_t.call(
             "flexible_date.messages.with_suffix.invalid",
             "flexible_date.messages.invalid")
         else
           begin
             format = I18n.t("flexible_date.configuration.format")
-            self.send("#{field}=", value.blank? ? "" : Date.strptime(value, format))
+            self.send("#{normalized_field}=", value.blank? ? "" : Date.strptime(value, format))
           rescue ArgumentError
-            self.send("#{field}=", nil)
-            @flexible_date_errors["#{field}".to_sym] = try_t.call(
+            self.send("#{normalized_field}=", nil)
+            @flexible_date_errors["#{normalized_field}".to_sym] = try_t.call(
               "flexible_date.messages.without_suffix.invalid",
               "flexible_date.messages.invalid")
-            @flexible_date_errors["#{field}_#{suffix}".to_sym] = try_t.call(
+            @flexible_date_errors["#{normalized_field}_#{suffix}".to_sym] = try_t.call(
               "flexible_date.messages.with_suffix.invalid",
               "flexible_date.messages.invalid")
           end
@@ -58,6 +60,11 @@ module FlexibleDate
       end
     end
   end
+
+  private
+  def normalize field, suffix
+    field.to_s.split(suffix)[0].to_sym
+  end
 end
 
 ActiveRecord::Base.extend(FlexibleDate)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexible_date
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &20975320 !ruby/object:Gem::Requirement
+  requirement: &11283900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *20975320
+  version_requirements: *11283900
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &20974600 !ruby/object:Gem::Requirement
+  requirement: &11283260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *20974600
+  version_requirements: *11283260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20973740 !ruby/object:Gem::Requirement
+  requirement: &11282640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *20973740
+  version_requirements: *11282640
 description: Make ActiveRecord understand any date format you want.
 email: rmanhaes@gmail.com
 executables: []
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Make possible enter date fields in any format into your ActiveRecord models