measured-rails 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55a2eeb6f2827956ac69666ba215d6a623ca8a3
-  data.tar.gz: 6068fc25392019de9c7f738abfaa5ee2d92c56dd
+  metadata.gz: 6839700295e39343ab0a6056185d6964aeb636db
+  data.tar.gz: 93eb92ab23f6fd6f5a765f70db987b0a98adcf20
 SHA512:
-  metadata.gz: 97ccdd59582fd05d08b51a76ab35242129ade6e99e13b48a896753c8e2697ee83e0cd20534f0185e690a7732dd686b55cc43755c11c1b4d87a67f292997f7425
-  data.tar.gz: 7a514f0edf0d5580f893a61388cd37b17603955c0f97f9b7cd30ea8e9f499f9e2e5dd1e7dfdd2919400683d0dbf4cdec4348e61b036a94f06a068e36a26eb3bf
+  metadata.gz: a10e9201daf1d78fdaddf32fc7fe24f524596da3f3ccc8305717a8d375e2beb767fd331c1003abcb47ff384fc3c41df9475e896a6fca8f11c9c64126bf38478b
+  data.tar.gz: 48277c7b1cec1b920d0f4a4eb627514285be55aba913be1471a145e0192a47bb9cb5e5fb08d848a5cd2216a79be683339ec7b7c315b28b95ab9c79f401667e60

data/lib/measured/rails/validations.rb

@@ -20,11 +20,11 @@ class MeasuredValidator < ActiveModel::EachValidator
     return unless measurable_unit_name.present? || measurable_value.present?
 
     measurable_unit = measured_class.unit_system.unit_for(measurable_unit_name)
-    record.errors.add(attribute, message("is not a valid unit")) unless measurable_unit
+    record.errors.add(attribute, message(record, "is not a valid unit")) unless measurable_unit
 
-    if options[:units]
+    if options[:units] && measurable_unit.present?
       valid_units = Array(options[:units]).map { |unit| measured_class.unit_system.unit_for(unit) }
-      record.errors.add(attribute, message("is not a valid unit")) unless valid_units.include?(measurable_unit)
+      record.errors.add(attribute, message(record, "is not a valid unit")) unless valid_units.include?(measurable_unit)
     end
 
     if measurable_unit && measurable_value.present?
@@ -32,7 +32,7 @@ class MeasuredValidator < ActiveModel::EachValidator
         comparable_value = value_for(value, record)
         comparable_value = measured_class.new(comparable_value, measurable_unit) unless comparable_value.is_a?(Measured::Measurable)
         unless measurable.public_send(CHECKS[option], comparable_value)
-          record.errors.add(attribute, message("#{measurable.to_s} must be #{CHECKS[option]} #{comparable_value}"))
+          record.errors.add(attribute, message(record, "#{measurable.to_s} must be #{CHECKS[option]} #{comparable_value}"))
         end
       end
     end
@@ -40,8 +40,12 @@ class MeasuredValidator < ActiveModel::EachValidator
 
   private
 
-  def message(default_message)
-    options[:message] || default_message
+  def message(record, default_message)
+    if options[:message].respond_to?(:call)
+      options[:message].call(record)
+    else
+      options[:message] || default_message
+    end
   end
 
   def value_for(key, record)

data/lib/measured/rails/version.rb

@@ -1,5 +1,5 @@
 module Measured
   module Rails
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: measured
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement