greenwich 0.0.3 → 0.0.4

data/lib/greenwich/rails.rb

@@ -26,7 +26,7 @@ module Greenwich  #:nodoc:
                       ActiveSupport::TimeWithZone.new(nil, time_zone, time)
                     },
                     :converter => Proc.new { |value|
-                      value[1] = ActiveSupport::TimeZone.new(value[1]) unless value[1].is_a? ActiveSupport::TimeZone
+                      value[1] = Greenwich::Utilities.get_time_zone_from(value[1])
                       value[0] = value[0].to_time
 
                       ActiveSupport::TimeWithZone.new(nil, value[1], value[0])
@@ -34,13 +34,10 @@ module Greenwich  #:nodoc:
 
         define_method "#{time_field}=" do |time|
           instance_eval do
-            time_zone = read_attribute(time_zone)
+            write_attribute(time_field, time.to_s)
 
-            if time_zone.nil?
-              write_attribute(time_field, time.to_s)
-            else
-              self.send("#{name}=".to_sym, [time, time_zone])
-            end
+            time_zone = read_attribute(time_zone)
+            self.send("#{name}=".to_sym, [time, time_zone]) if time && time_zone
           end
         end
 
@@ -56,15 +53,14 @@ module Greenwich  #:nodoc:
           ActiveSupport::TimeZone.new(time_zone_name) unless time_zone_name.nil?
         end
 
-        define_method "#{name}=" do |time_zone|
+        define_method "#{name}=" do |time_zone_string|
           instance_eval do
-            time_zone = ActiveSupport::TimeZone.new(time_zone) unless time_zone.is_a? ActiveSupport::TimeZone || time_zone.nil?
-            time_zone = time_zone.name if time_zone.respond_to? :name
+            time_zone = Greenwich::Utilities.get_time_zone_from(time_zone_string).try(:name)
             write_attribute(name, time_zone)
 
             options[:for].each do |composed_field, time_field|
               time = read_attribute(time_field)
-              self.send("#{composed_field}=".to_sym, [time, time_zone]) unless time.nil?
+              self.send("#{composed_field}=".to_sym, [time, time_zone]) if time && time_zone
             end
           end
         end

data/lib/greenwich/utilities.rb

@@ -12,6 +12,18 @@ module Greenwich
       get_target_column(target_columns, columns)
     end
 
+    def self.get_time_zone_from(value)
+      return nil if [nil, ''].include? value
+
+      begin
+        value = ActiveSupport::TimeZone.new(value) unless value.is_a? ActiveSupport::TimeZone
+      rescue ArgumentError
+        raise ArgumentError, "'#{value}' cannot be converted into a TimeZone."
+      end
+
+      value
+    end
+
   private
     def self.get_target_column(target_columns, all_columns)
       target_columns.each {|col| return col if all_columns.include?(col) }

data/lib/greenwich/version.rb

@@ -1,3 +1,3 @@
 module Greenwich
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greenwich
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-06 00:00:00.000000000 -07:00
+date: 2011-07-31 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156501600 !ruby/object:Gem::Requirement
+  requirement: &2172743720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156501600
+  version_requirements: *2172743720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156501060 !ruby/object:Gem::Requirement
+  requirement: &2172743220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2156501060
+  version_requirements: *2172743220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156500520 !ruby/object:Gem::Requirement
+  requirement: &2172742760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2156500520
+  version_requirements: *2172742760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156500000 !ruby/object:Gem::Requirement
+  requirement: &2172742300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,7 +56,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2156500000
+  version_requirements: *2172742300
 description: Store all of your times in the database as UTC but want to give your
   users the ability to choose a custom time zone for each instance of a DateTime field?
 email: