fishplate 1.1.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dba59d1794fd6223fdc2dbbc70b7d858ac594b0009cf3bfa4cbbde8decb5b2a
-  data.tar.gz: 87137068574dae905b2e12099eef0f3044fec8ca1be527a2c1cf016482bd9a75
+  metadata.gz: f292c17488c535a30fdf086eae8d9798533a072e0a44c8a5620d45466ff8dbba
+  data.tar.gz: fa788d1d5d376185b67aaf249228979c1975d9334e4c917ee58b3be9b32dda05
 SHA512:
-  metadata.gz: 8ce4e57904bb2600792c4bf07e33b55e4fc65e9f530d4408d5690f7fe92aeb5c4d288fbb6d55b2aa26d3e4272d3ac77074bedb3f1f986bbc2a9a69c0bb868f10
-  data.tar.gz: 820ef56f33a7518924c75164fe82ae82145df0b90f5930dd149598ebf9a547e3ccb5b125b3e3b72a79be4b5b2d1c575cd2d0d7df02aea108af85f06cba2ad624
+  metadata.gz: 9955fa782c4abcbcbc4f4490bb62474cf4d1cea76776521cfd81cba89103995d3a774f5e4acc7e74fe49e0b0096ee87d45985cbdc7bbbf1ecd1f8efcda34a03e
+  data.tar.gz: 53705d4b34ea0aeb8d4ee999d321f5559b1fb047a3797979b39c2566cd3574b4a88d2d81ac664ac5ccb824a8065c89282e500418d168c2711749e206a6627cf6

data/.bundler-version

@@ -0,0 +1 @@
+2.2.32

data/.dependabot/config.yml

@@ -3,9 +3,14 @@ version: 1
 update_configs:
   - package_manager: "ruby:bundler"
     directory: "/"
-    update_schedule: "monthly"
+    update_schedule: "daily"
     commit_message:
       prefix: "[dependabot]"
     allowed_updates:
       - match:
-          update_type: "all"
+          dependency_type: "all"
+          update_type: "security"
+    automerged_updates:
+      - match:
+          dependency_type: "all"
+          update_type: "security:patch"

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,6 @@
-## Description
+## Description, motivation and context
 <!--- Describe your changes in detail -->
-
-## Related issue(s)
-<!--- GH issue number -->
-
-## Motivation and Context
 <!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
 
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-
-## Screenshots (if appropriate):
-<!--- Please add any screenshots of the feature. -->
-
-## Related PRs
-<!--- Please add links to any related PRs (backend, component packages, etc). -->
+## Related issue(s) or PR(s)
+<!--- GH issue number -->

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

@@ -1,7 +1,7 @@
-# automatically approve PRs submitted by Dependabot
+# automatically approve PRs submitted by Dependabot or Renofidev
 # this will allow Dependabot to automatically merge dependency update PRs where CI passes
 # from: https://github.com/hmarr/auto-approve-action
-name: Auto approve Dependabot PRs
+name: Auto approve dependency upgrades PRs
 
 on:
   pull_request
@@ -10,7 +10,7 @@ jobs:
   auto-approve:
     runs-on: ubuntu-latest
     steps:
-    - uses: hmarr/auto-approve-action@v2.0.0
-      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+    - uses: hmarr/auto-approve-action@v2
+      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev'
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"

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

@@ -0,0 +1,19 @@
+name: automerge
+on:
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@v0.12.0"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: squash
+          MERGE_DELETE_BRANCH: true

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - 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
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: Run tests
+      run: bundle exec rake ci

data/Gemfile

@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in fishplate.gemspec
 gemspec

data/Gemfile.lock

@@ -1,87 +1,88 @@
 PATH
   remote: .
   specs:
-    fishplate (1.1.1)
+    fishplate (7.0.0)
       a9n (~> 1.0)
-      activemodel (~> 6.0)
-      activerecord (~> 6.0)
-      activesupport (~> 6.0)
-      rake (~> 13.0)
+      activemodel (~> 7.0)
+      activerecord (~> 7.0)
+      activesupport (~> 7.0)
+      rake (~> 13)
       tzinfo-data
 
 GEM
   remote: https://rubygems.org/
   specs:
-    a9n (1.2.2)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    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)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    i18n (1.8.5)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.2)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    minitest (5.15.0)
+    parallel (1.21.0)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rake (13.0.6)
+    regexp_parser (2.2.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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.90.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.23.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.0)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.6.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
     sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2020.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
-  ruby
+  aarch64-linux-musl
+  x86_64-darwin-18
+  x86_64-darwin-19
+  x86_64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   bundler
@@ -90,9 +91,9 @@ DEPENDENCIES
   rake
   rspec
   rubocop
-  rubocop-performance
+  rubocop-rake
   rubocop-rspec
   sqlite3
 
 BUNDLED WITH
-   2.1.4
+   2.2.29

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/fishplate.svg)](https://rubygems.org/gems/fishplate)
-[![Build Status](https://travis-ci.org/RenoFi/fishplate.svg?branch=master)](https://travis-ci.org/RenoFi/fishplate)
+[![Build Status](https://github.com/RenoFi/fishplate/actions/workflows/ci.yml/badge.svg)](https://github.com/RenoFi/fishplate/actions/workflows/ci.yml?query=branch%3Amain)
 
 # fishplate
 
@@ -43,7 +43,7 @@ Fishplate.load_tasks
 Available rake tasks are:
 ```
 rake console                            # Run application console
-rake generate:migration[name]           # Generate new migration with name given, e.g
+rake generate:migration[name]           # Generate new migration with name given, e.g rake generate:migration[CreateUsers]
 
 rake db:create                          # Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config). Wi...
 rake db:drop                            # Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config). Without ...
@@ -65,15 +65,11 @@ rake db:structure:load                  # Recreates the databases from the struc
 rake db:version                         # Retrieves the current schema version number
 ```
 
-When `rubocop` is available:
-```
-rake rubocop                            # Run RuboCop
-rake rubocop:auto_correct               # Auto-correct RuboCop offenses
-```
+### Rack Middleware
 
-When `rspec` is available:
-```
-rake spec                               # Run RSpec code examples
+To free up DB connections after each request, add middleware to your `config.ru`: 
+```ruby
+use Fishplate::Rack
 ```
 
 ## Contributing

data/Rakefile

@@ -5,4 +5,5 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: %i[rubocop:auto_correct spec]
+task ci: %i[spec rubocop]
+task default: %i[spec rubocop:auto_correct]

data/fishplate.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata['homepage_uri'] = 'https://github.com/RenoFi/fishplate'
   spec.metadata['source_code_uri'] = 'https://github.com/RenoFi/fishplate'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }
@@ -22,13 +23,13 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'a9n', '~> 1.0'
-  spec.add_dependency 'activemodel', '~> 6.0'
-  spec.add_dependency 'activerecord', '~> 6.0'
-  spec.add_dependency 'activesupport', '~> 6.0'
-  spec.add_dependency 'rake', '~> 13.0'
+  spec.add_dependency 'activemodel', '~> 7.0'
+  spec.add_dependency 'activerecord', '~> 7.0'
+  spec.add_dependency 'activesupport', '~> 7.0'
+  spec.add_dependency 'rake', '~> 13'
   spec.add_dependency 'tzinfo-data'
 
   spec.add_development_dependency 'bundler'
@@ -36,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'sqlite3'
 end

data/lib/fishplate/tasks.rake

@@ -12,8 +12,8 @@ task console: :environment do
   IRB.start
 end
 
-desc "Generate new migration with name given, example: rake generate:migration[CreateUsers]"
 namespace :generate do
+  desc "Generate new migration with name given, example: rake generate:migration[CreateUsers]"
   task :migration, [:name] do |name, args|
     klass = args[:name].tr('-', '_').camelize
     number = ActiveRecord::Migration.next_migration_number(0)

data/lib/fishplate/version.rb

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

data/lib/fishplate.rb

@@ -12,13 +12,14 @@ module Fishplate
   class << self
     def load_seed
       return unless A9n.root.join('db/seeds.rb').exist?
+
       Kernel.load A9n.root.join('db/seeds.rb')
     end
 
     def load_tasks
       Kernel.load 'active_record/railties/databases.rake'
       Kernel.load File.expand_path('fishplate/tasks.rake', __dir__)
-      A9n.root.join('lib/tasks').glob('*.rake').sort.each { |f| Kernel.load f }
+      A9n.root.join('lib/tasks').glob('**/*.rake').sort.each { |f| Kernel.load f }
     end
 
     def database_configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fishplate
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: a9n
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,15 +213,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundler-version"
 - ".dependabot/config.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/ISSUE_TEMPLATE/story.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/auto-approve.yml"
+- ".github/workflows/auto-merge.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -239,6 +241,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/RenoFi/fishplate
   source_code_uri: https://github.com/RenoFi/fishplate
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -247,14 +250,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.23
 signing_key:
 specification_version: 4
 summary: Fishplate is a library allowing running ActiveRecord without Railties.

data/.travis.yml

@@ -1,11 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6
-  - 2.7
-before_install: gem install bundler
-script:
-  - bundle exec rake spec
-  - bundle exec rake rubocop