cookies_manager 0.2.2 → 0.3.0

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.8.7@cookies_manager --create
+rvm use 1.9.2@cookies_manager --create

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+0.3.0   (May 04, 2012)
+
+* Adapted to Ruby 1.9.3 and Rails 3.2.3
+* Now using signed cookies to prevent tampering
+
 0.2.x (Nov 08, 2011)
 
 * Simplified usage: in reads operations, unpacks the data by default

data/Gemfile

@@ -2,3 +2,4 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in cookies_manager.gemspec
 gemspec
+

data/README.rdoc

@@ -4,16 +4,20 @@ CookiesManager is a simple tool that provides a convenient way to manage any kin
 - The data you store in the cookies is automatically marshalled, zipped, and base64-encoded.
 - The data you ask to retrieve from the cookies is read from a cache, which spares the need for reverse transformation as long as the cache is in sync with the cookies. When the cache is out of sync, CookiesManager automatically resynchronizes the cache by reading the data from the cookies and processing reverse transformation (base64-decoding, unzipping, unmarshalling).
 - The cache is defined somehow at the controller instance level. Thus, each HTTP request has its own cache for its whole lifetime.
+- Cookies are signed to prevent tampering.
 
 == Installation
 
-In <b>Rails 2</b>, add this to your environment.rb file.
+In <b>Rails 3</b>, add this to your environment.rb file.
 
-  config.gem "cookies_manager"
-
-Alternatively, you can install it as a plugin:
-
-  script/plugin install git@github.com:RStrike/CookiesManager.git
+  gem 'cookies_manager'
+  
+Then set a secret token in your config/secret_token.rb file.
+  # Your secret key for verifying the integrity of signed cookies.
+  # If you change this key, all old signed cookies will become invalid!
+  # Make sure the secret is at least 30 characters and all random,
+  # no regular words or you'll be exposed to dictionary attacks.
+  <Your Application Name>::Application.config.secret_token = 'your secret token' 
 
 == Getting started
 
@@ -55,16 +59,20 @@ than the session length, such as user display preferences.
 
 == Important notes
 
+- Do not store sensitive data in your cookies. Although all cookies are signed, those are not encrypted.
 - If your application is multi-threaded, using CookiesManager is threadsafe as long as your threads refer the same CookiesManager instance.
 - Unless you know what you are really doing, do not store large data in your cookies, since these are included in HTTP request headers.
 - Do not store model objects in cookies (nor in session). For more explanation, check {Ryan Bates's screencast about dangers of model in session}[http://railscasts.com/episodes/13-dangers-of-model-in-session].
+- If you really need to deal with an object, I recommend to store it in your database and set a simple related token in your the cookies.
 
 == Running the tests
 
 RSpec 2 is used for testing. To get the specs running, check {spec/README}[https://github.com/RStrike/CookiesManager/blob/master/spec/README.rdoc].
 
-== Coming up next
-- Adapt the gem to support Ruby 1.9.x and Rails 3.
+== Compatibility
+Tested on:
+- Ruby 1.9.3
+- Rails 3.2.3
 
 == Changes
 

data/cookies_manager.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'actionpack', '~> 2.3.14'
-  s.add_dependency 'aquarium', '~> 0.4.4'
-  s.add_development_dependency 'rspec', '~> 2.7.0'
+  s.add_dependency 'actionpack', '~> 3.2.3'
+  s.add_dependency 'activesupport', '~> 3.2.3'
+  s.add_development_dependency 'rspec', '~> 2.9.0'
   s.add_development_dependency 'rr', '~> 1.0.4'  
 end

data/lib/cookies_manager/base.rb

@@ -1,9 +1,6 @@
-require 'aquarium'
-
 module CookiesManager
   # The base class of CookiesManager 
   class Base
-    include Aquarium::DSL # AOP Filters are defined at the end of the class
     
     attr_accessor :cookies # The cookies hash to be based on
     
@@ -36,6 +33,7 @@ module CookiesManager
     # @return [Object] the data associated with the key 
     #
     def read(key, opts = {})
+      opts.symbolize_keys!
       result = nil
       getMutex(key).synchronize do
         result = read_from_cache_or_cookies(key, opts)  
@@ -68,12 +66,13 @@ module CookiesManager
     # @return [Integer] the number of bytes written in the cookies
     #
     def write(key, data, opts = {})
+      opts.symbolize_keys!
       unpacked_data = data
       data = pack(data) unless opts[:skip_pack]
       result = nil
       getMutex(key).synchronize do
         cache[key] ||= {}
-        result = cookies[key] = {:value => data}.merge(opts) # store the packed data in the cookies hash
+        result = cookies.signed[key] = {:value => data}.merge(opts) # store the packed data in the cookies hash
         cache[key][:unpacked_data] = unpacked_data # store the unpacked data in the cache for fast read in the read method
         cache[key][:packed_data] = data # store the packed data in the cache for fast change diff in the read method
       end
@@ -93,6 +92,7 @@ module CookiesManager
     # @return (see #read) 
     #
     def delete(key, opts = {})
+      opts.symbolize_keys!
       result = nil
       getMutex(key).synchronize do
         result = read_from_cache_or_cookies(key, opts)
@@ -121,7 +121,7 @@ module CookiesManager
     # reads from the cache if in sync. Otherwise, reads from the cookies and resynchronizes the cache for the given key
     def read_from_cache_or_cookies(key, opts)
       result = nil
-      data_from_cookies = cookies[key]
+      data_from_cookies = cookies.signed[key]
       cache[key] ||= {}
       if cache[key][:packed_data] == data_from_cookies # checks whether cache is in sync with cookies
         result = cache[key][:unpacked_data] # reads from cache
@@ -145,28 +145,9 @@ module CookiesManager
     end
 
     def unpack(data)
-      Marshal.load(ActiveSupport::Gzip.decompress(Base64.decode64(data)))
+      Marshal.load(ActiveSupport::Gzip.decompress(Base64.decode64(data))) unless data.nil?
     end    
     
-    #=================#
-    #== AOP Filters ==#
-    #=================#
-    
-    # Since Aquarium sets the arities of observered methods to -1, we need to save the methods arities in a hash declared as a class variable
-    self.instance_methods(false).each { |method| (@method_arities ||= {})[method.to_sym] = instance_method(method).arity }
-    
-    around :methods => [:read, :write, :delete] do |join_point, object, *args|
-      key = (args[0] = args[0].to_s) # we should stick with string keys since the cookies hash does not support indifferent access (i.e. :foo and "foo" are different keys), although this has changed in rails 3.1
-      opts = args[last_arg_index(join_point.method_name)] # retrieve the options arg (last argument)
-      opts.symbolize_keys! if opts.is_a?(Hash)
-      join_point.proceed(*args)
-    end
-
-    # Returns the index of the last arg in the method signature
-    def self.last_arg_index(method_name)
-      instance_eval { @method_arities[method_name] }.abs - 1
-    end
-    
   end
     
 end

data/lib/cookies_manager/controller_additions.rb

@@ -4,26 +4,40 @@ module CookiesManager
   # It is automatically extended by all controllers.
   module ControllerAdditions
     
-    # Sets up a before filter that creates a new CookiesManager into an instance variable,   
-    # which is made available to all views through the +cookies_manager+ helper method.
-    #
-    # You can call this method on your controller class as follows:
-    #
-    #   class YourController < ApplicationController
-    #     load_cookies_manager
-    #   
-    def load_cookies_manager
-      self.before_filter do |controller|
-        # defines a CookiesManager instance variable, based on the cookies hash
-        controller.instance_variable_set(:@_cookies_manager, CookiesManager::Base.new(controller.instance_eval { cookies } ))
-        # wraps the instance variable in a the +cookies_manager+ method
-        define_method :cookies_manager, proc { controller.instance_variable_get(:@_cookies_manager) }
-        # makes the +cookies_manager+ method available to all views as a helper method
-        helper_method :cookies_manager
+    module ClassMethods
+      # Sets up a before filter that creates a new CookiesManager into an instance variable,   
+      # which is made available to all views through the +cookies_manager+ helper method.
+      #
+      # You can call this method on your controller class as follows:
+      #
+      #   class YourController < ApplicationController
+      #     load_cookies_manager
+      #   
+      def load_cookies_manager
+        before_filter :build_cookies_manager
       end
     end
+    
+    # Builds a cookies manager as a controller instance variable, made available to all views
+    def build_cookies_manager
+      # defines a CookiesManager instance variable, based on the cookies hash
+      @_cookies_manager = CookiesManager::Base.new(cookies)
+      # wraps the instance variable in the +cookies_manager+ instance method
+      define_singleton_method :cookies_manager, proc { @_cookies_manager }
+      # makes the +cookies_manager+ method available to all views as a helper method
+      self.class.helper_method :cookies_manager
+    end
+    
+    def self.included(base)
+      base.extend ClassMethods
+    end
+        
   end
 end
 
-# Automatically add all ControllerAdditions methods to controller classes as class methods 
-ActionController::Base.extend CookiesManager::ControllerAdditions
+# Automatically add all ControllerAdditions methods to controllers 
+if defined? ActionController
+  ActionController::Base.class_eval do
+    include CookiesManager::ControllerAdditions
+  end
+end

data/lib/cookies_manager/version.rb

@@ -1,3 +1,3 @@
 module CookiesManager
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/README.rdoc

@@ -8,14 +8,7 @@
   bundle
   rake
 
-Some of the specs, covering race conditions in multithreaded contexts, pause in purpose some threads for a few seconds through AOP to test critical sections. Those "slow" tests can be easily skipped by passing +skip_slow+ as an argument to the +rake+ command:
-
-  rake skip_slow
-
-However, I recommend running all the specs whenever you change the code.
-
 == Ruby versions
 
-Currently, the specs require Ruby 1.8.7.
+Currently, the specs require Ruby 1.9.3
 
-Ruby 1.9.x support is coming up next.  

data/spec/cookies_manager/base_spec.rb

@@ -12,7 +12,6 @@ module MacrosForCookiesManager
 end
 
 include MacrosForCookiesManager
-include Aquarium::Aspects
 
 describe CookiesManager::Base do
   before(:all) do
@@ -26,41 +25,37 @@ describe CookiesManager::Base do
   describe "#write" do
     describe "#write + pack data" do
       context "when write complex data" do
-        before { @bytesize = subject.write('my_key', @complex_data) }
-        specify { @bytesize.should == pack(@complex_data).bytesize }
-        specify { unpack(cookies['my_key']).should eql @complex_data }      
+        before { subject.write('my_key', @complex_data) }
+        specify { unpack(cookies.signed['my_key']).should eql @complex_data }      
       end    
       context "when write nil value" do
-        before { @bytesize = subject.write('my_key', nil) }
-        specify { @bytesize.should == pack(nil).bytesize }
-        specify { unpack(cookies['my_key']).should be_nil}
+        before { subject.write('my_key', nil) }
+        specify { unpack(cookies.signed['my_key']).should be_nil}
       end
     end
     describe "write without packing data" do
       context "when write simple data" do
-        before { @bytesize = subject.write('my_key', @simple_data, :skip_pack => true) }
-        specify { @bytesize.should == @simple_data.bytesize }
-        specify { cookies['my_key'].should eql @simple_data }
+        before { subject.write('my_key', @simple_data, :skip_pack => true) }
+        specify { cookies.signed['my_key'].should eql @simple_data }
       end
       context "when write nil value" do
-        before { @bytesize = subject.write('my_key', nil, :skip_pack => true) }
-        specify { @bytesize.should == 0 }
-        specify { cookies['my_key'].should be_nil}
+        before { subject.write('my_key', nil, :skip_pack => true) }
+        specify { cookies.signed['my_key'].should be_nil}
       end
     end
     describe "#write + set expiration date" do
       before { subject.write(@key = 'my_key', @complex_data, :expires => (@expiration_date = 2.hours.from_now)) }
-      specify { Time.parse(cookies.controller.response["Set-Cookie"].select { |cookie_str|  cookie_str =~ /\A#{@key}=/ }.last[/expires=(.*?)(;|\Z)/, 1]).to_i.should == @expiration_date.to_i } #parse the expiration date from the cookies string in the response header using some simple non-greedy regex and convert it to epochs to test the time equality. This conversion technique works only for timestamps between 1901-12-13 and 2038-01-19, but is acceptable for our tests.        
+      specify { cookies.instance_eval {@set_cookies['my_key'][:expires]}.should == @expiration_date }        
     end
     describe "#write with nil key" do
       before { subject.write(nil, @complex_data) }
-      specify { unpack(cookies[nil]).should eql @complex_data }
-      specify { unpack(cookies['']).should eql @complex_data }
+      specify { unpack(cookies.signed[nil]).should eql @complex_data }
+      specify { unpack(cookies.signed['']).should eql @complex_data }
     end
     describe "#write with empty string key" do
       before { subject.write('', @complex_data) }
-      specify { unpack(cookies[nil]).should eql @complex_data }
-      specify { unpack(cookies['']).should eql @complex_data }
+      specify { unpack(cookies.signed[nil]).should eql @complex_data }
+      specify { unpack(cookies.signed['']).should eql @complex_data }
     end
   end
   
@@ -85,20 +80,20 @@ describe CookiesManager::Base do
     end
     describe "#read some data previously stored directly into the cookies hash" do
       context "when reading non-nil data" do
-        before { cookies['my_key'] = {:value => @complex_data} }
+        before { cookies.signed['my_key'] = {:value => @complex_data} }
         specify { subject.read('my_key', :skip_unpack => true).should eql @complex_data }
       end
       context "when reading a nil value" do
-        before { cookies['my_key'] = {:value => nil } }
+        before { cookies.signed['my_key'] = {:value => nil } }
         specify { subject.read('my_key').should be_nil }
       end
       context "when reading some data stored with a nil key" do
-        before { cookies[nil] = {:value => @complex_data} }
+        before { cookies.signed[nil] = {:value => @complex_data} }
         specify { subject.read(nil, :skip_unpack => true).should eql @complex_data }
         specify { subject.read('', :skip_unpack => true).should eql @complex_data }
       end
       context "when reading some data stored with an empty string key" do
-        before { cookies[''] = {:value => @complex_data} }
+        before { cookies.signed[''] = {:value => @complex_data} }
         specify { subject.read(nil, :skip_unpack => true).should eql @complex_data }
         specify { subject.read('', :skip_unpack => true).should eql @complex_data }
       end
@@ -107,7 +102,7 @@ describe CookiesManager::Base do
       context "when read some simple data" do
         before do
           subject.write('my_key', @simple_data)
-          cookies['my_key'] = {:value => (@new_simple_data = "some new data")}
+          cookies.signed['my_key'] = {:value => (@new_simple_data = "some new data")}
         end
         specify { subject.read('my_key', :skip_unpack => true).should eql @new_simple_data }
       end
@@ -115,7 +110,7 @@ describe CookiesManager::Base do
         before do
           subject.write('my_key', @complex_data)
           @new_complex_data = @complex_data.merge(:some_new_item => 'it modifies the data')
-          cookies['my_key'] = {:value => pack(@new_complex_data)}
+          cookies.signed['my_key'] = {:value => pack(@new_complex_data)}
         end
         specify { subject.read('my_key').should eql @new_complex_data }
         specify { unpack(subject.read('my_key', :skip_unpack => true)).should eql @new_complex_data } #if :skip_unpack option is set, we need to unpack the data manually
@@ -125,7 +120,7 @@ describe CookiesManager::Base do
       shared_examples_for "reading with indifferent access key" do
         specify { subject.read(:my_key).should eql @complex_data }  
         specify { subject.read('my_key').should eql @complex_data }
-        specify { unpack(cookies['my_key']).should eql @complex_data }
+        specify { unpack(cookies.signed['my_key']).should eql @complex_data }
       end
       context "when data has been written with a key of type symbol" do
         before { subject.write(:my_key, @complex_data) }
@@ -150,7 +145,7 @@ describe CookiesManager::Base do
         it_should_behave_like "when deleting existing data"
       end
       context "when data has been previously stored directly into the cookies hash" do
-        before { cookies['my_key'] = {:value => @complex_data} }
+        before { cookies.signed['my_key'] = {:value => @complex_data} }
         it_should_behave_like "when deleting existing data"
       end
     end
@@ -186,7 +181,7 @@ describe CookiesManager::Base do
   
   describe "#symbol/string indifferent keys in options hash" do
     describe "#read" do
-      before { cookies['my_key'] = pack(@complex_data) }
+      before { cookies.signed['my_key'] = pack(@complex_data) }
       specify { subject.read('my_key', :unpack => true).should eql @complex_data }
       specify { subject.read('my_key', 'unpack' => true).should eql @complex_data }
     end
@@ -195,11 +190,11 @@ describe CookiesManager::Base do
         subject.write('key1', @simple_data, :skip_pack => true)
         subject.write('key2', @simple_data, 'skip_pack' => true)
       end
-      specify { cookies['key1'].should eql @simple_data }
-      specify { cookies['key2'].should eql @simple_data }
+      specify { cookies.signed['key1'].should eql @simple_data }
+      specify { cookies.signed['key2'].should eql @simple_data }
     end
     describe "#delete" do
-      before { cookies['my_key'] = pack(@complex_data) }
+      before { cookies.signed['my_key'] = pack(@complex_data) }
       specify { subject.delete('my_key', :unpack => true).should eql @complex_data }
       specify { subject.delete('my_key', 'unpack' => true).should eql @complex_data }
     end
@@ -217,16 +212,16 @@ describe CookiesManager::Base do
     describe "#cache in sync with the cookies" do
       describe "#accessing some data that has been read at least once by the CookiesManager" do
         before do
-          cookies['my_key'] = pack(@complex_data)
-          subject.read('my_key').should eql @complex_data # this should store the data in the cache, thus sparing the need for future unmarshalling
-          dont_allow(Marshal).load # this makes sure unmarshalling is never done (i.e. the cache is used)
+          cookies.signed['my_key'] = pack(@complex_data)
+          subject.read('my_key').should eql @complex_data # this should store the data in the cache, thus sparing the need for future unpacking
+          dont_allow(subject).unpack # this makes sure unpacking is never done (i.e. the cache is used)
         end
         it_should_behave_like 'when accessing the data'
       end 
       describe "#accessing some data that has been written through the CookiesManager" do
         before do
-          subject.write('my_key', @complex_data) # this should store the data in the cache, thus sparing the need for future unmarshalling
-          dont_allow(Marshal).load # this makes sure unmarshalling is never done (i.e. the cache is used)
+          subject.write('my_key', @complex_data) # this should store the data in the cache, thus sparing the need for future unpacking
+          dont_allow(subject).unpack # this makes sure unpacking is never done (i.e. the cache is used)
         end 
         it_should_behave_like 'when accessing the data'
       end
@@ -234,129 +229,30 @@ describe CookiesManager::Base do
     describe "#cache out of sync" do
       before do
         subject.write('my_key', @original_data = ['my', 'original', 'array'])
-        cookies['my_key'] = pack(@complex_data) # this causes the cache to be out of sync, thus causing future reads to unmarshall the data from the cookies 
-        mock.proxy(Marshal).load.with_any_args # this makes sure unmarshalling is invoked
+        cookies.signed['my_key'] = pack(@complex_data) # this causes the cache to be out of sync, thus causing future reads to unmarshall the data from the cookies 
+        mock.proxy(subject).unpack.with_any_args # this makes sure unpacking is invoked
       end
       it_should_behave_like 'when accessing the data'      
       describe "#automatic cache resynchronization on read" do
         before do 
-          subject.read('my_key').should eql @complex_data # this causes unmarshalling, and cache resynchronization
-          dont_allow(Marshal).load # this makes sure we don't unmarshall anymore at this point (i.e. the cache is now in sync and can be used)
+          subject.read('my_key').should eql @complex_data # this causes unpacking, and cache resynchronization
+          dont_allow(subject).unpack # this makes sure we don't unmarshall anymore at this point (i.e. the cache is now in sync and can be used)
         end 
         specify { subject.read('my_key').should eql @complex_data}
       end
     end  
   end
   
-  describe "#multi-threading", :slow do
-    def print_inside_critical_section(method_name)
-      p "Inside the critical section, when calling cookies#{method_name}, the #{thread_name} thread pauses for #{sleep(2)} seconds, to make the other thread wait at the entrance of the critical section..."
-    end  
-    
-    def print_wait_before_action(action)
-      p "Before calling ##{action}, wait for #{sleep(1)} seconds to let the #{thread_name} thread lock the critical section..."
-    end
-    
-    def run_thread
-      Thread.new do
-        Thread.current["name"] = thread_name
-        yield
-      end      
-    end
-    
-    def build_aspect(method_name)
-      Aspect.new :around, :calls_to => method_name, :on_objects => subject.cookies do |join_point, object, *args|          
-        print_inside_critical_section(join_point.method_name) if Thread.current["name"] == thread_name
-        join_point.proceed
-      end      
-    end
-  
-    before { subject.write('my_key', @original_data = 'original data') }
-    after { @aspect.unadvise }
-    
-    describe "#a thread is reading with a key" do
-      let(:thread_name) { :reader }
-      before do
-        @aspect = build_aspect('[]')
-        @reader = run_thread { @result = subject.read('my_key') }
-      end
-      shared_examples_for 'when another thread wants to access the data with the same key while reading' do
-        it "should wait until the reader finishes reading" do
-          @reader.join
-          @result.should eql @original_data
-        end
-      end
-      context "when another thread wants to write some new data with the same key" do
-        before do
-          print_wait_before_action(:write)
-          subject.write('my_key', @complex_data)
-        end
-        it_should_behave_like 'when another thread wants to access the data with the same key while reading'
-      end
-      context "when another thread wants to delete with the same key" do
-        before do
-          print_wait_before_action(:delete)
-          subject.delete('my_key')
-        end
-        it_should_behave_like 'when another thread wants to access the data with the same key while reading'
-      end      
-    end
-    describe "#a thread is writing with a key" do
-      let(:thread_name) { :writer }
+  describe "#cookies tampering" do
+    describe "#when tampering a cookie value" do
       before do
-        @aspect = build_aspect('[]=')
-        @writer = run_thread { subject.write('my_key', @complex_data) }
+        subject.write('my_key', @complex_data)
+        cookies['my_key'] = 'some new value' # note that we intentionally don't call the method 'signed' on the cookies hash in order to tamper the cookies 
       end
-      shared_examples_for 'when another thread wants to access the data with the same key while writing' do
-        it 'should wait until the writer finishes writing' do
-          @writer.join
-          @result.should eql @complex_data
-        end
-      end
-      context "when another thread wants to read with same key" do
-        before do
-          print_wait_before_action(:read)
-          @result = subject.read('my_key')
-        end
-        it_should_behave_like 'when another thread wants to access the data with the same key while writing'
-      end
-      context "when another thread wants to delete with the same key" do
-        before do
-          print_wait_before_action(:delete)
-          @result = subject.delete('my_key')
-        end
-        it_should_behave_like 'when another thread wants to access the data with the same key while writing'
-      end      
+      specify { subject.read('my_key').should be_nil}
     end
-    describe "#a thread is deleting with a key" do
-      let(:thread_name) { :deletor }
-      before do
-        @aspect = build_aspect(:delete)
-        @deletor = run_thread { @delete_result = subject.delete('my_key') }
-      end
-      shared_examples_for 'when another thread wants to access the data with the same key while deleting' do
-        it 'should wait until the deletor finishes deleting' do
-          @deletor.join
-          @delete_result.should eql @original_data
-        end        
-      end
-      context "when another thread wants to read with the same key" do
-        before do
-          print_wait_before_action(:read)
-          @read_result = subject.read('my_key')
-        end
-        it_should_behave_like 'when another thread wants to access the data with the same key while deleting'
-        specify { @read_result.should be_nil }
-      end
-      context "when another thread wants to write with the same key" do
-        before do
-          print_wait_before_action(:write)
-          subject.write('my_key', @complex_data)
-        end
-        it_should_behave_like 'when another thread wants to access the data with the same key while deleting'
-      end      
-    end
-  end
+  end  
+  
   
 end
 

data/spec/cookies_manager/controller_additions_spec.rb

@@ -5,7 +5,7 @@ describe CookiesManager::ControllerAdditions do
   context "when calling the class method :load_cookies_manager on the controller class" do
     before do
       mock(TestController).helper_method(:cookies_manager) # makes sure the :cookies_manager method is declared as a helper (to make it available to the views, for example)
-      mock(TestController).before_filter { |block| block.call(controller) } # makes sure a before_filter is set AND runs the filter block with our controller as an argument
+      mock(TestController).before_filter(:build_cookies_manager) { controller.build_cookies_manager } # makes sure a before_filter is set AND calls the related method on our controller instance
       TestController.load_cookies_manager # the class method we want to test
     end
     it "should create a :cookies_manager instance method" do

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require 'rubygems'
 require 'bundler/setup'
 require 'action_controller'
+require 'active_support/all'
 Bundler.require(:default)
 
 RSpec.configure do |config|
@@ -11,19 +11,11 @@ RSpec.configure do |config|
   config.mock_with :rr
 end
 
- # A test controller with a cookies hash (this works in rails 2.3.14 but needs to be adapted for versions of rails >= 3.x.x)
 class TestController < ActionController::Base
 
-  def request 
-    @request ||= ActionController::Request.new('test')
-  end
-  
-  def response
-    @response ||= ActionController::Response.new
-  end  
-  
-  def initialize
-    self.cookies = ActionController::CookieJar.new(self)
+  def initialize(*args)
+    super(*args)
+    self.cookies = ActionDispatch::Cookies::CookieJar.new('b57121a9239fe9e55d46c534c7af7218')
   end
   
   protected

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: cookies_manager
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Christophe Levand
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 +01:00
+date: 2012-05-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,28 +21,18 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 3
-        - 14
-        version: 2.3.14
+        version: 3.2.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: aquarium
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 4
-        - 4
-        version: 0.4.4
+        version: 3.2.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
+        version: 2.9.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,11 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 0
-        - 4
         version: 1.0.4
   type: :development
   version_requirements: *id004
@@ -124,18 +99,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []