grape-swagger-rails 0.5.0 → 0.7.0

data/app/views/grape_swagger_rails/application/index.html.erb

@@ -4,8 +4,29 @@
   <title><%= GrapeSwaggerRails.options.app_name || 'Swagger UI' %></title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
-  <%= stylesheet_link_tag 'grape_swagger_rails/application.css' %>
-  <%= javascript_include_tag 'grape_swagger_rails/application.js' %>
+  <% if defined?(Propshaft::Railtie) && Rails.application.assets.is_a?(Propshaft::Assembly) %>
+    <%= stylesheet_link_tag 'grape_swagger_rails/reset', media: 'all' %>
+    <%= stylesheet_link_tag 'grape_swagger_rails/screen-propshaft', media: 'all' %>
+
+    <%= javascript_include_tag 'grape_swagger_rails/jquery-1.8.0.min' %>
+    <%= javascript_include_tag 'grape_swagger_rails/jquery.slideto.min' %>
+    <%= javascript_include_tag 'grape_swagger_rails/jquery.wiggle.min' %>
+    <%= javascript_include_tag 'grape_swagger_rails/jquery.ba-bbq.min' %>
+    <%= javascript_include_tag 'grape_swagger_rails/handlebars-2.0.0' %>
+    <%= javascript_include_tag 'grape_swagger_rails/marked' %>
+    <%= javascript_include_tag 'grape_swagger_rails/lodash.min' %>
+    <%= javascript_include_tag 'grape_swagger_rails/backbone-min' %>
+    <%= javascript_include_tag 'grape_swagger_rails/swagger-ui.min' %>
+    <%= javascript_include_tag 'grape_swagger_rails/highlight.9.1.0.pack' %>
+    <%= javascript_include_tag 'grape_swagger_rails/js-yaml.min' %>
+    <%= javascript_include_tag 'grape_swagger_rails/jsoneditor.min' %>
+    <%= javascript_include_tag 'grape_swagger_rails/object-assign-pollyfill' %>
+    <%= javascript_include_tag 'grape_swagger_rails/swagger-oauth' %>
+    <%= javascript_include_tag 'grape_swagger_rails/base64' %>
+  <% else %>
+    <%= stylesheet_link_tag 'grape_swagger_rails/application', media: 'all' %>
+    <%= javascript_include_tag 'grape_swagger_rails/application' %>
+  <% end %>
   <script type="text/javascript">
 	$(function () {
 	  var options = $("html").data('swagger-options');

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/engine.rb

@@ -3,6 +3,21 @@
 module GrapeSwaggerRails
   class Engine < ::Rails::Engine
     paths['lib/tasks'] = 'lib/tasks/exported'
+
     isolate_namespace GrapeSwaggerRails
+
+    initializer 'grape_swagger_rails.assets', group: :all do |app|
+      if app.config.respond_to?(:assets) && defined?(Sprockets)
+        sprockets_4_or_later = Gem::Version.new(Sprockets::VERSION) >= Gem::Version.new('4')
+
+        [
+          'grape_swagger_rails/application.js',
+          'grape_swagger_rails/application.css',
+          'grape_swagger_rails/favicon.ico'
+        ].each do |asset_path|
+          app.config.assets.precompile << (sprockets_4_or_later ? asset_path : proc { |path| path == asset_path })
+        end
+      end
+    end
   end
 end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrapeSwaggerRails
-  VERSION = '0.5.0'
+  VERSION = '0.7.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/lib/tasks/swagger_ui.rake

@@ -40,9 +40,9 @@ namespace :swagger_ui do
           'swagger-oauth.js',
           'base64.js'
         ].freeze
-        javascript_files = Dir["#{root}/app/assets/javascripts/grape_swagger_rails/*.js"].map { |f|
+        javascript_files = Dir["#{root}/app/assets/javascripts/grape_swagger_rails/*.js"].map do |f|
           f.split('/').last
-        } - ['application.js']
+        end - ['application.js']
         (javascript_files - JAVASCRIPT_FILES).each do |filename|
           puts "WARNING: add #{filename} to swagger_ui.rake"
         end
@@ -65,9 +65,9 @@ namespace :swagger_ui do
           'reset.css',
           'screen.css'
         ].freeze
-        css_files = Dir["#{root}/app/assets/stylesheets/grape_swagger_rails/*.css"].map { |f|
+        css_files = Dir["#{root}/app/assets/stylesheets/grape_swagger_rails/*.css"].map do |f|
           f.split('/').last
-        } - ['application.css']
+        end - ['application.css']
         (css_files - CSS_FILES).each do |filename|
           puts "WARNING: add #{filename} to swagger_ui.rake"
         end

data/spec/dummy/app/assets/config/manifest.js

@@ -1,3 +1,2 @@
 //= link_directory ../stylesheets .css
 //= link_directory ../javascripts .js
-//= link grape_swagger_rails_manifest.js

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
 

data/spec/spec_helper.rb

@@ -2,6 +2,15 @@
 
 ENV['RAILS_ENV'] ||= 'test'
 
+asset_pipeline = ENV.fetch('ASSET_PIPELINE', 'sprockets')
+case asset_pipeline
+when 'propshaft'
+  require 'rails/railtie'
+  require 'propshaft'
+else
+  require 'sprockets/railtie'
+end
+
 require File.expand_path('dummy/config/environment.rb', __dir__)
 require 'rspec/rails'
 

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Alexander Logunov
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-06 00:00:00.000000000 Z
+date: 1980-01-02 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
@@ -81,7 +94,8 @@ files:
 - app/assets/stylesheets/grape_swagger_rails/application.css
 - app/assets/stylesheets/grape_swagger_rails/print.css
 - app/assets/stylesheets/grape_swagger_rails/reset.css
-- app/assets/stylesheets/grape_swagger_rails/screen.css.erb
+- app/assets/stylesheets/grape_swagger_rails/screen-propshaft.css
+- app/assets/stylesheets/grape_swagger_rails/screen-sprockets.css.erb
 - app/assets/stylesheets/grape_swagger_rails/style.css
 - app/assets/stylesheets/grape_swagger_rails/typography.css
 - app/controllers/grape_swagger_rails/application_controller.rb
@@ -139,9 +153,8 @@ 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.7.0
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Swagger UI as Rails Engine for grape-swagger gem.
 test_files: []