grape-swagger-rails 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efdc8bb56a0364b50351abe79d3abfc95202397cdc5a0c1e766e4e3bc143490f
-  data.tar.gz: 8c118f83a1a0580dc8fd0e52ea3f6589b58d9fd7c6d7ce8cf53af466cbb8ec23
+  metadata.gz: 6acf0c3a11fe817b12f2b4c4469f1fc3a6efce7517731b3afd217474a95840a0
+  data.tar.gz: c4ab9b45226c2946ee4d20ff9c34e0cd3decfa83754c4119412587d383a4d12b
 SHA512:
-  metadata.gz: 641d69aca0022a9c06bbc1da9e2cb802cdb20e6735c60aee3d7a5f95d2c0e2c21bf6643b3d7d2934762eef3e03baafeceab3a09d7673de77bddb7a24ffd8fde3
-  data.tar.gz: 7a487d5c67cd911ac06a35e6671852f7745b487caf742119fc80101320aed28ae1a3cac7c017fe05349e870fced745c2b2bdb9ecc6be007efe06f30764546e0c
+  metadata.gz: d34167607d9a37eadcd4e387b1eb94e7ea1a810ef3abbfaf212de698c0d58d5f56d3c76325a6acc3863440aff2dddfd79e81bd56b949e77355a84dbbe796498d
+  data.tar.gz: 272375f5ff9dc45ff9d78e8b35d199936f59c4011bf5cf972e794ea55793ca1cdc5311ae07ce35d868c5c18e68fae4311fc2d9eddd621e8ab7fa139d8d6df963

data/.github/workflows/danger.yml

@@ -4,7 +4,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Set up Ruby

data/.github/workflows/head.yml

@@ -7,19 +7,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        entry:
-          - { ruby: "3.2", rails: "edge", grape-swagger: "HEAD" }
-          - { ruby: "ruby-head", rails: "edge", grape-swagger: "HEAD" }
-          - { ruby: "jruby-head", rails: "edge", grape-swagger: "HEAD" }
+        ruby: ['3.2', 'ruby-head', 'jruby-head']
+        rails: ['edge']
+        grape-swagger: ['HEAD']
     env:
-      GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }}
-      RAILS_VERSION: ${{ matrix.entry.rails }}
+      GRAPE_SWAGGER_VERSION: ${{ matrix.grape-swagger }}
+      RAILS_VERSION: ${{ matrix.rails }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.entry.ruby }}
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Print Bundler Versions
         run: bundle show
@@ -30,6 +29,7 @@ jobs:
       - uses: browser-actions/setup-geckodriver@latest
         with:
           geckodriver-version: "0.35.0"
-      - uses: coactions/setup-xvfb@v1
+      - name: Run tests
+        uses: coactions/setup-xvfb@v1
         with:
           run: bundle exec rake spec

data/.github/workflows/rubocop.yml

@@ -4,7 +4,7 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/test.yml

@@ -6,32 +6,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        entry:
-          - { ruby: "2.7", rails: "6.1.7", grape-swagger: "1.6.1" }
-          - { ruby: "3.0", rails: "6.1.7", grape-swagger: "1.6.1" }
-          - { ruby: "3.1", rails: "6.1.7", grape-swagger: "1.6.1" }
-          - { ruby: "3.1", rails: "7.2.1", grape-swagger: "1.6.1" }
-          - { ruby: "3.2", rails: "6.1.7", grape-swagger: "1.6.1" }
-          - { ruby: "3.2", rails: "6.1.7", grape-swagger: "2.1.1" }
-          - { ruby: "3.2", rails: "7.2.1", grape-swagger: "1.6.1" }
-          - { ruby: "3.2", rails: "7.2.1", grape-swagger: "2.1.1" }
-          - { ruby: "3.3", rails: "6.1.7", grape-swagger: "1.6.1" }
-          - { ruby: "3.3", rails: "6.1.7", grape-swagger: "2.1.1" }
-          - { ruby: "3.3", rails: "7.2.1", grape-swagger: "1.6.1" }
-          - { ruby: "3.3", rails: "7.2.1", grape-swagger: "2.1.1" }
-          - { ruby: "jruby-9.4.6", rails: "6.1.7", grape-swagger: "1.6.1" }
-          - { ruby: "jruby-9.4.6", rails: "6.1.7", grape-swagger: "2.1.1" }
-          - { ruby: "jruby-9.4.6", rails: "7.2.1", grape-swagger: "1.6.1" }
-          - { ruby: "jruby-9.4.6", rails: "7.2.1", grape-swagger: "2.1.1" }
+        ruby: ['3.1', '3.2', '3.3', '3.4', 'jruby']
+        rails: ['7.2.2.2', '8.0.2.1']
+        grape-swagger: ['1.6.1', '2.1.2']
+        exclude:
+          - { ruby: '3.1', rails: '8.0.2.1' } # Rails 8 requires Ruby >= 3.2
     env:
