measured 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08724bae7ca2587e6ac427df7588e08fcec42dfecbd5d0fd9858560b7d1ec1f
-  data.tar.gz: aa934b2932b9df4648acbd6d65378fdd00add45840834e5ef9119bfd2e627ff9
+  metadata.gz: 28b85a1e372c462023f0ad7985c8d8cb3c87b3de116593e8f26904e7734cfe85
+  data.tar.gz: fc223a541062dd7f3f94b9fe499f2af21ea198f2c73f2067ebf9f241086e856e
 SHA512:
-  metadata.gz: 5aea963586e68d4806e06d98993b2122b13fd19c79a825c035d413b908c8d30213d7fe4d23d4485b7cfdcd63c448db98150f11941bbb32d461a773e781ed5120
-  data.tar.gz: 55dd6b127ae8dcba52fca728246116a55274549bf0ee0ac31931a12393783554cb05dd5b7521714573e9d3c24350f6c88883a30a0110921e1594325660156f42
+  metadata.gz: 3189c14a03d9558b121c945f823475f0a21293461e9c4034da5ef48a8500c10cafd8be75dbc1e1b3b377efaf8ede981eb74a47b4fdb30dfd1db0f12b6da5e092
+  data.tar.gz: 02d983b4ce3860b6f2a88f1a8ef0d3332e5898675d6fce527ac8b5744de19742a9b5209a5eac414c46bfd4d0b1ef0356191a1361a5032f7b72602cd89af68d3e

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/release.yml

@@ -0,0 +1,22 @@
+changelog:
+  exclude:
+    labels:
+      - dependencies
+      - chore
+      - documentation
+    authors:
+      - dependabot
+  categories:
+    - title: 🚧 Breaking Changes
+      labels:
+        - breaking-change
+    - title: ✨ Enhancements
+      labels:
+        - enhancement
+        - feature
+    - title: 🐛 Bug Fixes
+      labels:
+        - bugfix
+    - title: 🛠 Other Changes
+      labels:
+        - "*"

data/.github/workflows/ci.yml

@@ -10,7 +10,6 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '3.1'
           - '3.2'
           - '3.3'
         gemfile:
@@ -19,16 +18,14 @@ jobs:
           - gemfiles/rails-7.1.gemfile
           - gemfiles/rails-edge.gemfile
         exclude:
-          - ruby: '3.1'
-            gemfile: gemfiles/rails-edge.gemfile
           - ruby: '3.2'
             gemfile: gemfiles/rails-edge.gemfile
 
     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/.github/workflows/release.yml

@@ -0,0 +1,52 @@
+name: Release gem on RubyGems.org and create GitHub release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  release_gem:
+    name: Release gem on RubyGems.org
+    if: github.repository == 'Shopify/measured'
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      id-token: write
+
+    environment: release
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@26e5b7d197ebf60545ee9667bcbace0be11ccaec # v1.334.0
+        with:
+          bundler-cache: true
+
+      - name: Release gem on RubyGems.org
+        uses: rubygems/release-gem@7f9650160c1a4e7989fdc9855807bdbd421d8b6b # v1.4.1
+
+  release_github:
+    name: Create GitHub release
+    if: github.repository == 'Shopify/measured'
+    needs: release_gem
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Create GitHub release
+        run: |
+          tag_name="$(git describe --tags --abbrev=0)"
+          gh release create "${tag_name}" --verify-tag --generate-notes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.ruby-version

@@ -1 +1 @@
-3.0.2
+4.0.7

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 Unreleased
+
+3.2.2
+-----
+* Fix loading the JSON conversion table cache under json 3.0, which no longer accepts comments by default. (@bonjourjules)
+
+3.2.1
 -----
+* Restrict Measured::Cache::Json initializer to valid filenames. (@caseyshop)
 
 3.2.0
 -----

data/dev.yml

@@ -1,5 +1,5 @@
 name: measured
-
+nix: true
 up:
   - ruby
   - bundler

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?
@@ -14,7 +15,8 @@ module Measured::Cache
 
     def read
       return unless exist?
-      decode(JSON.load(File.read(@path), nil, freeze: true))
+
+      decode(JSON.load(File.read(@path), nil, freeze: true, allow_comments: true))
     end
 
     def write(table)

data/lib/measured/version.rb

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

data/measured.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "combustion"
   spec.add_development_dependency "sqlite3", "> 1.4"
-  spec.add_development_dependency "tapioca"
+  spec.add_development_dependency "tapioca", ">= 0.17.0"
 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?
@@ -35,6 +53,13 @@ class Measured::Cache::JsonTest < ActiveSupport::TestCase
     assert_equal @table_hash, @cache.read
   end
 
+  test "#read loads a file that starts with the comment header written by the writer" do
+    commented_json = "// Do not modify this file directly. Regenerate it with 'rake cache:write'.\n#{@table_json}"
+    File.expects(:exist?).with(@cache.path).returns(true)
+    File.expects(:read).with(@cache.path).returns(commented_json)
+    assert_equal @table_hash, @cache.read
+  end
+
   test "#write raises not implemented" do
     assert_raises(ArgumentError) do
       @cache.write({})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: measured
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Kevin McPhillips
@@ -9,7 +9,7 @@ authors:
 - Javier Honduvilla Coto
 bindir: bin
 cert_chain: []
-date: 2025-01-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
 description: Wrapper objects which encapsulate measurements and their associated units
   in Ruby.
 email:
@@ -146,9 +146,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/release.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/cla.yml"
 - ".github/workflows/dependabot_auto_merge.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".ruby-version"
 - CHANGELOG.md
@@ -240,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Encapsulate measurements with their units in Ruby
 test_files: