multiparameter_date_time 0.0.1 → 0.0.2

data/README.md

@@ -52,6 +52,21 @@ record.publish_at_date_part #=> nil
 record.publish_at_time_part #=> "09:30 am"
 ````
 
+### Configuring the date and time formats
+In config/initializers/multiparameter\_date\_time.rb:
+
+````ruby
+MultiparameterDateTime.date_format = "%-m/%-d/%Y"
+MultiparameterDateTime.time_format = "%-I:%M %P"
+````
+
+### Validating the multipart date time data
+
+````ruby
+validates :published_at, presence: true, is_valid_multiparameter_date_time: true
+````
+
+
 ## Contributing
 
 1. Fork it

data/lib/is_valid_multiparameter_date_time_validator.rb

@@ -0,0 +1,42 @@
+class IsValidMultiparameterDateTimeValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    date_value = record.public_send(:"#{attribute}_date_part")
+    time_value = record.public_send(:"#{attribute}_time_part")
+
+    return if date_value.blank? && time_value.blank?
+
+    if date_value.present?
+      date_invalid = date_value !~ MultiparameterDateTime::VALID_DATE_FORMAT
+    end
+
+    if time_value.present?
+      time_invalid = time_value !~ MultiparameterDateTime::VALID_TIME_FORMAT
+    end
+
+    if date_invalid || time_invalid
+      record.errors.add(attribute, invalid_format_error_message)
+    elsif date_value.blank?
+      record.errors.add(attribute, "Please enter a date.")
+    elsif time_value.blank?
+      record.errors.add(attribute, "Please enter a time.")
+    else
+      attribute_value = record.public_send(:"#{attribute}_time_part")
+      begin
+        Time.zone.parse("#{date_value} #{time_value}")
+        Time.zone.parse(attribute_value)
+      rescue ArgumentError
+        record.errors.add(attribute, invalid_format_error_message)
+      end
+    end
+  end
+
+  private
+
+  def invalid_format_error_message
+    date_time = Time.zone.parse("1/29/2000 5:15pm")
+    date_string = date_time.strftime(MultiparameterDateTime.date_format)
+    time_string = date_time.strftime(MultiparameterDateTime.time_format)
+
+    "Please enter a valid date and time using the following formats: #{date_string}, #{time_string}"
+  end
+end

data/lib/multiparameter_date_time.rb

@@ -1,5 +1,6 @@
 require "active_support/concern"
 require "american_date"
+require 'is_valid_multiparameter_date_time_validator'
 
 module MultiparameterDateTime
   extend ActiveSupport::Concern
@@ -7,6 +8,19 @@ module MultiparameterDateTime
   VALID_TIME_FORMAT = /\A\d?\d:\d{2}(:\d{2})?\s*([ap]m)?\s*([A-Z]{3,5})?\Z/
   VALID_DATE_FORMAT = /\A\d?\d\/\d?\d\/\d{4}|(\d{4}-\d{2}-\d{2})\Z/
 
+  DEFAULT_DATE_FORMAT = "%-m/%-d/%Y"
+  DEFAULT_TIME_FORMAT = "%-I:%M %P"
+
+  mattr_writer :date_format, :time_format
+
+  def self.date_format
+    @@date_format ||= DEFAULT_DATE_FORMAT
+  end
+
+  def self.time_format
+    @@time_format ||= DEFAULT_TIME_FORMAT
+  end
+
   module ClassMethods
     def multiparameter_date_time(attribute_name)
       date_attribute = :"#{attribute_name}_date_part"
@@ -60,7 +74,7 @@ module MultiparameterDateTime
           time = public_send(attribute_name)
           return nil if time.nil? || time == :incomplete
 
-          time.strftime("%-I:%M %P")
+          time.strftime(MultiparameterDateTime.time_format)
         end
       end
 
@@ -70,7 +84,7 @@ module MultiparameterDateTime
         else
           date = public_send(attribute_name)
           return nil if date.nil? || date == :incomplete
-          date.strftime("%-m/%-d/%Y")
+          date.strftime(MultiparameterDateTime.date_format)
         end
       end
     end

data/lib/multiparameter_date_time/version.rb

@@ -1,3 +1,3 @@
 module MultiparameterDateTime
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/is_valid_multiparameter_date_time_validator_spec.rb

