gris 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf6e7fb8bfc35fe35e8bdd84f973ffd239306c3
-  data.tar.gz: 655b2b8bdbb97fb442f794c6cb550d235c351a28
+  metadata.gz: 469f407d1a43e892def021b0c73092149814d21f
+  data.tar.gz: 8b72d138c252746c3014777d833e36e1bfab3182
 SHA512:
-  metadata.gz: 60a27cf6ac36461e47a3f8a06f2785e4ad07fc461deaae7791e8eb40751847791a36f8822316de8529946c5ee1cec408ec8374b419c6d4a30d30a7d74e301bff
-  data.tar.gz: e42765faf069b860feeec35d85c4903b9e681698d75744e9ed7a943cedbe3e6cd92baac8daea41e6e7afa2ac96e3e88e76476e92d1d9a3b4fb97d29f1ba1d917
+  metadata.gz: c5a56604d2cef58e60e31b41740e4e61283d5986076d47bbee7d1e2410ee010c34514c1e70876b920a7564e97859fe51273f7239d9edeae826e30add9af2610a
+  data.tar.gz: d05838ce67e8f22f9c0e72247a07f0978a5331cd481134016b686fb9c9051a9022a4eed5d00c06c372118439322beb00d31827d7f3c5a7970659c18c3c072624

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gris (0.4.7)
+    gris (0.4.8)
       activesupport (~> 4.2, >= 4.2.0)
       chronic (~> 0.10.0)
       dalli (~> 2.7)

data/lib/gris.rb

@@ -14,7 +14,6 @@ require 'hashie-forbidden_attributes'
 require 'gris/application'
 require 'gris/caching'
 require 'gris/deprecations'
-require 'gris/grape_extensions/authentication_helpers'
 require 'gris/grape_extensions/crud_helpers'
 require 'gris/grape_extensions/date_time_helpers'
 require 'gris/grape_extensions/error_helpers'

data/lib/gris/generators/templates/api/spec/endpoints/%name_tableize%_endpoint_spec.rb.tt

@@ -2,15 +2,6 @@ require 'spec_helper'
 
 describe <%= name.classify.pluralize %>Endpoint do
   include Rack::Test::Methods
-  context 'with a running app' do
-    include_context 'with a running app'
-
-    it_should_behave_like 'an endpoint with token_authentication!', [
-      ['get', '/<%= name.tableize %>'], ['post', '/<%= name.tableize %>'],
-      ['get', '/<%= name.tableize %>/1'], ['patch', '/<%= name.tableize %>/2'],
-      ['delete', '/<%= name.tableize %>/3']
-    ]
-  end
 
   context 'with a running app and token authorized client' do
     include_context 'with a running app and token authorized client'

data/lib/gris/generators/templates/scaffold/app/endpoints/application_endpoint.rb

@@ -3,19 +3,6 @@ class ApplicationEndpoint < Grape::API
   formatter :json, Grape::Formatter::Roar
   content_type :json, 'application/hal+json'
 
-  helpers do
-    include Gris::AuthenticationHelpers
-  end
-
-  # Adds a simple environment variable based
-  # token authentication scheme to your endpoints.
-  # Alternatively, this token_authentication!
-  # method can be added to individual endpoints.
-  #
-  before do
-    token_authentication!
-  end
-
   desc 'Get the Root API Endpoint'
   get do
     present self, with: RootPresenter

data/lib/gris/generators/templates/scaffold/spec/support/app_helper.rb

@@ -2,20 +2,11 @@ shared_context 'with a running app' do
   let(:app) { Rack::Builder.parse_file('config.ru').first }
 end
 
-shared_context 'with token authorization' do
-  let(:permitted_token) { Gris.secrets.permitted_tokens }
-  before(:each) do
-    header 'Http-Authorization', permitted_token
-  end
-end
-
 shared_context 'with a running app and token authorized client' do
   include_context 'with a running app'
-  include_context 'with token authorization'
 
   let(:client) do
     Hyperclient.new('http://example.org/') do |client|
-      client.headers['Http-Authorization'] = permitted_token
       client.connection(default: false) do |conn|
         conn.request :hal_json
         conn.response :json

data/lib/gris/version.rb

@@ -1,5 +1,5 @@
 module Gris
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 
   class Version
     class << self

data/spec/generators/api_generator_spec.rb

@@ -82,8 +82,6 @@ describe Gris::Generators::ApiGenerator do
       api_code = File.read(expected_api_file)
       expect(api_code).to match(/describe ArticlesEndpoint/)
       expect(api_code).to match(/returns an article/)
-      expect(api_code).to match(/it_should_behave_like 'an endpoint with token_authentication!'/)
-      expect(api_code).to match %r{'get', '/articles/1'}
     end
 
     it 'creates a fabricator' do

data/spec/generators/scaffold_generator_spec.rb

@@ -110,9 +110,5 @@ describe Gris::Generators::ScaffoldGenerator do
         expect(root_presenter_file).to match(/endpoint_link :health/)
       end
     end
-
-    it 'generates a token authentication spec helper endpoint' do
-      expect(File).to exist("#{app_path}/spec/support/shared_authentication_spec_helper.rb")
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Dylan Fareed
@@ -367,8 +367,6 @@ files:
 - lib/gris/generators/templates/scaffold/spec/endpoints/cors_spec.rb.tt
 - lib/gris/generators/templates/scaffold/spec/spec_helper.rb
 - lib/gris/generators/templates/scaffold/spec/support/app_helper.rb
-- lib/gris/generators/templates/scaffold/spec/support/shared_authentication_spec_helper.rb
-- lib/gris/grape_extensions/authentication_helpers.rb
 - lib/gris/grape_extensions/crud_helpers.rb
 - lib/gris/grape_extensions/date_time_helpers.rb
 - lib/gris/grape_extensions/error_helpers.rb
@@ -389,19 +387,16 @@ files:
 - spec/generators/api_generator_spec.rb
 - spec/generators/migration_generator_spec.rb
 - spec/generators/scaffold_generator_spec.rb
-- spec/grape_extensions/authentication_helpers_spec.rb
 - spec/grape_extensions/crud_helpers_spec.rb
 - spec/grape_extensions/date_time_helpers_spec.rb
 - spec/grape_extensions/error_helpers_spec.rb
 - spec/identity_spec.rb
 - spec/integration/application_error_response_spec.rb
-- spec/integration/token_authentication_spec.rb
 - spec/output_formatters/presenter_link_helpers_spec.rb
 - spec/secrets_spec.rb
 - spec/spec_helper.rb
 - spec/support/caching_helper.rb
 - spec/support/integration_setup.rb
-- spec/support/spec_api_auth_helper.rb
 - spec/support/spec_api_error_helper.rb
 - spec/support/spec_crud_helper.rb
 - spec/support/spec_generators_helper.rb
@@ -438,19 +433,16 @@ test_files:
 - spec/generators/api_generator_spec.rb
 - spec/generators/migration_generator_spec.rb
 - spec/generators/scaffold_generator_spec.rb
-- spec/grape_extensions/authentication_helpers_spec.rb
 - spec/grape_extensions/crud_helpers_spec.rb
 - spec/grape_extensions/date_time_helpers_spec.rb
 - spec/grape_extensions/error_helpers_spec.rb
 - spec/identity_spec.rb
 - spec/integration/application_error_response_spec.rb
-- spec/integration/token_authentication_spec.rb
 - spec/output_formatters/presenter_link_helpers_spec.rb
 - spec/secrets_spec.rb
 - spec/spec_helper.rb
 - spec/support/caching_helper.rb
 - spec/support/integration_setup.rb
-- spec/support/spec_api_auth_helper.rb
 - spec/support/spec_api_error_helper.rb
 - spec/support/spec_crud_helper.rb
 - spec/support/spec_generators_helper.rb

data/lib/gris/generators/templates/scaffold/spec/support/shared_authentication_spec_helper.rb

@@ -1,8 +0,0 @@
-shared_examples_for 'an endpoint with token_authentication!' do |route_pairs|
-  route_pairs.each do |route_pair|
-    it "returns 401 for #{route_pair[0].upcase} #{route_pair[1]}" do
-      send route_pair[0], route_pair[1]
-      expect(response_code).to eq 401
-    end
-  end
-end

data/lib/gris/grape_extensions/authentication_helpers.rb

@@ -1,21 +0,0 @@
-module Gris
-  module AuthenticationHelpers
-    def token_authentication!
-      error!('Forbidden', 401) unless permit_by_headers || permit_by_params
-    end
-
-    private
-
-    def permit_by_headers
-      permitted_tokens.include? request.headers['Http-Authorization'] if request.headers['Http-Authorization']
-    end
-
-    def permit_by_params
-      permitted_tokens.include? params[:token] if params[:token]
-    end
-
-    def permitted_tokens
-      Gris.secrets.permitted_tokens.split(',')
-    end
-  end
-end

data/spec/grape_extensions/authentication_helpers_spec.rb

@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe Gris::AuthenticationHelpers do
-  include_context 'with secrets from config/secrets.yml'
-  context 'without permitted token' do
-    before(:each) do
-      @helper = SpecApiAuthHelper.new
-    end
-
-    context '#token_authentication!' do
-      context 'without matching tokens' do
-        it 'returns a 401 Forbidden error' do
-          allow(@helper).to receive(:params).and_return(token: nil)
-          allow(@helper).to receive_message_chain(:request, :headers).and_return('Http-Authorization' => nil)
-          @helper.token_authentication!
-          expect(@helper.message).to eq(message: 'Forbidden', status: 401)
-        end
-      end
-      context 'with included params token' do
-        it 'returns nil' do
-          allow(@helper).to receive(:params).and_return(token: 'my-token')
-          allow(@helper).to receive_message_chain(:request, :headers).and_return('Http-Authorization' => nil)
-          expect(@helper.token_authentication!).to be_nil
-        end
-      end
-      context 'with blank params token' do
-        it 'returns a 401 Forbidden error' do
-          allow(@helper).to receive(:params).and_return(token: '')
-          allow(@helper).to receive_message_chain(:request, :headers).and_return('Http-Authorization' => nil)
-          @helper.token_authentication!
-          expect(@helper.message).to eq(message: 'Forbidden', status: 401)
-        end
-      end
-      context 'with included request header token' do
-        it 'returns nil' do
-          allow(@helper).to receive(:params).and_return(token: nil)
-          allow(@helper).to receive_message_chain(:request, :headers).and_return('Http-Authorization' => 'my-token')
-          expect(@helper.token_authentication!).to be_nil
-        end
-      end
-      context 'with blank header token' do
-        it 'returns a 401 Forbidden error' do
-          allow(@helper).to receive(:params).and_return(token: nil)
-          allow(@helper).to receive_message_chain(:request, :headers).and_return('Http-Authorization' => '')
-          @helper.token_authentication!
-          expect(@helper.message).to eq(message: 'Forbidden', status: 401)
-        end
-      end
-    end
-  end
-end

data/spec/integration/token_authentication_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-require 'hyperclient'
-
-describe 'token authentication' do
-  include_context 'with a generated app'
-
-  let(:client_url) { "http://localhost:#{app_port}" }
-  let(:client) { Hyperclient.new(client_url) }
-
-  it 'returns a forbidden error' do
-    request = Faraday.get client_url
-    response = JSON.parse request.body
-    expect(response['error']).to include 'Forbidden'
-  end
-
-  context 'with correct token query params' do
-    it 'returns the root presenter' do
-      client.params['token'] = 'replace-me'
-      expect(client._links.self._url).to eq client_url
-    end
-  end
-
-  context 'with correct Http-Authorization headers' do
-    it 'returns the root presenter' do
-      client.headers['Http-Authorization'] = 'replace-me'
-      expect(client._links.self._url).to eq client_url
-    end
-  end
-end

data/spec/support/spec_api_auth_helper.rb

@@ -1,15 +0,0 @@
-class SpecApiAuthHelper
-  include Gris::AuthenticationHelpers
-  include Gris::ErrorHelpers
-
-  attr_accessor :params
-  attr_accessor :request
-
-  attr_accessor :message
-  attr_accessor :thrown
-
-  def throw(thrown, message)
-    @message = message
-    @thrown = thrown
-  end
-end