devise_masquerade 0.0.8 → 0.0.9

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - "1.9.2"
   - "1.9.3"
 

data/lib/devise_masquerade/model.rb

@@ -1,26 +1,41 @@
 module Devise
   module Models
     module Masqueradable
-      extend ActiveSupport::Concern
+      def self.included(base)
+        base.class_eval do
+          attr_reader :masquerade_key
 
-      included do
-        attr_reader :masquerade_key
+          include InstanceMethods
+          extend ClassMethods
+        end
+      end
 
+      module InstanceMethods
         def masquerade!
           @masquerade_key = SecureRandom.base64(Devise.masquerade_key_size)
 
           Rails.cache.write("#{self.class.name.pluralize.downcase}:#{@masquerade_key}:masquerade", id, :expires_in => Devise.masquerade_expires_in)
         end
+      end
+
+      module ClassMethods
+        def cache_masquerade_key_by(key)
+          "#{self.name.pluralize.downcase}:#{key}:masquerade"
+        end
+
+        def remove_masquerade_key!(key)
+          Rails.cache.delete(cache_masquerade_key_by(key))
+        end
 
-        def self.find_by_masquerade_key(key)
-          id = Rails.cache.read("#{self.name.pluralize.downcase}:#{key}:masquerade")
+        def find_by_masquerade_key(key)
+          id = Rails.cache.read(cache_masquerade_key_by(key))
 
           # clean up the cached masquerade key value
-          Rails.cache.write("#{self.name.pluralize.downcase}:#{key}:masquerade", nil)
+          remove_masquerade_key!(key)
 
-          self.find_by_id(id)
+          find_by_id(id)
         end
-      end
+      end # ClassMethods
     end
   end
 end

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/models/user_spec.rb

@@ -6,8 +6,21 @@ describe User do
   describe '#masquerade!' do
     it 'should cache special key on masquerade' do
       SecureRandom.should_receive(:base64).with(16).and_return("secure_key")
+      user.masquerade!
+    end
+  end
 
+  describe '#remove_masquerade_key' do
+    before { SecureRandom.stub(:base64).and_return("secure_key") }
+
+    let(:key) { 'users:secure_key:masquerade' }
+
+    it 'should be possible to remove cached masquerade key' do
       user.masquerade!
+      expect(Rails.cache.exist?(key)).to be_true
+
+      User.remove_masquerade_key!('secure_key')
+      expect(Rails.cache.exist?(key)).to be_false
     end
   end
 
@@ -16,7 +29,7 @@ describe User do
       user.masquerade!
 
       Rails.cache.should_receive(:read).with("users:#{user.masquerade_key}:masquerade").and_return(user.id)
-      Rails.cache.should_receive(:write).with("users:#{user.masquerade_key}:masquerade", nil)
+      Rails.cache.should_receive(:delete).with("users:#{user.masquerade_key}:masquerade")
 
       new_user = User.find_by_masquerade_key(user.masquerade_key)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4505805506761439122
+      hash: 3658538405332268443
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4505805506761439122
+      hash: 3658538405332268443
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25