@@ -0,0 +1,237 @@
+require 'spec_helper'
+
+require 'multiparameter_date_time'
+require 'informal'
+require 'active_support/core_ext/time/zones'
+require 'is_valid_multiparameter_date_time_validator'
+
+describe IsValidMultiparameterDateTimeValidator do
+  before do
+    Time.zone = "US/Eastern"
+  end
+
+  with_model :ModelWithDatetime do
+    table do |t|
+      t.datetime :foo
+    end
+
+    model do
+      include MultiparameterDateTime
+      multiparameter_date_time :foo
+      validates :foo, is_valid_multiparameter_date_time: true, allow_blank: true
+    end
+  end
+
+  describe "#validate_each" do
+    subject { record }
+    let(:record) do
+      ModelWithDatetime.new(
+        foo_date_part: date_string,
+        foo_time_part: time_string
+      )
+    end
+
+    let(:bad_format_error) do
+      "Please enter a valid date and time using the following formats: 1/29/2000, 5:15 pm"
+    end
+    let(:missing_time_error) { "Please enter a time." }
+    let(:missing_date_error) { "Please enter a date." }
+
+    before { record.valid? }
+
+    context "with valid date" do
+      let(:date_string) { "01/01/2001" }
+
+      context "with valid time" do
+        let(:time_string) { "12:31pm" }
+        it "should not have an error" do
+          record.errors[:foo].should be_empty
+        end
+      end
+
+      context "with invalid time" do
+        let(:time_string) { "asdf" }
+
+        it "should show the bad format error" do
+          record.errors[:foo].should == [bad_format_error]
+        end
+      end
+
+      [" ", nil].each do |time_value|
+        context "with time = #{time_value.inspect}" do
+          let(:time_string) { time_value }
+          it "should show the missing time error" do
+            record.errors[:foo].should == [missing_time_error]
+          end
+        end
+      end
+    end
+
+    context "with invalid date" do
+      let(:date_string) { "asdf" }
+
+      context "with valid time" do
+        let(:time_string) { "12:31pm" }
+
+        it "should show the bad format error" do
+          record.errors[:foo].should == [bad_format_error]
+        end
+      end
+
+      context "with invalid time" do
+        let(:time_string) { "asdf" }
+
+        it "should show the bad format error" do
+          record.errors[:foo].should == [bad_format_error]
+        end
+      end
+
+      [" ", nil].each do |time_value|
+        context "with time = #{time_value.inspect}" do
+          let(:time_string) { time_value }
+          it "should show the bad format error" do
+            record.errors[:foo].should == [bad_format_error]
+          end
+        end
+      end
+    end
+
+    [" ", nil].each do |date_value|
+      context "with date = #{date_value.inspect}" do
+        let(:date_string) { date_value }
+
+        context "with valid time" do
+          let(:time_string) { "12:31pm" }
+
+          it "should show the missing date error" do
+            record.errors[:foo].should == [missing_date_error]
+          end
+        end
+
+        context "with invalid time" do
+          let(:time_string) { "asdf" }
+
+          it "should show the bad format error" do
+            record.errors[:foo].should == [bad_format_error]
+          end
+        end
+
+        [" ", nil].each do |time_value|
+          context "with time = #{time_value.inspect}" do
+            let(:time_string) { time_value }
+            it "should not have an error" do
+              record.errors[:foo].should be_empty
+            end
+          end
+        end
+      end
+    end
+
+    context "when the datetime is set directly" do
+      let(:record) { ModelWithDatetime.new(foo: Time.current) }
+      it "should not have an error" do
+        record.errors[:foo].should be_empty
+      end
+    end
+
+    context "when the datetime is set directly to nil" do
+      let(:record) { ModelWithDatetime.new(foo: nil) }
+      it "should not have an error" do
+        record.errors[:foo].should be_empty
+      end
+    end
+
+    context "when nothing is set at all" do
+      let(:record) { ModelWithDatetime.new }
+      it "should not have an error" do
+        record.errors[:foo].should be_empty
+      end
+    end
+
+    context "with an impossible date" do
+      context "set in parts" do
+        let(:record) do
+          ModelWithDatetime.new(foo_date_part: "19/19/1919", foo_time_part: "04:50pm")
+        end
+
+        it "should show the bad format error" do
+          record.errors[:foo].should == [bad_format_error]
+        end
+      end
+
+      context "set directly" do
+        let(:record) do
+          ModelWithDatetime.new(foo: "19/19/1919 04:50pm")
+        end
+
+        it "should show the bad format error" do
+          record.errors[:foo].should == [bad_format_error]
+        end
+      end
+    end
+
+    context "with an impossible time" do
+      context "set in parts" do
+        let(:record) do
+          ModelWithDatetime.new(foo_date_part: "01/01/2001", foo_time_part: "09:99pm")
+        end
+
+        it "should show the bad format error" do
+          record.errors[:foo].should == [bad_format_error]
+        end
+      end
+
+      context "set directly" do
+        let(:record) do
+          ModelWithDatetime.new(foo: "01/01/2001 09:99pm")
+        end
+
+        it "should show the bad format error" do
+          record.errors[:foo].should == [bad_format_error]
+        end
+      end
+    end
+
+    context "when the display format has been configured" do
+      let(:date_string) { "asdf" }
+      let(:time_string) { "foo" }
+
+      context "when the date format is set" do
+        before do
+          MultiparameterDateTime.date_format = "%-m-%-e-%y"
+          record.valid?
+        end
+
+        it "should show the bad format error" do
+          record.errors[:foo].should == [
+            "Please enter a valid date and time using the following formats: 1-29-00, 5:15 pm"
+          ]
+        end
+
+        after do
+          MultiparameterDateTime.date_format = MultiparameterDateTime::DEFAULT_DATE_FORMAT
+        end
+      end
+
+      context "when the time format is set" do
+        let(:time_string) { "asdf" }
+
+        before do
+          MultiparameterDateTime.time_format = "%H%M hours"
+          record.valid?
+        end
+
+        it "should show the bad format error" do
+          record.errors[:foo].should == [
+            "Please enter a valid date and time using the following formats: 1/29/2000, 1715 hours"
+          ]
+        end
+
+        after do
+          MultiparameterDateTime.time_format = MultiparameterDateTime::DEFAULT_TIME_FORMAT
+        end
+      end
+    end
+  end
+
+end

