grape-swagger-rails 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c9588b4ccf8e66253f11a742506fc512c9a70d4d0f32c8ec72db06bdc47af5
-  data.tar.gz: 3148cee4aad16dced2e22f6f8639e6daa1c3190fcb46c9bc1627cdc385861d9c
+  metadata.gz: efdc8bb56a0364b50351abe79d3abfc95202397cdc5a0c1e766e4e3bc143490f
+  data.tar.gz: 8c118f83a1a0580dc8fd0e52ea3f6589b58d9fd7c6d7ce8cf53af466cbb8ec23
 SHA512:
-  metadata.gz: 91b7f33ff1190d15f16937087ca698a94e2daf43aed206b80821bbc879d1cdeac98e7fe151d1a5414fa50ae649adaa293d87ac0fd06135540903159ff8ed0e98
-  data.tar.gz: 69968abc92dc53117812b3901cb98baa72036496005fc5ba65fc7b759eb9a0e40536af7bbcd0f4cced9567a7e7687b53144bb18599731554569fd0f2f4938f50
+  metadata.gz: 641d69aca0022a9c06bbc1da9e2cb802cdb20e6735c60aee3d7a5f95d2c0e2c21bf6643b3d7d2934762eef3e03baafeceab3a09d7673de77bddb7a24ffd8fde3
+  data.tar.gz: 7a487d5c67cd911ac06a35e6671852f7745b487caf742119fc80101320aed28ae1a3cac7c017fe05349e870fced745c2b2bdb9ecc6be007efe06f30764546e0c

data/.github/workflows/head.yml

@@ -8,11 +8,12 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { ruby: "3.2", grape-swagger: "HEAD" }
-          - { ruby: "ruby-head", grape-swagger: "HEAD" }
-          - { ruby: "jruby-head", grape-swagger: "HEAD" }
+          - { ruby: "3.2", rails: "edge", grape-swagger: "HEAD" }
+          - { ruby: "ruby-head", rails: "edge", grape-swagger: "HEAD" }
+          - { ruby: "jruby-head", rails: "edge", grape-swagger: "HEAD" }
     env:
       GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }}
+      RAILS_VERSION: ${{ matrix.entry.rails }}
     steps:
       - uses: actions/checkout@v3
       - name: Set up Ruby
@@ -20,13 +21,15 @@ jobs:
         with:
           ruby-version: ${{ matrix.entry.ruby }}
           bundler-cache: true
+      - name: Print Bundler Versions
+        run: bundle show
       - name: Setup Firefox
         uses: browser-actions/setup-firefox@v1
         with:
-          firefox-version: "111.0.1"
+          firefox-version: "130.0"
       - uses: browser-actions/setup-geckodriver@latest
         with:
-          geckodriver-version: "0.32.2"
+          geckodriver-version: "0.35.0"
       - uses: coactions/setup-xvfb@v1
         with:
           run: bundle exec rake spec

data/.github/workflows/test.yml

@@ -7,15 +7,25 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { ruby: "2.7", grape-swagger: "1.6.1" }
-          - { ruby: "3.0", grape-swagger: "1.6.1" }
-          - { ruby: "3.1", grape-swagger: "1.6.1" }
-          - { ruby: "3.2", grape-swagger: "1.6.1" }
-          - { ruby: "3.2", grape-swagger: "2.0.2" }
-          - { ruby: "jruby-9.4.6", grape-swagger: "1.6.1" }
-          - { ruby: "jruby-9.4.6", grape-swagger: "2.0.2" }
+          - { 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" }
     env:
       GRAPE_SWAGGER_VERSION: ${{ matrix.entry.grape-swagger }}
+      RAILS_VERSION: ${{ matrix.entry.rails }}
     steps:
       - uses: actions/checkout@v3
       - name: Set up Ruby
@@ -23,13 +33,15 @@ jobs:
         with:
           ruby-version: ${{ matrix.entry.ruby }}
           bundler-cache: true
+      - name: Print Bundler Versions
+        run: bundle show
       - name: Setup Firefox
         uses: browser-actions/setup-firefox@v1
         with:
-          firefox-version: "111.0.1"
+          firefox-version: "130.0"
       - uses: browser-actions/setup-geckodriver@latest
         with:
-          geckodriver-version: "0.32.2"
+          geckodriver-version: "0.35.0"
       - uses: coactions/setup-xvfb@v1
         with:
           run: bundle exec rake spec

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-04-06 14:14:58 UTC using RuboCop version 1.62.1.
+# on 2024-09-11 20:09:03 UTC using RuboCop version 1.66.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -49,6 +49,7 @@ Metrics/BlockLength:
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
+    - 'Rakefile.rb'
     - 'lib/grape-swagger-rails.rb'
     - 'spec/features/grape-swagger-rails_spec.rb'
 
@@ -61,7 +62,7 @@ RSpec/ContextWording:
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SkipBlocks, EnforcedStyle.
+# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
 # SupportedStyles: described_class, explicit
 RSpec/DescribedClass:
   Exclude:
@@ -72,13 +73,6 @@ RSpec/DescribedClass:
 RSpec/ExampleLength:
   Max: 8
 
-# Offense count: 1
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
-  Exclude:
-    - 'spec/features/grape-swagger-rails_spec.rb'
-
 # Offense count: 2
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
@@ -124,9 +118,9 @@ Style/OpenStructUse:
   Exclude:
     - 'lib/grape-swagger-rails.rb'
 
-# Offense count: 2
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 143
+  Max: 124

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 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).
+* [#125](https://github.com/ruby-grape/grape-swagger-rails/pull/125): Add rails versions to CI matrix - [@padde](https://github.com/padde).
+* [#126](https://github.com/ruby-grape/grape-swagger-rails/pull/126): Ruby 3.5 compatibility - [@padde](https://github.com/padde).
+* [#127](https://github.com/ruby-grape/grape-swagger-rails/pull/127): Bump Firefox and geckodriver - [@padde](https://github.com/padde).
+
 ### 0.5.0 (2024/04/06)
 
 * [#110](https://github.com/ruby-grape/grape-swagger-rails/pull/110): Update dummy app to current rails conventions - [@duffn](https://github.com/duffn).

data/Gemfile

@@ -4,12 +4,19 @@ source 'https://rubygems.org'
 
 gemspec
 
-case version = ENV['GRAPE_SWAGGER_VERSION'] || '~> 1.6.0'
+case grape_swagger_version = ENV.fetch('GRAPE_SWAGGER_VERSION', '~> 1.6.0')
 when 'HEAD'
   gem 'grape-swagger', github: 'ruby-grape/grape-swagger'
 else
   gem 'grape', '>= 1.3.0'
-  gem 'grape-swagger', version
+  gem 'grape-swagger', grape_swagger_version
+end
+
+case rails_version = ENV.fetch('RAILS_VERSION', '>= 6.0.6.1')
+when 'edge'
+  gem 'railties', github: 'rails/rails', branch: 'main'
+else
+  gem 'railties', rails_version
 end
 
 group :development, :test do

data/README.md

@@ -1,7 +1,7 @@
 # GrapeSwaggerRails
 
 [![Gem Version](https://badge.fury.io/rb/grape-swagger-rails.svg)](http://badge.fury.io/rb/grape-swagger-rails)
-[![Test](https://github.com/ruby-grape/grape-swagger-rails/workflows/test/badge.svg?branch=master)](https://github.com/ruby-grape/grape-swagger-rails/actions)
+[![Tests](https://github.com/ruby-grape/grape-swagger-rails/actions/workflows/test.yml/badge.svg)](https://github.com/ruby-grape/grape-swagger-rails/actions/workflows/test.yml)
 [![Code Climate](https://codeclimate.com/github/ruby-grape/grape-swagger-rails/badges/gpa.svg)](https://codeclimate.com/github/ruby-grape/grape-swagger-rails)
 
 Swagger UI as Rails Engine for grape-swagger gem.
@@ -49,6 +49,8 @@ grape  | grape-swagger
 0.9.0  | 0.8.0
 0.10.0 | 0.9.0
 0.16.2 | 0.20.2
+1.8.0  | 1.6.1
+2.2.0  | 2.1.1
 
 ## Usage
 

data/grape-swagger-rails.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.require_paths = %w[lib]
+  spec.add_dependency 'ostruct'
   spec.add_dependency 'railties', '>= 6.0.6.1'
   spec.metadata = {
     'bug_tracker_uri' => 'https://github.com/ruby-grape/grape-swagger-rails/issues',

data/lib/grape-swagger-rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrapeSwaggerRails
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/grape-swagger-rails.rb

@@ -6,8 +6,10 @@ require 'ostruct'
 module GrapeSwaggerRails
   class Options < OpenStruct
     def before_filter(&block)
-      ActiveSupport::Deprecation.warn('This option is deprecated and going to be removed in 1.0.0. ' \
-                                      'Please use `before_action` instead')
+      GrapeSwaggerRails.deprecator.warn(
+        'This option is deprecated and going to be removed in 1.0.0. ' \
+        'Please use `before_action` instead'
+      )
       before_action(&block)
     end
 
@@ -43,4 +45,8 @@ module GrapeSwaggerRails
     hide_url_input: false,
     hide_api_key_input: false
   )
+
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new('1.0', 'GrapeSwaggerRails')
+  end
 end

data/spec/features/swagger_spec.rb

@@ -51,7 +51,7 @@ describe 'Swagger' do
         find_by_id('endpointListTogger_headers', visible: true).click
         first('span[class="http_method"] a', visible: true).click
         click_button 'Try it out!'
-        expect(page).to have_css 'span.hljs-attr', text: 'X-Test-Header'
+        expect(page).to have_css 'span.hljs-attr', text: /X-Test-Header/i
         expect(page).to have_css 'span.hljs-string', text: 'Test Value'
       end
 
@@ -59,9 +59,9 @@ describe 'Swagger' do
         find_by_id('endpointListTogger_headers', visible: true).click
         first('span[class="http_method"] a', visible: true).click
         click_button 'Try it out!'
-        expect(page).to have_css 'span.hljs-attr', text: 'X-Test-Header'
+        expect(page).to have_css 'span.hljs-attr', text: /X-Test-Header/i
         expect(page).to have_css 'span.hljs-string', text: 'Test Value'
-        expect(page).to have_css 'span.hljs-attr', text: 'X-Another-Header'
+        expect(page).to have_css 'span.hljs-attr', text: /X-Another-Header/i
         expect(page).to have_css 'span.hljs-string', text: 'Another Value'
       end
     end
@@ -108,7 +108,7 @@ describe 'Swagger' do
         find_by_id('endpointListTogger_headers', visible: true).click
         first('span[class="http_method"] a', visible: true).click
         click_button 'Try it out!'
-        expect(page).to have_css 'span.hljs-attr', text: 'Authorization'
+        expect(page).to have_css 'span.hljs-attr', text: /Authorization/i
         expect(page).to have_css 'span.hljs-string', text: "Basic #{Base64.encode64('username:password').strip}"
       end
     end
@@ -127,7 +127,7 @@ describe 'Swagger' do
         find_by_id('endpointListTogger_headers', visible: true).click
         first('span[class="http_method"] a', visible: true).click
         click_button 'Try it out!'
-        expect(page).to have_css 'span.hljs-attr', text: 'Authorization'
+        expect(page).to have_css 'span.hljs-attr', text: /Authorization/i
         expect(page).to have_css 'span.hljs-string', text: 'Bearer token'
       end
     end
@@ -146,7 +146,7 @@ describe 'Swagger' do
         find_by_id('endpointListTogger_headers', visible: true).click
         first('span[class="http_method"] a', visible: true).click
         click_button 'Try it out!'
-        expect(page).to have_css 'span.hljs-attr', text: 'Authorization'
+        expect(page).to have_css 'span.hljs-attr', text: /Authorization/i
         expect(page).to have_css 'span.hljs-string', text: 'Token token'
       end
     end
@@ -171,14 +171,16 @@ describe 'Swagger' do
 
     describe '#before_filter' do
       before do
-        allow(ActiveSupport::Deprecation).to receive(:warn)
+        allow(GrapeSwaggerRails.deprecator).to receive(:warn)
       end
 
       it 'throws deprecation warning' do
         GrapeSwaggerRails.options.before_filter { true }
 
-        expect(ActiveSupport::Deprecation).to have_received(:warn).with('This option is deprecated ' \
-                                                                        'and going to be removed in 1.0.0. Please use `before_action` instead')
+        expect(GrapeSwaggerRails.deprecator).to have_received(:warn).with(
+          'This option is deprecated and going to be removed in 1.0.0. ' \
+          'Please use `before_action` instead'
+        )
       end
     end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Alexander Logunov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-06 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +153,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/ruby-grape/grape-swagger-rails/issues
   changelog_uri: https://github.com/ruby-grape/grape-swagger-rails/blob/master/CHANGELOG.md
-  source_code_uri: https://github.com/ruby-grape/grape-swagger-rails/tree/v0.5.0
+  source_code_uri: https://github.com/ruby-grape/grape-swagger-rails/tree/v0.6.0
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -156,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Swagger UI as Rails Engine for grape-swagger gem.