foyer 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af5cb236dc4e724cfcc0e93c0b595257dbd3209d
-  data.tar.gz: 14bf2bfdc8a8c2a7cc0f3fc3f7024a3d312b2da3
+  metadata.gz: 57d0883283b4f625d72d8ce225b286601a4f30ef
+  data.tar.gz: 3a6aaf54a13c2f79623033a6e7458568599ac659
 SHA512:
-  metadata.gz: c40bfe2653f1a3d675be903bb880ddae30d1cd3bd707c0f6c101c294ddaeac2d1e26a4106de5c7690a303e2cc11e689e4bf4347f0a2267a6a2892f427e8fdaee
-  data.tar.gz: 304fcf02a5b52432cd7bd9b64273586e1570f9b1c01f94f69031c87e8dc087ea573e1188b25f6a828089fd45a244e6d98f8e356918774e4fcf84783c11204b5a
+  metadata.gz: 32ca88d2cd4a48b234ce4316ca7b5acafc4d329223facb668aaaf01c928e7c58b0408e6abdaf1dd571b740be0c2a52ebd5937cacbb366734b0d926b02e8c9880
+  data.tar.gz: a12db3dd41cd7b8978f929a35c016bec424ec71a7f6f1ab1ef728a6e846d8183b99d43cbaac98ed703f5ee64ed9d9ae35136f5a359f909c43189c669f6641b27

data/.rubocop.yml

@@ -1,5 +1,4 @@
 AllCops:
-  RunRailsCops: true
   Exclude:
     # Rubocop's default
     - 'vendor/**/*'
@@ -29,6 +28,9 @@ AllCops:
     # Add your exclude files specific to this project here
     - 'spec/dummy/config/initializers/secret_token.rb'
 
+Rails:
+  Enabled: true
+
 Style/AlignParameters:
   Enabled: true
   EnforcedStyle: with_fixed_indentation
@@ -36,14 +38,20 @@ Style/AlignParameters:
 Style/Documentation:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 # If the project still supporting ruby 1.8, uncomment the following lines to force Rubocop
 # to use old hash_rockets syntax, if left commented, Rubocop will force the newer ruby19 syntax
 # Style/HashSyntax:
 #   EnforcedStyle: hash_rockets
 
-Style/SingleSpaceBeforeFirstArg:
+Style/SpaceBeforeFirstArg:
   Enabled: false
 
+Style/SignalException:
+  EnforcedStyle: semantic
+
 ##################### Metrics ##################################
 
 Metrics/LineLength:

data/.travis.yml

@@ -3,9 +3,8 @@ language: ruby
 cache:
   - bundler
 rvm:
-  - 2.1.4
+  - 2.3.0
+  - 2.1.8
   - 2.0.0
-  - 1.9.3
-  - jruby-19mode
 before_script:
   - bundle exec rubocop -D

data/foyer.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec-rails', '~> 3.0.0.beta'
+  spec.add_development_dependency 'rspec-rails', '~> 3.4'
   spec.add_development_dependency 'rubocop'
 end

data/lib/foyer.rb

@@ -24,6 +24,10 @@ module Foyer
     autoload :Helpers, 'foyer/controller/helpers'
   end
 
+  module API
+    autoload :Helpers, 'foyer/api/helpers'
+  end
+
   module Grape
     autoload :Helpers, 'foyer/grape/helpers'
   end

data/lib/foyer/api/helpers.rb

@@ -0,0 +1,29 @@
+module Foyer
+  module API
+    module Helpers
+      extend ActiveSupport::Concern
+
+      protected
+
+      def user_signed_in?
+        current_user.present?
+      end
+
+      def current_user
+        return nil unless request.authorization.to_s =~ /^Bearer (.*)/m
+        @current_user ||= Foyer.token_finder.call(Regexp.last_match[1])
+      end
+
+      def authenticate_user!
+        head :unauthorized unless user_signed_in?
+      end
+
+      module ClassMethods
+        def set_token_finder(&blk) # rubocop:disable Style/AccessorMethodName
+          fail ':token_finder must accept 1 argument (token)' unless blk.arity == 1
+          Foyer.token_finder = blk
+        end
+      end
+    end
+  end
+end

data/lib/foyer/grape/helpers.rb

@@ -2,13 +2,10 @@ module Foyer
   module Grape
     module Helpers
       extend ActiveSupport::Concern
+      include Foyer::API::Helpers
 
       protected
 
-      def user_signed_in?
-        current_user.present?
-      end
-
       def current_user
         return nil unless headers['Authorization'] =~ /^Bearer (.*)/m
         @current_user ||= Foyer.token_finder.call(Regexp.last_match[1])
@@ -17,13 +14,6 @@ module Foyer
       def authenticate_user!
         error!('Unauthorized', 401) unless user_signed_in?
       end
-
-      module ClassMethods
-        def set_token_finder(&blk) # rubocop:disable Style/AccessorMethodName
-          fail ':token_finder must accept 1 argument (token)' unless blk.arity == 1
-          Foyer.token_finder = blk
-        end
-      end
     end
   end
 end

data/lib/foyer/rails.rb

@@ -6,7 +6,8 @@ module ActionDispatch
       def authenticate(guard = nil)
         constraint = lambda do |request|
           user_id = request.env['rack.session'][Foyer.session_key].try(:with_indifferent_access).try(:[], :id)
-          guard.nil? ? true : guard.call(Foyer.user_finder.call(user_id)) if user_id
+          break unless user_id
+          guard.nil? ? true : guard.call(Foyer.user_finder.call(user_id))
         end
 
         constraints(constraint) do

data/lib/foyer/version.rb

@@ -1,3 +1,3 @@
 module Foyer
-  VERSION = '0.2.2'
+  VERSION = '0.3.1'.freeze
 end

data/spec/controllers/authenticated_controller_spec.rb

@@ -15,7 +15,7 @@ describe AuthenticatedController, type: :controller do
 
       response.location.split('?').last.tap do |query_string|
         expect(query_string.split('=').first).to eq('origin')
-        expect(query_string.split('=').last).to eq(CGI.escape '/authenticated')
+        expect(query_string.split('=').last).to eq(CGI.escape('/authenticated'))
       end
     end
   end

data/spec/foyer/api/helpers_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Foyer::API::Helpers do
+  class IncludesFoyerAPIHelpers
+    def request
+      @request ||= Struct.new(:authorization).new('Bearer _')
+    end
+
+    include Foyer::API::Helpers
+  end
+
+  subject { IncludesFoyerAPIHelpers.new }
+
+  describe '.set_token_finder' do
+    it 'sets the :token_finder configuration to the provided block' do
+      expect do
+        subject.class_eval do
+          set_token_finder do |token|
+            token
+          end
+        end
+      end.to change(Foyer, :token_finder)
+    end
+  end
+
+  describe '#current_user' do
+    it 'calls the token_finder method' do
+      @called = false
+      Foyer.token_finder = ->(_) { @called = true }
+
+      subject.send :current_user
+
+      expect(@called).to eq true
+    end
+  end
+end

data/spec/foyer/omniauth_callbacks_controller_spec.rb

@@ -8,14 +8,14 @@ module Foyer
       end
 
       it 'defaults to root path' do
-        expect(controller.send :after_sign_in_path).to eq('/')
+        expect(controller.send(:after_sign_in_path)).to eq('/')
       end
 
       it 'returns omniauth.origin if available' do
         origin = '/some_path'
         @request.env['omniauth.origin'] = origin
 
-        expect(controller.send :after_sign_in_path).to eq(origin)
+        expect(controller.send(:after_sign_in_path)).to eq(origin)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foyer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Jason Nochlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,7 @@ files:
 - Rakefile
 - foyer.gemspec
 - lib/foyer.rb
+- lib/foyer/api/helpers.rb
 - lib/foyer/controller/helpers.rb
 - lib/foyer/engine.rb
 - lib/foyer/grape/helpers.rb
@@ -139,6 +140,7 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/foyer/api/helpers_spec.rb
 - spec/foyer/controller/helpers_spec.rb
 - spec/foyer/grape/helpers_spec.rb
 - spec/foyer/omniauth_callbacks_controller_spec.rb
@@ -164,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Authentication layer for OmniAuth
@@ -204,9 +206,9 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/foyer/api/helpers_spec.rb
 - spec/foyer/controller/helpers_spec.rb
 - spec/foyer/grape/helpers_spec.rb
 - spec/foyer/omniauth_callbacks_controller_spec.rb
 - spec/integration/authenticate_via_route_constraint_spec.rb
 - spec/spec_helper.rb
-has_rdoc: