model_token_auth 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5929157c163b1f04cc0901bed7d7e8dd52ac7757745a95b993df2b6ec6e8f54d
-  data.tar.gz: 263e54f27208a612e590b7b685b2493500ad78863d470aa557240cc7c4e04643
+  metadata.gz: 5db811590f96edd70be9dd6a69de23417df28b1f0bd462329730425224538866
+  data.tar.gz: 89dd8598f5366e651ff3a05faa776021e6fcb9500ee6f6a21ce7e6635a11f4cd
 SHA512:
-  metadata.gz: 4a4401fe57daa58f076e7ec858a727e7e60d67ff20edd6a34c5a21c9733ad681fc55033d3de51291905b60315a91a90d7c5c635d0d674a10043bf221e337a4c5
-  data.tar.gz: 42cacc4e2be630e5924a4c5142ab50fda96b8ee3f08075dad8b6772fe169594814363ddc6d92e3d95863d591b6682410ca2565356faaf4be9fbccc694e55b454
+  metadata.gz: dfa3c52bd3765557b37aa4e4317792e6e9c6c6cce5f5b6520f38f272379dc8ff3cd3dde2c3b5e369d0c54e9e186a0eaf264a21f1ba6eac75348f0a5605c18757
+  data.tar.gz: ce058c13cf9204bcf68d5f2d9136265464db6c56c1c3a0fcae4daba832ed1f549b1b5c337fbbcb4ff210d3bb079bb6493dc6efa23df89d789f147fc7dcb2ab7b

data/README.md

@@ -36,14 +36,15 @@ Once the migration finishes, the models will be ready to be authenticated.
 
 This plugin handles Token authentication for models. In models in which
 `#acts_as_model_authenticable` method is called, the instances will be able generating
-a token by calling the methods `#save`, `#create` and `#create!`of ActiveRecord. The
-token is generated in an associated model called AccessToken.
+a token by calling the methods `#save`, `#create` and `#create!`of `ActiveRecord::Base`.
+The token is generated in an associated model called `AccessToken`.
 
 The plugin also handles authentication in the controllers by inserting a generic
-`#authenticate!` method in ActionController::Base or ActionController::API that
-will verify the existence of the token and creates the `current_*` method.
+`#authenticate!` method when calling the callback `acts_as_controller_authenticable` in
+ApplicationController. This method will verify the existence of the token and
+creates the `current_*` method.
 
-To authenticate some token it'll need adding the standard header `Authorization` in the request
+To authenticate some token the request will need the standard header `Authorization`
 with a token as a value.
 
 ### Models
@@ -51,8 +52,6 @@ with a token as a value.
 Make models authenticatables.
 
 ```ruby
-# example
-
 class Center < ActiveRecord::Base
   acts_as_model_authenticable
 end
@@ -78,11 +77,9 @@ center.access_token
 
 ### Controllers
 
-Allow controllers to handle token authentication
+Allow controllers to handle token authentication.
 
 ```ruby
-# example ActionController::Base
-
 class ApplicationController < ActionController::Base
   acts_as_controller_authenticable
 end
@@ -122,14 +119,14 @@ end
 
 To facilitate the testing of the controllers:
 
-1.- Add a new folder with the name of ```support``` in the root of ```spec```.
+1.- Add a new folder with the name of `support` in the root of `spec`.
 
-2.- Create a ruby file with the name of model_token_auth_helper (```model_token_auth_helper.rb```).
+2.- Create a ruby file with the name of model_token_auth_helper (`model_token_auth_helper.rb`).
 
 3.- Copy the following code:
 
 ```ruby
-# => model_token_auth_helper.rb
+# model_token_auth_helper.rb
 
 module ModelTokenAuthHelper
 
@@ -145,18 +142,17 @@ module ModelTokenAuthHelper
   # value of the token that is passed to it,
   # giving it the necessary format.
   #
-  def add_authorization_header(token)
-    request.env['HTTP_AUTHORIZATION'] =
-      ActionController::HttpAuthentication::Token.encode_credentials(token)
+  def add_authorization_header(access_token)
+    subject.request.env['HTTP_AUTHORIZATION'] =
+      ActionController::HttpAuthentication::Token.encode_credentials(access_token.token)
   end
 end
 ```
 
