daily_affirmation 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 324f16541c789eee4d66b3c7986f53c0a21590a0
-  data.tar.gz: b602bca65f7b876b598af6af81a1b32180a65f2c
+  metadata.gz: 5d6a05019e18b5074eb228e2cd9e42ae8302cb00
+  data.tar.gz: f33966b9dc5669032db433ed3034aeacce539fd8
 SHA512:
-  metadata.gz: a91d08b3c6a0596a6d644c3483938cab4c79f45b9ed6e8eef023eefe814d448d38ba1afa1e4b997dd062ce7efde4b0bd1a5af6eb7d3ddf9e6ad19cdd4fc07411
-  data.tar.gz: e73cf19e62430dfa2ba3e81ce23cf533376d074e4b089734b2cc23851b57d5f1d4d76387d6efa3e8a05b4f143883a152cc8d866644f59324bf1ba46faebbbafd
+  metadata.gz: 2af4d1fd5b8bd6334e837aa1aa2842ed9c4dcbc8adb6200171313e26ebd7a54778548bc6ff37dd51a448fe1b52ce23cb34d235a52f642b9428bcd5de3c6a20bd
+  data.tar.gz: 1158c66ad417f70e3117573b8b51b9ed2d744f8b2e246a676548abe6be32b478ae3eaaab7f59d0d1bc583696b3e1e7797b57cad5e29ca31235ce0c67fd202696

data/lib/daily_affirmation/validators/date_validator.rb

@@ -3,6 +3,11 @@ require_relative "../validator"
 module DailyAffirmation
   module Validators
     class DateValidator < Validator
+      class NullDateLike
+        def <(val); true; end
+        def >(val); true; end
+      end
+
       def valid?
         @valid ||= parseable? && before? && after?
       end
@@ -25,20 +30,26 @@ module DailyAffirmation
         opts.fetch(:as, :date)
       end
 
+      def before
+        @before ||= -> {
+          val = opts.fetch(:before, NullDateLike.new)
+          val.respond_to?(:call) ? val.call : val
+        }.call
+      end
+
       def before?
-        if opts[:before]
-          value < opts[:before]
-        else
-          true
-        end
+        before > value
+      end
+
+      def after
+        @after ||= -> {
+          val = opts.fetch(:after, NullDateLike.new)
+          val.respond_to?(:call) ? val.call : val
+        }.call
       end
 
       def after?
-        if opts[:after]
-          value > opts[:after]
-        else
-          true
-        end
+        after < value
       end
 
       def klass

data/lib/daily_affirmation/version.rb

@@ -1,3 +1,3 @@
 module DailyAffirmation
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/validators/date_validator_spec.rb

@@ -145,6 +145,14 @@ describe "DateValidator" do
       validator = subject.new(obj, :created_at, :before => Date.today.prev_year)
       expect(validator).to_not be_valid
     end
+
+    it "allows a proc to be passed into before" do
+      obj = double(:created_at => Date.today.prev_year(2))
+      validator = subject.new(
+        obj, :created_at, :before => ->{ Date.today.prev_year }
+      )
+      expect(validator).to be_valid
+    end
   end
 
   context "the :after option is passed" do
@@ -159,5 +167,13 @@ describe "DateValidator" do
       validator = subject.new(obj, :created_at, :after => Date.today.prev_year)
       expect(validator).to be_valid
     end
+
+    it "allows a proc to be passed into after" do
+      obj = double(:created_at => Date.today)
+      validator = subject.new(
+        obj, :created_at, :after => ->{ Date.today.prev_year }
+      )
+      expect(validator).to be_valid
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daily_affirmation
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler