the_garage 2.5.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a8b827892d32f5517d67991bfc76a4832eba4f3aa5b1c1d1cd1f76141bc3422
-  data.tar.gz: fce58bbb7be2ef82e68416650419d88e3bf10205c011806660081a594cf29d6a
+  metadata.gz: db48e7a0d0aed64278d3ffa5864f19bd70782481411c1414583bd29b0067f006
+  data.tar.gz: e20592e6c499284c41afc51ea27c3c8258d074eae85afc062a20f878945511fa
 SHA512:
-  metadata.gz: d691e438110eabee1b14a9f011067f67f4cf5119f248843d6c4d8d3f44125e7f7a76f0b56d12cac53770238425c6a2d5f62c4321e8273264ce4306e6f943c0e8
-  data.tar.gz: d408e49c73f46d1fcda1d3d8f9a61a76b8a7e6411172bf4eace5c38c4572be838e4c0f65e1f8dea5006949532b741fc19de4600d72fccde4a49dc8bc7468f810
+  metadata.gz: ac22ddabbe44a7c762817f1a361248709348506c06a20f3028460467b5a650bc0fc3db77703f77b586f1783c4854221fc56972f284981c9f44f4571d18cff103
+  data.tar.gz: 37cbe8ea4a2b3cea57eb5ce3ffb199652a35fb973e3e57a77134ca92857d088a8442369f52458d758d46417236ca9e62b19d26fcfdd2b5561b72ba4d6a4e2634

data/README.md

@@ -153,7 +153,7 @@ Then configure auth server strategy:
 
 The OAuth server must response a json with following structure.
 
-- `token`(string) - OAuth access token value.
+- `token` (string, null) - OAuth access token value.
 - `token_type` (string) - OAuth access token value. i.e. `bearer` type.
 - `scope` (string) - OAuth scopes separated by spaces. i.e. `public read_user`.
 - `application_id` (integer) - OAuth application id of the access token.

data/app/assets/javascripts/garage/docs/console.js.coffee

@@ -9,14 +9,6 @@ jQuery ()->
     $.colorbox.close()
     ev.preventDefault()
 
-  buildAuthorizedUrl = (base, location, token) ->
-    url = base + location
-    if url.indexOf('?') > 0
-      url += '&'
-    else
-      url += '?'
-    url + 'access_token=' + token
-
   addNewParamField = (container) ->
     nextId = "parameter-" + $('.parameter', container).length
     copy = $('.template .parameter').clone().attr('id', nextId)
@@ -52,11 +44,11 @@ jQuery ()->
     $('#api-headers').text ''
     $('#api-response').text ''
 
-    url = buildAuthorizedUrl $('#base').val(), $('#location').val(), $('#access_token').val()
     console.log buildData($('.parameters'))
     $.ajax
       type: $('#method').val(),
-      url: url,
+      url: $('#base').val() + $('#location').val(),
+      headers: {'Authorization': 'Bearer ' + $('#access_token').val()},
       cache: false,
       data: buildData($('.parameters')),
       dataType: 'json',

data/app/controllers/garage/docs/resources_controller.rb

@@ -86,7 +86,7 @@ class Garage::Docs::ResourcesController < Garage::ApplicationController
   def require_console_application
     @app = console_application
     if @app[:uid].blank? || @app[:secret].blank?
-      render(text: 'Configuration for console application is missing.', status: :forbidden)
+      render(plain: 'Configuration for console application is missing.', status: :forbidden)
     end
   end
 

data/lib/garage/docs/engine.rb

@@ -1,6 +1,6 @@
 require "rails"
 require "haml"
-require "sass-rails"
+require "sassc-rails"
 require "coffee-rails"
 require "redcarpet"
 

data/lib/garage/paginating_responder.rb

@@ -90,7 +90,7 @@ module Garage
         links[:next] = rs.current_page + 1
       end
 
-      unless rs.last_page? || hide_total?
+      unless rs.last_page? || hide_total? || rs.total_pages.zero?
         links[:last] = rs.total_pages
       end
     end

data/lib/garage/representer.rb

@@ -1,3 +1,5 @@
+require 'active_support/time_with_zone'
+
 module Garage::Representer
   attr_accessor :params, :representer_attrs, :partial, :selector
 

data/lib/garage/restful_actions.rb

@@ -228,7 +228,12 @@ module Garage
     end
 
     def location
-      { action: :show, id: @resource.id } if @resource.try(:respond_to?, :id)
+      if @resource.try(:respond_to?, :id)
+        hash = { action: :show, id: @resource.id }
+        url_for(hash)
+        hash
+      end
+    rescue ActionController::UrlGenerationError
     end
   end
 end

data/lib/garage/strategy/access_token.rb

@@ -1,7 +1,8 @@
 module Garage
   module Strategy
     class AccessToken
-      attr_reader :scope, :token, :token_type, :raw_response
+      attr_accessor :token
+      attr_reader :scope, :token_type, :raw_response
 
       def initialize(attrs)
         @raw_response = attrs

data/lib/garage/strategy/auth_server.rb

@@ -58,10 +58,8 @@ module Garage
 
         def fetch
           if has_any_valid_credentials?
-            if has_cacheable_credentials?
-              fetch_with_cache
-            else
-              fetch_without_cache
+            fetch_access_token&.tap do |access_token|
+              access_token.token ||= token_string
             end
           else
             nil
@@ -89,6 +87,8 @@ module Garage
             'Resource-Owner-Id' => @request.headers['Resource-Owner-Id'],
             'Scopes' => @request.headers['Scopes'],
             'User-Agent' => USER_AGENT,
+            # ActionDispatch::Request#request_id is only available in Rails 5.0 or later.
+            'X-Request-Id' => @request.uuid,
           }.reject {|_, v| v.nil? }
         end
 
@@ -142,6 +142,14 @@ module Garage
           @bearer_token ||= @request.authorization.try {|o| o.slice(/\ABearer\s+(.+)\z/, 1) }
         end
 
+        def fetch_access_token
+          if has_cacheable_credentials?
+            fetch_with_cache
+          else
+            fetch_without_cache
+          end
+        end
+
         def fetch_with_cache
           Cache.with_cache("garage_gem/token_cache/#{Garage::VERSION}/#{bearer_token}") do
             fetch_without_cache
@@ -160,6 +168,12 @@ module Garage
             end
           end
         end
+
+        def token_string
+          bearer_token.presence ||
+            @request.params[:access_token].presence ||
+            @request.params[:bearer_token].presence
+        end
       end
 
       class Response

data/lib/garage/version.rb

@@ -1,3 +1,3 @@
 module Garage
-  VERSION = '2.5.0'
+  VERSION = '2.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_garage
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Tatsuhiko Miyagawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rack-accept-default
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Garage extends your RESTful, Hypermedia APIs as a Platform
 email:
 - miyagawa@bulknews.net
@@ -188,7 +174,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/manifest.js
 - app/assets/javascripts/garage/application.js
 - app/assets/javascripts/garage/docs/console.js.coffee
 - app/assets/javascripts/garage/docs/jquery.colorbox.js
@@ -271,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Garage Platform Engine

data/app/assets/config/manifest.js

@@ -1,2 +0,0 @@
-//= link_directory ../javascripts .js
-//= link_directory ../stylesheets .css