measured-rails 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: df2e90752c0498af26eec28e0bf7449943060f86
-  data.tar.gz: 9bbf70451053b0969d33221dc1fe8d08f493c200
+SHA256:
+  metadata.gz: 6077a6cf4bf52eb20d9601faeb82f7d86ed17cdef9f8ba1790911976d947d9e2
+  data.tar.gz: 39beec03cf41ae5ecfb31f3f5fc9c6910bd06741403871db080dcef7065347c5
 SHA512:
-  metadata.gz: 2002922a7bdd92292bd9b5fc027eae92bbb463026c1230f00dc167c6d51754c3623783947883b10c8155247797d49dd6c9808f07211bacb08f13759a72ff3013
-  data.tar.gz: 4aa0e718a3f72565c880b8a83b95ea9e0924248445a4038702b3a0f9083e718a0cb78774808475cd87deff132f83b6989ad9af435ce65b1c6ebffc3530d518de
+  metadata.gz: 0dd1f19a73555bfdbc885ab5b0a0ac41dc5692bfa68cd573c28add607c12f94c397ed75f3e02245026db799d65b3ecdc538cf5033a49df3562375a6931a0563f
+  data.tar.gz: 7c15e21fe5726761ebb6364285c2872f11818158f815601b7a772576c9f99ef11a6b9f7e9bb91d229a375f9fd0eba74b6a7cb03b5abbc3e5c8003e1b283eb391

data/.travis.yml

@@ -2,24 +2,27 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.1.8
-  - 2.2.4
-  - 2.3.1
-  - 2.4.0
+  - 2.3.8
+  - 2.4.5
+  - 2.5.5
+  - 2.6.3
 gemfile:
   - Gemfile
-  - gemfiles/rails-4.2.gemfile
   - gemfiles/rails-5.0.gemfile
+  - gemfiles/rails-5.1.gemfile
+  - gemfiles/rails-6.0.gemfile
   - gemfiles/rails-master.gemfile
+before_script:
+  - gem update --system
 matrix:
   exclude:
-    - gemfile: Gemfile
-      rvm: 2.1.8
     - gemfile: gemfiles/rails-master.gemfile
-      rvm: 2.1.8
-    - gemfile: gemfiles/rails-5.0.gemfile
-      rvm: 2.1.8
-    - gemfile: gemfiles/rails-4.2.gemfile
-      rvm: 2.4.0
+      rvm: 2.3.8
+    - gemfile: gemfiles/rails-master.gemfile
+      rvm: 2.4.5
+    - gemfile: gemfiles/rails-6.0.gemfile
+      rvm: 2.3.8
+    - gemfile: gemfiles/rails-6.0.gemfile
+      rvm: 2.4.5
   allow_failures:
     - gemfile: gemfiles/rails-master.gemfile

data/README.md

@@ -40,6 +40,7 @@ A column can be declared as a measurement with its measurement subclass:
 class Thing < ActiveRecord::Base
   measured Measured::Weight, :minimum_weight
   measured Measured::Length, :total_length
+  measured Measured::Volume, :total_volume
 end
 ```
 
@@ -49,6 +50,7 @@ You can optionally customize the model's unit column by specifying it in the `un
 class ThingWithCustomUnitAccessor < ActiveRecord::Base
   measured_length :length, :width, :height,     unit_field_name: :size_unit
   measured_weight :total_weight, :extra_weight, unit_field_name: :weight_unit
+  measured_volume :total_volume, :extra_volume, unit_field_name: :volume_unit
 end
 ```
 
@@ -58,6 +60,7 @@ There are some simpler methods for predefined types:
 class Thing < ActiveRecord::Base
   measured_weight :minimum_weight
   measured_length :total_length
+  measured_volume :total_volume
 end
 ```
 

data/dev.yml

@@ -2,7 +2,7 @@ name: measured-rails
 
 up:
   - ruby:
-      version: 2.3.1
+      version: 2.6.3
   - bundler
 
 commands:

data/gemfiles/{rails-4.2.gemfile → rails-5.1.gemfile}

@@ -2,5 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 4.2'
-gem 'rack', '< 2.0'
+gem 'rails', '~> 5.1'

data/gemfiles/rails-6.0.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '~> 6.0.0.rc1'

data/lib/measured-rails.rb

@@ -2,3 +2,4 @@ require "measured/rails/base"
 
 require "measured/rails/units/length"
 require "measured/rails/units/weight"
+require "measured/rails/units/volume"

data/lib/measured/rails/active_record.rb

@@ -5,7 +5,6 @@ module Measured::Rails::ActiveRecord
     def measured(measured_class, *fields)
       options = fields.extract_options!
       options = {}.merge(options)
-      defined_unit_accessors = []
 
       measured_class = measured_class.constantize if measured_class.is_a?(String)
       unless measured_class.is_a?(Class) && measured_class.ancestors.include?(Measured::Measurable)
@@ -34,7 +33,7 @@ module Measured::Rails::ActiveRecord
 
           return nil unless value && unit
 
-          instance = instance_variable_get("@measured_#{ field }")
+          instance = instance_variable_get("@measured_#{ field }") if instance_variable_defined?("@measured_#{ field }")
           new_instance = begin
             measured_class.new(value, unit)
           rescue Measured::UnitError
@@ -72,11 +71,8 @@ module Measured::Rails::ActiveRecord
           end
         end
 
-        next if defined_unit_accessors.include?(unit_field_name)
-
         # Writer to override unit assignment
-        define_method("#{ unit_field_name }=") do |incoming|
-          defined_unit_accessors << unit_field_name
+        redefine_method("#{ unit_field_name }=") do |incoming|
           unit_name = measured_class.unit_system.unit_for(incoming).try!(:name)
           write_attribute(unit_field_name, unit_name || incoming)
         end

data/lib/measured/rails/base.rb

@@ -1,7 +1,8 @@
 require "measured/rails/version"
 require "measured"
 
-require "active_support"
+require "active_support/all"
+require "active_record"
 require "active_model"
 require "active_model/validations"
 

data/lib/measured/rails/units/volume.rb

@@ -0,0 +1,13 @@
+module Measured::Rails::ActiveRecord::Volume
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def measured_volume(*fields)
+      measured(Measured::Volume, *fields)
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  ::ActiveRecord::Base.send :include, Measured::Rails::ActiveRecord::Volume
+end

data/lib/measured/rails/version.rb

@@ -1,5 +1,5 @@
 module Measured
   module Rails
-    VERSION = "2.4.0"
+    VERSION = "2.5.0"
   end
 end

data/measured-rails.gemspec

@@ -13,15 +13,16 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/Shopify/measured-rails"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "measured", Measured::Rails::VERSION
 
   spec.add_runtime_dependency "railties", ">= 4.2"
   spec.add_runtime_dependency "activemodel", ">= 4.2"
+  spec.add_runtime_dependency "activerecord", ">= 4.2"
 
   spec.add_development_dependency "rake", "> 10.0"
   spec.add_development_dependency "minitest", "> 5.5.1"

data/test/active_record_test.rb

@@ -0,0 +1,434 @@
+require "test_helper"
+
+class Measured::Rails::ActiveRecordTest < ActiveSupport::TestCase
+  setup do
+    reset_db
+  end
+
+  test ".measured raises if called with something that isn't a Measured::Measurable" do
+    assert_raises Measured::Rails::Error do
+      Thing.measured(Object, :field)
+    end
+  end
+
+  test ".measured raises if called with something that isn't a class" do
+    assert_raises Measured::Rails::Error do
+      Thing.measured(:not_correct, :field)
+    end
+  end
+
+  test ".measured raises if you attempt to define a field twice" do
+    assert_raises Measured::Rails::Error do
+      Thing.measured Measured::Length, :height
+    end
+  end
+
+  test ".measured defines a reader for the field" do
+    assert_equal length, thing.length
+  end
+
+  test ".measured defines a writer for the field that returns" do
+    assert_equal new_length, thing.length=(new_length)
+  end
+
+  test ".measured_fields returns the configuration for all measured fields on the class" do
+    expected = {
+      length: { class: Measured::Length },
+      width: { class: Measured::Length },
+      height: { class: Measured::Length },
+      volume: { class: Measured::Volume },
+      total_weight: { class: Measured::Weight },
+      extra_weight: { class: Measured::Weight },
+      length_with_max_on_assignment: { max_on_assignment: 500, class: Measured::Length }
+    }
+
+    assert_equal expected, Thing.measured_fields
+  end
+
+  test "reader returns the exact same object if the values are equivalent" do
+    thing.length = new_length
+    assert_equal new_length.object_id, thing.length.object_id
+  end
+
+  test "reader creates an instance from the _value and _unit columns" do
+    thing = Thing.new
+    thing.width_value = 23
+    thing.width_unit = "ft"
+    assert_equal Measured::Length.new(23, :ft), thing.width
+  end
+
+  test "reader creates creating an instance from columns caches the same object" do
+    thing = Thing.new
+    thing.width_value = 23
+    thing.width_unit = "ft"
+    assert_equal thing.width.object_id, thing.width.object_id
+  end
+
+  test "reader deals with only the _value column set" do
+    thing = Thing.new
+    thing.width_value = 23
+    assert_nil thing.width
+  end
+
+  test "reader deals with only the _unit column set" do
+    thing = Thing.new
+    thing.width_unit = "cm"
+    assert_nil thing.width
+  end
+
+  test "reader deals with nil-ing out the _value column" do
+    thing.width_value = nil
+    assert_nil thing.width
+  end
+
+  test "reader deals with nil-ing out the _unit column" do
+    thing.width_unit = nil
+    assert_nil thing.width
+  end
+
+  test "writer sets the value to nil if it is an incompatible object" do
+    thing.length = Object.new
+    assert_nil thing.length
+  end
+
+  test "writer assigning nil blanks out the unit and value columns" do
+    thing.width = nil
+    assert_nil thing.width
+    assert_nil thing.width_unit
+    assert_nil thing.width_value
+  end
+
+  test "assigning an invalid _unit sets the column but the measurable object is nil" do
+    thing.width_unit = "invalid"
+    assert_nil thing.width
+    assert_equal "invalid", thing.width_unit
+  end
+
+  test "assigning an invalid _unit sets the column but the measurable object is nil and there is validation on the column" do
+    validated_thing.length_unit = "invalid"
+    validated_thing.valid?
+    assert_nil validated_thing.length
+    assert_equal "invalid", validated_thing.length_unit
+  end
+
+  test "assigning a valid _unit sets it" do
+    thing.width_unit = :mm
+    assert_equal thing.width, Measured::Length.new(6, "mm")
+    assert_equal "mm", thing.width_unit
+  end
+
+  test "assigning a non-base unit to _unit converts it to its base unit" do
+    thing.width_unit = "millimetre"
+    assert_equal thing.width, Measured::Length.new(6, "mm")
+    assert_equal "mm", thing.width_unit
+  end
+
+  test "building a new object from attributes builds a measured object" do
+    thing = Thing.new(length_value: "30", length_unit: "m")
+    assert_equal Measured::Length.new(30, :m), thing.length
+  end
+
+  test "building a new object with a measured object assigns the properties" do
+    thing = Thing.new(length: new_length)
+    assert_equal new_length, thing.length
+    assert_equal 20, thing.length_value
+    assert_equal "in", thing.length_unit
+  end
+
+  test "assigning attributes updates the measured object" do
+    thing.attributes = {length_value: "30", length_unit: "m"}
+    assert_equal Measured::Length.new(30, :m), thing.length
+  end
+
+  test "assigning partial attributes updates the measured object" do
+    thing.attributes = {length_value: "30"}
+    assert_equal Measured::Length.new(30, :cm), thing.length
+  end
+
+  test "assigning the _unit leaves the _value unchanged" do
+    thing.total_weight_unit = :lb
+    assert_equal thing.total_weight, Measured::Weight.new(200, "lb")
+  end
+
+  test "assigning the _value leaves the _unit unchanged" do
+    thing.total_weight_value = "10"
+    assert_equal thing.total_weight, Measured::Weight.new(10, :g)
+  end
+
+  test "assigning the _unit to an invalid unit does not raise" do
+    thing.total_weight_value = 123
+    thing.total_weight_unit = :invalid
+    assert_nil thing.total_weight
+  end
+
+  test "save persists the attributes and retrieves an object" do
+    thing = Thing.new length: Measured::Length.new(3, :m)
+    assert thing.save
+    assert_equal 3, thing.length_value
+    assert_equal "m", thing.length_unit
+    thing.reload
+    assert_equal 3, thing.length_value
+    assert_equal "m", thing.length_unit
+  end
+
+  test "save pulls attributes from assigned object" do
+    thing = Thing.new total_weight_value: "100", total_weight_unit: :lb
+    assert thing.save
+    thing.reload
+    assert_equal 100, thing.total_weight_value
+    assert_equal "lb", thing.total_weight_unit
+    assert_equal Measured::Weight.new(100, :lb), thing.total_weight
+  end
+
+  test "save succeeds if you assign an invalid unit and there is no validation" do
+    thing = Thing.new total_weight_value: "100", total_weight_unit: :invalid
+    assert thing.save
+    thing.reload
+    assert_nil thing.total_weight
+    assert_equal 100, thing.total_weight_value
+  end
+
+  test "save fails if you assign an invalid unit and there is validation" do
+    thing = validated_thing
+    thing.length_unit = "invalid"
+    refute thing.save
+    assert_nil thing.length
+  end
+
+  test "update_attribute sets only the _value column" do
+    thing = Thing.create!
+    thing.update_attribute(:width_value, 11)
+    assert_nil thing.width
+  end
+
+  test "update_attribute sets only the _unit column" do
+    thing = Thing.create!
+    thing.update_attribute(:width_unit, "cm")
+    assert_nil thing.width
+  end
+
+  test "update_attribute modifies the _value column" do
+    assert thing.update_attribute(:width_value, 99)
+    assert_equal Measured::Length.new(99, :in), thing.width
+  end
+
+  test "update_attribute modifies only the _unit column" do
+    assert thing.update_attribute(:width_unit, :cm)
+    assert_equal Measured::Length.new(6, :cm), thing.width
+  end
+
+  test "update_attribute sets one then the other" do
+    thing = Thing.create!
+    assert thing.update_attribute(:width_value, 11.1)
+    assert_nil thing.width
+    assert thing.update_attribute(:width_unit, "cm")
+    assert_equal Measured::Length.new(11.1, :cm), thing.width
+  end
+
+  test "update_attributes sets only the _value column" do
+    thing = Thing.create!
+    assert thing.update_attributes(width_value: "314")
+    assert_equal 314, thing.width_value
+    thing.reload
+    assert_equal 314, thing.width_value
+    assert_nil thing.width
+  end
+
+  test "update_attributes sets only the _unit column" do
+    thing = Thing.create!
+    assert thing.update_attributes(width_unit: :cm)
+    assert_equal "cm", thing.width_unit
+    thing.reload
+    assert_equal "cm", thing.width_unit
+    assert_nil thing.width
+  end
+
+  test "update_attributes sets only the _unit column and converts it" do
+    thing = Thing.create!
+    assert thing.update_attributes(width_unit: "inch")
+    assert_equal "in", thing.width_unit
+    thing.reload
+    assert_equal "in", thing.width_unit
+  end
+
+  test "update_attributes sets the _unit column to something invalid" do
+    thing = Thing.create!
+    assert thing.update_attributes(width_unit: :invalid)
+    assert_equal "invalid", thing.width_unit
+    thing.reload
+    assert_equal "invalid", thing.width_unit
+    assert_nil thing.width
+  end
+
+  test "update_attributes does not set the _unit column to something invalid if there is validation" do
+    thing = validated_thing
+    thing.save!
+    refute thing.update_attributes(length_unit: :invalid)
+  end
+
+  test "update_attributes sets one column then the other" do
+    thing = Thing.create!
+    assert thing.update_attributes(width_unit: "inch")
+    assert_nil thing.width
+    assert thing.update_attributes(width_value: "314")
+    assert_equal Measured::Length.new(314, :in), thing.width
+  end
+
+  test "update_attributes sets both columns" do
+    thing = Thing.create!
+    assert thing.update_attributes(width_unit: :cm, width_value: 2)
+    assert_equal Measured::Length.new(2, :cm), thing.width
+    thing.reload
+    assert_equal Measured::Length.new(2, :cm), thing.width
+  end
+
+  test "update_attributes modifies the _value column" do
+    assert thing.update_attributes(height_value: 2)
+    assert_equal Measured::Length.new(2, :m), thing.height
+    thing.reload
+    assert_equal Measured::Length.new(2, :m), thing.height
+  end
+
+  test "update_attributes modifies only the _unit column" do
+    assert thing.update_attributes(height_unit: "foot")
+    assert_equal Measured::Length.new(1, :ft), thing.height
+    thing.reload
+    assert_equal Measured::Length.new(1, :ft), thing.height
+  end
+
+  test "update_attributes modifies the _unit column to be something invalid" do
+    assert thing.update_attributes(height_unit: :invalid)
+    assert_nil thing.height
+    assert_equal "invalid", thing.height_unit
+    thing.reload
+    assert_nil thing.height
+    assert_equal "invalid", thing.height_unit
+  end
+
+  test "update_attributes modifies both columns" do
+    assert thing.update_attributes(height_unit: "mm", height_value: 1.23)
+    assert_equal Measured::Length.new(1.23, :mm), thing.height
+    thing.reload
+    assert_equal Measured::Length.new(1.23, :mm), thing.height
+  end
+
+  test "assigning the _value with a BigDecimal rounds to the column's rounding scale" do
+    thing.height = Measured::Length.new(BigDecimal('23.4567891'), :mm)
+    assert_equal thing.height_value, BigDecimal('23.46')
+  end
+
+  test "assigning the _value with a float uses all the rounding scale permissible" do
+    thing.height = Measured::Length.new(4.45678912, :mm)
+    assert_equal thing.height_value, BigDecimal('4.46')
+  end
+
+  test "assigning a number with more significant digits than permitted by the column precision does not raise exception when it can be rounded to have lesser significant digits per column's scale" do
+    assert_nothing_raised do
+      thing.height = Measured::Length.new(4.45678912123123123, :mm)
+      assert_equal thing.height_value, BigDecimal('4.46')
+    end
+  end
+
+  test "assigning a number with more significant digits than permitted by the column precision raises exception" do
+    assert_raises Measured::Rails::Error, "The value 44567891212312312.3 being set for column: 'height' has too many significant digits. Please ensure it has no more than 10 significant digits." do
+      thing.height = Measured::Length.new(44567891212312312.3, :mm)
+    end
+  end
+
+  test "assigning a large number but with a small amount of significant digits than permitted by the column precision raises exception" do
+    assert_raises Measured::Rails::Error, "The value 2000000000000000.0 being set for column: 'height' has too many significant digits. Please ensure it has no more than 10 significant digits." do
+      thing.height = Measured::Length.new(2_000_000_000_000_000, :mm)
+    end
+  end
+
+  test "assigning a large number that's just smaller, equal to, and over the size of the column precision raises exception" do
+    assert_nothing_raised do
+      thing.height = Measured::Length.new(99999999.99, :mm)
+    end
+
+    assert_raises Measured::Rails::Error, "The value 100000000.0 being set for column: 'height' has too many significant digits. Please ensure it has no more than 10 significant digits." do
+      thing.height = Measured::Length.new(100000000, :mm)
+    end
+
+    assert_raises Measured::Rails::Error, "The value 100000000.01 being set for column: 'height' has too many significant digits. Please ensure it has no more than 10 significant digits." do
+      thing.height = Measured::Length.new(100000000.01, :mm)
+    end
+  end
+
+  test "assigning a large number to a field that specifies max_on_assignment" do
+    thing = Thing.create!(length_with_max_on_assignment: Measured::Length.new(10000000000000000, :mm))
+    assert_equal Measured::Length.new(500, :mm), thing.length_with_max_on_assignment
+  end
+
+  test "assigning a small number to a field that specifies max_on_assignment" do
+     thing = Thing.create!(length_with_max_on_assignment: Measured::Length.new(1, :mm))
+     assert_equal Measured::Length.new(1, :mm), thing.length_with_max_on_assignment
+  end
+
+  test "using a similar unit accessor for multiple size fields" do
+    assert_equal Measured::Length.new(1, :m), custom_unit_thing.length
+    assert_equal Measured::Length.new(2, :m), custom_unit_thing.width
+    assert_equal Measured::Length.new(3, :m), custom_unit_thing.height
+    assert_equal Measured::Volume.new(9, :l), custom_unit_thing.volume
+    assert_equal Measured::Weight.new(10, :g), custom_unit_thing.total_weight
+    assert_equal Measured::Weight.new(12, :g), custom_unit_thing.extra_weight
+  end
+
+  test "changing unit value when shared affects all fields" do
+    custom_unit_thing.length = Measured::Length.new(15, :in)
+    custom_unit_thing.total_weight = Measured::Weight.new(42, :kg)
+
+    assert_equal custom_unit_thing.length, Measured::Length.new(15, :in)
+    assert_equal custom_unit_thing.width, Measured::Length.new(2, :in)
+    assert_equal custom_unit_thing.height, Measured::Length.new(3, :in)
+    assert_equal custom_unit_thing.total_weight, Measured::Weight.new(42, :kg)
+    assert_equal custom_unit_thing.extra_weight, Measured::Weight.new(12, :kg)
+  end
+
+  private
+
+  def length
+    @length ||= Measured::Length.new(10, :cm)
+  end
+
+  def new_length
+    @new_length ||= Measured::Length.new(20, :in)
+  end
+
+  def thing
+    @thing ||= Thing.create!(
+      length: length,
+      width: Measured::Length.new(6, :in),
+      volume: Measured::Volume.new(6, :l),
+      height: Measured::Length.new(1, :m),
+      total_weight: Measured::Weight.new(200, :g),
+      extra_weight: Measured::Weight.new(16, :oz)
+    )
+  end
+
+  def validated_thing
+    @thing ||= ValidatedThing.new(
+      length: Measured::Length.new(1, :m),
+      length_true: Measured::Length.new(2, :cm),
+      length_message: Measured::Length.new(3, :mm),
+      length_message_from_block: Measured::Length.new(7, :mm),
+      length_units: Measured::Length.new(4, :m),
+      length_units_singular: Measured::Length.new(5, :ft),
+      length_presence: Measured::Length.new(6, :m),
+      length_numericality_inclusive: Measured::Length.new(15, :in),
+      length_numericality_exclusive: Measured::Length.new(4, :m),
+      length_numericality_equality: Measured::Length.new(100, :cm),
+    )
+  end
+
+  def custom_unit_thing
+    @custom_unit_thing ||= ThingWithCustomUnitAccessor.new(
+      length: Measured::Length.new(1, :m),
+      width: Measured::Length.new(2, :m),
+      height: Measured::Length.new(3, :m),
+      volume: Measured::Volume.new(9, :l),
+      total_weight: Measured::Weight.new(10, :g),
+      extra_weight: Measured::Weight.new(12, :g),
+    )
+  end
+end

data/test/support/models/thing.rb

@@ -0,0 +1,14 @@
+class Thing < ActiveRecord::Base
+
+  measured_length :length, :width
+
+  measured Measured::Length, :height
+  measured Measured::Volume, :volume
+
+  measured_weight :total_weight
+
+  measured "Measured::Weight", :extra_weight
+
+  measured_length :length_with_max_on_assignment, {max_on_assignment: 500}
+
+end

data/test/support/models/thing_with_custom_unit_accessor.rb

@@ -0,0 +1,18 @@
+class ThingWithCustomUnitAccessor < ActiveRecord::Base
+
+  measured_length :length, :width, unit_field_name: :size_unit
+  validates :length, measured: true
+  validates :width, measured: true
+
+  measured_volume :volume
+  validates :volume, measured: true
+
+  measured Measured::Length, :height, unit_field_name: :size_unit
+  validates :height, measured: true
+
+  measured_weight :total_weight, unit_field_name: :weight_unit
+  validates :total_weight, measured: true
+
+  measured "Measured::Weight", :extra_weight, unit_field_name: :weight_unit
+  validates :extra_weight, measured: true
+end

data/test/support/models/validated_thing.rb

@@ -0,0 +1,46 @@
+class ValidatedThing < ActiveRecord::Base
+
+  measured_length :length
+  validates :length, measured: true
+
+  measured_length :length_true
+  validates :length_true, measured: true
+
+  measured_length :length_message
+  validates :length_message, measured: {message: "has a custom failure message"}
+
+  measured_length :length_message_from_block
+  validates :length_message_from_block, measured: { message: Proc.new { |record| "#{record.length_message_from_block_unit} is not a valid unit" } }
+
+  measured_length :length_units
+  validates :length_units, measured: {units: [:meter, "cm"]}
+
+  measured_length :length_units_singular
+  validates :length_units_singular, measured: {units: :ft, message: "custom message too"}
+
+  measured_length :length_presence
+  validates :length_presence, measured: true, presence: true
+
+  measured_length :length_numericality_inclusive
+  validates :length_numericality_inclusive, measured: {greater_than_or_equal_to: :low_bound, less_than_or_equal_to: :high_bound }
+
+  measured_length :length_numericality_exclusive
+  validates :length_numericality_exclusive, measured: {greater_than: Measured::Length.new(3, :m), less_than: Measured::Length.new(500, :cm), message: "is super not ok"}
+
+  measured_length :length_numericality_equality
+  validates :length_numericality_equality, measured: {equal_to: Proc.new { Measured::Length.new(100, :cm) }, message: "must be exactly 100cm"}
+
+  measured_length :length_invalid_comparison
+  validates :length_invalid_comparison, measured: {equal_to: "not_a_measured_subclass"}
+
+  private
+
+  def low_bound
+    Measured::Length.new(10, :in)
+  end
+
+  def high_bound
+    Measured::Length.new(20, :in)
+  end
+
+end

data/test/support/schema.rb

@@ -0,0 +1,83 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20161118203701) do
+
+  create_table "thing_with_custom_unit_accessors", force: :cascade do |t|
+    t.decimal  "length_value",                  precision: 10, scale: 2
+    t.decimal  "width_value",                   precision: 10, scale: 2
+    t.decimal  "height_value",                  precision: 10, scale: 2
+    t.decimal  "volume_value",                  precision: 10, scale: 2
+    t.string   "volume_unit",          limit: 12
+    t.string   "size_unit",          limit: 12
+    t.decimal  "total_weight_value",            precision: 10, scale: 2, default: "10.0"
+    t.decimal  "extra_weight_value",            precision: 10, scale: 2
+    t.string   "weight_unit",        limit: 12
+    t.datetime "created_at",                                                              null: false
+    t.datetime "updated_at",                                                              null: false
+  end
+
+  create_table "things", force: :cascade do |t|
+    t.decimal  "length_value",                                   precision: 10, scale: 2
+    t.string   "length_unit",                         limit: 12
+    t.decimal  "width_value",                                    precision: 10, scale: 2
+    t.string   "width_unit",                          limit: 12
+    t.decimal  "height_value",                                   precision: 10, scale: 2
+    t.string   "height_unit",                         limit: 12
+    t.decimal  "volume_value",                                   precision: 10, scale: 2
+    t.string   "volume_unit",                         limit: 12
+    t.decimal  "total_weight_value",                             precision: 10, scale: 2, default: "10.0"
+    t.string   "total_weight_unit",                   limit: 12,                          default: "g"
+    t.decimal  "extra_weight_value",                             precision: 10, scale: 2
+    t.string   "extra_weight_unit",                   limit: 12
+    t.decimal  "length_with_max_on_assignment_value",            precision: 10, scale: 2
+    t.string   "length_with_max_on_assignment_unit",  limit: 12
+    t.datetime "created_at",                                                                               null: false
+    t.datetime "updated_at",                                                                               null: false
+  end
+
+  create_table "validated_things", force: :cascade do |t|
+    t.decimal  "length_value",                                               precision: 10, scale: 2
+    t.string   "length_unit",                                     limit: 12
+    t.decimal  "length_true_value",                                          precision: 10, scale: 2
+    t.string   "length_true_unit",                                limit: 12
+    t.decimal  "length_message_value",                                       precision: 10, scale: 2
+    t.string   "length_message_unit",                             limit: 12
+    t.decimal  "length_message_from_block_value",                            precision: 10, scale: 2
+    t.string   "length_message_from_block_unit",                  limit: 12
+    t.decimal  "length_units_value",                                         precision: 10, scale: 2
+    t.string   "length_units_unit",                               limit: 12
+    t.decimal  "length_units_singular_value",                                precision: 10, scale: 2
+    t.string   "length_units_singular_unit",                      limit: 12
+    t.decimal  "length_presence_value",                                      precision: 10, scale: 2
+    t.string   "length_presence_unit",                            limit: 12
+    t.decimal  "length_invalid_value",                                       precision: 10, scale: 2
+    t.string   "length_invalid_unit",                             limit: 12
+    t.datetime "created_at",                                                                          null: false
+    t.datetime "updated_at",                                                                          null: false
+    t.decimal  "length_numericality_inclusive_value",                        precision: 10, scale: 2
+    t.string   "length_numericality_inclusive_unit",              limit: 12
+    t.decimal  "length_numericality_exclusive_value",                        precision: 10, scale: 2
+    t.string   "length_numericality_exclusive_unit",              limit: 12
+    t.decimal  "length_numericality_equality_value",                         precision: 10, scale: 2
+    t.string   "length_numericality_equality_unit",               limit: 12
+    t.decimal  "length_invalid_comparison_value",                            precision: 10, scale: 2
+    t.string   "length_invalid_comparison_unit",                  limit: 12
+    t.decimal  "length_non_zero_scalar_value",                               precision: 10, scale: 2
+    t.string   "length_non_zero_scalar_unit",                     limit: 12
+    t.decimal  "length_zero_scalar_value",                                   precision: 10, scale: 2
+    t.string   "length_zero_scalar_unit",                         limit: 12
+    t.decimal  "length_numericality_less_than_than_scalar_value",            precision: 10, scale: 2
+    t.string   "length_numericality_less_than_than_scalar_unit",  limit: 12
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,29 @@
+require "pry" unless ENV["CI"]
+require "measured"
+require "measured-rails"
+require "minitest/autorun"
+require "minitest/reporters"
+require "mocha/setup"
+
+ActiveSupport.test_order = :random
+
+# Prevent two reporters from printing
+# https://github.com/kern/minitest-reporters/issues/230
+# https://github.com/rails/rails/issues/30491
+Minitest.load_plugins
+Minitest.extensions.delete('rails')
+Minitest.extensions.unshift('rails')
+
+Minitest::Reporters.use! [Minitest::Reporters::ProgressReporter.new(color: true)]
+
+class ActiveSupport::TestCase
+  def reset_db
+    ActiveRecord::Base.subclasses.each do |model|
+      model.delete_all
+    end
+  end
+end
+
+Dir.glob(File.expand_path("../support/models/*.rb", __FILE__)).each { |r| require r }
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+require_relative "support/schema.rb"

data/test/validation_test.rb

@@ -0,0 +1,237 @@
+require "test_helper"
+
+class Measured::Rails::ValidationTest < ActiveSupport::TestCase
+  setup do
+    reset_db
+  end
+
+  test "validation mock is valid" do
+    assert thing.valid?
+  end
+
+  test "validation measurable: validation leaves a model valid and deals with blank unit" do
+    assert ValidatedThing.new(length_presence: Measured::Length.new(4, :in)).valid?
+  end
+
+  test "validation fails when unit is nil" do
+    thing.length_unit = ''
+    refute thing.valid?
+    assert_equal({ length: "is not a valid unit" }, thing.errors.to_h)
+  end
+
+  test "validation fails on model with custom unit with nil value" do
+    custom_unit_thing.size_unit = ''
+    refute custom_unit_thing.valid?
+    assert_equal(
+      {
+        length: "is not a valid unit",
+        width:  "is not a valid unit",
+        height: "is not a valid unit",
+      },
+      custom_unit_thing.errors.to_h
+    )
+  end
+
+  test "validation true works by default" do
+    thing.length_unit = "junk"
+    refute thing.valid?
+    assert_equal ["Length is not a valid unit"], thing.errors.full_messages
+  end
+
+  test "validation can override the message with a static string" do
+    thing.length_message_unit = "junk"
+    refute thing.valid?
+    assert_equal ["Length message has a custom failure message"], thing.errors.full_messages
+  end
+
+  test "validation can override the message with a block" do
+    thing.length_message_from_block_unit = "junk"
+    refute thing.valid?
+    assert_equal ["Length message from block junk is not a valid unit"], thing.errors.full_messages
+  end
+
+  test "validation may be any valid unit" do
+    length_units.each do |unit|
+      thing.length_unit = unit
+      assert thing.valid?
+      thing.length_unit = unit.to_s
+      assert thing.valid?
+      thing.length = Measured::Length.new(123, unit)
+      assert thing.valid?
+    end
+  end
+
+  test "validation accepts a list of units in any format as an option and only allows them to be valid" do
+    thing.length_units_unit = :m
+    assert thing.valid?
+    thing.length_units_unit = :cm
+    assert thing.valid?
+    thing.length_units_unit = "cm"
+    assert thing.valid?
+    thing.length_units_unit = "meter"
+    assert thing.valid?
+    thing.length_units = Measured::Length.new(3, :cm)
+    assert thing.valid?
+    thing.length_units_unit = :mm
+    refute thing.valid?
+    thing.length_units = Measured::Length.new(3, :ft)
+    refute thing.valid?
+  end
+
+  test "validation lets the unit be singular" do
+    thing.length_units_singular_unit = :ft
+    assert thing.valid?
+    thing.length_units_singular_unit = "feet"
+    assert thing.valid?
+    thing.length_units_singular_unit = :mm
+    refute thing.valid?
+    thing.length_units_singular_unit = "meter"
+    refute thing.valid?
+  end
+
+  test "validation for unit reasons uses the default message" do
+    thing.length_units_unit = :mm
+    refute thing.valid?
+    assert_equal ["Length units is not a valid unit"], thing.errors.full_messages
+  end
+
+  test "validation for unit reasons also uses the custom message" do
+    thing.length_units_singular_unit = :mm
+    refute thing.valid?
+    assert_equal ["Length units singular custom message too"], thing.errors.full_messages
+  end
+
+  test "validation for unit reasons adds one message if unit is not supported by default and is not custom supported" do
+    thing.length_units_singular_unit = :t
+    refute thing.valid?
+
+    assert_equal ["Length units singular custom message too"], thing.errors.full_messages
+  end
+
+  test "validation presence works on measured columns" do
+    thing.length_presence = nil
+    refute thing.valid?
+    assert_equal ["Length presence can't be blank"], thing.errors.full_messages
+    thing.length_presence_unit = "m"
+    refute thing.valid?
+    thing.length_presence_value = "3"
+    assert thing.valid?
+  end
+
+  test "validation fails if only only the value is set" do
+    thing.length_unit = nil
+    refute thing.valid?
+  end
+
+  test "validation checks that numericality comparisons are against a Measurable subclass" do
+    thing.length_invalid_comparison = Measured::Length.new(30, :in)
+    assert_raises ArgumentError, ":not_a_measured_subclass must be a Measurable object" do
+      thing.valid?
+    end
+  end
+
+  test "validation for numericality uses a default invalid message" do
+    thing.length_numericality_inclusive = Measured::Length.new(30, :in)
+    refute thing.valid?
+    assert_equal ["Length numericality inclusive 30 in must be <= 20 in"], thing.errors.full_messages
+
+    thing.length_numericality_inclusive = Measured::Length.new(1, :mm)
+    refute thing.valid?
+    assert_equal ["Length numericality inclusive 1 mm must be >= 10 in"], thing.errors.full_messages
+  end
+
+  test "validation for numericality uses the override message" do
+    thing.length_numericality_exclusive = Measured::Length.new(2, :m)
+    refute thing.valid?
+    assert_equal ["Length numericality exclusive is super not ok"], thing.errors.full_messages
+
+    thing.length_numericality_exclusive = Measured::Length.new(6000, :mm)
+    refute thing.valid?
+    assert_equal ["Length numericality exclusive is super not ok"], thing.errors.full_messages
+  end
+
+  test "validation for numericality checks :greater_than and :less_than and can use symbols as method names to look up values" do
+    thing.length_numericality_exclusive = Measured::Length.new(4, :m)
+    assert thing.valid?
+
+    thing.length_numericality_exclusive = Measured::Length.new(1, :m)
+    refute thing.valid?
+  end
+
+  test "validation for numericality checks :greater_than_or_equal_to and :less_than_or_equal_to" do
+    thing.length_numericality_inclusive = Measured::Length.new(10, :in)
+    assert thing.valid?
+
+    thing.length_numericality_exclusive = Measured::Length.new(3, :m)
+    refute thing.valid?
+  end
+
+  test "validation for numericality checks :equal_to and can use procs to look up values" do
+    thing.length_numericality_equality = Measured::Length.new(100, :cm)
+    assert thing.valid?
+
+    thing.length_numericality_equality = Measured::Length.new(1, :m)
+    assert thing.valid?
+
+    thing.length_numericality_equality = Measured::Length.new("99.9", :cm)
+    refute thing.valid?
+
+    thing.length_numericality_equality = Measured::Length.new(101, :cm)
+    refute thing.valid?
+  end
+
+  test "validation for numericality handles a nil unit but a valid value" do
+    thing.length_numericality_exclusive_unit = nil
+    thing.length_numericality_exclusive_value = 1
+    refute thing.valid?
+  end
+
+  test "allow a nil value but a valid unit" do
+    thing.length_numericality_exclusive_unit = :cm
+    thing.length_numericality_exclusive_value = nil
+    assert thing.valid?
+  end
+
+  test "validations work as expected given a measured field with custom validators" do
+    assert custom_unit_thing.valid?
+
+    assert custom_unit_thing.size_unit = 'invalid'
+
+    refute custom_unit_thing.valid?
+
+    assert_equal(custom_unit_thing.errors[:length], ["is not a valid unit"])
+    assert_equal(custom_unit_thing.errors[:height], ["is not a valid unit"])
+    assert_equal(custom_unit_thing.errors[:width], ["is not a valid unit"])
+  end
+
+  private
+
+  def thing
+    @thing ||= ValidatedThing.new(
+      length: Measured::Length.new(1, :m),
+      length_true: Measured::Length.new(2, :cm),
+      length_message: Measured::Length.new(3, :mm),
+      length_message_from_block: Measured::Length.new(7, :mm),
+      length_units: Measured::Length.new(4, :m),
+      length_units_singular: Measured::Length.new(5, :ft),
+      length_presence: Measured::Length.new(6, :m),
+      length_numericality_inclusive: Measured::Length.new(15, :in),
+      length_numericality_exclusive: Measured::Length.new(4, :m),
+      length_numericality_equality: Measured::Length.new(100, :cm),
+    )
+  end
+
+  def custom_unit_thing
+    @custom_unit_thing ||= ThingWithCustomUnitAccessor.new(
+      length: Measured::Length.new(1, :m),
+      width: Measured::Length.new(2, :m),
+      height: Measured::Length.new(3, :m),
+      total_weight: Measured::Weight.new(10, :g),
+      extra_weight: Measured::Weight.new(12, :g),
+    )
+  end
+
+  def length_units
+    @length_units ||= [:m, :meter, :cm, :mm, :millimeter, :in, :ft, :feet, :yd]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: measured
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +154,9 @@ description: Rails adapter for assigning and managing measurements with their un
   provided by the measured gem.
 email:
 - gems@shopify.com
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -153,19 +169,28 @@ files:
 - bin/console
 - bin/setup
 - dev.yml