-4.- Require ModelTokenAuthHelper at top of the file ```spec_helper.rb``` and add the module to 
-the RSpec configuration:
+4.- Require `ModelTokenAuthHelper` at the top of the file `spec_helper.rb` and add the module to the RSpec configuration:
 
 ```ruby
-# => spec_helper.rb
+# spec_helper.rb
 
 require_relative 'support/model_token_auth_helper'
 
@@ -170,7 +166,7 @@ end
 
 ### ModelTokenAuthHelper Usage
 
-Here is described how to use the methods of the ModelTokenAuthHelper module that we created
+Here is described how to use the methods of the ModelTokenAuthHelper module that we created.
 
 ```ruby
 require 'rails_helper'
@@ -222,11 +218,11 @@ Bug report or pull request are welcome.
 
 Make a pull request:
 
-- Fork it
-- Create your feature branch (git checkout -b my-new-feature)
-- Commit your changes (git commit -am 'Add some feature')
-- Push to the branch (git push origin HEAD)
-- Create new Pull Request
+- Clone the repo
+- Create your feature branch
+- Commit your changes
+- Push the branch
+- Create new Pull-Request
 
 Please write tests if necessary.
 

data/lib/model_token_auth.rb

@@ -1,7 +1,7 @@
 require "model_token_auth/railtie"
 require 'model_token_auth/access_tokens_config'
 require 'model_token_auth/acts_as_model_authenticable'
-require 'model_token_auth/acts_as_controllers_authenticable'
+require 'model_token_auth/acts_as_controller_authenticable'
 
 # => Class associated with the models
 # that will be authenticated.
@@ -15,9 +15,7 @@ class AccessToken < ActiveRecord::Base
 end
 
 # => *
-ActiveRecord::Base.include ModelTokenAuth::ActsAsModelAuthenticable
+include ModelTokenAuth::ActsAsControllerAuthenticable
 
 # => *
-[ActionController::Base, ActionController::API].each do |resource|
-  resource.include ModelTokenAuth::ActsAsControllersAuthenticable
-end
+ActiveRecord::Base.include ModelTokenAuth::ActsAsModelAuthenticable

data/lib/model_token_auth/acts_as_controller_authenticable.rb

@@ -0,0 +1,9 @@
+require 'model_token_auth/controllers_auth'
+
+module ModelTokenAuth
+  module ActsAsControllerAuthenticable
+    def acts_as_controller_authenticable
+      include ModelTokenAuth::ControllersAuth
+    end
+  end
+end

data/lib/model_token_auth/version.rb

@@ -1,3 +1,3 @@
 module ModelTokenAuth
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_token_auth
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Armando Alejandre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -138,7 +138,7 @@ files:
 - lib/generators/access_token/templates/migration.rb
 - lib/model_token_auth.rb
 - lib/model_token_auth/access_tokens_config.rb
-- lib/model_token_auth/acts_as_controllers_authenticable.rb
+- lib/model_token_auth/acts_as_controller_authenticable.rb
 - lib/model_token_auth/acts_as_model_authenticable.rb
 - lib/model_token_auth/controllers_auth.rb
 - lib/model_token_auth/railtie.rb

data/lib/model_token_auth/acts_as_controllers_authenticable.rb

@@ -1,13 +0,0 @@
-require 'model_token_auth/controllers_auth'
-
-module ModelTokenAuth
-  module ActsAsControllersAuthenticable
-    extend ActiveSupport::Concern
-
-    class_methods do
-      def acts_as_controller_authenticable
-        superclass.include ModelTokenAuth::ControllersAuth
-      end
-    end
-  end
-end