-      GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }}
-      RAILS_VERSION: ${{ matrix.entry.rails }}
+      GRAPE_SWAGGER_VERSION: ${{ matrix.grape-swagger }}
+      RAILS_VERSION: ${{ matrix.rails }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.entry.ruby }}
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Print Bundler Versions
         run: bundle show
@@ -42,6 +30,15 @@ jobs:
       - uses: browser-actions/setup-geckodriver@latest
         with:
           geckodriver-version: "0.35.0"
-      - uses: coactions/setup-xvfb@v1
+      - name: Run tests with Sprockets
+        uses: coactions/setup-xvfb@v1
+        env:
+          ASSET_PIPELINE: sprockets
+        with:
+          run: bundle exec rake spec
+      - name: Run tests with Propshaft
+        uses: coactions/setup-xvfb@v1
+        env:
+          ASSET_PIPELINE: propshaft
         with:
           run: bundle exec rake spec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.7.0 (2025/09/16)
+
+* [#132](https://github.com/ruby-grape/grape-swagger-rails/pull/132): Automatically register assets with Sprockets - [@olivier-thatch](https://github.com/olivier-thatch).
+* [#130](https://github.com/ruby-grape/grape-swagger-rails/pull/130): Propshaft support - [@olivier-thatch](https://github.com/olivier-thatch).
+
 ### 0.6.0 (2024/11/21)
 
 * [#124](https://github.com/ruby-grape/grape-swagger-rails/pull/124): Rails 7 compatibility - [@padde](https://github.com/padde).

data/Gemfile

@@ -25,6 +25,7 @@ group :development, :test do
   gem 'jquery-rails'
   gem 'mime-types'
   gem 'nokogiri'
+  gem 'propshaft', require: false
   gem 'rack', '< 3.0'
   gem 'rack-cors'
   gem 'rake'
@@ -35,7 +36,8 @@ group :development, :test do
   gem 'rubocop-rspec'
   gem 'ruby-grape-danger', '~> 0.2.0', require: false
   gem 'selenium-webdriver'
-  gem 'sprockets-rails', require: 'sprockets/railtie'
+  gem 'sprockets', ENV.fetch('SPROCKETS_VERSION', '>= 4.0.0'), require: false
+  gem 'sprockets-rails', require: false
   gem 'uglifier'
   gem 'webrick'
 end

data/README.md

@@ -18,8 +18,6 @@ Swagger UI as Rails Engine for grape-swagger gem.
     - [Integration with DoorKeeper](#integration-with-doorkeeper)
   - [Hiding the API or Authorization text boxes](#hiding-the-api-or-authorization-text-boxes)
   - [Updating Swagger UI from Dist](#updating-swagger-ui-from-dist)
-  - [Enabling in a Rails-API Project](#enabling-in-a-rails-api-project)
-  - [Enabling in Rails 6 (Sprokets 5)](#enabling-in-rails-6-sprokets-5)
 - [Contributors](#contributors)
 - [Contributing](#contributing)
 - [License](#license)
@@ -217,42 +215,6 @@ NOTE: This action should be run part of this gem (not your application). In case
 make it up-to-date, clone the repo, run the rake task, examine the diff, fix any bugs, make sure
 tests pass and then send PR here.
 
-### Enabling in a Rails-API Project
-
-The grape-swagger-rails gem uses the Rails asset pipeline for its Javascript and CSS. Enable the asset pipeline with [rails-api](https://github.com/rails-api/rails-api).
-
-Add sprockets to `config/application.rb`.
-
-```ruby
-require 'sprockets/railtie'
-```
-
-Include JavaScript in `app/assets/javascripts/application.js`.
-
-```javascript
-//
-//= require_tree .
-```
-
-Include CSS stylesheets in `app/assets/stylesheets/application.css`.
-
-```css
-/*
-*= require_tree .
-*/
-```
-
-### Enabling in Rails 6 (Sprokets 5)
-
-Rails 6 top-level targets are determined via `./app/assets/config/manifest.js`. Specify `grape-swagger-rails` asset files as follows.
-
-```javascript
-//= link grape_swagger_rails/application.css
-//= link grape_swagger_rails/application.js
-```
-
-See [Upgrading Sprokets](https://github.com/rails/sprockets/blob/master/UPGRADING.md#manifestjs) for more information.
-
 ## Contributors
 
 * [unloved](https://github.com/unloved)

data/app/assets/stylesheets/grape_swagger_rails/application.css

@@ -1,5 +1,5 @@
 /*
 *= require ./reset
-*= require ./screen
+*= require ./screen-sprockets
 *= require_self
 */