-- gemfiles/rails-4.2.gemfile
 - gemfiles/rails-5.0.gemfile
+- gemfiles/rails-5.1.gemfile
+- gemfiles/rails-6.0.gemfile
 - gemfiles/rails-master.gemfile
 - lib/measured-rails.rb
 - lib/measured/rails/active_record.rb
 - lib/measured/rails/base.rb
 - lib/measured/rails/railtie.rb
 - lib/measured/rails/units/length.rb
+- lib/measured/rails/units/volume.rb
 - lib/measured/rails/units/weight.rb
 - lib/measured/rails/validations.rb
 - lib/measured/rails/version.rb
 - measured-rails.gemspec
 - shipit.rubygems.yml
+- test/active_record_test.rb
+- test/support/models/thing.rb
+- test/support/models/thing_with_custom_unit_accessor.rb
+- test/support/models/validated_thing.rb
+- test/support/schema.rb
+- test/test_helper.rb
+- test/validation_test.rb
 homepage: https://github.com/Shopify/measured-rails
 licenses:
 - MIT
@@ -186,8 +211,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails adaptor for measured
-test_files: []
+test_files:
+- test/active_record_test.rb
+- test/support/models/thing.rb
+- test/support/models/thing_with_custom_unit_accessor.rb
+- test/support/models/validated_thing.rb
+- test/support/schema.rb
+- test/test_helper.rb
+- test/validation_test.rb