measured-rails 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86e1a498be818adbbced7c5e65df996f43185d53
-  data.tar.gz: 56e4f4fcfc8428dd895f2d65251173e800bf4dc2
+  metadata.gz: 18e7435ac5ed17774e92a41436794528b6cb9e34
+  data.tar.gz: b62507545c7f7077840398abdefb7060beed4155
 SHA512:
-  metadata.gz: c2e38891f2943c3359ae87707a912c077f9ea6b88e92dc9c95b47c6f4d16f862f09e5e02bea6b9357dc75603b16a888aba5d1b3d673ed1e8fd5664abc07127c3
-  data.tar.gz: ad6ec66a798f1cb2deb3644b1da0c5e8126812f04e4525a66966fe2ef69f47bddd8e93a071b0b544a8d5f54ecd97ccb052b26792fc8b7cffa9daec545ee35aa5
+  metadata.gz: 94d26842b24e7bd07eca89f74df8cebea6b90dee47ee249983fee9e412c4f0ca4f7341eb3f8eb17d44155aca8ec278e2bed67074232a380ff8c399c1bd2669f1
+  data.tar.gz: bee75e064ee7ef9bf363dca35bf8748d36b7daa3e122b95daf1b1990e342feba60f8395e723080d86a66fe7be533fb3947571531fd4861b6525b297282d0532a

data/lib/measured/rails/validations.rb

@@ -25,11 +25,13 @@ class MeasuredValidator < ActiveModel::EachValidator
       record.errors.add(attribute, message("is not a valid unit")) unless valid_units.include?(measured_class.conversion.to_unit_name(measurable_unit))
     end
 
-    options.slice(*CHECKS.keys).each do |option, value|
-      comparable_value = value_for(value, record)
-      comparable_value = measured_class.new(comparable_value, measurable_unit) if comparable_value.is_a?(Numeric)
-      unless measurable.public_send(CHECKS[option], comparable_value)
-        record.errors.add(attribute, message("#{measurable.to_s} must be #{CHECKS[option]} #{comparable_value}"))
+    if measured_class.valid_unit?(measurable_unit)
+      options.slice(*CHECKS.keys).each do |option, value|
+        comparable_value = value_for(value, record)
+        comparable_value = measured_class.new(comparable_value, measurable_unit) if comparable_value.is_a?(Numeric)
+        unless measurable.public_send(CHECKS[option], comparable_value)
+          record.errors.add(attribute, message("#{measurable.to_s} must be #{CHECKS[option]} #{comparable_value}"))
+        end
       end
     end
   end
@@ -49,7 +51,7 @@ class MeasuredValidator < ActiveModel::EachValidator
     else
       key
     end
-    
+
     raise ArgumentError, ":#{ value } must be a number or a Measurable object" unless (value.is_a?(Numeric) || value.is_a?(Measured::Measurable))
     value
   end

data/lib/measured/rails/version.rb

@@ -1,5 +1,5 @@
 module Measured
   module Rails
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/measured-rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "railties", ">= 4.0"
   spec.add_runtime_dependency "activemodel", ">= 4.0"
-  spec.add_runtime_dependency "measured", "1.3.0"
+  spec.add_runtime_dependency "measured", "1.3.1"
 
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.5.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement