daily_affirmation 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63dddf98c1338f2c348cfc44c6f1e1325c17c3a1
-  data.tar.gz: 1be0d8af0b511c753aad20cca49d85185653c3a3
+  metadata.gz: f9de5dd78a0bef74b3651afb803f155368e25584
+  data.tar.gz: 09f91e14d2dbb1b5792f6e839f33df8652060294
 SHA512:
-  metadata.gz: 626d8b7867e06308262c2e8f5f2e9401137d1c81b649dd932c0555e9486f7a58cba29c38b3d3ec6c201d5f8c6aa55261cd60ff34b3aa67ac60634b19090f8ebe
-  data.tar.gz: 5d50e83ac7694ee5972d8240a9f8b99a51003333d9d82dce37be5d90ac74cc71b5254ae7cd21ba5f426836c96a42e38a8a83c6f5703486ea8462d9974108894c
+  metadata.gz: 274adb6724f09c22837e088d1b05c879114d9cfbc1a76ba1b7055d8e8dfd9d0adb1761514d9ad2af20916bb96cfa7ecbb657009773fc5d40f820b764c5415068
+  data.tar.gz: 9ac90e5455aa763cba07ef3c6c062a72bd7f6a4267ac4efb4163d79f5866c9281077e10e76dcc3ae16e9f94da53222c09009a49b240227e3f34688240ec3bcea

data/README.md

@@ -1,7 +1,8 @@
 # DailyAffirmation
 
+[ ![Codeship Status for teamsnap/daily_affirmation](https://www.codeship.io/projects/70727b30-de01-0131-af05-5236ebb52643/status)](https://www.codeship.io/projects/24759)
+
 [![Gem Version](https://badge.fury.io/rb/daily_affirmation.png)](http://badge.fury.io/rb/daily_affirmation)
-[![Semaphore](https://semaphoreapp.com/api/v1/projects/7268def52c792e50bfc60e1b1a6e905ed4e2a80d/118940/shields_badge.png)](https://semaphoreapp.com/minter/daily_affirmation)
 [![Code Climate](https://codeclimate.com/github/teamsnap/daily_affirmation.png)](https://codeclimate.com/github/teamsnap/daily_affirmation)
 [![Coverage Status](https://coveralls.io/repos/teamsnap/daily_affirmation/badge.png?branch=master)](https://coveralls.io/r/teamsnap/daily_affirmation?branch=master)
 [![Dependency Status](https://gemnasium.com/teamsnap/daily_affirmation.png)](https://gemnasium.com/teamsnap/daily_affirmation)

data/lib/daily_affirmation.rb

@@ -1,3 +1,4 @@
+require_relative "daily_affirmation/process_affirmation_evaluator"
 require_relative "daily_affirmation/affirmations"
 require_relative "daily_affirmation/validators/absence_validator"
 require_relative "daily_affirmation/validators/acceptance_validator"

data/lib/daily_affirmation/affirmations.rb

@@ -37,13 +37,7 @@ module DailyAffirmation
       attribute = affirmation[:attribute]
       args = affirmation.reject { |k, _| [:type, :attribute].include?(k) }
 
-      process_validation = if args.include?(:if)
-                             instance_eval(&args[:if])
-                           else
-                             true
-                           end
-
-      if process_validation
+      if ProcessAffirmationEvaluator.new(object, attribute, args).process?
         validator = Object.const_get(
           "DailyAffirmation::Validators::#{type.to_s.capitalize}Validator"
         )

data/lib/daily_affirmation/process_affirmation_evaluator.rb

@@ -0,0 +1,31 @@
+class ProcessAffirmationEvaluator
+  def initialize(object, attribute, args)
+    self.object = object
+    self.attribute = attribute
+    self.args = args
+  end
+
+  def process?
+    if_statement_passes? && allow_nil_passes?
+  end
+
+  private
+
+  attr_accessor :object, :attribute, :args
+
+  def if_statement_passes?
+    if args.include?(:if)
+      instance_eval(&args[:if])
+    else
+      true
+    end
+  end
+
+  def allow_nil_passes?
+    if args.include?(:allow_nil)
+      object.send(attribute)
+    else
+      true
+    end
+  end
+end

data/lib/daily_affirmation/version.rb

@@ -1,3 +1,3 @@
 module DailyAffirmation
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/daily_affirmation_spec.rb

@@ -135,6 +135,23 @@ describe DailyAffirmation do
     expect(affirmation2).to_not be_valid
   end
 
+  it "skips an affirmation for an :allow_nil option" do
+    cls = Class.new do
+      include DailyAffirmation.affirmations
+
+      affirms_format_of :name, :regex => /^\D+$/, :allow_nil => true
+    end
+
+    obj1 = double(:name => nil)
+    obj2 = double(:name => "name1")
+
+    affirmation1 = cls.new(obj1)
+    affirmation2 = cls.new(obj2)
+
+    expect(affirmation1).to be_valid
+    expect(affirmation2).to_not be_valid
+  end
+
   it "allows each affirmation to be inverted via an :inverse option" do
     cls = Class.new do
       include DailyAffirmation.affirmations

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require "coveralls"
+require "pry"
+
 Coveralls.wear!
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daily_affirmation
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - daily_affirmation.gemspec
 - lib/daily_affirmation.rb
 - lib/daily_affirmation/affirmations.rb
+- lib/daily_affirmation/process_affirmation_evaluator.rb
 - lib/daily_affirmation/validator.rb
 - lib/daily_affirmation/validators/absence_validator.rb
 - lib/daily_affirmation/validators/acceptance_validator.rb