string_date_accessors 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/string_date_accessors.rb

@@ -1,11 +1,19 @@
 require 'date'
 module StringDateAccessors
-  def self.format=(string)
-    @format = string
+  def self.date_format=(string)
+    @date_format = string
   end
 
-  def self.format
-    @format
+  def self.date_format
+    @date_format
+  end
+
+  def self.datetime_format=(string)
+    @datetime_format = string
+  end
+
+  def self.datetime_format
+    @datetime_format
   end
 
   def self.included(klass)
@@ -13,9 +21,13 @@ module StringDateAccessors
   end
 
   def self.formatted(input)
-    Date.strptime(input, format)
+    DateTime.strptime(input, datetime_format)
   rescue ArgumentError
-    input
+    begin
+      Date.strptime(input, date_format)
+    rescue ArgumentError
+      input
+    end
   end
 
   def invalid_date_accessors

data/spec/string_date_accessors_spec.rb

@@ -11,15 +11,30 @@ end
 
 describe StringDateAccessors do
   before do
-    StringDateAccessors.format = '%Y/%m/%d'
+    StringDateAccessors.date_format = '%Y/%m/%d'
   end
 
   describe "UK format" do
     before do
-      StringDateAccessors.format = '%d/%m/%y'
+      StringDateAccessors.date_format = '%d/%m/%y'
+      StringDateAccessors.datetime_format = '%d/%m/%y %H:%M'
     end
 
-    context "entering strings with slashes" do
+    context "entering time strings with slashes" do
+      subject do
+        inheritor = StringDateInheritor.new
+        inheritor.punched_on = '11/12/09 15:03'
+        inheritor.punched_on
+      end
+
+      its(:min) { should == 3 }
+      its(:hour) { should == 15 }
+      its(:day) { should == 11 }
+      its(:month) { should == 12 }
+      its(:year) { should == 2009 }
+    end
+
+    context "entering date strings with slashes" do
       subject do
         inheritor = StringDateInheritor.new
         inheritor.punched_on = '11/12/09'
@@ -69,6 +84,20 @@ describe StringDateAccessors do
       its(:year) { should == 2011 }
     end
 
+    context "entering DateTime objects" do
+      subject do
+        inheritor = StringDateInheritor.new
+        inheritor.punched_on = DateTime.new(2011, 12, 11, 15, 30)
+        inheritor.punched_on
+      end
+
+      its(:min) { should == 30 }
+      its(:hour) { should == 15 }
+      its(:day) { should == 11 }
+      its(:month) { should == 12 }
+      its(:year) { should == 2011 }
+    end
+
     context "entering blank strings" do
       subject do
         inheritor = StringDateInheritor.new

data/string_date_accessors.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{string_date_accessors}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Bruce"]
-  s.date = %q{2010-03-27}
+  s.date = %q{2010-03-28}
   s.description = %q{
       This gem is useful if you don't want to use Rails' standard date helpers and would rather
       set a text format for reading and writing dates.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Andrew Bruce
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 +00:00
+date: 2010-03-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency