greenwich 2.0.3 → 2.0.4

data/lib/greenwich/conversion.rb

@@ -30,6 +30,7 @@ module Greenwich
           time_zone = Greenwich::Utilities.get_time_zone(self, time_zone_field)
           time      = Greenwich::Utilities.coerce_to_time_without_zone(value)
           time      = ActiveSupport::TimeWithZone.new(nil, time_zone, time) if time && time_zone
+          time      = ActiveSupport::TimeWithZone.new(nil, ActiveSupport::TimeZone.new('UTC'), time) if time && !time_zone
 
           greenwich_time_fields_converted["#{time_field}_utc"] = true unless time_zone.nil?
 

data/lib/greenwich/version.rb

@@ -1,3 +1,3 @@
 module Greenwich
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/spec/conversion_spec.rb

@@ -182,15 +182,25 @@ describe Greenwich::Conversion do
         before { model.time_zone = nil }
 
         context 'and the time field is set' do
-          before { model.started_at = Time.utc(2012, 1, 2, 12, 59, 1) }
+          before { model.started_at = Time.find_zone('Alaska').local(2012, 1, 2, 12, 59, 1) }
 
-          it 'the time field is not adjusted' do
+          it 'the time field is adjusted' do
+            model.started_at.should eql Time.utc(2012, 1, 2, 12, 59, 1)
             raw_time_field.should eql Time.utc(2012, 1, 2, 12, 59, 1)
           end
 
           it 'needs to be converted' do
             model.send(:greenwich_time_field_needs_conversion?, 'started_at', 'time_zone').should be_true
           end
+
+          context 'and then the time zone is set' do
+            before { model.time_zone = 'Hawaii' }
+
+            it 'reflects the local time zone' do
+              model.started_at.should eql Time.find_zone('Hawaii').local(2012, 1, 2, 12, 59, 1)
+              raw_time_field.should eql Time.utc(2012, 1, 2, 22, 59, 1)
+            end
+          end
         end
 
         context 'and the time field is not set' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greenwich
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -236,4 +236,3 @@ test_files:
 - spec/support/focused.rb
 - spec/support/pending.rb
 - spec/utilities_spec.rb
-has_rdoc: