daily_affirmation 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc1e1ce0b58bfda7c7d73f8d28f03e1e5e74756
-  data.tar.gz: bbb527d49af075c5512336fbde9a1139f85c840f
+  metadata.gz: f7ba5e00c6949914c9cfd4e9cbf88ccac79a0cb7
+  data.tar.gz: 7023bf3b10fbc9caa76c59553f899ba06f7f8580
 SHA512:
-  metadata.gz: 08ce5f23b0c2911bd124818fd1a71ab052db502027d8d72f146c5980b0c07ad2d9ceb42e0761488dc93674bd6df083d97a1a58dc4f16826d30a4736e2bfbb172
-  data.tar.gz: 02eff11856d22c91fc861630c34210f5b02e4b40d7adcf520853ff657f82971d3e8cb8ae303628e59d1a785ea13c957d9692898ad93c89554a1a276200a73e56
+  metadata.gz: 7f34c62e82ca717e3389d6afb7b2c54de266a754d5d33a2938e41c8d00111e3744e0bf7ebc96f7a799258428e2a6947ae1ccf7b64f50765f27572395b8de94c3
+  data.tar.gz: fc852275569a2b97e0ce079c63a93f2cd3a7b5ac147ec084e5ab92d992d0834bd153049cea77eb891192888674c59e11aea41dee6b9c0cecd51f279a52387561

data/README.md

@@ -8,7 +8,7 @@
 [![Dependency Status](https://gemnasium.com/teamsnap/daily_affirmation.png)](https://gemnasium.com/teamsnap/daily_affirmation)
 [![License](http://img.shields.io/license/MIT.png?color=green)](http://opensource.org/licenses/MIT)
 
-[Documentation](http://www.rubydoc.info/github/teamsnap/daily_affirmation)
+[Documentation](http://www.rubydoc.info/gems/daily_affirmation)
 
 A simple library for external validations of POROs
 

data/lib/daily_affirmation/process_affirmation_evaluator.rb

@@ -6,7 +6,7 @@ class ProcessAffirmationEvaluator
   end
 
   def process?
-    if_statement_passes? && allow_nil_passes?
+    if_statement_passes? && process_non_nil_value? && process_non_blank_value?
   end
 
   private
@@ -21,11 +21,36 @@ class ProcessAffirmationEvaluator
     end
   end
 
-  def allow_nil_passes?
-    if args.include?(:allow_nil)
-      object.send(attribute)
+  def process_non_blank_value?
+    !(allow_blank_values? && object_is_blank?)
+  end
+
+  def allow_blank_values?
+    args.include?(:allow_blank)
+  end
+
+  def object_is_blank?
+    blank?(object.send(attribute))
+  end
+
+  def blank?(val)
+    case val
+    when String
+      val !~ /[^[:space:]]/
     else
-      true
+      val.respond_to?(:empty?) ? val.empty? : !val
     end
   end
+
+  def object_is_nil?
+    object.send(attribute).nil?
+  end
+
+  def allow_nil_values?
+    args.include?(:allow_nil)
+  end
+
+  def process_non_nil_value?
+    !(allow_nil_values? && object_is_nil?)
+  end
 end

data/lib/daily_affirmation/version.rb

@@ -1,3 +1,3 @@
 module DailyAffirmation
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/daily_affirmation_spec.rb

@@ -154,6 +154,23 @@ describe DailyAffirmation do
     expect(affirmation2).to_not be_valid
   end
 
+  it "skips an affirmation for an :allow_blank option" do
+    cls = Class.new do
+      include DailyAffirmation.affirmations
+
+      affirms_inclusion_of :name, :list => ["name1"], :allow_blank => true
+    end
+
+    obj1 = double(:name => "")
+    obj2 = double(:name => "name2")
+
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daily_affirmation
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A simple library for external validations of POROs