touth 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb6f3f37d102cc22a9be19c43f1d56a174b32ed1
-  data.tar.gz: f691dac5c428d62b7077ffdaa09eaa0df4ba29a1
+  metadata.gz: 469a3737bb35a3a5c9b14d4af257e0a2c7d2e0f6
+  data.tar.gz: 630d22bfbd1c42c70a376555826ec1e4aac5a585
 SHA512:
-  metadata.gz: 2d166f9d6c80bf09865253d54c67e9338eb7888566df916203e798a2ed1823c0143c4200dedfa0de9788e125e4537920591593bfacf430ba030388008668bd18
-  data.tar.gz: 4ac78b3026d68cc44331b71392e029e5bf54ca7d5241a72353cf045a8421e80bbed61a637b1aa294d05f79f159059ab7f3c349346c67174f9c6887cbaa274e67
+  metadata.gz: dfb8ea431513911ee94fa8df7997bf333b79dad68da0a3819fc5494981584693a2278c4f1600bc84e2d6043c4bb8d9ca91782b2b5b3011b25729fbfef79d30ae
+  data.tar.gz: ca035808f9b2fc84027c6a5fde3cbcbbf8ac2bf7937c3951cac4672184966b4d4057166955ff3bf267f23d0e73d0556fc4dd96983416f65c721e93ddb336d2fa

data/lib/touth.rb

@@ -1,6 +1,8 @@
 require 'active_support'
 
 
+#  Touth
+#-----------------------------------------------
 module Touth
 
   extend ActiveSupport::Autoload
@@ -54,4 +56,18 @@ module Touth
 
 end
 
+
+#  Setup
+#-----------------------------------------------
 Touth.setup
+
+
+#  Load
+#-----------------------------------------------
+ActiveSupport.on_load(:action_controller) do
+  extend Touth::ActionControllerSupport::ClassMethods
+  include Touth::ActionControllerSupport::InstanceMethods
+end
+ActiveSupport.on_load(:active_record) do
+  extend Touth::ActiveRecordSupport::ClassMethods
+end

data/lib/touth/action_controller_support.rb

@@ -31,20 +31,15 @@ module Touth
       def authenticate_token!
         token = request.headers[Touth.header_name]
 
-        if Authenticator.valid_access_token? token
+        unless token && Authenticator.valid_access_token?(token)
           render nothing: true, status: :unauthorized
           return false
         end
 
         model = Authenticator.get_model token
-        self.class.access_token_resources[model.name] = model
+        self.class.access_token_resources[model.class.name] = model
       end
 
     end
   end
 end
-
-ActiveSupport.on_load(:action_controller) do
-  extend Touth::ActionControllerSupport::ClassMethods
-  include Touth::ActionControllerSupport::InstanceMethods
-end

data/lib/touth/active_record_support.rb

@@ -21,7 +21,3 @@ module Touth
     end
   end
 end
-
-ActiveSupport.on_load(:active_record) do
-  extend Touth::ActiveRecordSupport::ClassMethods
-end

data/lib/touth/version.rb

@@ -1,3 +1,3 @@
 module Touth
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: touth
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yuki Iwanaga