fishplate 7.0.0.beta → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b7ec3d1ef0e1ba81bcf6a2cf28573507008fdcf1d32b7129da7ccbf62278538
-  data.tar.gz: '09ed87936e557cd4558777820bd960ad7aabd6dd68d65f767b11fcb157705a9a'
+  metadata.gz: 96b918a4bc5e94318675e0aeac58954512f1cb0562c4624b735ec4f3a1e94cc7
+  data.tar.gz: c9cf2bcdd447b6c4e2f6fddfdbb8810d21c97610c1e6d4b71134b874b5f5e658
 SHA512:
-  metadata.gz: 5ba2f4a54b29d630553572d72724a91e2a626de484a433f487e08a71d0df8f7aac1b052f47bfd563a1d2f0441ae68fe32f7e8790a4cf0f94f99684e66dc9bfa6
-  data.tar.gz: bf16c4052bb95033fafead576192bc78692e4c154862c783197a51964194759f744f03d53ae3b0420d01c2151f971cbf1a9e2cdb0427a233111c1cdbc78e7d11
+  metadata.gz: f4533ab3bb8e877b9f22a55efcba5f608b4a35767e7aa4cb4191ed0b2f6fb14e9d56e7e028a5bd5b1c70269f2b0cdb079e22fc2f95ba97a10bfacda8a4dbd5bb
+  data.tar.gz: 22e324d3a3d2d36aed578fd490e7173012ecdd50e162e7a351f735e4460d2a447b7c14e13deff5a3ac34845217ab0ed64f1eee58b7911c3ca1d4e884fd1c0e4f

data/.bundler-version

@@ -1 +1 @@
-2.2.32
+2.3.11

data/.github/workflows/auto-approve.yml

@@ -2,9 +2,7 @@
 # this will allow Dependabot to automatically merge dependency update PRs where CI passes
 # from: https://github.com/hmarr/auto-approve-action
 name: Auto approve dependency upgrades PRs
-
-on:
-  pull_request
+on: pull_request_target
 
 jobs:
   auto-approve:

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0']
+        ruby-version: ['3.0', 3.1]
 
     steps:
     - uses: actions/checkout@v2
@@ -19,7 +19,7 @@ jobs:
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
     # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      uses: ruby/setup-ruby@bd94d6a504586da892a5753afdd1480096ed30df
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fishplate (7.0.0.beta)
+    fishplate (7.0.2)
       a9n (~> 1.0)
       activemodel (~> 7.0)
       activerecord (~> 7.0)
@@ -12,68 +12,68 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    a9n (1.2.3)
-    activemodel (7.0.0)
-      activesupport (= 7.0.0)
-    activerecord (7.0.0)
-      activemodel (= 7.0.0)
-      activesupport (= 7.0.0)
-    activesupport (7.0.0)
+    a9n (1.3.1)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activerecord (7.0.2.3)
+      activemodel (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    i18n (1.8.11)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     minitest (5.15.0)
-    parallel (1.21.0)
-    parser (3.0.3.2)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.3.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.23.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.27.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.6.0)
+    rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     sqlite3 (1.4.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.5)
+    tzinfo-data (1.2022.1)
       tzinfo (>= 1.0.0)
     unicode-display_width (2.1.0)
 
@@ -82,6 +82,7 @@ PLATFORMS
   x86_64-darwin-18
   x86_64-darwin-19
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -96,4 +97,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.29
+   2.3.11

data/lib/fishplate/tasks.rake

@@ -26,7 +26,7 @@ namespace :generate do
       |  end
       |end
     CONTENT
-    File.open(file_path, "w+") { |f| f.write(content.gsub(/( +\|)/, '')) }
+    File.write(file_path, content.gsub(/( +\|)/, ''))
     puts "Created migration file: #{relative_file_path}"
   end
 end

data/lib/fishplate/version.rb

@@ -1,3 +1,3 @@
 module Fishplate
-  VERSION = "7.0.0.beta".freeze
+  VERSION = "7.0.2".freeze
 end

data/lib/fishplate.rb

@@ -23,7 +23,14 @@ module Fishplate
     end
 
     def database_configuration
-      @database_configuration ||= YAML.load(ERB.new(A9n.root.join('config/database.yml').read).result) # rubocop:disable Security/YAMLLoad
+      @database_configuration ||= begin
+        content = ERB.new(A9n.root.join('config/database.yml').read).result
+        if RUBY_VERSION >= '3.1'
+          YAML.load(content, aliases: true)
+        else
+          YAML.load(content)
+        end
+      end
     end
 
     def time_zone=(value)
@@ -55,10 +62,9 @@ module Fishplate
     private
 
     def configure_active_record
+      ActiveRecord.default_timezone = :utc
       ActiveRecord::Base.logger = logger
       ActiveRecord::Base.time_zone_aware_attributes = true
-      ActiveRecord::Base.default_timezone = :utc
-      ActiveRecord::Base.connection_handlers = { ActiveRecord::Base.writing_role => ActiveRecord::Base.default_connection_handler }
       ActiveRecord::Base.configurations = database_configuration
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fishplate
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta
+  version: 7.0.2
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: a9n
@@ -253,11 +253,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.23
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Fishplate is a library allowing running ActiveRecord without Railties.