measured-rails 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68355e20283509779816298a639059a8cbf389ee
-  data.tar.gz: 93c43698257e4831d50da35d2525ced2cb1dae7b
+  metadata.gz: 30cfdc7cf3a7bcdf8984107c7dec28b642646e10
+  data.tar.gz: 9eac87d730570d6b2e64ffb8c3bd4a8d707ec7c2
 SHA512:
-  metadata.gz: b0f42793e76e6cacae038d8843d91089163ae57501db98f939e3b0fe39012882412936b0a52def1c485f2f9fe4d3d1ba3b9b7e8322bc502a7ab1c4962dca5061
-  data.tar.gz: fb820be61b40641dd5c16b40c243bc7a859b13d7dda91a4a95e1833fde9ea0077f306c124e4bd1e0265a4b4f94ae57d0c2d3aae0c155a0f8df2472ed6577172e
+  metadata.gz: b69f85fabb97c64ed67fe17472b4dea887def4e15ac5fbda554593d9aab128cdf7686876c2f676a08a915a9aa770c5118e38ee87faa038f4980baeb26c5ebc8a
+  data.tar.gz: 27b4dbb803cc1ab3ec9d055534367d2ed20a0e106dd76eed7eeb71a3d008fd295c75a0a8c9e828b9f58a537f05e335e67290ffd45bf4d2db90621c3055aca0ea

data/lib/measured/rails/active_record.rb

@@ -45,8 +45,8 @@ module Measured::Rails::ActiveRecord
             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 rounded_to_scale_value.split[1].size > precision
+            
+            if rounded_to_scale_value.to_i.to_s.length > (precision - scale)
               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 }=", rounded_to_scale_value)

data/lib/measured/rails/validations.rb

@@ -27,6 +27,7 @@ class MeasuredValidator < ActiveModel::EachValidator
 
     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
@@ -48,14 +49,8 @@ class MeasuredValidator < ActiveModel::EachValidator
     else
       key
     end
-
-    if value.is_a?(Numeric)
-      raise ArgumentError, ":#{ value } is a scalar. Please validate against a Measurable object with correct units" unless value == 0
-      return value
-    end
-
-    raise ArgumentError, ":#{ value } must be a Measurable object" unless value.is_a?(Measured::Measurable)
-
+    
+    raise ArgumentError, ":#{ value } must be a number or a Measurable object" unless (value.is_a?(Numeric) || value.is_a?(Measured::Measurable))
     value
   end
 end

data/lib/measured/rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails