foyer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 682800c810ac3c955473143f0bec308908390fcf
-  data.tar.gz: b871b220cc2c46069cd0070f60f88a70d0d2bf30
+  metadata.gz: a7b52e3b4d9a31b491c4b49eb4b6df196df66eba
+  data.tar.gz: bef81cb0602a6812eb29a53d113ed2a9c524dd49
 SHA512:
-  metadata.gz: 6fcf0ca948b532f9ae84fa68f7b277691790142da2ec1170ff12785bd8a0e8f7718d0b3ae60e4b33a0b70068b1cde4890768f2f40537caafabac0b8a48f70805
-  data.tar.gz: 81473a970e91d87620a36a8aee2cfc6842f0921ecaf6aac905bb8686aba9b0522f83a11131e439c716fc4f4cbaeb8dc32852d3e3436e27f4120bc77dc94d0aa3
+  metadata.gz: 91440e9420e1ac33b39c437a1468a94abd0031fb12a306b56defe59ab9cbe416efd61dabbc162f29c23d44879315a48035cba13421d55b902c886a94139934ca
+  data.tar.gz: 46ae76bee314261f51fe6dc7a7f22eeebeb901a7d6aac83943620a9741ecc690eb5e1727b9b669fc43de313e855a7030b36165c0f8df8d9959f1ece73c2452b6

data/.rubocop.yml

@@ -0,0 +1,56 @@
+AllCops:
+  RunRailsCops: true
+  Exclude:
+    # Rubocop's default
+    - 'vendor/**/*'
+    # To ensure smooth `rake rails:update`, we exclude some of the Rails' generated files
+    # please add new Rails' generated files to this list after running `rake rails:update` (if any)
+    # please add your exclude specific for this project after this section
+    - 'bin/**/*'
+    - 'config/boot.rb'
+    - 'config/application.rb'
+    - 'config/environment.rb'
+    - 'config/environments/development.rb'
+    - 'config/environments/production.rb'
+    - 'config/environments/test.rb'
+    - 'config/initializers/assets.rb'
+    - 'config/initializers/backtrace_silencers.rb'
+    - 'config/initializers/cookies_serializer.rb'
+    - 'config/initializers/filter_parameter_logging.rb'
+    - 'config/initializers/inflections.rb'
+    - 'config/initializers/mime_types.rb'
+    - 'config/initializers/session_store.rb'
+    - 'config/initializers/wrap_parameters.rb'
+    - 'db/schema.rb'
+    - 'script/**/*'
+    # Common generated files (projects independent)
+    - 'config/unicorn.rb'
+    - 'config/initializers/devise.rb'
+    # Add your exclude files specific to this project here
+    - 'spec/dummy/config/initializers/secret_token.rb'
+
+Style/AlignParameters:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
+Style/Documentation:
+  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:
+  Enabled: false
+
+##################### Metrics ##################################
+
+Metrics/LineLength:
+  Max: 120
+  AllowURI: true
+
+Metrics/MethodLength:
+  CountComments: false
+  Exclude:
+    - 'db/migrate/*'

data/.travis.yml

@@ -0,0 +1,11 @@
+sudo: false
+language: ruby
+cache:
+  - bundler
+rvm:
+  - 2.1.4
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode
+before_script:
+  - bundle exec rubocop -D

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/foyer.gemspec

@@ -4,23 +4,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'foyer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "foyer"
+  spec.name          = 'foyer'
   spec.version       = Foyer::VERSION
-  spec.authors       = ["Jason Nochlin"]
-  spec.email         = ["jason@gaggleamp.com"]
-  spec.summary       = "Authentication layer for OmniAuth"
-  spec.description   = "Authentication layer for OmniAuth"
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['Jason Nochlin']
+  spec.email         = ['jason@gaggleamp.com']
+  spec.summary       = 'Authentication layer for OmniAuth'
+  spec.description   = 'Authentication layer for OmniAuth'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.executables   = spec.files.grep(%r{^bin\/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)\/})
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "rails", "~> 4.0"
+  spec.add_dependency 'rails', '~> 4.0'
 
-  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 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec-rails', '~> 3.0.0.beta'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/foyer.rb

@@ -3,6 +3,9 @@ require 'foyer/engine'
 require 'foyer/rails'
 
 module Foyer
+  # Class variables are required for the implementation of this class.
+  # rubocop:disable Style/ClassVars
+
   mattr_accessor :identity_provider
   @@identity_provider = :gaggleamp
 
@@ -10,10 +13,12 @@ module Foyer
   @@session_key = 'foyer.authenticated_user'
 
   mattr_accessor :user_finder
-  @@user_finder = lambda { |_| raise 'Override this method' }
+  @@user_finder = ->(_) { fail 'Override this method' }
 
   mattr_accessor :token_finder
-  @@token_finder = lambda { |_| raise 'Override this method' }
+  @@token_finder = ->(_) { fail 'Override this method' }
+
+  # rubocop:enable Style/ClassVars
 
   module Controller
     autoload :Helpers, 'foyer/controller/helpers'

data/lib/foyer/controller/helpers.rb

@@ -8,11 +8,12 @@ module Foyer
       end
 
       protected
+
       def sign_in(user)
         session[Foyer.session_key] = {
           id: user.id,
-          current_sign_in_at: Time.now,
-          current_sign_in_ip: request.ip,
+          current_sign_in_at: Time.now, # rubocop:disable Rails/TimeZone
+          current_sign_in_ip: request.ip
         }.with_indifferent_access
       end
 
@@ -21,7 +22,7 @@ module Foyer
       end
 
       def user_signed_in?
-        user_session.present? and current_user.present?
+        user_session.present? && current_user.present?
       end
 
       def current_user
@@ -36,16 +37,13 @@ module Foyer
       end
 
       def authenticate_user!
-        unless user_signed_in?
-          redirect_to "/auth/#{Foyer.identity_provider}?origin=#{CGI.escape request.fullpath}"
-        end
+        return if user_signed_in?
+        redirect_to "/auth/#{Foyer.identity_provider}?origin=#{CGI.escape request.fullpath}"
       end
 
       module ClassMethods
-        def set_user_finder(&blk)
-          if blk.arity != 1
-            raise ":user_finder must accept 1 argument (user_id)"
-          end
+        def set_user_finder(&blk) # rubocop:disable Style/AccessorMethodName
+          fail ':user_finder must accept 1 argument (user_id)' unless blk.arity == 1
           Foyer.user_finder = blk
         end
       end

data/lib/foyer/grape/helpers.rb

@@ -4,13 +4,14 @@ module Foyer
       extend ActiveSupport::Concern
 
       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($1)
+        @current_user ||= Foyer.token_finder.call(Regexp.last_match[1])
       end
 
       def authenticate_user!
@@ -18,10 +19,8 @@ module Foyer
       end
 
       module ClassMethods
-        def set_token_finder(&blk)
-          if blk.arity != 1
-            raise ":token_finder must accept 1 argument (token)"
-          end
+        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

data/lib/foyer/omniauth_callbacks_controller.rb

@@ -3,15 +3,18 @@ module Foyer
     include Controller::Helpers
 
     def callback
-      raise NotImplementedError
+      fail NotImplementedError
     end
 
     protected
+
     def after_sign_in_path
-      origin || root_path
+      return origin if origin.to_s.match(%r{^\/}) || origin.to_s.match(%r{^#{request.scheme}://#{request.host}})
+      root_path
     end
 
     private
+
     def origin
       request.env['omniauth.origin']
     end

data/lib/foyer/rails.rb

@@ -1,16 +1,17 @@
 require 'action_dispatch/routing/mapper'
 
-module ActionDispatch::Routing
-  class Mapper
-    def authenticate(guard=nil)
-      constraint = lambda do |request|
-        if user_id = request.env['rack.session'][Foyer.session_key].try(:[], :id)
-          guard.nil?? true : guard.call(Foyer.user_finder.call(user_id))
+module ActionDispatch
+  module Routing
+    class Mapper
+      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
         end
-      end
 
-      constraints(constraint) do
-        yield
+        constraints(constraint) do
+          yield
+        end
       end
     end
   end

data/lib/foyer/version.rb

@@ -1,3 +1,3 @@
 module Foyer
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'
 end

data/spec/controllers/authenticated_controller_spec.rb

@@ -2,15 +2,15 @@ require 'ostruct'
 
 require 'spec_helper'
 
-describe AuthenticatedController do
-  describe "not authenticated" do
-    it "redirects to the identity_provider" do
+describe AuthenticatedController, type: :controller do
+  describe 'not authenticated' do
+    it 'redirects to the identity_provider' do
       get :index
 
       expect(response.location).to match('/auth/gaggleamp')
     end
 
-    it "sets origin to the location an unauthenticated user was trying to access" do
+    it 'sets origin to the location an unauthenticated user was trying to access' do
       get :index
 
       response.location.split('?').last.tap do |query_string|
@@ -20,14 +20,14 @@ describe AuthenticatedController do
     end
   end
 
-  describe "after authenticating" do
-    let(:user) { OpenStruct.new.tap { |i| i.id = rand(10000) } }
+  describe 'after authenticating' do
+    let(:user) { OpenStruct.new.tap { |i| i.id = rand(10_000) } }
     before do
       sign_in user
-      Foyer.user_finder = lambda { |_| user }
+      Foyer.user_finder = ->(_) { user }
     end
 
-    it "allows user to access the action" do
+    it 'allows user to access the action' do
       get :index
 
       expect(response.status).to eq 200

data/spec/dummy/app/controllers/sessions_controller.rb

@@ -4,7 +4,7 @@ class SessionsController < ActionController::Base
   include Foyer::Controller::Helpers
 
   def developer
-    sign_in OpenStruct.new.tap { |i| i.id = rand(10000) }
+    sign_in OpenStruct.new.tap { |i| i.id = rand(10_000) }
 
     head :no_content
   end

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application

data/spec/dummy/config/application.rb

@@ -1,12 +1,12 @@
 require File.expand_path('../boot', __FILE__)
 
 # Pick the frameworks you want:
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "sprockets/railtie"
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'sprockets/railtie'
 
 Bundler.require(*Rails.groups)
-require "foyer"
+require 'foyer'
 
 module Dummy
   class Application < Rails::Application
@@ -23,4 +23,3 @@ module Dummy
     # config.i18n.default_locale = :de
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environments/test.rb

@@ -14,7 +14,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance.
   config.serve_static_assets  = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/dummy/config/routes.rb

@@ -1,14 +1,13 @@
 Rails.application.routes.draw do
-
   post '/sign_in' => 'sessions#developer'
 
-  get '/authenticated' => "authenticated#index"
+  get '/authenticated' => 'authenticated#index'
 
   authenticate do
     get '/authenticated_by_route_constraint' => 'unauthenticated#index'
   end
 
-  authenticate lambda { |user| false } do
+  authenticate ->(_user) { false } do
     get '/authenticated_by_route_constraint_which_blocks_all_users' => 'unauthenticated#index'
   end
 end

data/spec/foyer/controller/helpers_spec.rb

@@ -15,23 +15,23 @@ describe Foyer::Controller::Helpers do
 
   subject { IncludesFoyerControllerHelpers.new }
 
-  describe ".set_user_finder" do
-    it "sets the :user_finder configuration to the provided block" do
-      expect {
+  describe '.set_user_finder' do
+    it 'sets the :user_finder configuration to the provided block' do
+      expect do
         subject.class_eval do
           set_user_finder do |user_id|
             user_id
           end
         end
-      }.to change(Foyer, :user_finder)
+      end.to change(Foyer, :user_finder)
     end
   end
 
-  describe "#current_user" do
-    it "calls the user_finder method" do
+  describe '#current_user' do
+    it 'calls the user_finder method' do
       @called = false
       subject.send(:user_session)[:id] = '_'
-      Foyer.user_finder = lambda { |_| @called = true }
+      Foyer.user_finder = ->(_) { @called = true }
 
       subject.send :current_user
 

data/spec/foyer/grape/helpers_spec.rb

@@ -11,22 +11,22 @@ describe Foyer::Grape::Helpers do
 
   subject { IncludesFoyerGrapeHelpers.new }
 
-  describe ".set_token_finder" do
-    it "sets the :token_finder configuration to the provided block" do
-      expect {
+  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
-      }.to change(Foyer, :token_finder)
+      end.to change(Foyer, :token_finder)
     end
   end
 
-  describe "#current_user" do
-    it "calls the token_finder method" do
+  describe '#current_user' do
+    it 'calls the token_finder method' do
       @called = false
-      Foyer.token_finder = lambda { |_| @called = true }
+      Foyer.token_finder = ->(_) { @called = true }
 
       subject.send :current_user
 

data/spec/foyer/omniauth_callbacks_controller_spec.rb

@@ -2,22 +2,21 @@ require 'spec_helper'
 
 module Foyer
   describe OmniauthCallbacksController, type: :controller do
-    describe "#after_sign_in_path" do
+    describe '#after_sign_in_path' do
       before do
         allow(controller).to receive(:root_path).and_return '/'
       end
 
-      it "defaults to root path" do
+      it 'defaults to root path' do
         expect(controller.send :after_sign_in_path).to eq('/')
       end
 
-      it "returns omniauth.origin if available" do
+      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)
       end
     end
-
   end
 end

data/spec/integration/authenticate_via_route_constraint_spec.rb

@@ -1,14 +1,12 @@
 require 'ostruct'
 require 'spec_helper'
 
-describe "authentication via routes helper" do
-  it "does not allow an unauthenticated user to access to route" do
-    expect {
-      get '/authenticated_by_route_constraint'
-    }.to raise_error(ActionController::RoutingError)
+describe 'authentication via routes helper', type: :request do
+  it 'does not allow an unauthenticated user to access to route' do
+    expect { get '/authenticated_by_route_constraint' }.to raise_error(ActionController::RoutingError)
   end
 
-  it "allows authenticated users to access the route" do
+  it 'allows authenticated users to access the route' do
     post '/sign_in'
 
     get '/authenticated_by_route_constraint'
@@ -16,13 +14,12 @@ describe "authentication via routes helper" do
     expect(response).to be_success
   end
 
-  it "allows only certain users to access the route" do
-    Foyer.user_finder = lambda { |user_id| nil }
+  it 'allows only certain users to access the route' do
+    Foyer.user_finder = ->(_user_id) { nil }
 
     post '/sign_in'
 
-    expect {
-      get '/authenticated_by_route_constraint_which_blocks_all_users'
-    }.to raise_error(ActionController::RoutingError)
+    expect { get '/authenticated_by_route_constraint_which_blocks_all_users' }
+      .to raise_error(ActionController::RoutingError)
   end
 end

data/spec/spec_helper.rb

@@ -1,15 +1,15 @@
 # Configure Rails Envinronment
-ENV["RAILS_ENV"] = "test"
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+ENV['RAILS_ENV'] = 'test'
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
 
 require 'rspec/rails'
 
-ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
+ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
+Dir[File.join(ENGINE_RAILS_ROOT, 'spec/support/**/*.rb')].each { |f| require f }
 
 RSpec.configure do |config|
-  config.include Foyer::TestHelpers, :type => :controller
+  config.include Foyer::TestHelpers, type: :controller
 end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: foyer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Nochlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: Authentication layer for OmniAuth
 email:
 - jason@gaggleamp.com
@@ -73,8 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -138,12 +154,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []