multiparameter_date_time 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ddf8a324cd35af351af34df75e7a89f3c159554
-  data.tar.gz: a025da039da052889e1fd2627eaa3e94cce1341b
+  metadata.gz: fd4b646671a89153334e24e8e5965616725df430
+  data.tar.gz: f2e6aef9a92bd20cb6334b53e62b23156404476d
 SHA512:
-  metadata.gz: 9a2131a2c0a35f1c7eb7f1037134a714f58c21258eaae2259d603dfb2d765d74c813a69fbc35b11a806f428f46e97f07baf5a092fcbea31145f8d5f6add08592
-  data.tar.gz: ad58b2a5835233d8bf5256a64f8d4529f8ca248539c08eccf78c87213f4d34dbd4a2a480a539f10b084bea0950aeaa95a563816fce3653c508ba79e2d6969b81
+  metadata.gz: a43cc2612bc431a19085a49264dd4045c10f9b6169edbbc99a4248a95d628b067822c13333b2192d17576172aab3efe44547a26da8821f1d6116009a0c2ce092
+  data.tar.gz: a067365b7f8aad02982b715b2aac8ffa22ec9fb491c8ba66cd694549e175fb39fcf9e1efd31771a8ee40b786e3f71f39de6422624f9322190103d40d4cc8d465

data/README.md

@@ -79,7 +79,7 @@ validates :published_at, presence: true, is_valid_multiparameter_date_time: true
 IsValidMultiparameterDateTimeValidator.invalid_format_error_message
 ```
 
-## Contributing
+### Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
@@ -87,6 +87,25 @@ IsValidMultiparameterDateTimeValidator.invalid_format_error_message
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+### Customizing the error message via I18n
+
+This gem supports custom error messages using the I18n gem. There is one message key
+for a missing date part and another for a missing time part. Default messages are
+provided if you choose not to supply your own.
+
+```yaml
+en:
+  activerecord:
+    errors:
+      models:
+        <your_model>:
+          attributes:
+            ended_at_time_part:
+              blank: '<your message>'
+            ended_at_date_part:
+              blank: '<your message>'
+```
+
 ## License
 
 Copyright © 2012–2013 Case Commons, LLC. License is available in the LICENSE file.

data/lib/is_valid_multiparameter_date_time_validator.rb

@@ -10,9 +10,13 @@ class IsValidMultiparameterDateTimeValidator < ActiveModel::EachValidator
     if date_invalid?(date_value) || time_invalid?(time_value)
       record.errors.add(attribute, self.class.invalid_format_error_message)
     elsif date_value.blank?
-      record.errors.add(attribute, 'Please enter a date.')
+      key = :"#{attribute}_date_part"
+      message = record.errors.generate_message(key, :blank, default: 'Please enter a date.')
+      record.errors.add(attribute, message)
     elsif time_value.blank?
-      record.errors.add(attribute, 'Please enter a time.')
+      key = :"#{attribute}_time_part"
+      message = record.errors.generate_message(key, :blank, default: 'Please enter a time.')
+      record.errors.add(attribute, message)
     else
       attribute_value = record.public_send(:"#{attribute}_time_part")
       begin

data/lib/multiparameter_date_time/version.rb

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

data/multiparameter_date_time.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport', '~> 4.0'
 
   gem.add_development_dependency 'activerecord'
-  gem.add_development_dependency 'rspec', '~> 2.11'
+  gem.add_development_dependency 'rspec', '~> 3'
   gem.add_development_dependency 'with_model', '~> 1.0'
 end

data/spec/is_valid_multiparameter_date_time_validator_spec.rb

@@ -22,12 +22,14 @@ describe IsValidMultiparameterDateTimeValidator do
 
   shared_examples_for "a valid time" do
     it "should not have an error" do
+      record.valid?
       record.errors[:foo].should be_empty
     end
   end
 
   shared_examples_for "a badly formatted date or time" do
     it "should show the bad format error" do
+      record.valid?
       record.errors[:foo].should == [bad_format_error]
     end
   end
@@ -47,8 +49,6 @@ describe IsValidMultiparameterDateTimeValidator do
     let(:missing_time_error) { 'Please enter a time.' }
     let(:missing_date_error) { 'Please enter a date.' }
 
-    before { record.valid? }
-
     context "with valid date" do
       let(:date_string) { '01/01/2001' }
 
@@ -124,8 +124,35 @@ describe IsValidMultiparameterDateTimeValidator do
       [' ', nil].each do |time_value|
         context "with time = #{time_value.inspect}" do
           let(:time_string) { time_value }
-          it "should show the missing time error" do
-            record.errors[:foo].should == [missing_time_error]
+
+          context 'and default error messages' do
+            it 'should show the missing time error' do
+              record.valid?
+              expect(record.errors[:foo]).to match_array [missing_time_error]
+            end
+          end
+        end
+      end
+
+      [' ', nil].each do |time_value|
+        context 'with I18n error messages' do
+          let(:time_string) { time_value }
+
+          before do
+            translation = {
+              activerecord: {
+                errors: {
+                  models: {
+                    model_with_datetime: {
+                      attributes: {
+                        foo_time_part: { blank: 'custom error' } } } } } } }
+
+            I18n.backend.store_translations :en, translation
+          end
+
+          it 'should show the I18n missing time error' do
+            record.valid?
+            expect(record.errors[:foo]).to match_array ['custom error']
           end
         end
       end
@@ -192,6 +219,7 @@ describe IsValidMultiparameterDateTimeValidator do
           let(:time_string) { '12:31pm' }
 
           it "should show the missing date error" do
+            record.valid?
             record.errors[:foo].should == [missing_date_error]
           end
         end
@@ -202,10 +230,11 @@ describe IsValidMultiparameterDateTimeValidator do
           it_should_behave_like "a badly formatted date or time"
         end
 
-        [" ", nil].each do |time_value|
+        [' ', nil].each do |time_value|
           context "with time = #{time_value.inspect}" do
             let(:time_string) { time_value }
-            it "should not have an error" do
+            it 'should not have an error' do
+              record.valid?
               record.errors[:foo].should be_empty
             end
           end
@@ -213,9 +242,36 @@ describe IsValidMultiparameterDateTimeValidator do
       end
     end
 
+    [' ', nil].each do |date_value|
+      context "with valid time" do
+        let(:date_string) { date_value }
+        let(:time_string) { '12:31pm' }
+
+        before do
+          translation = {
+            activerecord: {
+              errors: {
+                models: {
+                  model_with_datetime: {
+                    attributes: {
+                      foo_date_part: { blank: 'custom error' } } } } } } }
+
+          I18n.backend.store_translations :en, translation
+        end
+
+        context 'and I18n error messages' do
+          it "should show the missing date error" do
+            record.valid?
+            record.errors[:foo].should == ['custom error']
+          end
+        end
+      end
+    end
+
     context "when the datetime is set directly" do
       let(:record) { ModelWithDatetime.new(foo: Time.current) }
       it "should not have an error" do
+        record.valid?
         record.errors[:foo].should be_empty
       end
     end
@@ -223,6 +279,7 @@ describe IsValidMultiparameterDateTimeValidator do
     context "when the datetime is set directly to nil" do
       let(:record) { ModelWithDatetime.new(foo: nil) }
       it "should not have an error" do
+        record.valid?
         record.errors[:foo].should be_empty
       end
     end
@@ -230,6 +287,7 @@ describe IsValidMultiparameterDateTimeValidator do
     context "when nothing is set at all" do
       let(:record) { ModelWithDatetime.new }
       it "should not have an error" do
+        record.valid?
         record.errors[:foo].should be_empty
       end
     end
@@ -277,10 +335,10 @@ describe IsValidMultiparameterDateTimeValidator do
       context "when the date format is set" do
         before do
           MultiparameterDateTime.date_format = '%-m-%-e-%0y'
-          record.valid?
         end
 
         it "should show the bad format error" do
+          record.valid?
           record.errors[:foo].should == [
             'Please enter a valid date and time using the following formats: 1-29-00, 5:15 pm'
           ]
@@ -296,10 +354,10 @@ describe IsValidMultiparameterDateTimeValidator do
 
         before do
           MultiparameterDateTime.time_format = '%H%M hours'
-          record.valid?
         end
 
         it "should show the bad format error" do
+          record.valid?
           record.errors[:foo].should == [
             'Please enter a valid date and time using the following formats: 1/29/2000, 1715 hours'
           ]
@@ -329,11 +387,9 @@ describe IsValidMultiparameterDateTimeValidator do
   end
 
   describe ".invalid_format_error_message" do
-    subject { IsValidMultiparameterDateTimeValidator.invalid_format_error_message }
-
     it do
-      should ==
-        'Please enter a valid date and time using the following formats: 1/29/2000, 5:15 pm'
+      expected_error = 'Please enter a valid date and time using the following formats: 1/29/2000, 5:15 pm'
+      expect(described_class.invalid_format_error_message).to eq expected_error
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiparameter_date_time
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: american_date
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: with_model
   requirement: !ruby/object:Gem::Requirement