the_garage 2.6.1 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22866c2b96913a0808dc58ee3c6616a1fa190bdd632d5cbcf23ba0781b5012fc
-  data.tar.gz: c05332be7ec143fe6aec9b52d9e982be382e45db5c1433c67127a69c692add79
+  metadata.gz: b48c2510bfd1fe5926e9fdd4adac78374bb9ed83b46db0b9202e1b6028645974
+  data.tar.gz: 1d92f344d618e25f1eef2d7e7778edaa4f3e2a0e1f236a19d476b19a893fc012
 SHA512:
-  metadata.gz: 9525bff41a05c514895634c65db08f5644b7c32e2e812f7935df9c7cb68b384d96e21e4bf8ccccc9dbc5561a85d889bd160ff679e9c5e2685a1b07f8c30ed874
-  data.tar.gz: dd942e114ef1fe840e0a145a3530dbe924970012d66fa7198dacb0409cc1447f36b6111bbb14fdde71ddee5341d76c8a87f4944e8ab3e7a8957ed8513043014a
+  metadata.gz: 063d9f1cdf9744ec2fb4d18f6697e44f390bccc259a8c4ff36839992732e4578916ef1691949c8dc8f67872de161bd97e12c049dbd69b81fd5b5e599c8f4faae
+  data.tar.gz: e76b35e33c9332afbe6ff7b16ec6b96c23e41c9bd85605e58e2532729e4389ca6090599a32ad67c9e45d8e6c03fade453d8d3e861f87445be45ae30c0b5f53cb

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

@@ -0,0 +1,103 @@
+jQuery(function(){
+  $(".get-oauth-token").colorbox({
+    transition: "none",
+    href: "#oauth-dialog",
+    inline: true
+  });
+
+  $(".modal-close").click(function(ev) {
+    $.colorbox.close();
+    ev.preventDefault();
+  });
+
+  var addNewParamField = function(container) {
+    const nextId = "parameter-" + $('.parameter', container).length;
+    const copy = $('.template .parameter').clone().attr('id', nextId);
+    $('.close-field', copy).click(ev => $('#' + nextId).detach());
+    $('.add-field', copy).click(ev => addNewParamField(container));
+    copy.show().appendTo(container);
+  };
+
+  const buildData = function(container) {
+    const data = {};
+    $('.parameter', container).each(function(index) {
+      const name = $('.name', this).val();
+      const value = $('.value', this).val();
+      return data[name] = value;
+    });
+    return data;
+  };
+
+  $('.console #method').change(function(ev) {
+    if (($(this).val() === 'POST') || ($(this).val() === 'PUT')) {
+      if ($('.parameters .parameter').length === 0) {
+        addNewParamField($('.parameters'));
+      }
+    } else {
+      $('.parameters').empty();
+    }
+  });
+
+  const buildHyperlinks = function(json) {
+    const html = $('<div/>').text(json).html().replace(/"href": "(\/.*?)"/g, "\"href\": \"<a>$1</a>\"");
+    const dom = $(`<div>${html}</div>`);
+    $('a', dom).each(function(i) {
+      return $(this).attr('href', `${location.pathname}?location=${encodeURIComponent($(this).text())}&method=GET`);
+    });
+    return dom.html();
+  };
+
+  $('.console .send-request').click(function(ev) {
+    $('#api-headers').text('');
+    $('#api-response').text('');
+
+    console.log(buildData($('.parameters')));
+    $.ajax({
+      type: $('#method').val(),
+      url: $('#base').val() + $('#location').val(),
+      headers: {'Authorization': 'Bearer ' + $('#access_token').val()},
+      cache: false,
+      data: buildData($('.parameters')),
+      dataType: 'json',
+      complete() {
+        const queryString = $.param({'location': $('#location').val(), 'method': $('#method').val()});
+        const newFullpath = `${location.pathname}?${queryString}`;
+        history.pushState('', '', newFullpath);
+        $("#oauth-dialog #return_to").val(newFullpath);
+      },
+      success(data, textStatus, xhr) {
+        $('#api-headers').text(`${xhr.status} ${xhr.statusText}\n` + xhr.getAllResponseHeaders());
+        $('#api-response').html(buildHyperlinks(JSON.stringify(data, undefined, 2)));
+      },
+      error(xhr, textStatus, error) {
+        $('#api-headers').text(`${xhr.status} ${xhr.statusText}\n` + xhr.getAllResponseHeaders());
+        $('#api-response').text(xhr.responseText);
+      }
+    });
+    ev.preventDefault();
+  });
+
+  if (($('.console #token').val() !== '') && ($('.console #location').val() !== '') && ($('.console #method').val() === 'GET')) {
+    $('.send-request').click();
+  }
+
+  if ($('.oauth-callback-redirect').size() > 0) {
+    const token = window.location.hash.match(/\#access_token=(\w+)/)[1];
+    if (token) {
+      $('#access_token').val(token);
+      $('form.oauth-callback-redirect').submit();
+    }
+  }
+
+  $('#oauth-dialog .token-scope-check-all').click(function(ev) {
+    $('.token-scope-checkbox').prop('checked', this.checked);
+  });
+
+  return $('#oauth-dialog .token-scope-checkbox').click(function(ev) {
+    if ($('.token-scope-checkbox:not(:checked)').length === 0) {
+      $('.token-scope-check-all').prop('checked', true);
+    } else if (!this.checked) {
+      $('.token-scope-check-all').prop('checked', false);
+    }
+  });
+});

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,7 +1,6 @@
 require "rails"
 require "haml"
-require "sass-rails"
-require "coffee-rails"
+require "sassc-rails"
 require "redcarpet"
 
 require "garage/docs/anchor_building"

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
@@ -144,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
@@ -162,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.6.1'
+  VERSION = '2.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_garage
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.8.1
 platform: ruby
 authors:
 - Tatsuhiko Miyagawa
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2022-04-05 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,21 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
-  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: coffee-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,20 +150,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
@@ -189,7 +161,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/garage/application.js
-- app/assets/javascripts/garage/docs/console.js.coffee
+- app/assets/javascripts/garage/docs/console.js
 - app/assets/javascripts/garage/docs/jquery.colorbox.js
 - app/assets/stylesheets/garage/application.css
 - app/assets/stylesheets/garage/colorbox.scss
@@ -255,7 +227,7 @@ homepage: https://github.com/cookpad/garage
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -271,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Garage Platform Engine
 test_files: []

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

@@ -1,84 +0,0 @@
-jQuery ()->
-  $(".get-oauth-token").colorbox(
-    transition: "none"
-    href: "#oauth-dialog"
-    inline: true
-  )
-
-  $(".modal-close").click (ev) ->
-    $.colorbox.close()
-    ev.preventDefault()
-
-  addNewParamField = (container) ->
-    nextId = "parameter-" + $('.parameter', container).length
-    copy = $('.template .parameter').clone().attr('id', nextId)
-    $('.close-field', copy).click (ev) ->
-      $('#' + nextId).detach()
-    $('.add-field', copy).click (ev) ->
-      addNewParamField(container)
-    copy.show().appendTo(container)
-
-  buildData = (container) ->
-    data = {}
-    $('.parameter', container).each (index) ->
-      name = $('.name', this).val()
-      value = $('.value', this).val()
-      data[name] = value
-    data
-
-  $('.console #method').change (ev) ->
-    if $(this).val() == 'POST' or $(this).val() == 'PUT'
-      if $('.parameters .parameter').length == 0
-        addNewParamField($('.parameters'))
-    else
-      $('.parameters').empty()
-
-  buildHyperlinks = (json) ->
-    html = $('<div/>').text(json).html().replace /"href": "(\/.*?)"/g, "\"href\": \"<a>$1</a>\""
-    dom = $("<div>#{html}</div>")
-    $('a', dom).each (i) ->
-      $(this).attr('href', "#{location.pathname}?location=#{encodeURIComponent($(this).text())}&method=GET")
-    dom.html()
-
-  $('.console .send-request').click (ev) ->
-    $('#api-headers').text ''
-    $('#api-response').text ''
-
-    console.log buildData($('.parameters'))
-    $.ajax
-      type: $('#method').val(),
-      url: $('#base').val() + $('#location').val(),
-      headers: {'Authorization': 'Bearer ' + $('#access_token').val()},
-      cache: false,
-      data: buildData($('.parameters')),
-      dataType: 'json',
-      complete: ->
-        queryString = $.param({'location': $('#location').val(), 'method': $('#method').val()})
-        newFullpath = "#{location.pathname}?#{queryString}"
-        history.pushState('', '', newFullpath)
-        $("#oauth-dialog #return_to").val(newFullpath)
-      success: (data, textStatus, xhr) ->
-        $('#api-headers').text("#{xhr.status} #{xhr.statusText}\n" + xhr.getAllResponseHeaders())
-        $('#api-response').html buildHyperlinks(JSON.stringify(data, undefined, 2))
-      error: (xhr, textStatus, error) ->
-        $('#api-headers').text("#{xhr.status} #{xhr.statusText}\n" + xhr.getAllResponseHeaders())
-        $('#api-response').text xhr.responseText
-    ev.preventDefault()
-
-  if $('.console #token').val() != '' && $('.console #location').val() != '' && $('.console #method').val() == 'GET'
-    $('.send-request').click()
-
-  if $('.oauth-callback-redirect').size() > 0
-    token = window.location.hash.match(/\#access_token=(\w+)/)[1]
-    if token
-      $('#access_token').val(token)
-      $('form.oauth-callback-redirect').submit()
-
-  $('#oauth-dialog .token-scope-check-all').click (ev) ->
-    $('.token-scope-checkbox').prop('checked', this.checked)
-
-  $('#oauth-dialog .token-scope-checkbox').click (ev) ->
-    if $('.token-scope-checkbox:not(:checked)').length == 0
-      $('.token-scope-check-all').prop('checked', true)
-    else if not this.checked
-      $('.token-scope-check-all').prop('checked', false)