split_dmy 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1cc272431001c8df28f5868fc48099d0c6e9687
-  data.tar.gz: 6788d518f913b907599e6f774d5964cf9d2d481c
+  metadata.gz: 77b51777ddac980e96091125b2a9c91944a47211
+  data.tar.gz: edbc9e21a698aa1e96a0b680c6d2ca5021ab4814
 SHA512:
-  metadata.gz: eaac8f937162d0f5ef4e36e885bbe29ac511afa105c80b028c2a3e9e78b395eb85c46b26b0f68af1805aeef4b0fc6ef8407366143576a588d27525c5234f2761
-  data.tar.gz: 65786e12689aa4b12199c99b8c56330b80e731de49d15299307d79e077ed521cd79b272b3a4f8229d8df4abdc4fcc630b206a09c018444ce73d741e98389bd1d
+  metadata.gz: 827fe90bd6339930a704f8862b7d73d0f56a7bf9fe57f235d102007bff323ba2fdb3667ce6261ddb75f2eb2dea443b9463c366d5c7bd0f3ebc49cddd18c40ac3
+  data.tar.gz: 55b434c4d90e11a60923489d9abdda47d2a5d829ebf917469c78c417d091a81b0e1edb9e33bbf6e8478c1c0dcf92ec52ad343c92dfe167f777d69adcfdaad731

data/lib/split_dmy/date_validator.rb

@@ -9,8 +9,8 @@ module SplitDmy
     end
 
     def partial_updated
-      bd = build_date
-      partials_valid? && bd ? bd : nil
+      new_date = build_date
+      partials_valid? && new_date ? new_date : nil
     end
 
     def parse_month(val)
@@ -40,16 +40,8 @@ module SplitDmy
       false
     end
 
-    def generate_errors
-      %w[day month year].each do |part|
-        error = get_partial_error(part)
-        @object.errors.add("#{@attr}_#{part}".to_sym, error) if error.present?
-      end
-
-      err = []
-      err << 'you need to provide a valid date' if all_partials_empty?
-      err << combine_partials_error if partials_valid_date_fails?
-      err
+    def any_errors?
+      !partials_valid? || partials_valid_date_fails?
     end
 
     private
@@ -62,11 +54,6 @@ module SplitDmy
       partials_valid? && !build_date
     end
 
-    def combine_partials_error
-      joined_date = [@split_day, @split_month, @split_year].join('-')
-      "'#{joined_date}' is not a valid date"
-    end
-
     def all_partials_empty?
       [@split_day.empty?, @split_month.empty?, @split_year.empty?].values.all?
     rescue

data/lib/split_dmy/split_accessors.rb

@@ -18,8 +18,7 @@ module SplitDmy
     def extend_validation(attr)
       define_method("validate_#{attr}_partials") do
         dv = DateValidator.new(self, attr)
-        new_errs = dv.generate_errors
-        unless new_errs.empty?
+        if dv.any_errors?
           errors.delete(attr.to_sym)
           errors.add(attr.to_sym, :invalid)
         end
@@ -44,10 +43,6 @@ module SplitDmy
         instance_variable_set("@#{attr}_month", full_date.month)
         instance_variable_set("@#{attr}_year", full_date.year)
       end
-
-      define_method('make_sentence_of') do |errors|
-        errors.to_sentence(last_word_connector: ' and ')
-      end
     end
 
     def add_attr_accessors(attr)

data/lib/split_dmy/version.rb

@@ -1,3 +1,3 @@
 module SplitDmy
-  VERSION = '0.2'.freeze
+  VERSION = '0.3'.freeze
 end

data/spec/split_dmy/split_accessors_spec.rb

@@ -3,9 +3,14 @@ require 'split_dmy/split_accessors'
 require_relative '../../spec/support/matchers/accessors_shared'
 
 describe SplitDmy::SplitAccessors do
-  let(:model) { User.new }
+  let(:date_of_birth) { nil }
+  let(:model) do
+    User.extend(described_class)
+    User.split_dmy_accessor(:date_of_birth)
+    User.new(date_of_birth: date_of_birth)
+  end
 
-  describe 'test model' do
+  describe 'the test model' do
     it 'has a date of birth field to extend' do
       expect(model).to respond_to :date_of_birth
     end
@@ -14,329 +19,444 @@ describe SplitDmy::SplitAccessors do
     end
   end
 
-  describe 'after adding our gem, a model' do
-    before do
-      User.extend(described_class)
-      User.split_dmy_accessor(:date_of_birth)
+  ['day', 'month', 'year'].each do |part|
+    it "responds to attribute_#{part}" do
+      expect(model).to respond_to "date_of_birth_#{part}".to_sym
+    end
+
+    it "has split accessor for attribute_#{part}" do
+      expect(model).to have_attr_accessor "date_of_birth_#{part}".to_sym
     end
+  end
+
+  context 'when date is pre-filled' do
+    let(:date_of_birth) { Date.new(1992, 1, 21) }
+
+    describe 'it splits the partials' do
+      it 'sets the day' do
+        expect(model.date_of_birth_day).to eq 21
+      end
 
-    ['day', 'month', 'year'].each do |part|
-      it "responds to attribute_#{part}" do
-        expect(model).to respond_to "date_of_birth_#{part}".to_sym
+      it 'sets the month' do
+        expect(model.date_of_birth_month).to eq 1
       end
 
-      it "has split accessor for attribute_#{part}" do
-        expect(model).to have_attr_accessor "date_of_birth_#{part}".to_sym
+      it 'sets the year' do
+        expect(model.date_of_birth_year).to eq 1992
       end
     end
 
-    describe 'split dmy methods' do
-      describe 'handles pre-set dates' do
-        describe 'passes them to the new accessors' do
-          before(:each) { model.date_of_birth = '1991-1-21' }
+    describe 'setting the _day' do
+      before { model.date_of_birth_day = dob_day }
+      describe 'when sent numbers' do
+        (1..31).each do |i|
+          describe 'between 1 and 31 ' do
+            let(:dob_day) { i }
+            before { model.valid? }
+
+            it 'sets the value' do
+              expect(model.date_of_birth_day).to eq i
+            end
+
+            it 'sets the date' do
+              expect(model.date_of_birth).to eq Date.new(1992, 1, i)
+            end
 
-          it 'sets the _day' do
-            expect(model.date_of_birth_day).to eq 21
+            it 'makes the model valid' do
+              expect(model).to be_valid
+            end
+
+            it 'returns no errors' do
+              expect(model.errors.count).to eq 0
+            end
           end
         end
+      end
 
-        context 'when object created with date' do
-          let(:model) { User.new(date_of_birth: Date.new(1992, 1, 21)) }
+      describe 'to text' do
+        let(:dob_day) { 'first' }
 
-          it 'sets the date' do
-            expect(model.date_of_birth).to eq Date.new(1992, 1, 21)
-          end
+        before { model.valid? }
+
+        it 'sets the value' do
+          expect(model.date_of_birth_day).to eq 'first'
+        end
+
+        it 'sets the date to nil' do
+          expect(model.date_of_birth).to eq nil
+        end
+
+        it 'makes the model invalid' do
+          expect(model).to be_invalid
+        end
+
+        it 'sets the error to invalid' do
+          expect(model.errors[:date_of_birth]).to eq ['is invalid']
+        end
+      end
+
+      describe 'to too low a value' do
+        let(:dob_day) { 0 }
+
+        before { model.valid? }
+
+        it 'sets the value' do
+          expect(model.date_of_birth_day).to eq 0
+        end
+
+        it 'sets the date to nil' do
+          expect(model.date_of_birth).to eq nil
+        end
+
+        it 'makes the model invalid' do
+          expect(model).to be_invalid
+        end
+
+        it 'sets the error to invalid' do
+          expect(model.errors[:date_of_birth]).to eq ['is invalid']
+        end
+      end
+
+      describe 'to too high a value' do
+        let(:dob_day) { 32 }
+
+        before { model.valid? }
+
+        it 'sets the value' do
+          expect(model.date_of_birth_day).to eq 32
+        end
+
+        it 'sets the date to nil' do
+          expect(model.date_of_birth).to eq nil
+        end
 
-          describe 'splits the partials' do
-            it 'sets the day' do
-              expect(model.date_of_birth_day).to eq 21
+        it 'makes the model invalid' do
+          expect(model).to be_invalid
+        end
+
+        it 'sets the error to invalid' do
+          expect(model.errors[:date_of_birth]).to eq ['is invalid']
+        end
+      end
+
+      describe 'to nil' do
+        let(:dob_day) { nil }
+
+        before { model.valid? }
+
+        it 'sets the value' do
+          expect(model.date_of_birth_day).to eq nil
+        end
+
+        it 'sets the date to nil' do
+          expect(model.date_of_birth).to be nil
+        end
+
+        it 'makes the model invalid' do
+          expect(model).to be_invalid
+        end
+
+        it 'sets the error to invalid' do
+          expect(model.errors[:date_of_birth]).to eq ['is invalid']
+        end
+      end
+    end
+
+    describe 'setting the _month' do
+      before { model.date_of_birth_month = dob_month }
+
+      describe 'when sent text' do
+
+        I18n.t('date.month_names').each_with_index do |month, _index|
+          next if month.nil?
+          describe 'of long month names' do
+            let(:dob_month) { model.date_of_birth_month = month }
+
+            before { model.valid? }
+
+            it { expect(model.date_of_birth_month).to eq Date::MONTHNAMES.index(month) }
+
+            it 'sets the date to nil' do
+              expect(model.date_of_birth).to eq Date.new(1992, Date::MONTHNAMES.index(month), 21)
             end
 
-            it 'sets the month' do
-              expect(model.date_of_birth_month).to eq 1
+            it 'makes the model valid' do
+              expect(model).to be_valid
             end
 
-            it 'sets the year' do
-              expect(model.date_of_birth_year).to eq 1992
+            it 'returns no errors' do
+              expect(model.errors.count).to eq 0
             end
           end
         end
 
-        describe 'allows clearing of preset data' do
-          before(:each) { model.date_of_birth = '1991-1-21' }
+        I18n.t('date.abbr_month_names').each_with_index do |month, _index|
+          next if month.nil?
+          describe 'of long month names' do
+            let(:dob_month) { model.date_of_birth_month = month }
 
-          it 'by setting all values to nil' do
-            model.date_of_birth_day = nil
-            model.date_of_birth_month = nil
-            model.date_of_birth_year = nil
-            expect(model.date_of_birth).to be_nil
-          end
+            before { model.valid? }
 
-          describe 'by setting' do
-            it 'day to nil' do
-              model.date_of_birth_day = nil
-              expect(model.date_of_birth).to be_nil
+            it { expect(model.date_of_birth_month).to eq Date::ABBR_MONTHNAMES.index(month) }
+
+            it 'sets the date to nil' do
+              expect(model.date_of_birth).to eq Date.new(1992, Date::ABBR_MONTHNAMES.index(month), 21)
             end
-            it 'month to nil' do
-              model.date_of_birth_month = nil
-              expect(model.date_of_birth).to be_nil
+
+            it 'makes the model valid' do
+              expect(model).to be_valid
             end
-            it 'year to nil' do
-              model.date_of_birth_year = nil
-              expect(model.date_of_birth).to be_nil
+
+            it 'returns no errors' do
+              expect(model.errors.count).to eq 0
             end
           end
         end
+
+        describe 'that is not a valid month' do
+          let(:dob_month) { 'first' }
+
+          before { model.valid? }
+
+          it 'sets the value' do
+            expect(model.date_of_birth_month).to eq 'first'
+          end
+
+          it 'sets the date to nil' do
+            expect(model.date_of_birth).to eq nil
+          end
+
+          it 'makes the model invalid' do
+            expect(model).to be_invalid
+          end
+
+          it 'sets the error to invalid' do
+            expect(model.errors[:date_of_birth]).to eq ['is invalid']
+          end
+        end
       end
 
-      describe '_day' do
-        describe 'when sent numbers' do
-          describe 'between 1 and 31 is valid' do
+      describe 'when sent numbers' do
+        (1..12).each do |i|
+          describe 'between 1 and 12 ' do
+            let(:dob_month) { i }
+            before { model.valid? }
+
             it 'sets the value' do
-              (1..31).each do |i|
-                model.date_of_birth_day = i
-                expect(model.date_of_birth_day).to eq i
-              end
+              expect(model.date_of_birth_month).to eq i
             end
-          end
 
-          describe 'above accepted range' do
-            before do
-              model.date_of_birth_day = 32
-              model.valid?
+            it 'sets the date' do
+              expect(model.date_of_birth).to eq Date.new(1992, i, 21)
             end
 
-            it 'sets the value' do
-              expect(model.date_of_birth_day).to eq 32
+            it 'makes the model valid' do
+              expect(model).to be_valid
             end
 
-            it 'adds an error message' do
-              err_msg = ['is not a valid day']
-              expect(model.errors[:date_of_birth_day]).to eq err_msg
+            it 'returns no errors' do
+              expect(model.errors.count).to eq 0
             end
           end
+        end
 
-          describe 'below accepted range' do
-            before { model.date_of_birth_day = 0 }
+        describe 'to too high a value' do
+          let(:dob_month) { 13 }
 
-            it 'sets the value' do
-              expect(model.date_of_birth_day).to eq 0
-            end
+          before { model.valid? }
 
-            it 'makes the model invalid' do
-              expect(model).to be_invalid
-            end
+          it 'sets the value' do
+            expect(model.date_of_birth_month).to eq 13
+          end
+
+          it 'sets the date to nil' do
+            expect(model.date_of_birth).to eq nil
+          end
+
+          it 'makes the model invalid' do
+            expect(model).to be_invalid
+          end
+
+          it 'sets the error to invalid' do
+            expect(model.errors[:date_of_birth]).to eq ['is invalid']
           end
         end
 
-        describe 'when sent text' do
-          before { model.date_of_birth_day = 'first' }
+        describe 'to too low a value' do
+          let(:dob_month) { 0 }
+
+          before { model.valid? }
 
-          it 'returns nil' do
-            expect(model.date_of_birth_day).to eq 'first'
+          it 'sets the value' do
+            expect(model.date_of_birth_month).to eq 0
+          end
+
+          it 'sets the date to nil' do
+            expect(model.date_of_birth).to eq nil
           end
 
           it 'makes the model invalid' do
             expect(model).to be_invalid
           end
-        end
 
-        describe 'when sent nil' do
-          it 'returns nil' do
-            model.date_of_birth_day = nil
-            expect(model.date_of_birth_day).to be_nil
+          it 'sets the error to invalid' do
+            expect(model.errors[:date_of_birth]).to eq ['is invalid']
           end
         end
       end
 
-      describe '_month' do
-        describe 'when sent numbers' do
-          describe 'between 1 and 31 is valid' do
-            it 'sets the value' do
-              (1..12).each do |i|
-                model.date_of_birth_month = i
-                expect(model.date_of_birth_month).to eq i
-              end
-            end
-          end
+      describe 'to nil' do
+        let(:dob_month) { nil }
 
-          describe 'above accepted range' do
-            before { model.date_of_birth_month = 13 }
+        before { model.valid? }
 
-            it 'sets the value' do
-              expect(model.date_of_birth_month).to eq 13
-            end
+        it 'sets the value' do
+          expect(model.date_of_birth_month).to eq nil
+        end
 
-            it 'makes the model invalid' do
-              expect(model).to be_invalid
-            end
-          end
+        it 'sets the date to nil' do
+          expect(model.date_of_birth).to be nil
+        end
+
+        it 'makes the model invalid' do
+          expect(model).to be_invalid
+        end
+
+        it 'sets the error to invalid' do
+          expect(model.errors[:date_of_birth]).to eq ['is invalid']
+        end
+      end
+    end
 
-          describe 'below accepted range' do
-            before { model.date_of_birth_month = 0 }
+    describe 'setting the _year' do
+      before { model.date_of_birth_year = dob_year }
+
+      describe 'as numbers' do
+        describe 'numerically' do
+          describe 'in the acceptable range' do
+            let(:dob_year) { 1961 }
+
+            before { model.valid? }
 
             it 'sets the value' do
-              expect(model.date_of_birth_month).to eq 0
+              expect(model.date_of_birth_year).to eq 1961
             end
 
-            it 'makes the model invalid' do
-              expect(model).to be_invalid
+            it 'sets the date to nil' do
+              expect(model.date_of_birth).to eq Date.new(1961, 1, 21)
             end
-          end
-        end
 
-        describe 'when sent text' do
-          describe 'that is a valid long month' do
-            I18n.t('date.month_names').each_with_index do |month, _index|
-              it "sending #{month} sets the month to #{month}" do
-                model.date_of_birth_month = month
-                expect(model.date_of_birth_month).to eq month unless month.nil?
-              end
+            it 'makes the model valid' do
+              expect(model).to be_valid
             end
-          end
-          describe 'that is a valid short month' do
-            I18n.t('date.abbr_month_names').each_with_index do |month, _index|
-              it "sending #{month} sets the month to #{month}" do
-                model.date_of_birth_month = month
-                expect(model.date_of_birth_month).to eq month unless month.nil?
-              end
+
+            it 'returns no errors' do
+              expect(model.errors.count).to eq 0
             end
           end
-          describe 'that is not a valid month' do
-            before { model.date_of_birth_month = 'first' }
 
-            it 'returns the text' do
-              expect(model.date_of_birth_month).to eq 'first'
+          describe 'outside the acceptable range' do
+            let(:dob_year) { 3334 }
+
+            before { model.valid? }
+
+            it 'sets the value' do
+              expect(model.date_of_birth_year).to eq 3334
+            end
+
+            it 'sets the date to nil' do
+              expect(model.date_of_birth).to eq nil
             end
 
             it 'makes the model invalid' do
               expect(model).to be_invalid
             end
-          end
-        end
-
-        describe 'when sent nil' do
-          it 'returns nil' do
-            model.date_of_birth_month = nil
-            expect(model.date_of_birth_month).to be_nil
-          end
-        end
-      end
 
-      describe '_year' do
-        describe 'when sent numbers' do
-          describe 'numerically' do
-            describe 'in the acceptable range' do
-              it 'sets the value' do
-                model.date_of_birth_year = 1961
-                expect(model.date_of_birth_year).to eq 1961
-              end
-            end
-            describe 'outside the acceptable range' do
-              before { model.date_of_birth_year = 3334 }
-              it 'returns nil' do
-                expect(model.date_of_birth_year).to be 3334
-              end
-
-              it 'makes the model invalid' do
-                expect(model).to be_invalid
-              end
-            end
-          end
-          describe 'as text' do
-            it 'accepts and converts them' do
-              model.date_of_birth_year = '1961'
-              expect(model.date_of_birth_year).to eq '1961'
+            it 'sets the error to invalid' do
+              expect(model.errors[:date_of_birth]).to eq ['is invalid']
             end
           end
         end
 
-        describe 'when sent text' do
-          before { model.date_of_birth_year = 'Nineteen Sixty One' }
+        describe 'as text' do
+          let(:dob_year) { '1961' }
+
+          before { model.valid? }
 
           it 'sets the value' do
-            expect(model.date_of_birth_year).to eq 'Nineteen Sixty One'
+            expect(model.date_of_birth_year).to eq 1961
           end
 
-          it 'makes the model invalid' do
-            expect(model).to be_invalid
+          it 'sets the date to nil' do
+            expect(model.date_of_birth).to eq Date.new(1961, 1, 21)
+          end
+
+          it 'makes the model valid' do
+            expect(model).to be_valid
           end
-        end
 
-        describe 'when sent nil' do
-          it 'returns nil' do
-            model.date_of_birth_year = nil
-            expect(model.date_of_birth_year).to be_nil
+          it 'returns no errors' do
+            expect(model.errors.count).to eq 0
           end
         end
       end
 
-      describe 'when passed implausible dates' do
-        before do
-          model.date_of_birth_day = 30
-          model.date_of_birth_month = 2
-          model.date_of_birth_year = 2015
-          model.valid?
-        end
+      describe 'using text' do
+        let(:dob_year) { 'Nineteen Sixty One' }
 
-        it 'returns an error' do
-          expect(model.errors[:date_of_birth]).to eq ['is invalid']
+        before { model.valid? }
+
+        it 'sets the value' do
+          expect(model.date_of_birth_year).to eq 'Nineteen Sixty One'
         end
-      end
 
-      describe 'set themselves but do not set date' do
-        describe '#posted_day' do
-          it 'can be set and returned' do
-            model.date_of_birth_day = 1
-            expect(model.date_of_birth_day).to eq 1
-            expect(model.date_of_birth).to be nil
-          end
+        it 'sets the date to nil' do
+          expect(model.date_of_birth).to eq nil
         end
 
-        describe '#posted_month' do
-          it 'can be set and returned' do
-            model.date_of_birth_month = 10
-            expect(model.date_of_birth_month).to eq 10
-            expect(model.date_of_birth).to be nil
-          end
+        it 'makes the model invalid' do
+          expect(model).to be_invalid
         end
 
-        describe '#posted_year' do
-          it 'can be set and returned' do
-            model.date_of_birth_year = 10
-            expect(model.date_of_birth_year).to eq 10
-            expect(model.date_of_birth).to be nil
-          end
+        it 'sets the error to invalid' do
+          expect(model.errors[:date_of_birth]).to eq ['is invalid']
         end
       end
 
-      describe 'set the date field by calling validate_date' do
-        context 'when all are completed' do
-          before(:each) { model.date_of_birth = nil }
+      describe 'to nil' do
+        let(:dob_year) { nil }
 
-          it 'with year last' do
-            model.date_of_birth_day = 21
-            model.date_of_birth_month = 1
-            model.date_of_birth_year = 1961
-            expect(model.date_of_birth).to eql Date.new(1961, 1, 21)
-          end
+        before { model.valid? }
 
-          it 'with month last' do
-            model.date_of_birth_year = 1961
-            model.date_of_birth_day = 21
-            model.date_of_birth_month = 1
-            expect(model.date_of_birth).to eql Date.new(1961, 1, 21)
-          end
+        it 'sets the value' do
+          expect(model.date_of_birth_year).to eq nil
+        end
 
-          it 'with day last' do
-            model.date_of_birth_month = 1
-            model.date_of_birth_year = 1961
-            model.date_of_birth_day = 21
-            expect(model.date_of_birth).to eql Date.new(1961, 1, 21)
-          end
+        it 'sets the date to nil' do
+          expect(model.date_of_birth).to be nil
+        end
+
+        it 'makes the model invalid' do
+          expect(model).to be_invalid
+        end
+
+        it 'sets the error to invalid' do
+          expect(model.errors[:date_of_birth]).to eq ['is invalid']
         end
       end
     end
 
+    describe 'when passed implausible dates' do
+      before do
+        model.date_of_birth_day = 30
+        model.date_of_birth_month = 2
+        model.date_of_birth_year = 2015
+        model.valid?
+      end
+
+      it 'returns an error' do
+        expect(model.errors[:date_of_birth]).to eq ['is invalid']
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: split_dmy
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Colin Bruce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler