icu_utils 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f97cfbd598b1e453a7e2dcf3de583f60ba462d75
-  data.tar.gz: 525cbf547ee580ada1da81cbf4da119361a0c353
+  metadata.gz: ab59aa173d3006e292c62c663aef7e2a324cd541
+  data.tar.gz: 633b645d25e35b55976aa23930dca65ea338a503
 SHA512:
-  metadata.gz: cfa42575c3b40cec0f6aa7f531f6db3192009dd44599ab600ef800ca196d65c6b147b1c3825e4daf9799276f699464ec945ba0afdbfc463b6fd5919849fb13ec
-  data.tar.gz: eb0da907423c6d21a4b44c2ca4a8be8de670b4758b06947709dbaa8aadd55fb0a9b272a118376807524ab2c34f58e2a9e442c6f3e00ddea0befbd795f9989c93
+  metadata.gz: 224f78a3f5b8dacf2a587456249361279f43e2a4d96d203af8f44d1801d02a17f65cd031fa00721f975d578b33592239ad318ea85e2dc4104cf17b29fe2a711c
+  data.tar.gz: 47d8ce1bcce6c40e68bd895baf84462609d0f95a149b249f13465f275b75ddd58fea4762f6cb0b7cd9dd5928b5418787adffa685b58c971ec7012158d979d150

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    icu_utils (1.2.0)
+    icu_utils (1.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/icu_utils/date.rb

@@ -59,6 +59,7 @@ module ICU
     private
 
     def to_date(thing)
+      thing = thing.call if thing.respond_to?(:call)
       if thing.is_a?(Date)
         thing.dup
       else

data/lib/icu_utils/version.rb

@@ -1,3 +1,3 @@
 module IcuUtils
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/date_spec.rb

@@ -2,173 +2,211 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module ICU
   describe Date do
+    let(:penny)     { ::Date.new(1986, 6, 16) }
+    let(:mark)      { ::Date.new(1955, 11, 9) }
+    let(:today)     { ::Date.today }
+    let(:yesterday) { ::Date.today - 1 }
+
     context "no constraints" do
       it "today" do
-        today = ICU::Date.new(::Date.today)
-        expect(today).to be_valid
-        expect(today.date).to eq ::Date.today
-        expect(today.reasons).to be_empty
+        d = ICU::Date.new(today)
+        expect(d).to be_valid
+        expect(d.date).to eq today
+        expect(d.reasons).to be_empty
       end
 
       it "now" do
-        now = ICU::Date.new(Time.now)
-        expect(now).to be_valid
-        expect(now.date).to eq ::Date.today
-        expect(now.reasons).to be_empty
+        d = ICU::Date.new(Time.now)
+        expect(d).to be_valid
+        expect(d.date).to eq today
+        expect(d.reasons).to be_empty
       end
 
       it "human" do
-        now = ICU::Date.new("9th November 1955")
-        expect(now).to be_valid
-        expect(now.date).to eq ::Date.new(1955, 11, 9)
-        expect(now.reasons).to be_empty
+        d = ICU::Date.new("9th November 1955")
+        expect(d).to be_valid
+        expect(d.date).to eq mark
+        expect(d.reasons).to be_empty
       end
 
       it "abbreviated" do
-        now = ICU::Date.new("June 16 1986")
-        expect(now).to be_valid
-        expect(now.date).to eq ::Date.new(1986, 6, 16)
-        expect(now.reasons).to be_empty
+        d = ICU::Date.new("June 16 1986")
+        expect(d).to be_valid
+        expect(d.date).to eq penny
+        expect(d.reasons).to be_empty
       end
 
       it "invalid" do
-        invalid = ICU::Date.new("rubbish")
-        expect(invalid).to_not be_valid
-        expect(invalid.reasons).to_not be_empty
-        expect(invalid.reasons.size).to eq 1
-        expect(invalid.reasons.first).to eq "errors.messages.invalid_date"
+        d = ICU::Date.new("rubbish")
+        expect(d).to_not be_valid
+        expect(d.reasons).to_not be_empty
+        expect(d.reasons.size).to eq 1
+        expect(d.reasons.first).to eq "errors.messages.invalid_date"
       end
 
       it "impossible" do
-        invalid = ICU::Date.new("2014-02-30")
-        expect(invalid).to_not be_valid
-        expect(invalid.reasons).to_not be_empty
-        expect(invalid.reasons.size).to eq 1
-        expect(invalid.reasons.first).to eq "errors.messages.invalid_date"
+        d = ICU::Date.new("2014-02-30")
+        expect(d).to_not be_valid
+        expect(d.reasons).to_not be_empty
+        expect(d.reasons.size).to eq 1
+        expect(d.reasons.first).to eq "errors.messages.invalid_date"
       end
     end
 
     context "after" do
       it "today/yesterday" do
-        d = ICU::Date.new(::Date.today, after: ::Date.today - 1)
+        d = ICU::Date.new(today, after: yesterday)
         expect(d).to be_valid
-        expect(d.date).to eq ::Date.today
+        expect(d.date).to eq today
         expect(d.reasons).to be_empty
       end
 
       it "yesterday/today" do
-        d = ICU::Date.new(::Date.today - 1, after: ::Date.today)
+        d = ICU::Date.new(yesterday, after: today)
         expect(d).to_not be_valid
-        expect(d.date).to eq ::Date.today - 1
+        expect(d.date).to eq yesterday
         expect(d.reasons[0]).to eq "errors.messages.after"
-        expect(d.reasons[1]).to eq restriction: ::Date.today.to_s
+        expect(d.reasons[1]).to eq restriction: today.to_s
       end
 
       it "today/today" do
-        d = ICU::Date.new(::Date.today, after: ::Date.today)
+        d = ICU::Date.new(today, after: today)
         expect(d).to_not be_valid
-        expect(d.date).to eq ::Date.today
+        expect(d.date).to eq today
         expect(d.reasons[0]).to eq "errors.messages.after"
-        expect(d.reasons[1]).to eq restriction: ::Date.today.to_s
+        expect(d.reasons[1]).to eq restriction: today.to_s
       end
 
       it "invalid" do
-        expect{ICU::Date.new(::Date.today, after: "rubbish")}.to raise_error(/invalid/)
+        expect{ICU::Date.new(today, after: "rubbish")}.to raise_error(/invalid/)
       end
     end
 
     context "on or after" do
       it "today/yesterday" do
-        d = ICU::Date.new(::Date.today, on_or_after: ::Date.today - 1)
+        d = ICU::Date.new(today, on_or_after: yesterday)
         expect(d).to be_valid
-        expect(d.date).to eq ::Date.today
+        expect(d.date).to eq today
         expect(d.reasons).to be_empty
       end
 
       it "yesterday/today" do
-        d = ICU::Date.new(::Date.today - 1, on_or_after: ::Date.today)
+        d = ICU::Date.new(yesterday, on_or_after: today)
         expect(d).to_not be_valid
-        expect(d.date).to eq ::Date.today - 1
+        expect(d.date).to eq yesterday
         expect(d.reasons[0]).to eq "errors.messages.on_or_after"
-        expect(d.reasons[1]).to eq restriction: ::Date.today.to_s
+        expect(d.reasons[1]).to eq restriction: today.to_s
       end
 
       it "today/today" do
-        d = ICU::Date.new(::Date.today, on_or_after: ::Date.today)
+        d = ICU::Date.new(today, on_or_after: today)
         expect(d).to be_valid
-        expect(d.date).to eq ::Date.today
+        expect(d.date).to eq today
         expect(d.reasons).to be_empty
       end
 
       it "impossible" do
-        expect{ICU::Date.new(::Date.today, on_or_after: ::Date.new(1955, 2, 29))}.to raise_error(/invalid/)
+        expect{ICU::Date.new(today, on_or_after: ::Date.new(1955, 2, 29))}.to raise_error(/invalid/)
       end
     end
 
     context "before" do
       it "yesterday/today" do
-        d = ICU::Date.new(::Date.today - 1, before: ::Date.today)
+        d = ICU::Date.new(yesterday, before: today)
         expect(d).to be_valid
-        expect(d.date).to eq ::Date.today - 1
+        expect(d.date).to eq yesterday
         expect(d.reasons).to be_empty
       end
 
       it "today/yesterday" do
-        d = ICU::Date.new(::Date.today, before: ::Date.today - 1)
+        d = ICU::Date.new(today, before: yesterday)
         expect(d).to_not be_valid
-        expect(d.date).to eq ::Date.today
+        expect(d.date).to eq today
         expect(d.reasons[0]).to eq "errors.messages.before"
-        expect(d.reasons[1]).to eq restriction: (::Date.today - 1).to_s
+        expect(d.reasons[1]).to eq restriction: yesterday.to_s
       end
 
       it "today/today" do
-        d = ICU::Date.new(::Date.today, before: ::Date.today.to_s)
+        d = ICU::Date.new(today, before: today.to_s)
         expect(d).to_not be_valid
-        expect(d.date).to eq ::Date.today
+        expect(d.date).to eq today
         expect(d.reasons[0]).to eq "errors.messages.before"
-        expect(d.reasons[1]).to eq restriction: ::Date.today.to_s
+        expect(d.reasons[1]).to eq restriction: today.to_s
       end
 
       it "invalid" do
-        expect{ICU::Date.new(::Date.today, before: "")}.to raise_error(/invalid/)
+        expect{ICU::Date.new(today, before: "")}.to raise_error(/invalid/)
       end
     end
 
     context "on or before" do
       it "yesterday/today" do
-        d = ICU::Date.new(::Date.today - 1, on_or_before: ::Date.today.to_s)
+        d = ICU::Date.new(yesterday, on_or_before: today.to_s)
         expect(d).to be_valid
-        expect(d.date).to eq ::Date.today - 1
+        expect(d.date).to eq yesterday
         expect(d.reasons).to be_empty
       end
 
       it "today/yesterday" do
-        d = ICU::Date.new(::Date.today, on_or_before: ::Date.today - 1)
+        d = ICU::Date.new(today, on_or_before: yesterday)
         expect(d).to_not be_valid
-        expect(d.date).to eq ::Date.today
+        expect(d.date).to eq today
         expect(d.reasons[0]).to eq "errors.messages.on_or_before"
-        expect(d.reasons[1]).to eq restriction: (::Date.today - 1).to_s
+        expect(d.reasons[1]).to eq restriction: yesterday.to_s
       end
 
       it "today/today" do
-        d = ICU::Date.new(::Date.today, on_or_before: ::Date.today)
+        d = ICU::Date.new(today, on_or_before: today)
         expect(d).to be_valid
-        expect(d.date).to eq ::Date.today
+        expect(d.date).to eq today
         expect(d.reasons).to be_empty
       end
 
       it "impossible" do
-        expect{ICU::Date.new(::Date.today, on_or_before: "2014-06-31")}.to raise_error(/invalid/)
+        expect{ICU::Date.new(today, on_or_before: "2014-06-31")}.to raise_error(/invalid/)
       end
     end
-  end
 
-  context "multiple constraints" do
-    it "today/today" do
-      d = ICU::Date.new(::Date.today, on_or_after: ::Date.today.to_s, on_or_before: ::Date.today)
-      expect(d).to be_valid
-      expect(d.date).to eq ::Date.today
-      expect(d.reasons).to be_empty
+    context "multiple constraints" do
+      it "today/today" do
+        d = ICU::Date.new(today, on_or_after: today.to_s, on_or_before: today)
+        expect(d).to be_valid
+        expect(d.date).to eq today
+        expect(d.reasons).to be_empty
+      end
+    end
+
+    context "proc constraints" do
+      it "before" do
+        d = ICU::Date.new(penny, before: -> { ::Date.today })
+        expect(d).to be_valid
+        expect(d.date).to eq penny
+        expect(d.reasons).to be_empty
+      end
+
+      it "after" do
+        d = ICU::Date.new(yesterday, after: -> { ::Date.today })
+        expect(d).to_not be_valid
+        expect(d.date).to eq yesterday
+        expect(d.reasons[0]).to eq "errors.messages.after"
+        expect(d.reasons[1]).to eq restriction: today.to_s
+      end
+
+      it "on or before" do
+        d = ICU::Date.new(today, on_or_before: -> { ::Date.today - 1 })
+        expect(d).to_not be_valid
+        expect(d.date).to eq today
+        expect(d.reasons[0]).to eq "errors.messages.on_or_before"
+        expect(d.reasons[1]).to eq restriction: yesterday.to_s
+      end
+
+      it "on or after" do
+        d = ICU::Date.new(mark, on_or_after: -> { ::Date.new(1986, 6, 16) })
+        expect(d).to_not be_valid
+        expect(d.date).to eq mark
+        expect(d.reasons[0]).to eq "errors.messages.on_or_after"
+        expect(d.reasons[1]).to eq restriction: penny.to_s
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icu_utils
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Mark Orr