grape-knock 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4807209f1dd16ed6c0c7745e215459ce530937e1
-  data.tar.gz: cb81980c4e78683d4c08a1ec0a49a6b321d25197
+  metadata.gz: 50cd128cfd75e40bcb80421915a41787e9244805
+  data.tar.gz: 123a4f325d95f1a16917779ad3ab6f6f3c4e4c32
 SHA512:
-  metadata.gz: fc945a605704f04fadca44f6ebe299a523baeb6c741d279c16cf6ceb730e80f5a4c10e88998294dba9c1a2e218301c303d8b1e1a85dfb4a213b0ac622fe1f77b
-  data.tar.gz: 97f6d59291a2033bb44addb752e53571485a6f5b3cfdc0802c2f1ee7584bac576c31f3a7204d1c373333bf6b360f81963aab312ab75200529b0c4e52ce80a049
+  metadata.gz: 5642c5d80ff6f03ebd770edb7d1b16893a00338c14ab16996996a67a5397a9c674606a421b3a229397067b08ec35c46f72d94b9a37fe72e4dbb11d6e779f94ec
+  data.tar.gz: 6ead0a60917a7564a11e90fdb09a52f1c5ccad90c1c690e2f8d1e145ef6831c6fd2a015e1e5dd1b8ed11bafa62a602a0e1f02fa8811a93b56cdc593a6a02f282

data/.byebug_history

@@ -0,0 +1,9 @@
+exit
+getter_name
+self.class_name
+self.class
+self
+continue
+getter_name
+continue
+env

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.idea

data/README.md

@@ -30,6 +30,24 @@ class MyApi < Grape::API
 end
 ```
 
+You now have a `current_user` method available in your endpoints:
+
+```ruby
+class MyApi < Grape::API
+  format :json
+
+  use Grape::Knock::Authenticable
+
+  resource :comments do
+    get do
+      current_user.comments
+    end
+  end
+end
+```
+
+
+
 The gem will raise `Grape::Knock::ForbiddenError` when authentication failed. You can rescue this exception in your API
 in order to respond with a `403 Forbidden` http request:
 
@@ -67,4 +85,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/grape-knock.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "grape", ">= 0.10"
   spec.add_dependency "knock"
-
+  
   spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
 end

data/lib/grape/knock.rb

@@ -1,6 +1,7 @@
 require 'grape'
 require 'grape/knock/version'
 require 'grape/knock/authenticable'
+require 'jwt'
 
 module Grape
   module Knock

data/lib/grape/knock/authenticable.rb

@@ -1,37 +1,71 @@
 require 'knock'
 require 'knock/authenticable'
 require 'grape/knock/forbidden_error'
-require 'grape/knock/methods'
 
 module Grape
   module Knock
     class Authenticable < Grape::Middleware::Base
       include ::Knock::Authenticable
 
+      def initialize(_, options = {})
+       super
+       define_current_entity_getter entity_class, getter_name
+     end
+
       def context
         env['api.endpoint']
       end
 
       def before
         authenticate
-        context.extend Grape::Knock::Methods
-        context.current_user = @current_user
+
+        memoization_var_name = "@_#{getter_name}"
+        context.send(:instance_variable_set, memoization_var_name, send(getter_name))
+        context.class.send(:define_method, getter_name) { instance_variable_get memoization_var_name }
       end
 
       private
 
       def authenticate
         fail ::Grape::Knock::ForbiddenError unless token
-        @current_user = ::Knock::AuthToken.new(token: token).current_user
-        fail ::Grape::Knock::ForbiddenError unless @current_user
+        fail ::Grape::Knock::ForbiddenError unless send(getter_name)
       rescue ::JWT::DecodeError
         fail ::Grape::Knock::ForbiddenError
       end
 
-      def token
-        env['HTTP_AUTHORIZATION'].to_s.split(' ').last
+      def define_current_entity_getter(entity_class, getter_name)
+        unless self.respond_to?(getter_name)
+          memoization_var_name = "@_#{getter_name}"
+          self.class.send(:define_method, getter_name) do
+            unless instance_variable_defined?(memoization_var_name)
+              current =
+                begin
+                  ::Knock::AuthToken.new(token: token).entity_for(entity_class)
+                rescue ::Knock.not_found_exception_class, JWT::DecodeError
+                  nil
+                end
+              instance_variable_set(memoization_var_name, current)
+            end
+            instance_variable_get(memoization_var_name)
+          end
+        end
       end
 
+      def entity_class
+        @options[:entity_class] || Object.const_get('User')
+      end
+
+      def getter_name
+        "current_#{entity_class.to_s.parameterize.underscore}".freeze
+      end
+
+      def header_name
+        (@options[:header_name] || 'HTTP_AUTHORIZATION').freeze
+      end
+
+      def token
+        env[header_name].to_s.split(' ').last
+      end
     end
   end
 end

data/lib/grape/knock/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Knock
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,83 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: grape-knock
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: knock
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: Use Knock with Grape.
@@ -87,9 +101,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".byebug_history"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,7 +115,6 @@ files:
 - lib/grape/knock.rb
 - lib/grape/knock/authenticable.rb
 - lib/grape/knock/forbidden_error.rb
-- lib/grape/knock/methods.rb
 - lib/grape/knock/version.rb
 homepage: https://github.com/gottfrois/grape-knock
 licenses:
@@ -112,17 +126,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.4.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Use Knock with Grape.

data/lib/grape/knock/methods.rb

@@ -1,9 +0,0 @@
-module Grape
-  module Knock
-    module Methods
-
-      attr_accessor :current_user
-
-    end
-  end
-end