sequel_caller_location 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 475ec67c63cf67c042c9ec60267a35f3612ef41ceae6dced9900a2d9cd719b34
-  data.tar.gz: 5d06413010d4e05f9c84d4e10c91d61208fed87b75497a7d067f0c5623349c65
+  metadata.gz: 664ed2c560cae2dd6dcec7eb5375894c582ecec65c47e9b2d7430128d1a0748d
+  data.tar.gz: 53d362a1bb2704d8a03bf03923f7eac7540c49868773583404252dc970143867
 SHA512:
-  metadata.gz: 001e1bfc735875c4097a390068e3212e9d73ac1eb8ec2c5f225b4da6e0179548b73423aae481165f703a7b274055b726e58cc91ecf144f7e7e18f6dba64a3690
-  data.tar.gz: 006ced3d9eb278d13e4f1760ce0a990a10b6e9ed88d557499d330bf1643e9e4cbb9d1fa0fb4ba32ec31518cd60e132914e2329a347853d762f62cf7b76454263
+  metadata.gz: fbe86a4254db07e89fb81c2600680a927793a9352c8770b79b639c5c03fd9de1c34a0f59d98396512e35deaddbdf363ce5cdc56a482060d9eb5169ceffc44bcb
+  data.tar.gz: cf5394da20edc9ea12cf3e60d43afd239667d6688cec172f07c8bfea37befa56b1d566e10c5aa51379af2538eaef484c6e23128d5c5f8d4ab72d2c68a4faea1f

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/build.yml

@@ -1,16 +1,17 @@
 name: Build
-on: [push]
+on:
+  push:
+  pull_request:
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
-    - name: Install dependencies
-      run: bundle install
+        ruby-version: '3.4'
+        bundler-cache: true
     - name: Run linter
       run: bundle exec rubocop --parallel
     - name: Run tests

data/.github/workflows/publish.yml

@@ -7,11 +7,11 @@ jobs:
     name: Publish
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v7
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
       with:
-        version: 2.6.x
+        ruby-version: '3.4'
     - name: Publish to RubyGems
       run: |
         mkdir -p $HOME/.gem

data/.rubocop.yml

@@ -1,15 +1,12 @@
-require:
+plugins:
   - rubocop-rspec
 
+AllCops:
+  NewCops: enable
+
 # Offense count: 2
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
     - 'lib/sequel/extensions/caller_location.rb'
-
-# Offense count: 5
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 106

data/Gemfile

@@ -3,3 +3,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'rspec', '~> 3.13'
+gem 'rubocop', '~> 1.75'
+gem 'rubocop-rspec', '~> 3.7'
+gem 'simplecov', '~> 0.22'

data/lib/sequel/extensions/caller_location.rb

@@ -1,44 +1,42 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require 'sequel'
 
 module Sequel
   module CallerLocation
     def insert_sql(*values)
-      sql = super(*values)
+      sql = super
       backtrace = caller_locations(1).find { |c| c.path !~ /gems/ }
       append_location(sql, backtrace)
-      sql
     end
 
     def update_sql(*values)
-      sql = super(*values)
+      sql = super
       backtrace = caller_locations(1).find { |c| c.path !~ /gems/ }
       append_location(sql, backtrace)
-      sql
     end
 
     def select_sql(*values)
-      sql = super(*values)
+      sql = super
       backtrace = caller_locations(1).find { |c| c.path !~ /gems/ }
 
       @cache.delete(:_select_sql)
       append_location(sql, backtrace)
-      sql
     end
 
     def delete_sql(*values)
-      sql = super(*values)
+      sql = super
       backtrace = caller_locations(1).find { |c| c.path !~ /gems/ }
       @cache.delete(:_delete_sql)
       append_location(sql, backtrace)
-      sql
     end
 
     private
 
     def append_location(sql, backtrace)
-      sql << format_sql_comment(backtrace) if !sql.frozen? && backtrace
+      return sql unless backtrace
+
+      sql + format_sql_comment(backtrace)
     end
 
     def format_sql_comment(comment)

data/sequel_caller_location.gemspec

@@ -5,20 +5,17 @@ Gem::Specification.new do |gem|
   gem.email         = ['timothee.peignier@tryphon.org']
   gem.description   = 'Add caller location as SQL comments'
   gem.summary       = 'Add caller location as SQL comments.'
-  gem.homepage      = 'http://rubygems.org/gems/sequel_caller_location'
+  gem.homepage      = 'https://rubygems.org/gems/sequel_caller_location'
   gem.license       = 'MIT'
+  gem.metadata['rubygems_mfa_required'] = 'true'
 
   gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'sequel_caller_location'
   gem.require_paths = ['lib']
-  gem.version       = '0.3.0'
+  gem.version       = '0.4.0'
 
-  gem.add_runtime_dependency 'sequel', '>= 4.39.0'
+  gem.required_ruby_version = '>= 2.4'
 
-  gem.add_development_dependency 'rspec', '~> 3.5', '>= 3.5.0'
-  gem.add_development_dependency 'rubocop', '~> 0.52', '>= 0.52.0'
-  gem.add_development_dependency 'rubocop-rspec', '~> 1.22.0', '>= 1.22.0'
-  gem.add_development_dependency 'simplecov', '~> 0.15.0'
+  gem.add_dependency 'sequel', '>= 4.39.0'
 end

data/spec/sequel/caller_location_spec.rb

@@ -1,4 +1,4 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require 'spec_helper'
 
@@ -30,4 +30,13 @@ describe Sequel::CallerLocation do
   it 'add caller location to update statement' do
     expect(ds.update_sql(a: 1)).to eq("UPDATE t SET a = 1 -- #{caller_locations(0, 1).first}\n")
   end
+
+  it 'does not mutate frozen SQL' do
+    sql = String.new('SELECT * FROM t').freeze
+    location = caller_locations(0, 1).first
+
+    result = ds.send(:append_location, sql, location)
+
+    expect(result).to eq("SELECT * FROM t -- #{location}\n")
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require 'bundler'
 Bundler.require

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_caller_location
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2026-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -24,80 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.39.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.52.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.52.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.22.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.22.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.22.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.22.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.0
 description: Add caller location as SQL comments
 email:
 - timothee.peignier@tryphon.org
@@ -105,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/build.yml"
 - ".github/workflows/publish.yml"
 - ".gitignore"
@@ -116,10 +43,11 @@ files:
 - sequel_caller_location.gemspec
 - spec/sequel/caller_location_spec.rb
 - spec/spec_helper.rb
-homepage: http://rubygems.org/gems/sequel_caller_location
+homepage: https://rubygems.org/gems/sequel_caller_location
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -128,17 +56,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Add caller location as SQL comments.
-test_files:
-- spec/sequel/caller_location_spec.rb
-- spec/spec_helper.rb
+test_files: []