daily_affirmation 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bebab94b6507fded2c3c6b8620064c31753fbd7
-  data.tar.gz: 7ec0f8b962d6981a99f62d3475524437ecdec690
+  metadata.gz: 94605e7d69f4f97c4ec51b7ae89f813f74a75e8f
+  data.tar.gz: 3754de93153d51826cc98410c199cc6cac4730db
 SHA512:
-  metadata.gz: b73c9f489458982f747535fa715dd90f6a10d8f7cf7814b9f00c247b99aa521f4b53a1a70d56794b38961aabeef41f4722ac98931afd535bc160a21460aa6dbf
-  data.tar.gz: 3cd11055f9b7fc591796320fb951324d522481835e69e8e588bf6360a425f9e642945d8929ce86189d1f13b1c984ba0d8df4022ca8013793aa83a4627ec17e99
+  metadata.gz: 6e7006de8350a3b28611692d7b4a1e2dbe0430c90175e6f6e02f9f70f393a0aa4203433f5b7d9c8564233e5d47a530166f308da1f48b2854cbf8fcedf6766c59
+  data.tar.gz: b4d8275d96b85de094dd78fa89f4c9aef10e6d2aed4db502f2a56fd933e430c5663c55a5d89ad157e7b025d2e89c50c83307ec15ba463f4a73fe7586c80e9397

data/lib/daily_affirmation/affirmations.rb

@@ -37,55 +37,75 @@ module DailyAffirmation
       attribute = affirmation[:attribute]
       args = affirmation.reject { |k, _| [:type, :attribute].include?(k) }
 
-      validator = Object.const_get(
-        "DailyAffirmation::Validators::#{type.to_s.capitalize}Validator"
-      )
-      validator.new(object, attribute, args).affirm
+      process_validation = if args.include?(:if)
+                             instance_eval(&args[:if])
+                           else
+                             true
+                           end
+
+      if process_validation
+        validator = Object.const_get(
+          "DailyAffirmation::Validators::#{type.to_s.capitalize}Validator"
+        )
+        validator.new(object, attribute, args).affirm
+      else
+        [true, nil]
+      end
     end
 
     module ClassMethods
-      def affirms_absence_of(attribute)
-        affirmations << {:attribute => attribute, :type => :absence}
+      def affirms_absence_of(attribute, opts = {})
+        affirmations << {
+          :attribute => attribute, :type => :absence
+        }.merge(opts)
       end
 
-      def affirms_acceptance_of(attribute)
-        affirmations << {:attribute => attribute, :type => :acceptance}
+      def affirms_acceptance_of(attribute, opts = {})
+        affirmations << {
+          :attribute => attribute, :type => :acceptance
+        }.merge(opts)
       end
 
-      def affirms_confirmation_of(attribute)
-        affirmations << {:attribute => attribute, :type => :confirmation}
+      def affirms_confirmation_of(attribute, opts = {})
+        affirmations << {
+          :attribute => attribute, :type => :confirmation
+        }.merge(opts)
       end
 
-      def affirms_exclusion_of(attribute, list: [])
+      def affirms_exclusion_of(attribute, opts = {}, list: [])
         affirmations << {
           :attribute => attribute, :type => :exclusion, :list => list
-        }
+        }.merge(opts)
       end
 
-      def affirms_format_of(attribute, regex: //)
+      def affirms_format_of(attribute, opts = {}, regex: //)
         affirmations << {
           :attribute => attribute, :type => :format, :regex => regex
-        }
+        }.merge(opts)
       end
 
-      def affirms_inclusion_of(attribute, list: [])
+      def affirms_inclusion_of(attribute, opts = {}, list: [])
         affirmations << {
           :attribute => attribute, :type => :inclusion, :list => list
-        }
+        }.merge(opts)
       end
 
-      def affirms_length_of(attribute, range: 0..0)
+      def affirms_length_of(attribute, opts = {}, range: 0..0)
         affirmations << {
           :attribute => attribute, :type => :length, :range => range
-        }
+        }.merge(opts)
       end
 
-      def affirms_numericality_of(attribute)
-        affirmations << {:attribute => attribute, :type => :numericality}
+      def affirms_numericality_of(attribute, opts = {})
+        affirmations << {
+          :attribute => attribute, :type => :numericality
+        }.merge(opts)
       end
 
-      def affirms_presence_of(attribute)
-        affirmations << {:attribute => attribute, :type => :presence}
+      def affirms_presence_of(attribute, opts = {})
+        affirmations << {
+          :attribute => attribute, :type => :presence
+        }.merge(opts)
       end
 
       def affirmations

data/lib/daily_affirmation/version.rb

@@ -1,3 +1,3 @@
 module DailyAffirmation
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/daily_affirmation_spec.rb

@@ -114,4 +114,20 @@ describe DailyAffirmation do
       expect(affirmation).to be_valid
     end
   end
+
+  it "allows each affirmation to be skipped via an :if option" do
+    cls = Class.new do
+      include DailyAffirmation.affirmations
+
+      affirms_presence_of :name, :if => Proc.new { object.age > 10 }
+    end
+
+    obj1 = double(:name => nil, :age => 1)
+    obj2 = double(:name => nil, :age => 11)
+
+    affirmation1 = cls.new(obj1)
+    affirmation2 = cls.new(obj2)
+    expect(affirmation1).to be_valid
+    expect(affirmation2).to_not be_valid
+  end
 end

metadata

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