measured 3.1.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b304fbf20408beb13b8408d74c17747f00ccb991b586775b91249f2e90e9073
-  data.tar.gz: d8df7e3a16743234d79b1d8375f2f6d83e69f18824fdd1ff95c530fdd333d3a3
+  metadata.gz: 1e8794e944fe077ce5f8fe1271de15dbd7aae08e9faa25870d5a2f1df2fecfe3
+  data.tar.gz: d6250b4975dbf4a2972b998cc68971b983f6ee2d45c2a22fe7839d672c951233
 SHA512:
-  metadata.gz: 3f7e92b9cdc9165c11dca6857ae9bbc141b938eb071e89f56ca1e13198fc6d281bde0abe4d3436d2f102d869057c5b1f60562bdcb2f9376739a4927b11ccb248
-  data.tar.gz: 4b3d830a1814b6b64dd9123a40e444918adf3a546b925bb57088bc2c4324da0ccd7040253a838d24f0c53ea1c749cbade548dee29f2995678be903f87af04dcf
+  metadata.gz: 30590d0e624813f1cbc0bc8bbe5a397b0197e799cd36070c91eba906890cea07fbf2b1755db57fc73aea8e1ce5bbf220edd608cf27ee809afccc0d18a0abafe7
+  data.tar.gz: 4197246ef6225ab834396b9287e705d1e12878f90ed9892a372d552c566ab387cfee24b083f0a6018a4e6515d1245167db548f123521c510af1671a835373599

data/.github/dependabot.yml

@@ -11,6 +11,10 @@ registries:
     username: ${{secrets.DEPENDENCIES_GITHUB_USER}}
     password: ${{secrets.DEPENDENCIES_GITHUB_TOKEN}}
 updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
   - package-ecosystem: bundler
     directory: "/"
     schedule:

data/.github/workflows/ci.yml

@@ -26,9 +26,9 @@ jobs:
 
     name: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }}
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
       - name: Set up Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true

data/.github/workflows/dependabot_auto_merge.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@c9c4182bf1b97f5224aee3906fd373f6b61b4526 # v1.6.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
@@ -16,7 +16,7 @@ jobs:
         id: check_ci_failure
         continue-on-error: true
         if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.dependency-group == 'auto_merge' }}
-        uses: actions/github-script@v6
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           script: |
             function sleep(ms) {
@@ -62,7 +62,7 @@ jobs:
             core.setOutput("ci_state", ci_state)
       - name: Send Slack notification if auto-merge failed
         if: ${{ steps.check_ci_failure.outputs.ci_state == 'false' }}
-        uses: ruby/action-slack@v3.0.0
+        uses: ruby/action-slack@b6882ea6ef8f556f9f9af9ec1220d3f1ced74acf # v3.0.0
         with:
           payload: |
             {
@@ -77,7 +77,7 @@ jobs:
 
       - name: Approve and merge
         if: ${{ steps.check_ci_failure.outputs.ci_state == 'true' && (steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.dependency-group == 'auto_merge') }}
-        uses: actions/github-script@v6
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           script: |
             await github.rest.pulls.createReview({

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Unreleased
 -----
 
+3.2.1
+-----
+* Restrict Measured::Cache::Json initializer to valid filenames. (@caseyshop)
+
+3.2.0
+-----
+* Make the ActiveRecord validation errors have the correct type. (@alexcarruthers)
 
 3.1.0
 -----

data/lib/measured/cache/json.rb

@@ -5,7 +5,8 @@ module Measured::Cache
 
     def initialize(filename)
       @filename = filename
-      @path = Pathname.new(File.join(File.dirname(__FILE__), "../../../cache", @filename)).cleanpath
+      raise ArgumentError, "Invalid cache file: #{filename}" unless %w[length.json weight.json volume.json test.json].include?(filename.to_s)
+      @path = Pathname.new(File.join(File.dirname(__FILE__), "../../../cache", filename)).cleanpath
     end
 
     def exist?

data/lib/measured/rails/validations.rb

@@ -24,11 +24,11 @@ class MeasuredValidator < ActiveModel::EachValidator
     return unless measurable_unit_name.present? || measurable_value.present?
 
     measurable_unit = measured_class.unit_system.unit_for(measurable_unit_name)
-    record.errors.add(attribute, message(record, "is not a valid unit")) unless measurable_unit
+    record.errors.add(attribute, :invalid, message: message(record, "is not a valid unit")) unless measurable_unit
 
     if options[:units] && measurable_unit.present?
       valid_units = Array(options[:units]).map { |unit| measured_class.unit_system.unit_for(unit) }
-      record.errors.add(attribute, message(record, "is not a valid unit")) unless valid_units.include?(measurable_unit)
+      record.errors.add(attribute, :invalid, message: message(record, "is not a valid unit")) unless valid_units.include?(measurable_unit)
     end
 
     if measurable_unit && measurable_value.present?
@@ -36,7 +36,7 @@ class MeasuredValidator < ActiveModel::EachValidator
         comparable_value = value_for(value, record)
         comparable_value = measured_class.new(comparable_value, measurable_unit) unless comparable_value.is_a?(Measured::Measurable)
         unless measurable.public_send(CHECKS[option], comparable_value)
-          record.errors.add(attribute, message(record, "#{measurable.to_s} must be #{CHECKS[option]} #{comparable_value}"))
+          record.errors.add(attribute, option, message: message(record, "#{measurable.to_s} must be #{CHECKS[option]} #{comparable_value}"))
         end
       end
     end

data/lib/measured/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Measured
-  VERSION = "3.1.0"
+  VERSION = "3.2.1"
 end

data/test/cache/json_test.rb

@@ -14,6 +14,24 @@ class Measured::Cache::JsonTest < ActiveSupport::TestCase
     refute_match "../", @cache.path.to_s
   end
 
+  test "#initialize accepts valid cache filenames for Measured::Measurable.subclasses, and test file" do
+    valid_files = %w[length.json weight.json volume.json test.json]
+    valid_files.each do |filename|
+      assert_nothing_raised do
+        Measured::Cache::Json.new(filename)
+      end
+    end
+  end
+
+  test "#initialize rejects invalid cache filenames" do
+    invalid_files = ["volum.json", "../volume.json", "other.txt"]
+    invalid_files.each do |filename|
+      assert_raises ArgumentError do
+        Measured::Cache::Json.new(filename)
+      end
+    end
+  end
+
   test "#exist? returns false if the file does not exist" do
     File.expects(:exist?).with(@cache.path).returns(false)
     refute_predicate @cache, :exist?

data/test/rails/validation_test.rb

@@ -39,6 +39,12 @@ class Measured::Rails::ValidationTest < ActiveSupport::TestCase
     assert_equal ["Length is not a valid unit"], thing.errors.full_messages
   end
 
+  test "validation sets error codes when unit is invalid" do
+    thing.length_unit = "junk"
+    refute thing.valid?
+    assert thing.errors.of_kind?(:length, :invalid)
+  end
+
   test "validation can override the message with a static string" do
     thing.length_message_unit = "junk"
     refute thing.valid?
@@ -181,6 +187,28 @@ class Measured::Rails::ValidationTest < ActiveSupport::TestCase
     refute thing.valid?
   end
 
+  test "validation for numericality puts the proper error types" do
+    thing.length_numericality_inclusive_value = 5
+    refute thing.valid?
+    assert thing.errors.of_kind?(:length_numericality_inclusive, :greater_than_or_equal_to)
+
+    thing.length_numericality_inclusive_value = 25
+    refute thing.valid?
+    assert thing.errors.of_kind?(:length_numericality_inclusive, :less_than_or_equal_to)
+
+    thing.length_numericality_exclusive_value = 2
+    refute thing.valid?
+    assert thing.errors.of_kind?(:length_numericality_exclusive, :greater_than)
+
+    thing.length_numericality_exclusive_value = 550
+    refute thing.valid?
+    assert thing.errors.of_kind?(:length_numericality_exclusive, :less_than)
+
+    thing.length_numericality_equality_value = 200
+    refute thing.valid?
+    assert thing.errors.of_kind?(:length_numericality_equality, :equal_to)
+  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

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: measured
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Kevin McPhillips
 - Jason Gedge
 - Javier Honduvilla Coto
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -227,7 +226,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -242,8 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.20
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Encapsulate measurements with their units in Ruby
 test_files: