sequel_caller_location 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34eecdc38097b7169d2d0326a4c17f8fa593062ff0b48a66eae4f7a48c6a20c5
-  data.tar.gz: 5aa107b9b9c127d890c2270704fedd7b119ac4899cb5e29e15c81462e3fdafe3
+  metadata.gz: 664ed2c560cae2dd6dcec7eb5375894c582ecec65c47e9b2d7430128d1a0748d
+  data.tar.gz: 53d362a1bb2704d8a03bf03923f7eac7540c49868773583404252dc970143867
 SHA512:
-  metadata.gz: acadb149207c12ad0601ae555d7e960e7e5500f4184439c6ebae677bea4af937d07efb41a28dd6ad8ac3bb6661da0e157dcb89bb106495b66481f57d9368261a
-  data.tar.gz: 35b8084e5f6792fab8b152d679755d9b204e7bdb0e18e326060476b091a28a7ec97acfc794bfb014504dd191447b27330f32a8b45e840eceae219190657dd4c5
+  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

@@ -0,0 +1,18 @@
+name: Build
+on:
+  push:
+  pull_request:
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v7
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.4'
+        bundler-cache: true
+    - name: Run linter
+      run: bundle exec rubocop --parallel
+    - name: Run tests
+      run: bundle exec rspec

data/.github/workflows/publish.yml

@@ -0,0 +1,24 @@
+name: Publish
+on:
+  release:
+    types: [published]
+jobs:
+  build:
+    name: Publish
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v7
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.4'
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

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

@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
 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,21 +1,44 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require 'sequel'
 
 module Sequel
   module CallerLocation
-    %w[select insert update delete].each do |type|
-      define_method(:"#{type}_sql") do |*a|
-        sql = super(*a)
-        if !sql.frozen? && (backtrace = caller_locations(1).find { |c| c.path !~ /gems/ })
-          sql << format_sql_comment(backtrace)
-        end
-        sql
-      end
+    def insert_sql(*values)
+      sql = super
+      backtrace = caller_locations(1).find { |c| c.path !~ /gems/ }
+      append_location(sql, backtrace)
+    end
+
+    def update_sql(*values)
+      sql = super
+      backtrace = caller_locations(1).find { |c| c.path !~ /gems/ }
+      append_location(sql, backtrace)
+    end
+
+    def select_sql(*values)
+      sql = super
+      backtrace = caller_locations(1).find { |c| c.path !~ /gems/ }
+
+      @cache.delete(:_select_sql)
+      append_location(sql, backtrace)
+    end
+
+    def delete_sql(*values)
+      sql = super
+      backtrace = caller_locations(1).find { |c| c.path !~ /gems/ }
+      @cache.delete(:_delete_sql)
+      append_location(sql, backtrace)
     end
 
     private
 
+    def append_location(sql, backtrace)
+      return sql unless backtrace
+
+      sql + format_sql_comment(backtrace)
+    end
+
     def format_sql_comment(comment)
       " -- #{comment.to_s.gsub(/\s+/, ' ')}\n"
     end

data/sequel_caller_location.gemspec

@@ -1,22 +1,21 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |gem|
   gem.authors       = ['Timothée Peignier']
   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.2.2'
+  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'
 
@@ -9,6 +9,11 @@ describe Sequel::CallerLocation do
     expect(ds.select_sql).to eq("SELECT * FROM t -- #{caller_locations(0, 1).first}\n")
   end
 
+  it 'add caller location to select statement only once' do
+    ds.select_sql
+    expect(ds.select_sql).to eq("SELECT * FROM t -- #{caller_locations(0, 1).first}\n")
+  end
+
   it 'add caller location to insert statement' do
     expect(ds.insert_sql(a: 1)).to eq("INSERT INTO t (a) VALUES (1) -- #{caller_locations(0, 1).first}\n")
   end
@@ -17,7 +22,21 @@ describe Sequel::CallerLocation do
     expect(ds.delete_sql).to eq("DELETE FROM t -- #{caller_locations(0, 1).first}\n")
   end
 
+  it 'add caller location to delete statement only once' do
+    ds.delete_sql
+    expect(ds.delete_sql).to eq("DELETE FROM t -- #{caller_locations(0, 1).first}\n")
+  end
+
   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.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-14 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'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.52.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.52.0
-- !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,9 +31,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/build.yml"
+- ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -115,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:
@@ -127,18 +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: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+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: []

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-script:
-  - bundle exec rubocop --parallel
-  - bundle exec rspec
-notifications:
-  email: false