measured-rails 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a228c3feac7e0810823eb7a838318ef24b1b459
-  data.tar.gz: 46d35f6ce7e1d68f65fe23620b21eba1e8358e40
+  metadata.gz: 68355e20283509779816298a639059a8cbf389ee
+  data.tar.gz: 93c43698257e4831d50da35d2525ced2cb1dae7b
 SHA512:
-  metadata.gz: cc6967a2287ac7cff1beb58a2af703bd1a512eafffd5f3791a6fd7f3027cb24771b3a8679cae7b5861bec4a36c35da3c6a9068a4e62476fe26c2ee0878f4c068
-  data.tar.gz: 0c9041617dc8ac13d9c06092adb946daddae25c370d2415e2ada1bb41ed9424ce0280c1d8160285b448bc2f79f55d1711890462ae95cb3df388ead85e7f649f7
+  metadata.gz: b0f42793e76e6cacae038d8843d91089163ae57501db98f939e3b0fe39012882412936b0a52def1c485f2f9fe4d3d1ba3b9b7e8322bc502a7ab1c4962dca5061
+  data.tar.gz: fb820be61b40641dd5c16b40c243bc7a859b13d7dda91a4a95e1833fde9ea0077f306c124e4bd1e0265a4b4f94ae57d0c2d3aae0c155a0f8df2472ed6577172e

data/README.md

@@ -1,4 +1,4 @@
-# Measured Rails [![Build Status](https://travis-ci.org/Shopify/measured-rails.svg)](https://travis-ci.org/Shopify/measured-rails)
+# Measured Rails [![Build Status](https://travis-ci.org/Shopify/measured-rails.svg)](https://travis-ci.org/Shopify/measured-rails) [![Gem Version](https://badge.fury.io/rb/measured-rails.svg)](http://badge.fury.io/rb/measured-rails)
 
 This gem is the Rails integration for the [measured](https://github.com/Shopify/measured) gem.
 
@@ -133,3 +133,4 @@ $ bundle exec rake test
 
 * [Kevin McPhillips](https://github.com/kmcphillips) at [Shopify](http://shopify.com/careers)
 * [Sai Warang](https://github.com/cyprusad) at [Shopify](http://shopify.com/careers)
+* [Gareth du Plooy](https://github.com/garethson) at [Shopify](http://shopify.com/careers)

data/lib/measured/rails/active_record.rb

@@ -44,11 +44,12 @@ module Measured::Rails::ActiveRecord
             value_field_name = "#{ field }_value"
             precision = self.column_for_attribute(value_field_name).precision
             scale = self.column_for_attribute(value_field_name).scale
+            rounded_to_scale_value = incoming.value.round(scale)
             ## For BigDecimal#split syntax, refer http://ruby-doc.org/stdlib-2.1.1/libdoc/bigdecimal/rdoc/BigDecimal.html#method-i-split
-            if incoming.value.split[1].size > precision
-              raise Measured::Rails::Error, "The value #{incoming.value} being set for column '#{value_field_name}' has too many significant digits. Please ensure it has no more than #{precision} significant digits."
+            if rounded_to_scale_value.split[1].size > precision
+              raise Measured::Rails::Error, "The value #{rounded_to_scale_value} being set for column '#{value_field_name}' has too many significant digits. Please ensure it has no more than #{precision} significant digits."
             end
-            public_send("#{ value_field_name }=", incoming.value.round(scale))
+            public_send("#{ value_field_name }=", rounded_to_scale_value)
             public_send("#{ field }_unit=", incoming.unit)
           else
             instance_variable_set("@measured_#{ field }", nil)

data/lib/measured/rails/validations.rb

@@ -16,24 +16,27 @@ class MeasuredValidator < ActiveModel::EachValidator
 
     return unless measurable_unit.present? || measurable_value.present?
 
-    record.errors.add(attribute, message) if [measurable_unit.blank?, measurable_value.blank?].any?
+    record.errors.add(attribute, message("cannot be blank")) if [measurable_unit.blank?, measurable_value.blank?].any?
 
-    record.errors.add(attribute, message) unless measured_class.valid_unit?(measurable_unit)
+    record.errors.add(attribute, message("is not a valid unit")) unless measured_class.valid_unit?(measurable_unit)
 
     if options[:units]
       valid_units = [options[:units]].flatten.map{|u| measured_class.conversion.to_unit_name(u) }
-      record.errors.add(attribute, message) unless valid_units.include?(measured_class.conversion.to_unit_name(measurable_unit))
+      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|
-      record.errors.add(attribute, message) unless measurable.public_send(CHECKS[option], value_for(value, record))
+      comparable_value = value_for(value, record)
+      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
 
   private
 
-  def message
-    options[:message] || "is not a valid unit"
+  def message(default_message)
+    options[:message] || default_message
   end
 
   def value_for(key, record)

data/lib/measured/rails/version.rb

@@ -1,5 +1,5 @@
 module Measured
   module Rails
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Kevin McPhillips