foyer 0.1.3 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjdmZWViMTEyMzE0ODUzNDUxMTljMmEyYmIwZTExOTg0NjM5M2EyMA==
-  data.tar.gz: !binary |-
-    YjBkOWM3NjNmYTk0MmVkZWRmMzkxOGU5YThmODMxYjcyN2M2YTZiYQ==
+SHA1:
+  metadata.gz: 682800c810ac3c955473143f0bec308908390fcf
+  data.tar.gz: b871b220cc2c46069cd0070f60f88a70d0d2bf30
 SHA512:
-  metadata.gz: !binary |-
-    ZGVkMTZmOGM5MjZjZmJjZWNiMzlhMDRhMDNlZGZlZTJlNmVjNDg5OWRlOGNi
-    Yjg1MGFhNDBlZDdjYjE4MGFlOTMxNDlkMDdjMDY4OWVmMzA0N2MxODFmYWUy
-    ZTVlZWJiNjM5MDFjYzVkZGZmODBjZjAxNmQzOTcyNWZjMTAxNWI=
-  data.tar.gz: !binary |-
-    ZGFiNmEyMTliNDBkNjRlMjllYzA2ZTVmMmE3OWJlNDRiODEwNmMwZjVmNTM1
-    ODdhNzc3MjRlYjRkZWIzYjE1NzNmZjQ5ZTlhZmU5MWI3MDlhOWYxOWY0Y2M5
-    OGRlMTQzODg4ZjBiNmEwYmFjMTI2YjljY2ZkNmM0MzNhN2ZmM2M=
+  metadata.gz: 6fcf0ca948b532f9ae84fa68f7b277691790142da2ec1170ff12785bd8a0e8f7718d0b3ae60e4b33a0b70068b1cde4890768f2f40537caafabac0b8a48f70805
+  data.tar.gz: 81473a970e91d87620a36a8aee2cfc6842f0921ecaf6aac905bb8686aba9b0522f83a11131e439c716fc4f4cbaeb8dc32852d3e3436e27f4120bc77dc94d0aa3

data/lib/foyer.rb

@@ -12,10 +12,17 @@ module Foyer
   mattr_accessor :user_finder
   @@user_finder = lambda { |_| raise 'Override this method' }
 
+  mattr_accessor :token_finder
+  @@token_finder = lambda { |_| raise 'Override this method' }
+
   module Controller
     autoload :Helpers, 'foyer/controller/helpers'
   end
 
+  module Grape
+    autoload :Helpers, 'foyer/grape/helpers'
+  end
+
   autoload :OmniauthCallbacksController, 'foyer/omniauth_callbacks_controller'
 
   autoload :TestHelpers, 'foyer/test_helpers'

data/lib/foyer/controller/helpers.rb

@@ -13,7 +13,7 @@ module Foyer
           id: user.id,
           current_sign_in_at: Time.now,
           current_sign_in_ip: request.ip,
-        }
+        }.with_indifferent_access
       end
 
       def sign_out
@@ -30,7 +30,8 @@ module Foyer
       end
 
       def user_session
-        session[Foyer.session_key]||= {}
+        session[Foyer.session_key] ||= {}
+        session[Foyer.session_key] = session[Foyer.session_key].with_indifferent_access
         session[Foyer.session_key]
       end
 

data/lib/foyer/grape/helpers.rb

@@ -0,0 +1,30 @@
+module Foyer
+  module Grape
+    module Helpers
+      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)
+      end
+
+      def authenticate_user!
+        error!('Unauthorized', 401) unless user_signed_in?
+      end
+
+      module ClassMethods
+        def set_token_finder(&blk)
+          if blk.arity != 1
+            raise ":token_finder must accept 1 argument (token)"
+          end
+          Foyer.token_finder = blk
+        end
+      end
+    end
+  end
+end

data/lib/foyer/version.rb

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

data/spec/foyer/grape/helpers_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Foyer::Grape::Helpers do
+  class IncludesFoyerGrapeHelpers
+    def headers
+      @headers ||= { 'Authorization' => 'Bearer _' }
+    end
+
+    include Foyer::Grape::Helpers
+  end
+
+  subject { IncludesFoyerGrapeHelpers.new }
+
+  describe ".set_token_finder" do
+    it "sets the :token_finder configuration to the provided block" do
+      expect {
+        subject.class_eval do
+          set_token_finder do |token|
+            token
+          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 = lambda { |_| @called = true }
+
+      subject.send :current_user
+
+      expect(@called).to eq true
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foyer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Nochlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -42,14 +42,14 @@ dependencies:
   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
@@ -83,6 +83,7 @@ files:
 - lib/foyer.rb
 - lib/foyer/controller/helpers.rb
 - lib/foyer/engine.rb
+- lib/foyer/grape/helpers.rb
 - lib/foyer/omniauth_callbacks_controller.rb
 - lib/foyer/rails.rb
 - lib/foyer/test_helpers.rb
@@ -123,6 +124,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - 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
@@ -136,17 +138,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Authentication layer for OmniAuth
@@ -187,6 +189,7 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - 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