paper_trail-sinatra 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36573b85709697bd0e687f6c7b870d5e1d7beeebd110e9444557a7ce0cac7693
-  data.tar.gz: a3ea2ff6ace54f91317bc3e167775212fe2f3c908b42f82e6d6254e37de5841a
+  metadata.gz: 5a363a9d1719dca25c9773d0f293ba3a39b80ff58100f37d911e301a82e489f3
+  data.tar.gz: 2504bf279dccac5ab7ff43a5a7162a24c5f91407e9b8824e3a6afe69447077f1
 SHA512:
-  metadata.gz: 4a11145f518abe19e18d631ce3ca6d3e12d6c1e31406321d3a8b52aa70153394f53793b03c6b77be1220690564f7b584c3936b9d71ee53f86f6ad09f13b6f4b1
-  data.tar.gz: 4cbd2f016c6f3e783f673e3bb727e4d858810a3d64d290f3133ca057580929f8be86e70a22351e67039b4cc20dcfe086e235cd646a3435cb431efc0ea2d494f3
+  metadata.gz: 50c8ea50b662b098f81a7cf7d0b62c56d7005e142812316014d5d8b208f4f733d1414b5867eb24447378417842dc34c2ff00cebef5c5c716c5066b2b1e423659
+  data.tar.gz: 69a9b8b1092cc3109ae04cb518e130102fe2b874ddeac174e89dfdd64eec96cae761e32b43d4c304e863421bd130d4f3fe421867d0d8ade541e4e4fadc7e0547

data/.github/workflows/ruby.yml

@@ -0,0 +1,105 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test-pt9:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        gemfile:
+          - 'gemfiles/pt9_sinatra1.rb'
+          - 'gemfiles/pt9_sinatra2.rb'
+        ruby-version: ['2.7']
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Setup DB
+      run: mkdir db && touch db/test.sqlite3 && sqlite3 db/test.sqlite3 ".read spec/create_db.sql"
+    - name: Run tests
+      run: bundle exec rspec
+    - name: Rubocop
+      run: bundle exec rubocop
+
+  test-pt10:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        gemfile:
+          - 'gemfiles/pt10_sinatra1.rb'
+          - 'gemfiles/pt10_sinatra2.rb'
+        ruby-version: ['2.7']
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Setup DB
+      run: mkdir db && touch db/test.sqlite3 && sqlite3 db/test.sqlite3 ".read spec/create_db.sql"
+    - name: Run tests
+      run: bundle exec rspec
+    - name: Rubocop
+      run: bundle exec rubocop
+
+  test-pt11:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        gemfile:
+          - 'gemfiles/pt11_sinatra1.rb'
+          - 'gemfiles/pt11_sinatra2.rb'
+        ruby-version: ['2.7']
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Setup DB
+      run: mkdir db && touch db/test.sqlite3 && sqlite3 db/test.sqlite3 ".read spec/create_db.sql"
+    - name: Run tests
+      run: bundle exec rspec
+    - name: Rubocop
+      run: bundle exec rubocop
+  test-pt13:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        gemfile:
+          - 'gemfiles/pt13_sinatra2.rb'
+          - 'gemfiles/pt13_sinatra3.rb'
+        ruby-version: ['2.7', '3.0']
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Setup DB
+      run: mkdir db && touch db/test.sqlite3 && sqlite3 db/test.sqlite3 ".read spec/create_db.sql"
+    - name: Run tests
+      run: bundle exec rspec
+    - name: Rubocop
+      run: bundle exec rubocop

data/.rubocop.yml

@@ -8,25 +8,33 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   Exclude:
-    # This is where travis CI installs our bundle. If we don't exclude it,
-    # travis will try to lint all of our dependencies XD
-    - gemfiles/vendor/bundle/**/*
+    # This is where Github Actions installs our bundle. If we don't exclude it,
+    # rubocop will try to lint all of our dependencies XD
+    - 'vendor/**/*'
+  NewCops: enable
+  SuggestExtensions: false
 
   # Set to lowest supported version
   TargetRubyVersion: 2.3
 
-Layout/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
 Layout/DotPosition:
   EnforcedStyle: trailing
 
+# The Ruby Style Guide recommends to "Limit lines to 80 characters."
+# (https://github.com/bbatsov/ruby-style-guide#80-character-limits)
+# Please aim for 80, but up to 100 is OK.
+Layout/LineLength:
+  Max: 100
+
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
 Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
+Layout/ParameterAlignment:
+  EnforcedStyle: with_fixed_indentation
+
 # Use exactly one space on each side of an operator. Do not align operators
 # because it makes the code harder to edit, and makes lines unnecessarily long.
 Layout/SpaceAroundOperators:
@@ -40,12 +48,6 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Enabled: false
 
-# The Ruby Style Guide recommends to "Limit lines to 80 characters."
-# (https://github.com/bbatsov/ruby-style-guide#80-character-limits)
-# Please aim for 80, but up to 100 is OK.
-Metrics/LineLength:
-  Max: 100
-
 # The number of lines in a method is not a useful metric compared to `AbcSize`.
 # It's common to have very long methods (> 50 lines) which are quite simple. For
 # example, a method that returns a long string with only a few interpolations.
@@ -69,7 +71,7 @@ Naming/HeredocDelimiterNaming:
 # Too subtle to lint.
 # Two-letter param names are OK. Consider `send_email(to:, cc:)`.
 # Even one-letter names are OK. Consider `draw_point(x, y)`.
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 
 # Please use semantic style, e.g. `do` when there's a side-effect, else `{}`.
@@ -99,6 +101,13 @@ Style/GuardClause:
 Style/IfUnlessModifier:
   Enabled: false
 
+# Usage of OpenStruct is discouraged since it's breaking some performance
+# optimizations in the Ruby VM. But when using it in tests, these can be
+# ignored.
+Style/OpenStructUse:
+  Exclude:
+    - spec/**/*
+
 # The Ruby Style Guide does not prescribe a particular quote character, only
 # that a project should pick one and be consistent. The decision has no
 # performance implications. Double quotes are slightly easier to read.

data/.rubocop_todo.yml

@@ -1,28 +1,13 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-05-08 22:55:10 -0400 using RuboCop version 0.55.0.
+# on 2022-09-27 07:06:52 UTC using RuboCop version 1.36.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 42
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'lib/paper_trail/sinatra.rb'
-
 # Offense count: 1
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -30,56 +15,39 @@ Style/Documentation:
     - 'lib/paper_trail/sinatra/version.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/Encoding:
   Exclude:
     - 'paper_trail-sinatra.gemspec'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/ExpandPathArguments:
   Exclude:
     - 'paper_trail-sinatra.gemspec'
 
+# Offense count: 19
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/paper_trail/sinatra.rb'
-    - 'spec/spec_helper.rb'
-
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
 Style/MutableConstant:
   Exclude:
     - 'lib/paper_trail/sinatra/version.rb'
 
-# Offense count: 149
-# Cop supports --auto-correct.
+# Offense count: 12
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
-    - 'bin/console'
     - 'lib/paper_trail/sinatra.rb'
-    - 'lib/paper_trail/sinatra/version.rb'
     - 'paper_trail-sinatra.gemspec'
     - 'spec/gem_version_spec.rb'
-    - 'spec/gemfiles/Gemfile_pt7_sinatra1.rb'
-    - 'spec/gemfiles/Gemfile_pt7_sinatra2.rb'
-    - 'spec/gemfiles/Gemfile_pt8_sinatra1.rb'
-    - 'spec/gemfiles/Gemfile_pt8_sinatra2.rb'
-    - 'spec/gemfiles/Gemfile_pt9_sinatra1.rb'
-    - 'spec/gemfiles/Gemfile_pt9_sinatra2.rb'
-    - 'spec/modular_sinatra_spec.rb'
-    - 'spec/sinatra_spec.rb'
     - 'spec/spec_helper.rb'
