tiddle 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca3f210e267f73c0e067d27533534c9c3f9c683
-  data.tar.gz: 460622c0502eb261e06b2cf617740ef500dbbbf0
+  metadata.gz: cfe845a06fabc2a40cd22474e1312ca1647b8c0d
+  data.tar.gz: b4fde58413f9050dae56a67864843b82de0f5fa5
 SHA512:
-  metadata.gz: 5d8b78acb6c499efa52fee1f38b639fc1541170badf1ecfbeafa9509677b856ef09a2921637b057f1aa6ba5c383fd5b4a7ebc76105053ff35f7ec2b03f48dd1e
-  data.tar.gz: 1b2f8360d54fb6fac59a42bc90d3340236fb10b7626465afa45ba66bdb6d402bf49d2b96f077f3c63e0493d9787d754f0cd8726ff562776c286f5570fa496e5a
+  metadata.gz: a348ea2217110695c94bab0d7a2133533854bd0e09d23aceec68cfcd6d51bf1796f4e3bc67755c18f64b7d834e2b3dda69e3320eb7bec7056df168b8cd14b4e8
+  data.tar.gz: a4fb1d612c2e9f675273b184544269de508138e8016f512baba57ac3c551f9e1c5e96e0ce96cbcbad6f999fc9aff61f160dd3d248d96db76770c7a07acf0dd49

data/lib/tiddle/strategy.rb

@@ -1,5 +1,6 @@
 require 'devise/strategies/authenticatable'
 require 'tiddle/model_name'
+require 'tiddle/token_issuer'
 
 module Devise
   module Strategies
@@ -11,11 +12,10 @@ module Devise
         resource = mapping.to.find_for_authentication(email: email_from_headers)
         return fail(:invalid_token) unless resource
 
-        resource.authentication_tokens.each do |token|
-          if Devise.secure_compare(token.body, token_from_headers)
-            touch_token(token)
-            return success!(resource)
-          end
+        token = Tiddle::TokenIssuer.build.find_token(resource, token_from_headers)
+        if (token)
+          touch_token(token)
+          return success!(resource)
         end
 
         fail(:invalid_token)

data/lib/tiddle/token_issuer.rb

@@ -23,10 +23,14 @@ module Tiddle
     end
 
     def expire_token(resource, request)
-      resource.authentication_tokens
-        .where(body: request.headers["X-#{ModelName.new.with_dashes(resource)}-TOKEN"])
-        .take!
-        .destroy
+      find_token(resource, request.headers["X-#{ModelName.new.with_dashes(resource)}-TOKEN"])
+        .try(:destroy)
+    end
+
+    def find_token(resource, token_from_headers)
+      resource.authentication_tokens.detect do |token|
+        Devise.secure_compare(token.body, token_from_headers)
+      end
     end
 
     def purge_old_tokens(resource)

data/lib/tiddle/version.rb

@@ -1,3 +1,3 @@
 module Tiddle
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'simplecov'
 require 'coveralls'
 

data/spec/tiddle_spec.rb

@@ -36,6 +36,25 @@ describe Tiddle do
     end
   end
 
+  describe "find_token" do
+
+    before do
+      @admin_user = AdminUser.create!(email: "test@example.com", password: "12345678")
+      @token = Tiddle.create_and_return_token(@admin_user, FakeRequest.new)
+    end
+
+    it "returns a token from the database" do
+      result = Tiddle::TokenIssuer.build.find_token(@admin_user, @token)
+      expect(result).to eq @admin_user.authentication_tokens.last
+    end
+
+    it 'only returns tokens belonging to the resource' do
+      other_user = AdminUser.create!(email: "test-other@example.com", password: "12345678")
+      result = Tiddle::TokenIssuer.build.find_token(other_user, @token)
+      expect(result).to be_nil
+    end
+  end
+
   describe "expire_token" do
 
     before do

data/tiddle.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1.0'
 
-  spec.add_dependency "devise", "~> 3.4.1"
+  spec.add_dependency "devise", ">= 3.4.1", "< 3.6"
   spec.add_dependency "activerecord", "~> 4.2.0"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: tiddle
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Adam Niedzielski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement