daily_affirmation 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 305ab950efd80d14e92eff86fd045a339a22aa8b
-  data.tar.gz: 9afae48904dc91d603ce35cd7a261be311089eb7
+  metadata.gz: f4ecd8c16b9ba58d859435a2411832db38da7bba
+  data.tar.gz: ae497ebd542784fadc5f2ebc55545cfd2efd1599
 SHA512:
-  metadata.gz: 40902db7caf7ddc098d8e2515637bcde4f1a3a47e1c2e854728c80776d85761917803dbf4023cc342d0bc59a8bc2761ce90c0d7b70b690a7eeea8f1eb449dcff
-  data.tar.gz: 76486bf174bdaca77ba75b66e5a676b32aa7d9b24c77b839f4de11d5ade12042edd875cc1e5ea486aec5cb3a3088024bae4176f069e1b305c3e90e606ddf4289
+  metadata.gz: e2122846d1b00cc97b10f25a67f219306dd966813cd91610aed6af041f80b0c2faf8d2c6bf39564471bebf56caf4dc0821a5bdfd42140261d566e0b81564bce2
+  data.tar.gz: 7875f55e1ca8cdefee943e2619d847ebe510c4b9e5fb2fffcf1120a462a3d65bb1949a0461494a1a252456eebda743f4caa40f1d9cb832549d3061a5f7496260

data/lib/daily_affirmation/validators/numericality_validator.rb

@@ -4,14 +4,61 @@ module DailyAffirmation
   module Validators
     class NumericalityValidator < Validator
       def valid?
-        @valid ||= value.is_a?(Numeric)
+        @valid ||= numeric? && greater_than? && less_than?
       end
 
       def error_message
         @error_message ||= i18n_error_message(
-          :numericality, :default => "#{attribute} is not a number"
+          :numericality, :default => default_error_message
         )
       end
+
+      private
+
+      def numeric?
+        value.is_a?(Numeric)
+      end
+
+      def greater_than?
+        if gt = opts[:greater_than]
+          value > gt
+        else
+          true
+        end
+      end
+
+      def less_than?
+        if lt = opts[:less_than]
+          value < lt
+        else
+          true
+        end
+      end
+
+      def default_error_message
+        numeric_error_message + greater_than_error_message +
+          less_than_error_message
+      end
+
+      def numeric_error_message
+        "#{attribute} must be a number."
+      end
+
+      def greater_than_error_message
+        if greater_than?
+          ""
+        else
+          " Must also be greater than #{opts[:greater_than]}."
+        end
+      end
+
+      def less_than_error_message
+        if less_than?
+          ""
+        else
+          " Must also be less than #{opts[:less_than]}."
+        end
+      end
     end
   end
 end

data/lib/daily_affirmation/version.rb

@@ -1,3 +1,3 @@
 module DailyAffirmation
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/validators/numericality_validator_spec.rb

@@ -23,7 +23,57 @@ describe "NumericalityValidator" do
 
     validator = subject.new(obj, :age)
     expect(validator.error_message).to eq(
-      "age is not a number"
+      "age must be a number."
     )
   end
+
+  context ":greater_than provided" do
+    it "passes validation if value is > opt" do
+      obj = double(:age => 10)
+
+      validator = subject.new(obj, :age, :greater_than => 5)
+      expect(validator).to be_valid
+    end
+
+    it "fails validation if value is < opt" do
+      obj = double(:age => 10)
+
+      validator = subject.new(obj, :age, :greater_than => 15)
+      expect(validator).to_not be_valid
+    end
+
+    it "has the correct error message" do
+      obj = double(:age => 10)
+
+      validator = subject.new(obj, :age, :greater_than => 15)
+      expect(validator.error_message).to eq(
+        "age must be a number. Must also be greater than 15."
+      )
+    end
+  end
+
+  context ":less_than provided" do
+    it "passes validation if value is < opt" do
+      obj = double(:age => 10)
+
+      validator = subject.new(obj, :age, :less_than => 15)
+      expect(validator).to be_valid
+    end
+
+    it "fails validation if value is > opt" do
+      obj = double(:age => 10)
+
+      validator = subject.new(obj, :age, :less_than => 5)
+      expect(validator).to_not be_valid
+    end
+
+    it "has the correct error message" do
+      obj = double(:age => 10)
+
+      validator = subject.new(obj, :age, :less_than => 5)
+      expect(validator.error_message).to eq(
+        "age must be a number. Must also be less than 5."
+      )
+    end
+  end
 end

metadata

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