measured-rails 2.6.0 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd5658fda3d706ca2a15122793008dea4a312e8fe6dccbeb72743dbabc165d1d
-  data.tar.gz: 96eb251668aca9622ec35cafba76730edfa1243749b8cdced184aa6e49c2c754
+  metadata.gz: dd3b14a42a96727f80163ed52e53634447e42c65b21ce3456005a37816d4f102
+  data.tar.gz: 375fa0c585f3bef90e286640b0a1e5c1b3e7ddee654eed3d1b22f3bd8f40c2d7
 SHA512:
-  metadata.gz: 130a3980eb4b1eaa5de174316ac1073f144bb1bf9676a906f68f3cc44bb3752a825b81a5a5cc20768c01ad86cad5ee0cb7ca24e32a28327bd0f6853b564fb4bb
-  data.tar.gz: edcb3fd7eb2fdd691c49cd31f44047d0cf1d63c3ebe5e27fbad3bd96aee8a2ed965c48ac29da846d11c0ca3f2ac592698e26b6ca9faeff2ea9f5dfe55475a5c8
+  metadata.gz: ab7fedf62f1aa93ecee4a9fdb6d32c245cd91a480d132ff524f5a54dee506006be80c10a0865649d5fa6cc350003dbba360905726cc0417c0849a6c3ca0a4cf5
+  data.tar.gz: 56d47429dc8d6c126c28a4e0e5ff3a9b3d98982096a8768dad60e68e1f5f3b5144a4f7f76c3c50d91800b385fb80b79e89fbcf2c59a7ceef91f586bc9638f5ef

data/.github/workflows/ci.yml

@@ -8,17 +8,23 @@ jobs:
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     strategy:
+      fail-fast: false
       matrix:
         ruby:
-          - 2.5
-          - 2.6
-          - 2.7
+          - '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-master.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

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+Unreleased
+-----
+
+
+
+2.8.2
+-----
+
+* Bump measured to 2.8.2
+
+2.8.1
+-----
+
+* Bump measured to 2.8.1
+
+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
 -----
 

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-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.6.0"
+    VERSION = "2.8.2"
   end
 end

data/test/active_record_test.rb

@@ -364,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
@@ -410,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.8.2
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-12-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.6.0
+        version: 2.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.8.2
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ files:
 - gemfiles/rails-5.2.gemfile
 - gemfiles/rails-6.0.gemfile
 - gemfiles/rails-6.1.gemfile
-- gemfiles/rails-master.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
@@ -208,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+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