multiparameter_date_time 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc63493a635ad27f89775a40b7341fa1c5d7dae1
-  data.tar.gz: f0925022123dbae27fc5093a060fbca253f45feb
+  metadata.gz: 875e99239f026cac0e6448b8056af1aedfd46c2e
+  data.tar.gz: 153a5eaf6862baff4b8723097f3fc9125af25164
 SHA512:
-  metadata.gz: e9fb1385f8e7def9fbb7a99f2a8920e9cddc845c559bf4fa31aea171b8cddde7eea602f4dc501d25ea901ed82e7dd0b7c86b3446e3ce41fa31d1986b0ea0633c
-  data.tar.gz: b731a1ff6cbbd8a8b1cc21ec1c9cdab30afc0d6f1fe8afe8a5060948da84ca3b8f57223c63c7e013527e3e9a04357870ece28b40f6aa760f3483170d4a064bd5
+  metadata.gz: bfba5fef5626f7e3eb2e46aeac82bc68cb738383f46569b190acbbc85395970bb15e58b91bd7af85b0a38c1ef1dafdae7f50f729f35e817c9ae21cc7fa3421a7
+  data.tar.gz: f782f4b7e9a5ea768d08b583c90d407e2ed759a62f74447d066cf6bcef2cd3e188ae484c0b99428f33b1293cd7057c7fc02c0a8eeffa0f2316aa02dadaf33ff3

data/lib/multiparameter_date_time/version.rb

@@ -1,3 +1,3 @@
 module MultiparameterDateTime
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/multiparameter_date_time.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'active_support/core_ext/time/zones'
 require 'american_date'
 require 'is_valid_multiparameter_date_time_validator'
 
@@ -33,33 +34,37 @@ module MultiparameterDateTime
       time_part_setter = :"#{time_attribute}="
 
       define_method "#{attribute_name}=" do |date_time_input|
-        begin
-          if date_time_input.respond_to?(:in_time_zone)
+        case date_time_input
+        when Date, Time, DateTime
+          begin
             date_time_input = date_time_input.in_time_zone
-          elsif date_time_input.respond_to?(:to_time_in_current_zone)
-            date_time_input = date_time_input.to_time_in_current_zone
+          rescue ArgumentError
           end
-        rescue ArgumentError
-        end
-
-        if date_time_input.is_a?(String)
-          iso8601 = Time.iso8601(date_time_input).in_time_zone(Time.zone) rescue nil
+          write_attribute_for_multiparameter_date_time(attribute_name, date_time_input)
+        when String
+          iso8601 = begin
+                      Time.iso8601(date_time_input).in_time_zone
+                    rescue ArgumentError
+                      nil
+                    end
           if iso8601
             write_attribute_for_multiparameter_date_time(attribute_name, iso8601)
           else
             date_part, time_part = date_time_input.split(' ', 2)
-            parsed_date_part = Date.parse(date_part) rescue nil
+            parsed_date_part = begin
+                                 Date.parse(date_part)
+                               rescue ArgumentError
+                                 nil
+                               end
             if time_part.nil? && parsed_date_part
               write_attribute_for_multiparameter_date_time(
                 attribute_name,
-                parsed_date_part.to_time_in_current_zone)
+                parsed_date_part.in_time_zone)
             else
               public_send(date_part_setter, date_part)
               public_send(time_part_setter, time_part)
             end
           end
-        else
-          write_attribute_for_multiparameter_date_time(attribute_name, date_time_input)
         end
       end
 

data/spec/is_valid_multiparameter_date_time_validator_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 require 'multiparameter_date_time'
-require 'active_support/core_ext/time/zones'
 require 'is_valid_multiparameter_date_time_validator'
 
 describe IsValidMultiparameterDateTimeValidator do

data/spec/multiparameter_date_time_spec.rb

@@ -266,11 +266,11 @@ describe MultiparameterDateTime do
             end
 
             it "sets the attribute to a DateTime object" do
-              subject.foo.should == Time.zone.parse('1/1/2000 12:30pm')
+              subject.foo.should == Time.zone.parse('01/01/2000 12:30pm')
             end
 
             it "has the original date" do
-              subject.foo_date_part.should == '1/1/2000'
+              subject.foo_date_part.should == '01/01/2000'
             end
 
             it "has the original time" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiparameter_date_time
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: american_date