touth 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a982bb3f2804af9044cbc34c112d9e9169e2c060
-  data.tar.gz: 69d657f673a36d5145ce472dd03f83ef005f2ede
+  metadata.gz: f6424a7f72477d07f75e3d86466f63b7309767e3
+  data.tar.gz: ba296cbb722b4d902d5727dcd954987fc50b1c70
 SHA512:
-  metadata.gz: 01374f38683aafa8ea082f89e4a376fcf204ae116fa4416583f18480e7644250ec2e716dbd9c68be7f0d65dafa1a1f7866aa23850ac1d78301cfc4c10dee2615
-  data.tar.gz: d43b3269705ba47bef2ec31a2ed958a5bcade63732cf27ff840f7cb2a835de0818357cfa34d21d44c726ce8846694e22b90811e4c6a398a5372410ac9104f298
+  metadata.gz: 8fd354d81d7ac6b1c873d31241bc6043cfca190febe0d2d3acca887371463e6cec7ad74e8d3dbbaba1fff7097dd5296ee88288a9a14ca60f499004ea334fc773
+  data.tar.gz: 8eadb69151befd9645955bfad92273eb2c1178afdd1f491e5f1b4cb8bd97924b0ef6c0a3b67cc8564b878057aa7a1b8e369311cdce3c32ff27dbdfef0d81f25a

data/lib/touth.rb

@@ -1,7 +1,5 @@
 require 'active_support'
 
-require_relative 'touth/engine' if defined? Rails
-
 
 #  Touth
 #-----------------------------------------------
@@ -71,4 +69,3 @@ ActiveSupport.on_load(:action_controller) do
   extend Touth::ActionControllerSupport::ClassMethods
   include Touth::ActionControllerSupport::InstanceMethods
 end
-

data/lib/touth/action_controller_support.rb

@@ -6,11 +6,12 @@ module Touth
       mattr_accessor :token_authentication_on
 
       def token_authentication_for(scope)
-        name = scope.to_s
+        scope = scope.to_s
+        name = scope.gsub('::', '_').underscore
 
         self.token_authentication_on = {
-          model_class: name.camelize.constantize,
-          current:     nil,
+          class:   scope.camelize.constantize,
+          current: nil,
         }
 
         before_action :authenticate_entity_from_token!
@@ -41,7 +42,7 @@ module Touth
         id = token_authentication_header[:id]
 
         model = id.present? \
-          && self.class.token_authentication_on[:model_class].find(id)
+          && self.class.token_authentication_on[:class].find(id)
 
         unless model
           return token_authentication_error! :no_entity

data/lib/touth/acts_as_token_authenticatable.rb

@@ -4,13 +4,13 @@ module Touth
     def access_token(lifetime = Touth.access_token_lifetime)
       expires_at = Time.now.to_i + lifetime
 
-      "#{access_token_id(expires_at)}#{[expires_at].pack('V')}".unpack('H*')[0]
+      [access_token_id(expires_at), [expires_at].pack('V')].join.unpack('H*')[0]
     end
 
     def valid_access_token?(token)
       begin
         data = [token].pack 'H*'
-        token_id, timestamp = data[0..0x1f], data[0x20..-1]
+        token_id, timestamp = data.unpack 'A32A*'
         expires_at = timestamp.unpack('V')[0]
 
         access_token_id(expires_at) == token_id && Time.now.to_i < expires_at

data/lib/touth/version.rb

@@ -1,3 +1,3 @@
 module Touth
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: touth
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yuki Iwanaga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -74,7 +74,6 @@ files:
 - lib/touth/action_controller_support.rb
 - lib/touth/active_record_support.rb
 - lib/touth/acts_as_token_authenticatable.rb
-- lib/touth/engine.rb
 - lib/touth/version.rb
 - touth.gemspec
 homepage: https://github.com/creasty/touth

data/lib/touth/engine.rb

@@ -1,6 +0,0 @@
-require 'rails/engine'
-
-module ActsAsTaggableOn
-  class Engine < Rails::Engine
-  end
-end