data/spec/multiparameter_date_time_spec.rb

@@ -344,6 +344,47 @@ describe MultiparameterDateTime do
             subject.foo_time_part.should == "12:00 am"
           end
         end
+
+        describe "configuring the datetime format" do
+          let(:record) { model.new(foo: Time.zone.parse("01/09/2000 1:30 pm")) }
+
+          context "when the date format is set" do
+            before do
+              MultiparameterDateTime.date_format = "%-m-%-e-%y"
+            end
+
+            it "should format the date properly" do
+              subject.foo_date_part.should == "1-9-00"
+            end
+
+            it "should use the default format for the time" do
+              subject.foo_time_part.should == "1:30 pm"
+            end
+
+            after do
+              MultiparameterDateTime.date_format = MultiparameterDateTime::DEFAULT_DATE_FORMAT
+            end
+          end
+
+          context "when the time format is set" do
+            before do
+              MultiparameterDateTime.time_format = "%H%M hours"
+            end
+
+            it "should format the time properly" do
+              subject.foo_time_part.should == "1330 hours"
+            end
+
+            it "should use the default format for the date" do
+              subject.foo_date_part.should == "1/9/2000"
+            end
+
+            after do
+              MultiparameterDateTime.time_format = MultiparameterDateTime::DEFAULT_TIME_FORMAT
+            end
+          end
+
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiparameter_date_time
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: american_date
@@ -123,9 +123,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/is_valid_multiparameter_date_time_validator.rb
 - lib/multiparameter_date_time.rb
 - lib/multiparameter_date_time/version.rb
 - multiparameter_date_time.gemspec
+- spec/is_valid_multiparameter_date_time_validator_spec.rb
 - spec/multiparameter_date_time_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/Casecommons/multiparameter_date_time
@@ -142,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1009483105681798666
+      hash: 340950943914695248
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1009483105681798666
+      hash: 340950943914695248
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -159,5 +161,6 @@ signing_key:
 specification_version: 3
 summary: Set a DateTime via two accessors, one for the date, one for the time
 test_files:
+- spec/is_valid_multiparameter_date_time_validator_spec.rb
 - spec/multiparameter_date_time_spec.rb
 - spec/spec_helper.rb