-
-# Offense count: 1
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 89

data/CHANGELOG.md

@@ -19,6 +19,34 @@ Fixed
 
 - None
 
+## 0.9.0 (2021-10-02)
+
+Breaking Changes
+
+- None
+
+Added
+
+- Support for Sinatra 3
+
+Fixed
+
+- None
+
+## 0.8.0 (2021-01-06)
+
+Breaking Changes
+
+- None
+
+Added
+
+- Support for PaperTrail 11
+
+Fixed
+
+- None
+
 ## 0.7.0 (2020-04-23)
 
 Breaking Changes

data/Gemfile

@@ -1,2 +1,4 @@
 source "https://rubygems.org"
 gemspec
+
+gem "rake"

data/README.md

@@ -4,7 +4,7 @@ Register this module inside your Sinatra application to gain access to
 controller-level methods used by PaperTrail.
 
 To configure PaperTrail for usage with [Sinatra][1], your `Sinatra` app must be
-using `ActiveRecord` 3, 4, or 5.
+using `ActiveRecord`.
 
 It is recommended to use the
 [Sinatra ActiveRecord Extension][2] or something similar for managing your

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/gemfiles/pt10_sinatra1.rb

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 gemspec(path: "..")
-gem "activesupport", "~> 4.2"
+gem "activesupport", "~> 5.2"
 gem "paper_trail", "~> 10.0"
 gem "sinatra", "~> 1.4"

data/gemfiles/pt10_sinatra2.rb

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 gemspec(path: "..")
-gem "activesupport", "~> 4.2"
+gem "activesupport", "~> 5.2"
 gem "paper_trail", "~> 10.0"
-gem "sinatra", "~> 2.0"
+gem "sinatra", "~> 2.0.0"

data/gemfiles/pt11_sinatra1.rb

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+gemspec(path: "..")
+gem "activesupport", "~> 6.0"
+gem "paper_trail", "~> 11.0"
+gem "sinatra", "~> 1.4"

data/gemfiles/pt11_sinatra2.rb

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+gemspec(path: "..")
+gem "activesupport", "~> 6.0"
+gem "paper_trail", "~> 11.0"
+gem "sinatra", "~> 2.0.0"

data/gemfiles/pt13_sinatra2.rb

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+gemspec(path: "..")
+gem "activesupport", "~> 7.0"
+gem "paper_trail", "~> 13.0"
+gem "sinatra", "~> 2.0.0"

data/gemfiles/pt13_sinatra3.rb

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+gemspec(path: "..")
+gem "activesupport", "~> 7.0"
+gem "paper_trail", "~> 13.0"
+gem "sinatra", "~> 3.0.0"

data/gemfiles/pt9_sinatra1.rb

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 gemspec(path: "..")
-gem "activesupport", "4.2.10"
+gem "activesupport", "~> 5.2"
 gem "paper_trail", "9.0.1"
 gem "sinatra", "1.4.8"

data/gemfiles/pt9_sinatra2.rb

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 gemspec(path: "..")
-gem "activesupport", "4.2.10"
+gem "activesupport", "~> 5.2"
 gem "paper_trail", "9.0.1"
-gem "sinatra", "2.0.1"
+gem "sinatra", "2.0.0"

data/lib/paper_trail/sinatra/version.rb

@@ -1,6 +1,6 @@
 module PaperTrail
   module Sinatra
-    VERSION = "0.7.0"
+    VERSION = "0.9.0"
 
     # Added in 0.5.0
     # @api public

data/lib/paper_trail/sinatra.rb

@@ -27,6 +27,7 @@ module PaperTrail
     # method, e.g. `current_person`, or anything you like.
     def user_for_paper_trail
       return unless defined?(current_user)
+
       current_user&.id || current_user
     end
 
@@ -66,6 +67,7 @@ module PaperTrail
     # Tells PaperTrail who is responsible for any changes that occur.
     def set_paper_trail_whodunnit
       return unless ::PaperTrail.enabled?
