paper_trail-sinatra 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021a2412757e54989a43c3e99fe84733b76541672eb3088cec3ebdde634fccf5
-  data.tar.gz: f37236192a3b5cec5b6c79e4fb725af5fd9b12402d83ad93659e1273aa52154a
+  metadata.gz: 36573b85709697bd0e687f6c7b870d5e1d7beeebd110e9444557a7ce0cac7693
+  data.tar.gz: a3ea2ff6ace54f91317bc3e167775212fe2f3c908b42f82e6d6254e37de5841a
 SHA512:
-  metadata.gz: 7f59c5d93e87a2e3aba9f2afd2824eb553da06043c29a0cdccfbd0c5f20eeac93f7f12446a044327b6e5811aec5a23289cfeedc4076c3047fd9b9dac6b44be26
-  data.tar.gz: 1385f5215ea7071ac7f79fd9b901c2892a92a6577c6f10941bebf6ec064d4bfd4abf1e0d0826c151510811c2c9fe88421be7424e007413615fe6a96f39d3f9f5
+  metadata.gz: 4a11145f518abe19e18d631ce3ca6d3e12d6c1e31406321d3a8b52aa70153394f53793b03c6b77be1220690564f7b584c3936b9d71ee53f86f6ad09f13b6f4b1
+  data.tar.gz: 4cbd2f016c6f3e783f673e3bb727e4d858810a3d64d290f3133ca057580929f8be86e70a22351e67039b4cc20dcfe086e235cd646a3435cb431efc0ea2d494f3

data/CHANGELOG.md

@@ -19,6 +19,21 @@ Fixed
 
 - None
 
+## 0.7.0 (2020-04-23)
+
+Breaking Changes
+
+- None
+
+Added
+
+- None
+
+Fixed
+
+- [#11](https://github.com/paper-trail-gem/paper_trail-sinatra/pull/11) - Drop
+  `activesupport` dependency, thus allowing `activerecord` 6.0
+
 ## 0.6.1 (2019-03-18)
 
 Breaking Changes

data/lib/paper_trail/sinatra.rb

@@ -20,15 +20,14 @@ module PaperTrail
     protected
 
     # Returns the user who is responsible for any changes that occur.
-    # By default this calls `current_user` and returns the result.
+    # By default this calls `current_user#id` and falls back to
+    # `current_user`.
     #
     # Override this method in your controller to call a different
     # method, e.g. `current_person`, or anything you like.
     def user_for_paper_trail
       return unless defined?(current_user)
-      ActiveSupport::VERSION::MAJOR >= 4 ? current_user.try!(:id) : current_user.try(:id)
-    rescue NoMethodError
-      current_user
+      current_user&.id || current_user
     end
 
     # Returns any information about the controller or request that you

data/lib/paper_trail/sinatra/version.rb

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

data/paper_trail-sinatra.gemspec

@@ -19,8 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.3.0"
 
-  spec.add_dependency "activesupport", [">= 4.2", "< 6"]
-
   # This gem should not be used with PT < 7 because both define
   # `::PaperTrail::Sinatra`.
   spec.add_dependency "paper_trail", [">= 9", "< 11"]

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Jared Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2020-04-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Sinatra support for paper_trail