flexible_date 0.1.1 → 0.2.0

data/README.rdoc

@@ -4,19 +4,49 @@ Make ActiveRecord understand any date format you want.
 
 == How to use
 
-Simply do, within your model:
+Within your model, you should do:
 
-    flexible_date :my_date_field, :format => "%d/%m/%Y"
+    flexible_date :my_date_field
 
-The format follows the same pattern used by strptime and strftime. This will
+
+And in config/locales/br.yml (or your native language):
+
+    br:
+      flexible_date:
+        configuration:
+          format: "%d/%m/%Y"
+        messages:
+          with_suffix:
+            invalid: "inválida."
+            empty: "não pode ser vazia."
+          without_suffix:
+            invalid: "inválida."
+            empty: "não pode ser vazia."
+
+
+Or, in a reduced form, when messages for with or without suffix are the same:
+
+    br:
+      flexible_date:
+        configuration:
+          format: "%d/%m/%Y"
+        messages:
+          invalid: "inválida."
+          empty: "não pode ser vazia."
+
+
+Date format follows the same pattern used by strptime and strftime. This will
 generate a my_date_field_flex "property" in which you can enter the date as
 string in the specified format and then the correct date will be stored in
 my_date_field.
 
-Talk is cheap, let's see the code:
+When an error occurs, the "with_suffix" messages are generated for the "flex"
+fields and "without_suffix" messages are generated for the regular ones.
+
+Talk is cheap, let's see the code (given any of the locale files above):
 
     class Event < ActiveRecord::Base
-      flexible_date :start_date, :end_date, :format => "%d/%m/%Y"
+      flexible_date :start_date, :end_date
     end
 
     event = Event.new
@@ -38,10 +68,10 @@ specified format:
 Suffix can be customized:
 
     class Event < ActiveRecord::Base
-      flexible_date :judgement_day, :format => '%d-%m-%Y', :suffix => 'yyz'
+      flexible_date :judgement_day, :suffix => 'yyz'
 
     event = Event.new
-    event.judgement_day_yyz = "28-02-2011"
+    event.judgement_day_yyz = "28/02/2011"
     event.judgement_day.should == Date.new(2011, 02, 28)
 
 

data/lib/flexible_date.rb

@@ -1,7 +1,7 @@
+# -*- encoding : utf-8 -*-
 module FlexibleDate
   def flexible_date(*params)
-    options, fields = params.pop, params
-    format = options[:format]
+    params.last.kind_of?(Hash) ? (options, fields = params.pop, params) : (options, fields = {}, params)
     suffix = options[:suffix] || "flex"
     fields.each do |field|
       unless methods.include?(:flexible_date_validations)
@@ -17,18 +17,41 @@ module FlexibleDate
       end
 
       define_method "#{field}_#{suffix}" do
+        format = I18n.t("flexible_date.configuration.format")
         date = self.send("#{field}")
         date.try(:strftime, format)
       end
 
       define_method "#{field}_#{suffix}=" do |value|
-        begin
-          self.send("#{field}=", Date.strptime(value, format))
-        rescue ArgumentError
-          self.send("#{field}=", nil)
-          @flexible_date_errors ||= {}
-          @flexible_date_errors["#{field}".to_sym] = 'invalid'
-          @flexible_date_errors["#{field}_#{suffix}".to_sym] = 'invalid'
+        try_t = lambda do |option1, option2|
+          begin
+            I18n.t option1, :raise => true
+          rescue I18n::MissingTranslationData
+            I18n.t option2
+          end
+        end
+
+        @flexible_date_errors ||= {}
+        if value.blank?
+          @flexible_date_errors["#{field}".to_sym] = try_t.call(
+            "flexible_date.messages.without_suffix.empty",
+            "flexible_date.messages.empty")
+          @flexible_date_errors["#{field}_#{suffix}".to_sym] = try_t.call(
+            "flexible_date.messages.with_suffix.empty",
+            "flexible_date.messages.empty")
+        else
+          begin
+            format = I18n.t("flexible_date.configuration.format")
+            self.send("#{field}=", Date.strptime(value, format))
+          rescue ArgumentError
+            self.send("#{field}=", nil)
+            @flexible_date_errors["#{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.messages.with_suffix.invalid",
+              "flexible_date.messages.invalid")
+          end
         end
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: flexible_date
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Rodrigo Manh\xC3\xA3es"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -03:00
+date: 2011-05-21 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   version_requirements: *id003
 description: Make ActiveRecord understand any date format you want.