multiparameter_date_time 0.0.5 → 0.0.6

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 .bundle
+.vimlog
 .config
 .rvmrc
 .yardoc

data/lib/is_valid_multiparameter_date_time_validator.rb

@@ -5,15 +5,7 @@ class IsValidMultiparameterDateTimeValidator < ActiveModel::EachValidator
 
     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
+    if date_invalid?(date_value) || time_invalid?(time_value)
       record.errors.add(attribute, self.class.invalid_format_error_message)
     elsif date_value.blank?
       record.errors.add(attribute, "Please enter a date.")
@@ -37,4 +29,18 @@ class IsValidMultiparameterDateTimeValidator < ActiveModel::EachValidator
 
     "Please enter a valid date and time using the following formats: #{date_string}, #{time_string}"
   end
+
+  def time_invalid?(time_value)
+    if time_value.present?
+      time_invalid_standard = time_value !~ MultiparameterDateTime::VALID_STANDARD_TIME_FORMAT 
+      time_invalid_military = time_value !~ MultiparameterDateTime::VALID_MILITARY_TIME_FORMAT 
+      time_invalid_standard && time_invalid_military 
+    end
+  end
+  
+  def date_invalid?(date_value)
+    if date_value.present?
+      date_invalid = date_value !~ MultiparameterDateTime::VALID_DATE_FORMAT
+    end
+  end
 end

data/lib/multiparameter_date_time/version.rb

@@ -1,3 +1,3 @@
 module MultiparameterDateTime
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/multiparameter_date_time.rb

@@ -5,8 +5,9 @@ require 'is_valid_multiparameter_date_time_validator'
 module MultiparameterDateTime
   extend ActiveSupport::Concern
 
-  VALID_TIME_FORMAT = /\A\d?\d:\d{2}(:\d{2})?\s*([ap]m)?\s*([A-Z]{3,5})?\Z/
   VALID_DATE_FORMAT = /\A((\d{1,2}[\/\-.]\d{1,2}[\/\-.]\d{2,4})|(\d{4}-\d{1,2}-\d{1,2}))/
+  VALID_STANDARD_TIME_FORMAT = /\A[0]*([1-9]|1[0-2]):\d{2}(:\d{2})?\s*([apAP][mM])?\s*([A-Z]{3,5})?\Z/
+  VALID_MILITARY_TIME_FORMAT = /\A[0]*([0-9]|1[0-9]|2[0-3]):\d{2}(:\d{2})?\s*([A-Z]{3,5})?\Z/
 
   DEFAULT_DATE_FORMAT = "%-m/%-d/%Y"
   DEFAULT_TIME_FORMAT = "%-I:%M %P"
@@ -93,7 +94,7 @@ module MultiparameterDateTime
   private
 
   def set_combined_datetime(name, date_string, time_string)
-    if date_string =~ MultiparameterDateTime::VALID_DATE_FORMAT && time_string =~ MultiparameterDateTime::VALID_TIME_FORMAT
+    if date_string =~ MultiparameterDateTime::VALID_DATE_FORMAT && (time_string =~ MultiparameterDateTime::VALID_STANDARD_TIME_FORMAT || time_string =~ VALID_MILITARY_TIME_FORMAT)
       begin
         write_attribute_for_multiparameter_date_time(
           name, Time.zone.parse("#{date_string} #{time_string}")

data/spec/is_valid_multiparameter_date_time_validator_spec.rb

@@ -22,6 +22,18 @@ describe IsValidMultiparameterDateTimeValidator do
     end
   end
 
+  shared_examples_for "a valid time" do
+    it "should not have an error" do
+      record.errors[:foo].should be_empty
+    end
+  end
+
+  shared_examples_for "a badly formatted date or time" do
+    it "should show the bad format error" do
+      record.errors[:foo].should == [bad_format_error]
+    end
+  end
+
   describe "#validate_each" do
     subject { record }
     let(:record) do
@@ -42,18 +54,72 @@ describe IsValidMultiparameterDateTimeValidator do
     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
+      context "with valid time in" do
+        context "military format" do
+          context "lots of zeros" do
+            let(:time_string) { "00:00" }
+            it_should_behave_like "a valid time"
+          end
+
+          context "last valid value" do
+            let(:time_string){ "23:59" }
+            it_should_behave_like "a valid time"
+          end
+
+          context "1 pm" do
+            let(:time_string){ "13:00" }
+            it_should_behave_like "a valid time"
+          end
+        end
+
+        context "standard format" do
+          let(:time_string) { "12:31pm" }
+          it_should_behave_like "a valid time"
+
+          context "with a capital AM or PM" do
+            let(:time_string) { "12:31 PM" }
+            it_should_behave_like "a valid time"
+          end
+
+          context "without a space between the time and AM or PM" do
+            let(:time_string) { "12:31AM" }
+            it_should_behave_like "a valid time"
+          end
+
+          context "with no space and a mixed case aM or pM" do
+            let(:time_string) { "12:31aM" }
+            it_should_behave_like "a valid time"
+          end
+
+          context "with a space and a mixed case aM or pM" do
+            let(:time_string) { "12:31 aM" }
+            it_should_behave_like "a valid time"
+          end
+
+          context "with a space and a lower case am or pm" do
+            let(:time_string) { "12:31 am" }
+            it_should_behave_like "a valid time"
+          end
         end
       end
 
-      context "with invalid time" do
-        let(:time_string) { "asdf" }
+      context "with invalid time in" do
+        context "military format" do
+          context "above 23:59" do
+            let(:time_string) { "25:00" }
+            it_should_behave_like "a badly formatted date or time"
+          end
 
-        it "should show the bad format error" do
-          record.errors[:foo].should == [bad_format_error]
+          context "with am or pm" do
+            let(:time_string) { "23:00 am" }
+            it_should_behave_like "a badly formatted date or time"
+          end
+        end
+
+        context "standard format" do
+          let(:time_string) { "90:00pm" }
+
+          it_should_behave_like "a badly formatted date or time"
         end
       end
 
@@ -73,25 +139,19 @@ describe IsValidMultiparameterDateTimeValidator do
       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
+        it_should_behave_like "a badly formatted date or time"
       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
+        it_should_behave_like "a badly formatted date or time"
       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
+          it_should_behave_like "a badly formatted date or time"
         end
       end
     end
@@ -111,9 +171,7 @@ describe IsValidMultiparameterDateTimeValidator do
         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
+          it_should_behave_like "a badly formatted date or time"
         end
 
         [" ", nil].each do |time_value|
@@ -154,9 +212,7 @@ describe IsValidMultiparameterDateTimeValidator 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
+        it_should_behave_like "a badly formatted date or time"
       end
 
       context "set directly" do
@@ -164,9 +220,7 @@ describe IsValidMultiparameterDateTimeValidator 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
+        it_should_behave_like "a badly formatted date or time"
       end
     end
 
@@ -176,9 +230,7 @@ describe IsValidMultiparameterDateTimeValidator 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
+        it_should_behave_like "a badly formatted date or time"
       end
 
       context "set directly" do
@@ -186,9 +238,7 @@ describe IsValidMultiparameterDateTimeValidator 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
+        it_should_behave_like "a badly formatted date or time"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiparameter_date_time
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: american_date
@@ -152,10 +152,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4193815623193875602
+      hash: -4212657700101252110
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Set a DateTime via two accessors, one for the date, one for the time