fishplate 7.0.1 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2431680113b62da1a71a17b8df3503b0c450781d28c09f4d6afec09dd2f2766e
-  data.tar.gz: cb0fdf35cba582737b649f6b516e67e088805c529697dfbc892d670f79a295db
+  metadata.gz: dbf295c44dd25360243486fe32975544fdb7a30232999857703c8c6f9f546e2b
+  data.tar.gz: d15861a0edca900f1293e789ad6ea7472e117aa0322fb60113dca740e94dd136
 SHA512:
-  metadata.gz: 9b4b827d28fc3d0e24a6b42ad4ee72e1c73de0394b2e84a0fcf02fc9474b74177d025b63cadd3a29b948801d95ae1a746f926b929ec2849d9a5316552414978a
-  data.tar.gz: 20137b02c380ae5da9a08bf0e68275e3fe5c562bad41554660b10c9eadb7d30a7b2796f6f2bede98300208d69d2244514d91301c39768b8925550a06888c4730
+  metadata.gz: 5e533f78a36273e09150f97ba0e94c350476dd30332026b2ab0ba368badb4a84b1dbd1d0595889d7028e8be058cb897f9dd1b353656170e6d28d1ebba016ff98
+  data.tar.gz: f5241568354f7b5134bd4546ca81c37d30b0a9a96a42f8f724334a8041726e11c255fb422cbd4f445354f7204c5b5a7a128d14ebe293c28aa7d27673bea871c8

data/.bundler-version

@@ -1 +1 @@
-2.3.5
+2.3.22

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,15 +11,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0']
+        ruby-version: ['3.0', 3.1]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
-    # 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@v1
       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.1)
+    fishplate (7.0.4)
       a9n (~> 1.0)
       activemodel (~> 7.0)
       activerecord (~> 7.0)
@@ -12,78 +12,77 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    a9n (1.2.3)
-    activemodel (7.0.1)
-      activesupport (= 7.0.1)
-    activerecord (7.0.1)
-      activemodel (= 7.0.1)
-      activesupport (= 7.0.1)
-    activesupport (7.0.1)
+    a9n (1.3.1)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
       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)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.2)
     method_source (1.0.0)
-    minitest (5.15.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       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.5.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.1)
       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.24.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.7.0)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.13.1)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
-    sqlite3 (1.4.2)
-    tzinfo (2.0.4)
+    sqlite3 (1.5.0)
+      mini_portile2 (~> 2.8.0)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.5)
+    tzinfo-data (1.2022.3)
       tzinfo (>= 1.0.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
-  aarch64-linux-musl
-  x86_64-darwin-18
-  x86_64-darwin-19
-  x86_64-darwin-20
-  x86_64-darwin-21
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
   bundler
@@ -97,4 +96,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.3.5
+   2.3.22

data/Rakefile

@@ -6,4 +6,4 @@ RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
 task ci: %i[spec rubocop]
-task default: %i[spec rubocop:auto_correct]
+task default: %i[spec rubocop:autocorrect]

data/lib/fishplate/version.rb

@@ -1,3 +1,3 @@
 module Fishplate
-  VERSION = "7.0.1".freeze
+  VERSION = "7.0.4".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)
@@ -49,6 +56,8 @@ module Fishplate
 
       load_initializers
 
+      add_i18n_load_paths if defined?(I18n)
+
       add_sidekiq_middleware if defined?(Sidekiq)
     end
 
@@ -82,6 +91,10 @@ module Fishplate
       A9n.root.join('config/initializers').glob('*.rb').sort.each { |f| require f }
     end
 
+    def add_i18n_load_paths
+      I18n.load_path |= A9n.root.join('config/locales').glob('**/*.yml')
+    end
+
     def add_sidekiq_middleware
       Sidekiq.configure_server do |config|
         config.server_middleware do |chain|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fishplate
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.4
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: a9n
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Fishplate is a library allowing running ActiveRecord without Railties.