multiparameter_date_time 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d0cfeb2fce7550d8d25996a0311794250af84f2
-  data.tar.gz: 5309314fdb18b0b2b13ade0535eeae882ed8c0dd
+  metadata.gz: 6ddf8a324cd35af351af34df75e7a89f3c159554
+  data.tar.gz: a025da039da052889e1fd2627eaa3e94cce1341b
 SHA512:
-  metadata.gz: 481030cfc94b83cda61d86cc5c4117676ce829d9440b8a3c0acbb2c336c2f56f5858b0f3a33488aabd937b7210f9b8bcffbb69aed46a9c199a62e2381847d551
-  data.tar.gz: 919d1c9d62544e0c887d040a70528df9665308d8d0a01be86cc98cb6fb81c1f99dba83a8225402c9d610f5e8e91d279b17bf5052589f63f4848b298d9312948f
+  metadata.gz: 9a2131a2c0a35f1c7eb7f1037134a714f58c21258eaae2259d603dfb2d765d74c813a69fbc35b11a806f428f46e97f07baf5a092fcbea31145f8d5f6add08592
+  data.tar.gz: ad58b2a5835233d8bf5256a64f8d4529f8ca248539c08eccf78c87213f4d34dbd4a2a480a539f10b084bea0950aeaa95a563816fce3653c508ba79e2d6969b81

data/lib/multiparameter_date_time.rb

@@ -14,6 +14,7 @@ module MultiparameterDateTime
   DEFAULT_TIME_FORMAT = '%-I:%0M %P'
 
   mattr_writer :date_format, :time_format
+  mattr_accessor :date_string_formatter
 
   def self.date_format
     @@date_format ||= DEFAULT_DATE_FORMAT
@@ -111,8 +112,13 @@ module MultiparameterDateTime
   def set_combined_datetime(name, date_string, time_string)
     if date_string =~ MultiparameterDateTime::VALID_DATE_FORMAT && (time_string =~ MultiparameterDateTime::VALID_STANDARD_TIME_FORMAT || time_string =~ VALID_MILITARY_TIME_FORMAT)
       begin
+        formatted_date_string = date_string
+        if MultiparameterDateTime.date_string_formatter.present?
+          formatted_date_string = MultiparameterDateTime.date_string_formatter.format(date_string)
+        end
+
         write_attribute_for_multiparameter_date_time(
-          name, Time.zone.parse("#{date_string} #{time_string}")
+          name, Time.zone.parse("#{formatted_date_string} #{time_string}")
         )
       rescue ArgumentError
         write_attribute_for_multiparameter_date_time(name, :incomplete)

data/lib/multiparameter_date_time/version.rb

@@ -1,3 +1,3 @@
 module MultiparameterDateTime
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/multiparameter_date_time_spec.rb

@@ -42,8 +42,13 @@ describe MultiparameterDateTime do
 
         describe "when a value is present" do
           let(:record) { model.new(foo: Time.zone.parse('1/2/2003 04:05pm')) }
-          its(:foo_date_part) { should == '1/2/2003' }
-          its(:foo_time_part) { should == '4:05 pm' }
+          it 'assigns date_part' do
+            expect(subject.foo_date_part).to eq '1/2/2003'
+          end
+
+          it 'assigns time_part' do
+            expect(subject.foo_time_part).to eq '4:05 pm'
+          end
         end
 
         describe "setting a valid date and time" do
@@ -390,6 +395,44 @@ describe MultiparameterDateTime do
             end
           end
         end
+
+        describe 'using a custom date string formatter' do
+          let(:foo_date_part) { '1/12/15' }
+          let(:foo_time_part) { '9:30 pm EST' }
+
+          context 'when the date string formatter is nil' do
+            it 'parses the unmodified date string' do
+              MultiparameterDateTime.date_string_formatter = nil
+              expect(Time.zone).to receive(:parse)
+                .with("#{foo_date_part} #{foo_time_part}")
+
+              model.new(foo_date_part: foo_date_part, foo_time_part: foo_time_part)
+            end
+          end
+
+          context 'when the date string formatter is present' do
+            before do
+              class TestFormatter
+                def self.format(date_string)
+                  '12/31/1995'
+                end
+              end
+
+              MultiparameterDateTime.date_string_formatter = TestFormatter
+            end
+
+            after do
+              MultiparameterDateTime.date_string_formatter = nil
+            end
+
+            it 'uses a formatted date string' do
+              expect(Time.zone).to receive(:parse)
+                .with("#{'12/31/1995'} #{foo_time_part}")
+
+              model.new(foo_date_part: foo_date_part, foo_time_part: foo_time_part)
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiparameter_date_time
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -11,76 +11,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: american_date
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: with_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: 
@@ -93,8 +93,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -116,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Set a DateTime via two accessors, one for the date, one for the time