+
       if ::Gem::Version.new(::PaperTrail::VERSION) >= ::Gem::Version.new('9')
         ::PaperTrail.request.whodunnit = user_for_paper_trail
       else
@@ -77,6 +79,7 @@ module PaperTrail
     # alongside any changes that occur.
     def set_paper_trail_request_info
       return unless ::PaperTrail.enabled?
+
       if ::Gem::Version.new(::PaperTrail::VERSION) >= ::Gem::Version.new('9')
         ::PaperTrail.request.controller_info = info_for_paper_trail
       else
@@ -88,6 +91,7 @@ module PaperTrail
     # request.
     def set_paper_trail_enabled_for_request
       return unless ::PaperTrail.enabled?
+
       if ::Gem::Version.new(::PaperTrail::VERSION) >= ::Gem::Version.new('9')
         ::PaperTrail.request.enabled = paper_trail_enabled_for_request
       else

data/paper_trail-sinatra.gemspec

@@ -19,17 +19,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.3.0"
 
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
   # This gem should not be used with PT < 7 because both define
   # `::PaperTrail::Sinatra`.
-  spec.add_dependency "paper_trail", [">= 9", "< 11"]
+  spec.add_dependency "paper_trail", ">= 9"
 
-  spec.add_dependency "sinatra", [">= 1.0.0", "< 3"]
+  spec.add_dependency "sinatra", [">= 1.0.0", "< 4"]
   spec.add_development_dependency "bundler", [">= 1.13", "< 3"]
   spec.add_development_dependency "rack-test", "~> 0.6"
   spec.add_development_dependency "rspec", "~> 3.7"
-  spec.add_development_dependency "rubocop", "~> 0.55.0"
-
-  # Constraining sqlite3 to 1.3 seems to fix "Gem::LoadError: can't activate
-  # sqlite3 (~> 1.3.6), already activated sqlite3-1.4.0"
-  spec.add_development_dependency "sqlite3", "~> 1.3.6"
+  spec.add_development_dependency "rubocop", "~> 1.36.0"
+  spec.add_development_dependency "sqlite3", "~> 1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jared Beck
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paper_trail
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '9'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '9'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '11'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +33,7 @@ dependencies:
         version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +43,7 @@ dependencies:
         version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,48 +98,53 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 1.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 1.36.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
-description: 
+        version: 1.4.0
+description:
 email:
 - jared@jaredbeck.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - bin/console
 - bin/setup
 - gemfiles/pt10_sinatra1.rb
 - gemfiles/pt10_sinatra2.rb
+- gemfiles/pt11_sinatra1.rb
+- gemfiles/pt11_sinatra2.rb
+- gemfiles/pt13_sinatra2.rb
+- gemfiles/pt13_sinatra3.rb
 - gemfiles/pt9_sinatra1.rb
 - gemfiles/pt9_sinatra2.rb
 - lib/paper_trail/sinatra.rb
@@ -154,8 +153,9 @@ files:
 homepage: https://github.com/jaredbeck/paper_trail-sinatra
 licenses:
 - GPL-3.0
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Sinatra support for paper_trail
 test_files: []

data/.travis.yml

@@ -1,25 +0,0 @@
-before_install:
-  - gem update --system
-  - gem update bundler
-before_script:
-  - mkdir db
-  - touch db/test.sqlite3
-  - sqlite3 db/test.sqlite3 < spec/create_db.sql
-cache: bundler
-gemfile:
-  - gemfiles/pt9_sinatra1.rb
-  - gemfiles/pt9_sinatra2.rb
-  - gemfiles/pt10_sinatra1.rb
-  - gemfiles/pt10_sinatra2.rb
-language: ruby
-
-# For ruby compatibility, we usually only test the highest and lowest supported
-# versions.
-rvm:
-  - 2.6.2
-  - 2.3.8
-
-script:
-  - bundle exec rubocop
-  - bundle exec rspec
-sudo: false