string_date_accessors 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/string_date_accessors.rb

@@ -25,13 +25,19 @@ module StringDateAccessors
   def self.formatted(input)
     date = Date.strptime(input, date_format)
     zone = date.to_time.zone
-    DateTime.strptime("#{input} #{zone}", "#{datetime_format} %Z").to_time
+    datetime_utc = DateTime.strptime("#{input} #{zone}", "#{datetime_format} %Z").to_time.utc
+    Time.utc(datetime_utc.year, 
+             datetime_utc.month, 
+             datetime_utc.day, 
+             datetime_utc.hour,
+             datetime_utc.min,
+             datetime_utc.sec)
   rescue ArgumentError, NoMethodError => e
     date ? date : input
   end
 
   def invalid_date_accessors
-    string_date_accessors_set.reject {|attribute| send(attribute).is_a?(Date)}
+    string_date_accessors_set.reject {|attribute| send(attribute).respond_to?(:strftime)}
   end
 
   def string_date_accessors_set

data/spec/string_date_accessors_spec.rb

@@ -1,12 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 class ModelBase
-  attr_accessor :punched_on, :patched_up_on
+  attr_accessor :punched_on, :patched_up_on, :fell_at
 end
 
 class StringDateInheritor < ModelBase
   include StringDateAccessors
-  string_date_accessors :punched_on, :patched_up_on
+  string_date_accessors :punched_on, :patched_up_on, :fell_at
 end
 
 describe StringDateAccessors do
@@ -16,11 +16,11 @@ describe StringDateAccessors do
 
   describe "formatted" do
     context "datetime" do
-      it "should add the current timezone" do
+      it "should convert to UTC" do
         input = '21/05/10 10:30'
         StringDateAccessors.datetime_format = '%d/%m/%y %H:%M'
         Time.stub(:zone).and_return('(GMT+00:00) London')
-        StringDateAccessors.formatted(input).zone.should == '+01:00'
+        StringDateAccessors.formatted(input).zone.should == 'UTC'
       end
     end
   end
@@ -43,6 +43,7 @@ describe StringDateAccessors do
       its(:day) { should == 11 }
       its(:month) { should == 12 }
       its(:year) { should == 2009 }
+      it { should be_a(Time) }
     end
 
     context "entering date strings with slashes" do
@@ -55,6 +56,7 @@ describe StringDateAccessors do
       its(:day) { should == 11 }
       its(:month) { should == 12 }
       its(:year) { should == 2009 }
+      it { should be_a(Date) }
     end
   end
 
@@ -63,11 +65,13 @@ describe StringDateAccessors do
       inheritor = StringDateInheritor.new
       inheritor.punched_on = 'bad'
       inheritor.patched_up_on = '2009/12/25'
+      inheritor.fell_at = '25/05/10 15:00'
       inheritor
     end
 
     its(:invalid_date_accessors) { should include(:punched_on) }
     its(:invalid_date_accessors) { should_not include(:patched_up_on) }
+    its(:invalid_date_accessors) { should_not include(:fell_at) }
   end
 
   describe "date accessor" do
@@ -81,6 +85,7 @@ describe StringDateAccessors do
       its(:day) { should == 11 }
       its(:month) { should == 12 }
       its(:year) { should == 2011 }
+      it { should be_a(Date) }
     end
 
     context "entering Date objects" do

data/string_date_accessors.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{string_date_accessors}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Bruce"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Andrew Bruce