measured-rails 2.5.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5340f7b4030fd78e807b7ad45a0b5a9e5f58062b7cee3ca1e28170900e3eaba
-  data.tar.gz: 6f5613d8d80893a1a5fb1644f0f2b55cb25ddf1b8f20595170ec1b7ac78deee8
+  metadata.gz: 0f53b4259959a215a55d423a3fb805982755d583a4d134ec2704df4017a58fc1
+  data.tar.gz: d28466e9df22e295aca2ed764411c8e55c0e7d2e63cda1d26d66a432ca789e5c
 SHA512:
-  metadata.gz: cb30cf468cc1fadcd546e8415a360226cbe4ca161c180e08c2e43461c684cb06f5a0e911f95d34f2704b36532ecb86a2272eb596af91b6c564ab8381e5318e7f
-  data.tar.gz: 3dad6cfd31a4adfbc72732a26697503b74ad9dfbff599d4b9ab8937dc4e57ee2a5a18e4410769bcdb4206ce98665a459f8a7db418f8f30b994f3d87bb33f0eed
+  metadata.gz: 17b097b9ed058aa86f20605b435bcb340a68a3fb9a7f40d5cb7fd4f17411634abf5d14f86057b735a84b4db20ac025bfb0809d7bec88e8636c9798e261dabba0
+  data.tar.gz: 2769862d7e7946e1a27f547fe7c0ef7ac4384a879619b63011376c57727337aa5ffbd790c99d3d20fe549885abb70edcfdd73cf5867ec1671c60a5c84255bdeb

data/.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+        gemfile:
+          - Gemfile
+          - gemfiles/rails-5.2.gemfile
+          - gemfiles/rails-6.0.gemfile
+          - gemfiles/rails-6.1.gemfile
+          - gemfiles/rails-edge.gemfile
+        exclude:
+          - ruby: '2.6'
+            gemfile: gemfiles/rails-edge.gemfile
+          - ruby: '3.0'
+            gemfile: gemfiles/rails-5.2.gemfile
+    name: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }}
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: |
+          bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+2.8.0
+-----
+
+* Support setting a custom value field. (Thanks @Steffylicious)
+* Drop support for Ruby 2.5
+* Use Ruby 3.0.2 for development
+
+2.7.1
+-----
+
+* Bump measured to 2.7.1
+
+2.6.0
+-----
+
+* Only support Rails 5.2 and above.
+
+
+2.5.2
+-----
+
+* Fix some deprecations in tests and CI.
+
 2.5.1
 -----
 

data/README.md

@@ -54,6 +54,16 @@ class ThingWithCustomUnitAccessor < ActiveRecord::Base
 end
 ```
 
+Similarly, you can optionally customize the model's value column by specifying it in the `value_field_name` option, as follows:
+
+```ruby
+class ThingWithCustomValueAccessor < ActiveRecord::Base
+  measured_length :length, value_field_name: :custom_length
+  measured_weight :total_weight, value_field_name: :custom_weight
+  measured_volume :volume, value_field_name: :custom_volume
+end
+```
+
 There are some simpler methods for predefined types:
 
 ```ruby

data/dev.yml

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

data/gemfiles/{rails-5.0.gemfile → rails-5.2.gemfile}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 5.0'
+gem 'rails', '~> 5.2'

data/gemfiles/rails-6.0.gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 6.0.0.rc1'
+gem 'rails', '~> 6.0'

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

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 5.1'
+gem 'rails', '~> 6.1'

data/gemfiles/{rails-master.gemfile → rails-edge.gemfile}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', github: 'rails/rails'
+gem 'rails', github: 'rails/rails', branch: 'main'

data/lib/measured/rails/active_record.rb

@@ -25,7 +25,11 @@ module Measured::Rails::ActiveRecord
           "#{ field }_unit"
         end
 
-        value_field_name = "#{ field }_value"
+        value_field_name = if options[:value_field_name]
+          measured_fields[field][:value_field_name] = options[:value_field_name].to_s
+        else
+          "#{ field }_value"
+        end
 
         # Reader to retrieve measured object
         define_method(field) do

data/lib/measured/rails/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Measured
   module Rails
-    VERSION = "2.5.1"
+    VERSION = "2.8.0"
   end
 end

data/measured-rails.gemspec

@@ -13,6 +13,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/Shopify/measured-rails"
   spec.license       = "MIT"
 
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
+
   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)/})
@@ -20,14 +28,14 @@ Gem::Specification.new do |spec|
 
   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_runtime_dependency "railties", ">= 5.2"
+  spec.add_runtime_dependency "activemodel", ">= 5.2"
+  spec.add_runtime_dependency "activerecord", ">= 5.2"
 
   spec.add_development_dependency "rake", "> 10.0"
   spec.add_development_dependency "minitest", "> 5.5.1"
   spec.add_development_dependency "minitest-reporters"
-  spec.add_development_dependency "mocha", "> 1.1.0"
+  spec.add_development_dependency "mocha", ">= 1.4.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "sqlite3"
 end

data/test/active_record_test.rb

@@ -196,109 +196,87 @@ class Measured::Rails::ActiveRecordTest < ActiveSupport::TestCase
     assert_nil thing.length
   end
 
-  test "update_attribute sets only the _value column" do
+  test "update sets one then the other" do
     thing = Thing.create!
-    thing.update_attribute(:width_value, 11)
+    assert thing.update(width_value: 11.1)
     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 thing.update(width_unit: "cm")
     assert_equal Measured::Length.new(11.1, :cm), thing.width
   end
 
-  test "update_attributes sets only the _value column" do
+  test "update sets only the _value column" do
     thing = Thing.create!
-    assert thing.update_attributes(width_value: "314")
+    assert thing.update(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
+  test "update sets only the _unit column" do
     thing = Thing.create!
-    assert thing.update_attributes(width_unit: :cm)
+    assert thing.update(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
+  test "update sets only the _unit column and converts it" do
     thing = Thing.create!
-    assert thing.update_attributes(width_unit: "inch")
+    assert thing.update(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
+  test "update sets the _unit column to something invalid" do
     thing = Thing.create!
-    assert thing.update_attributes(width_unit: :invalid)
+    assert thing.update(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
+  test "update 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)
+    refute thing.update(length_unit: :invalid)
   end
 
-  test "update_attributes sets one column then the other" do
+  test "update sets one column then the other" do
     thing = Thing.create!
-    assert thing.update_attributes(width_unit: "inch")
+    assert thing.update(width_unit: "inch")
     assert_nil thing.width
-    assert thing.update_attributes(width_value: "314")
+    assert thing.update(width_value: "314")
     assert_equal Measured::Length.new(314, :in), thing.width
   end
 
-  test "update_attributes sets both columns" do
+  test "update sets both columns" do
     thing = Thing.create!
-    assert thing.update_attributes(width_unit: :cm, width_value: 2)
+    assert thing.update(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)
+  test "update modifies the _value column" do
+    assert thing.update(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")
+  test "update modifies only the _unit column" do
+    assert thing.update(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)
+  test "update modifies the _unit column to be something invalid" do
+    assert thing.update(height_unit: :invalid)
     assert_nil thing.height
     assert_equal "invalid", thing.height_unit
     thing.reload
@@ -306,8 +284,8 @@ class Measured::Rails::ActiveRecordTest < ActiveSupport::TestCase
     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)
+  test "update modifies both columns" do
+    assert thing.update(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
@@ -386,6 +364,15 @@ class Measured::Rails::ActiveRecordTest < ActiveSupport::TestCase
     assert_equal custom_unit_thing.extra_weight, Measured::Weight.new(12, :kg)
   end
 
+  test "using custom value fields works correctly" do
+    assert_equal custom_value_thing.length, Measured::Length.new(4, :m)
+    assert_equal custom_value_thing.width, Measured::Length.new(5, :m)
+    assert_equal custom_value_thing.height, Measured::Length.new(6, :m)
+    assert_equal custom_value_thing.volume, Measured::Volume.new(13, :l)
+    assert_equal custom_value_thing.total_weight, Measured::Weight.new(14, :g)
+    assert_equal custom_value_thing.extra_weight, Measured::Weight.new(15, :g)
+  end
+
   private
 
   def length
@@ -432,4 +419,15 @@ class Measured::Rails::ActiveRecordTest < ActiveSupport::TestCase
       extra_weight: Measured::Weight.new(12, :g),
     )
   end
+
+  def custom_value_thing
+    @custom_value_thing ||= ThingWithCustomValueAccessor.new(
+      length: Measured::Length.new(4, :m),
+      width: Measured::Length.new(5, :m),
+      height: Measured::Length.new(6, :m),
+      volume: Measured::Volume.new(13, :l),
+      total_weight: Measured::Weight.new(14, :g),
+      extra_weight: Measured::Weight.new(15, :g),
+    )
+  end
 end

data/test/support/models/thing_with_custom_value_accessor.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+class ThingWithCustomValueAccessor < ActiveRecord::Base
+  measured_length :length, value_field_name: :custom_length
+  validates :length, measured: true
+  measured_length :width, value_field_name: :custom_width
+  validates :width, measured: true
+
+  measured_volume :volume, value_field_name: :custom_volume
+  validates :volume, measured: true
+
+  measured_length :height, value_field_name: :custom_height
+  validates :height, measured: true
+
+  measured_weight :total_weight, value_field_name: :custom_weight
+  validates :total_weight, measured: true
+
+  measured_weight :extra_weight, value_field_name: :custom_extra_weight
+  validates :extra_weight, measured: true
+end

data/test/support/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161118203701) do
+ActiveRecord::Schema.define(version: 20211105120355) do
 
   create_table "thing_with_custom_unit_accessors", force: :cascade do |t|
     t.decimal  "length_value",                  precision: 10, scale: 2
@@ -80,4 +80,21 @@ ActiveRecord::Schema.define(version: 20161118203701) do
     t.string   "length_numericality_less_than_than_scalar_unit",  limit: 12
   end
 
+  create_table "thing_with_custom_value_accessors", force: :cascade do |t|
+    t.decimal  "custom_length",                  precision: 10, scale: 2
+    t.string   "length_unit",         limit: 12
+    t.decimal  "custom_width",                   precision: 10, scale: 2
+    t.string   "width_unit",          limit: 12
+    t.decimal  "custom_height",                  precision: 10, scale: 2
+    t.string   "height_unit",         limit: 12
+    t.decimal  "custom_volume",                  precision: 10, scale: 2
+    t.string   "volume_unit",         limit: 12
+    t.decimal  "custom_weight",                  precision: 10, scale: 2, default: "10.0"
+    t.string   "total_weight_unit",   limit: 12
+    t.decimal  "custom_extra_weight",            precision: 10, scale: 2
+    t.string   "extra_weight_unit",   limit: 12
+    t.datetime "created_at",                                                              null: false
+    t.datetime "updated_at",                                                              null: false
+  end
+
 end

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require "measured"
 require "measured-rails"
 require "minitest/autorun"
 require "minitest/reporters"
-require "mocha/setup"
+require "mocha/minitest"
 
 ActiveSupport.test_order = :random
 

data/test/validation_test.rb

@@ -17,7 +17,7 @@ class Measured::Rails::ValidationTest < ActiveSupport::TestCase
   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)
+    assert_equal({ length: ["is not a valid unit"] }, thing.errors.to_hash)
   end
 
   test "validation fails on model with custom unit with nil value" do
@@ -25,11 +25,11 @@ class Measured::Rails::ValidationTest < ActiveSupport::TestCase
     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",
+        length: ["is not a valid unit"],
+        width:  ["is not a valid unit"],
+        height: ["is not a valid unit"],
       },
-      custom_unit_thing.errors.to_h
+      custom_unit_thing.errors.to_hash
     )
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: measured
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -158,18 +158,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - dev.yml
-- gemfiles/rails-5.0.gemfile
-- gemfiles/rails-5.1.gemfile
+- gemfiles/rails-5.2.gemfile
 - gemfiles/rails-6.0.gemfile
-- gemfiles/rails-master.gemfile
+- gemfiles/rails-6.1.gemfile
+- gemfiles/rails-edge.gemfile
 - lib/measured-rails.rb
 - lib/measured/rails/active_record.rb
 - lib/measured/rails/base.rb
@@ -184,6 +184,7 @@ files:
 - test/active_record_test.rb
 - test/support/models/thing.rb
 - test/support/models/thing_with_custom_unit_accessor.rb
+- test/support/models/thing_with_custom_value_accessor.rb
 - test/support/models/validated_thing.rb
 - test/support/schema.rb
 - test/test_helper.rb
@@ -191,7 +192,8 @@ files:
 homepage: https://github.com/Shopify/measured-rails
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -207,8 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: Rails adaptor for measured
@@ -216,6 +217,7 @@ test_files:
 - test/active_record_test.rb
 - test/support/models/thing.rb
 - test/support/models/thing_with_custom_unit_accessor.rb
+- test/support/models/thing_with_custom_value_accessor.rb
 - test/support/models/validated_thing.rb
 - test/support/schema.rb
 - test/test_helper.rb

data/.travis.yml

@@ -1,28 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.5
-  - 2.6.3
-gemfile:
-  - 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: gemfiles/rails-master.gemfile
-      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