action_controller_tweaks 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18d5ac685043630bc71743acdbdfa01954ca26d
-  data.tar.gz: decb6e92a43ee69c13b753d1fe7ba350011aea9b
+  metadata.gz: feadb1e4e2545cb5b2adc42b4ce47aeef0955947
+  data.tar.gz: a0e5eb6fbf78fb8fec5d37a303d836c19dbbc67c
 SHA512:
-  metadata.gz: 218dc267dee725e8084a96c09ed05403ea2b6591a9b3ad438349f3584fe5499a635e6d46c204cd5f1731d3e01015bfc95fd639b41c04ce856b7d28acac7e404e
-  data.tar.gz: ffae98b515dd4d3ac1068c87e484e5b32b9cd47e8abbccfb5a780bf28e108879849c37a842ce654592d5ee52416b0fa33a7ec1b8a3140a1fbc6e3fdc87f02c1e
+  metadata.gz: 4367c9a17979a053bbb94a16022fdfeb2f491e66028e53fa856e3f048323ce0d182ca1052fe7cdb2d62f0b4726ce4ed12f9effaeeb28ee99a19b739073ce118c
+  data.tar.gz: eb0f9cafd5ea2274e88bfe04899da73966508f919907d25ec2593c568d45241ea7abd99d17d8ebfc66edd46d32d124274e1a8b5a836f5e5267f9573ac841fe05

data/.gitignore

@@ -1,2 +1,7 @@
-gemfiles/*.gemfile.lock
 Gemfile.lock
+# Ignore Coverage Report
+coverage/.last_run.json
+coverage/.resultset.json
+# Ignore Appraisal related files
+gemfiles/*.gemfile.lock
+pkg/*

data/.travis.yml

@@ -2,16 +2,18 @@ language: ruby
 cache:
 - bundler
 rvm:
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
+  - 2.0
+  - 2.1
+  - 2.2
+  - ruby-head
 gemfile:
-  - gemfiles/rails3_2.gemfile
-  - gemfiles/rails4_0.gemfile
+  - gemfiles/rails_3_2.gemfile
+  - gemfiles/rails_4_0.gemfile
+  - gemfiles/rails_4_1.gemfile
+  - gemfiles/rails_4_2.gemfile
 matrix:
-  exclude:
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails4_0.gemfile
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
 

data/Appraisals

@@ -1,14 +1,32 @@
 
-appraise "rails3-2" do
-  version = "3.2.17"
+appraise "rails_3_2" do
+  version = "~> 3.2.20"
   gem 'activesupport', version
   gem 'actionpack', version
   gem 'activerecord', version
+  gem 'railties', version
 end
 
-appraise "rails4-0" do
-  version = "4.0.3"
+appraise "rails_4_0" do
+  version = "~> 4.0.12"
   gem 'activesupport', version
   gem 'actionpack', version
   gem 'activerecord', version
+  gem 'railties', version
+end
+
+appraise "rails_4_1" do
+  version = "~> 4.1.8"
+  gem 'activesupport', version
+  gem 'actionpack', version
+  gem 'activerecord', version
+  gem 'railties', version
+end
+
+appraise "rails_4_2" do
+  version = "~> 4.2.0"
+  gem 'activesupport', version
+  gem 'actionpack', version
+  gem 'activerecord', version
+  gem 'railties', version
 end

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ### Changelog
 
 
+- **0.3.1**
+  - Fix session key still gets deleted when no option is set
+  - Fix options not passed to `#set_session` when `#set_session_with_expiry` is called
+
 - **0.3.0**
   - Add method `#set_session_with_expiry`
   - Add option `expires_in` and `expires_at` to #set_session

data/README.md

@@ -5,15 +5,12 @@ ActionController is great, but could be better. Here are some tweaks for it.
 
 ### Support
 ===========
-Tested against:
-- Action Controller of version `3.2` and `4.0` (`3.1` and below got problem with buggy `rspec-rails`)
-- Ruby `1.9.2`, `1.9.3`, `2.0.0` (except Rails 4 with `1.9.2`)
 
-[![Build Status](http://img.shields.io/travis/PikachuEXE/action_controller_tweaks.svg)](https://travis-ci.org/PikachuEXE/action_controller_tweaks)
-[![Gem Version](http://img.shields.io/gem/v/action_controller_tweaks.svg)](http://badge.fury.io/rb/action_controller_tweaks)
-[![Dependency Status](http://img.shields.io/gemnasium/PikachuEXE/action_controller_tweaks.svg)](https://gemnasium.com/PikachuEXE/action_controller_tweaks)
-[![Coverage Status](http://img.shields.io/coveralls/PikachuEXE/action_controller_tweaks.svg)](https://coveralls.io/r/PikachuEXE/action_controller_tweaks)
-[![Code Climate](http://img.shields.io/codeclimate/github/PikachuEXE/action_controller_tweaks.svg)](https://codeclimate.com/github/PikachuEXE/action_controller_tweaks)
+[![Build Status](http://img.shields.io/travis/PikachuEXE/action_controller_tweaks.svg?style=flat-square)](https://travis-ci.org/PikachuEXE/action_controller_tweaks)
+[![Gem Version](http://img.shields.io/gem/v/action_controller_tweaks.svg?style=flat-square)](http://badge.fury.io/rb/action_controller_tweaks)
+[![Dependency Status](http://img.shields.io/gemnasium/PikachuEXE/action_controller_tweaks.svg?style=flat-square)](https://gemnasium.com/PikachuEXE/action_controller_tweaks)
+[![Coverage Status](http://img.shields.io/coveralls/PikachuEXE/action_controller_tweaks.svg?style=flat-square)](https://coveralls.io/r/PikachuEXE/action_controller_tweaks)
+[![Code Climate](http://img.shields.io/codeclimate/github/PikachuEXE/action_controller_tweaks.svg?style=flat-square)](https://codeclimate.com/github/PikachuEXE/action_controller_tweaks)
 
 Install
 =======

data/Rakefile

@@ -8,7 +8,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
   task :default do
-    sh "rake appraisal:install && rake appraisal spec"
+    sh "appraisal install && rake appraisal spec"
   end
 else
   task :default => :spec

data/action_controller_tweaks.gemspec

@@ -31,14 +31,17 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake", ">= 0.9.2"
-  s.add_development_dependency "appraisal", ">= 0.5.2"
-  s.add_development_dependency "rspec-rails", "~> 2.6"
+  s.add_development_dependency "appraisal", "~> 1.0"
+  s.add_development_dependency "rspec-rails", "~> 3.0"
+  s.add_development_dependency "rspec-its", "~> 1.0"
   s.add_development_dependency "activerecord", ">= 3.2.0", "< 5.0.0" # rspec-rails needs activerecord...
   s.add_development_dependency "sqlite3", ">= 1.3"
   s.add_development_dependency "database_cleaner", ">= 1.0"
   s.add_development_dependency "timecop", ">= 0.6"
   s.add_development_dependency "coveralls", ">= 0.7"
   s.add_development_dependency "gem-release", ">= 0.7"
+  # This is for rails < 4.1 on MRI 2.2 (and other later version I suppose)
+  s.add_development_dependency "test-unit", ">= 3.0.0"
 
   s.required_rubygems_version = ">= 1.4.0"
 end

data/gemfiles/rails_3_2.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 3.2.20"
+gem "actionpack", "~> 3.2.20"
+gem "activerecord", "~> 3.2.20"
+gem "railties", "~> 3.2.20"
+
+gemspec :path => "../"

data/gemfiles/rails_4_0.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.0.12"
+gem "actionpack", "~> 4.0.12"
+gem "activerecord", "~> 4.0.12"
+gem "railties", "~> 4.0.12"
+
+gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.1.8"
+gem "actionpack", "~> 4.1.8"
+gem "activerecord", "~> 4.1.8"
+gem "railties", "~> 4.1.8"
+
+gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.2.0"
+gem "actionpack", "~> 4.2.0"
+gem "activerecord", "~> 4.2.0"
+gem "railties", "~> 4.2.0"
+
+gemspec :path => "../"

data/lib/action_controller_tweaks/session.rb

@@ -37,34 +37,13 @@ module ActionControllerTweaks
       # @option expires_at [Integer] What time should the session value be expired (using a time in the past would expire at next request)
       # @option expire_at [Integer] same as `expires_at`
       def set_session(key, value, options = {})
-        options.symbolize_keys!
-
         if RESERVED_SESSION_KEYS.include?(key.to_s)
           raise Errors::ReservedSessionKeyConflict.new, "you are trying to set #{value} to #{key}, but reserved by ActionControllerTweaks::Session"
         end
 
         session[key] = value
 
-        # Set special session
-        new_session_keys_to_expire = session_keys_to_expire
-
-        expires_in = options.delete(:expires_in) || options.delete(:expire_in)
-        expires_at = options.delete(:expires_at) || options.delete(:expire_at)
-
-        if expires_at && expires_at.respond_to?(:to_time)
-          expires_at = expires_at.to_time
-        end
-
-        raise InvalidOptionValue.new(:expires_in, expires_in, Numeric) if expires_in && !expires_in.is_a?(Numeric)
-        raise InvalidOptionValue.new(:expires_at, expires_at, Time) if expires_at && !expires_at.is_a?(Time)
-
-        new_session_keys_to_expire[key] = if expires_in
-          expires_in.from_now
-        elsif expires_at
-          expires_at
-        end
-
-        session[:session_keys_to_expire] = new_session_keys_to_expire
+        session[:session_keys_to_expire] = new_session_keys_to_expire(key, options)
       end
 
       # set value in session just like `set_session`, but checked option keys
@@ -78,7 +57,7 @@ module ActionControllerTweaks
         invalid_option_key_absent = (option_keys - VALID_OPTION_KEYS.dup).empty?
         (required_option_key_present && invalid_option_key_absent) or raise ActionControllerTweaks::Session::Errors::InvalidOptionKeys
 
-        set_session(key, value, options = {})
+        set_session(key, value, options)
       end
 
       def delete_expired_session_keys
@@ -106,6 +85,32 @@ module ActionControllerTweaks
 
         session[:session_keys_to_expire]
       end
+
+      def new_session_keys_to_expire(key, options = {})
+        options.symbolize_keys!
+
+        result = session_keys_to_expire
+
+        expires_in = options.delete(:expires_in) || options.delete(:expire_in)
+        expires_at = options.delete(:expires_at) || options.delete(:expire_at)
+
+        if expires_at && expires_at.respond_to?(:to_time)
+          expires_at = expires_at.to_time
+        end
+
+        raise InvalidOptionValue.new(:expires_in, expires_in, Numeric) if expires_in && !expires_in.is_a?(Numeric)
+        raise InvalidOptionValue.new(:expires_at, expires_at, Time) if expires_at && !expires_at.is_a?(Time)
+
+        if expires_in || expires_at
+          result[key] = if expires_in
+            expires_in.seconds.from_now
+          elsif expires_at
+            expires_at
+          end
+        end
+
+        result
+      end
     end
   end
 end

data/lib/action_controller_tweaks/version.rb

@@ -1,5 +1,5 @@
 module ActionControllerTweaks
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 
   def self.version
     Gem::Version.new(VERSION)

data/spec/action_controller_tweaks_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe PostsController, type: :controller do
   describe 'included modules' do
-    it do
-      described_class.ancestors.should include(ActionControllerTweaks)
+    specify do
+      expect(described_class.ancestors).to include(ActionControllerTweaks)
     end
   end
 
@@ -14,8 +14,8 @@ describe PostsController, type: :controller do
       end
 
       it 'includes the pre defined headeres' do
-       controller.headers.deep_include?(ActionControllerTweaks::Caching::HEADERS).should be_true
-     end
+        expect(controller.headers.deep_include?(ActionControllerTweaks::Caching::HEADERS)).to be true
+      end
     end
   end
 
@@ -42,7 +42,7 @@ describe PostsController, type: :controller do
           end
 
           it 'set the session' do
-            session[session_key].should eq session_value
+            expect(session[session_key]).to eq session_value
           end
         end
 
@@ -70,7 +70,7 @@ describe PostsController, type: :controller do
           end
 
           it 'set the session' do
-            session[session_key].should eq session_value
+            expect(session[session_key]).to eq session_value
           end
 
           context 'before expire time' do
@@ -81,7 +81,7 @@ describe PostsController, type: :controller do
             end
 
             it 'keeps the session key' do
-              session[session_key].should eq session_value
+              expect(session[session_key]).to eq session_value
             end
           end
           context 'after expire time' do
@@ -92,11 +92,25 @@ describe PostsController, type: :controller do
             end
 
             it 'keeps the session key' do
-              session.key?(session_key).should be_false
+              expect(session.key?(session_key)).to be false
             end
           end
         end
 
+        context 'when calling it with no option' do
+          before do
+            controller.send(:set_session, session_key, session_value)
+          end
+
+          it 'set the session' do
+            expect(session[session_key]).to eq session_value
+          end
+
+          it 'does NOT add the session key to `session_keys_to_expire`' do
+            expect(session['session_keys_to_expire'].keys).to_not include(session_key)
+          end
+        end
+
         context 'when calling it with option expire_at' do
           let!(:time_before_expire) { expire_at - 1 }
           let!(:time_after_expire) { expire_at + 1 }
@@ -111,7 +125,7 @@ describe PostsController, type: :controller do
           end
 
           it 'set the session' do
-            session[session_key].should eq session_value
+            expect(session[session_key]).to eq session_value
           end
 
           context 'before expire time' do
@@ -122,7 +136,7 @@ describe PostsController, type: :controller do
             end
 
             it 'keeps the session key' do
-              session[session_key].should eq session_value
+              expect(session[session_key]).to eq session_value
             end
           end
           context 'after expire time' do
@@ -133,7 +147,7 @@ describe PostsController, type: :controller do
             end
 
             it 'keeps the session key' do
-              session.key?(session_key).should be_false
+              expect(session.key?(session_key)).to be false
             end
           end
         end
@@ -153,7 +167,7 @@ describe PostsController, type: :controller do
           end
 
           it 'set the session' do
-            session[session_key].should eq session_value
+            expect(session[session_key]).to eq session_value
           end
 
           context 'before expire time' do
@@ -164,7 +178,7 @@ describe PostsController, type: :controller do
             end
 
             it 'keeps the session key' do
-              session[session_key].should eq session_value
+              expect(session[session_key]).to eq session_value
             end
           end
           context 'after expire time' do
@@ -175,7 +189,7 @@ describe PostsController, type: :controller do
             end
 
             it 'keeps the session key' do
-              session.key?(session_key).should be_false
+              expect(session.key?(session_key)).to be false
             end
           end
         end
@@ -194,7 +208,7 @@ describe PostsController, type: :controller do
           end
 
           it 'set the session' do
-            session[session_key].should eq session_value
+            expect(session[session_key]).to eq session_value
           end
 
           context 'before expire time' do
@@ -205,7 +219,7 @@ describe PostsController, type: :controller do
             end
 
             it 'keeps the session key' do
-              session[session_key].should eq session_value
+              expect(session[session_key]).to eq session_value
             end
           end
           context 'after expire time' do
@@ -216,7 +230,7 @@ describe PostsController, type: :controller do
             end
 
             it 'keeps the session key' do
-              session.key?(session_key).should be_false
+              expect(session.key?(session_key)).to be false
             end
           end
         end
@@ -326,23 +340,30 @@ describe PostsController, type: :controller do
           end
 
           it 'destroys the session key' do
-            session.key?(session_key).should be_false
+            expect(session.key?(session_key)).to be false
           end
         end
 
-        context 'when someone set non has to session_keys_to_expire' do
+        context 'when someone set non-hash to session_keys_to_expire' do
           before do
             session['session_keys_to_expire'] = []
           end
 
           it 'does not destroy the session key' do
-            session.key?(session_key).should be_true
+            expect(session.key?(session_key)).to be true
           end
         end
       end
     end
 
     describe '#set_session_with_expiry' do
+      let(:expire_in) { 60 * 60 } # 1 hour
+      let(:expire_at) { Time.new(2014, 1, 1).in_time_zone }
+      let(:time_now) { Time.new(2013, 1, 1).in_time_zone }
+      # Corrected option keys
+      let(:expires_in) { expire_in }
+      let(:expires_at) { expire_at }
+
       let(:method_call) do
         controller.send(:set_session_with_expiry, session_key, session_value, options)
       end
@@ -379,6 +400,270 @@ describe PostsController, type: :controller do
           specify { expect{method_call}.to_not raise_error }
         end
       end
+
+      context 'for old option keys' do
+        context 'when calling it with option expire_in' do
+          let!(:time_before_expire) { time_now + (expire_in / 2) }
+          let!(:time_after_expire) { time_now + (expire_in * 2) }
+
+          before do
+            Timecop.freeze(time_now)
+            controller.send(:set_session_with_expiry, session_key, session_value, expire_in: expire_in)
+          end
+
+          after do
+            Timecop.return
+          end
+
+          it 'set the session' do
+            expect(session[session_key]).to eq session_value
+          end
+
+          context 'before expire time' do
+            before do
+              Timecop.travel(time_before_expire)
+              # Runs before_filter
+              get :index
+            end
+
+            it 'keeps the session key' do
+              expect(session[session_key]).to eq session_value
+            end
+          end
+          context 'after expire time' do
+            before do
+              Timecop.travel(time_after_expire)
+              # Runs before_filter
+              get :index
+            end
+
+            it 'keeps the session key' do
+              expect(session.key?(session_key)).to be false
+            end
+          end
+        end
+
+        context 'when calling it with no option' do
+          let(:method_call) do
+            controller.send(:set_session_with_expiry, session_key, session_value)
+          end
+
+          specify { expect{ method_call }.to raise_error(ActionControllerTweaks::Session::Errors::InvalidOptionKeys) }
+        end
+
+        context 'when calling it with option expire_at' do
+          let!(:time_before_expire) { expire_at - 1 }
+          let!(:time_after_expire) { expire_at + 1 }
+
+          before do
+            Timecop.freeze(time_now)
+            controller.send(:set_session_with_expiry, session_key, session_value, expire_at: expire_at)
+          end
+
+          after do
+            Timecop.return
+          end
+
+          it 'set the session' do
+            expect(session[session_key]).to eq session_value
+          end
+
+          context 'before expire time' do
+            before do
+              Timecop.travel(time_before_expire)
+              # Runs before_filter
+              get :index
+            end
+
+            it 'keeps the session key' do
+              expect(session[session_key]).to eq session_value
+            end
+          end
+          context 'after expire time' do
+            before do
+              Timecop.travel(time_after_expire)
+              # Runs before_filter
+              get :index
+            end
+
+            it 'keeps the session key' do
+              expect(session.key?(session_key)).to be false
+            end
+          end
+        end
+      end
+      context 'for new option keys' do
+        context 'when calling it with option expires_in' do
+          let!(:time_before_expire) { time_now + (expires_in / 2) }
+          let!(:time_after_expire) { time_now + (expires_in * 2) }
+
+          before do
+            Timecop.freeze(time_now)
+            controller.send(:set_session_with_expiry, session_key, session_value, expires_in: expires_in)
+          end
+
+          after do
+            Timecop.return
+          end
+
+          it 'set the session' do
+            expect(session[session_key]).to eq session_value
+          end
+
+          context 'before expire time' do
+            before do
+              Timecop.travel(time_before_expire)
+              # Runs before_filter
+              get :index
+            end
+
+            it 'keeps the session key' do
+              expect(session[session_key]).to eq session_value
+            end
+          end
+          context 'after expire time' do
+            before do
+              Timecop.travel(time_after_expire)
+              # Runs before_filter
+              get :index
+            end
+
+            it 'keeps the session key' do
+              expect(session.key?(session_key)).to be false
+            end
+          end
+        end
+
+        context 'when calling it with option expires_at' do
+          let!(:time_before_expire) { expires_at - 1 }
+          let!(:time_after_expire) { expires_at + 1 }
+
+          before do
+            Timecop.freeze(time_now)
+            controller.send(:set_session_with_expiry, session_key, session_value, expire_at: expires_at)
+          end
+
+          after do
+            Timecop.return
+          end
+
+          it 'set the session' do
+            expect(session[session_key]).to eq session_value
+          end
+
+          context 'before expire time' do
+            before do
+              Timecop.travel(time_before_expire)
+              # Runs before_filter
+              get :index
+            end
+
+            it 'keeps the session key' do
+              expect(session[session_key]).to eq session_value
+            end
+          end
+          context 'after expire time' do
+            before do
+              Timecop.travel(time_after_expire)
+              # Runs before_filter
+              get :index
+            end
+
+            it 'keeps the session key' do
+              expect(session.key?(session_key)).to be false
+            end
+          end
+        end
+      end
+
+      context 'when option value with different types is passed into options' do
+        let(:method_call) do
+          controller.send(:set_session_with_expiry, session_key, session_value, options)
+        end
+
+        context 'for old option keys' do
+          context 'for expire_in' do
+            let(:options) { {expire_in: expire_in.to_s} }
+
+            specify { expect{ method_call }.to raise_error(ActionControllerTweaks::Session::InvalidOptionValue) }
+          end
+          context 'for expire_at' do
+            context 'with a Hash' do
+              # String#to_time would be nil if format invalid
+              let(:options) { {expire_at: {}} }
+
+              specify { expect{ method_call }.to raise_error(ActionControllerTweaks::Session::InvalidOptionValue) }
+            end
+            context 'with a blank String' do
+              # String#to_time would be nil if format invalid
+              let(:options) { {expire_at: ''} }
+
+              specify { expect{ method_call }.to_not raise_error }
+            end
+            context 'with a time String' do
+              let(:options) { {expire_at: expire_at.to_s} }
+
+              specify { expect{ method_call }.to_not raise_error }
+            end
+            context 'with a Time' do
+              let(:options) { {expire_at: expire_at.to_time} }
+
+              specify { expect{ method_call }.to_not raise_error }
+            end
+            context 'with a Date' do
+              let(:options) { {expire_at: expire_at.to_date} }
+
+              specify { expect{ method_call }.to_not raise_error }
+            end
+            context 'with a DateTime' do
+              let(:options) { {expire_at: expire_at.in_time_zone} }
+
+              specify { expect{ method_call }.to_not raise_error }
+            end
+          end
+        end
+        context 'for new option keys' do
+          context 'for expires_in' do
+            let(:options) { {expires_in: expires_in.to_s} }
+
+            specify { expect{ method_call }.to raise_error(ActionControllerTweaks::Session::InvalidOptionValue) }
+          end
+          context 'for expires_at' do
+            context 'with a Hash' do
+              # String#to_time would be nil if format invalid
+              let(:options) { {expires_at: {}} }
+
+              specify { expect{ method_call }.to raise_error(ActionControllerTweaks::Session::InvalidOptionValue) }
+            end
+            context 'with a blank String' do
+              # String#to_time would be nil if format invalid
+              let(:options) { {expires_at: ''} }
+
+              specify { expect{ method_call }.to_not raise_error }
+            end
+            context 'with a time String' do
+              let(:options) { {expires_at: expire_at.to_s} }
+
+              specify { expect{ method_call }.to_not raise_error }
+            end
+            context 'with a Time' do
+              let(:options) { {expires_at: expire_at.to_time} }
+
+              specify { expect{ method_call }.to_not raise_error }
+            end
+            context 'with a Date' do
+              let(:options) { {expires_at: expire_at.to_date} }
+
+              specify { expect{ method_call }.to_not raise_error }
+            end
+            context 'with a DateTime' do
+              let(:options) { {expires_at: expire_at.in_time_zone} }
+
+              specify { expect{ method_call }.to_not raise_error }
+            end
+          end
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,12 +7,19 @@ require 'action_controller_tweaks'
 
 require 'fixtures/application'
 require 'fixtures/controllers'
+
 require 'rspec/rails'
+require 'rspec/its'
 
 require 'timecop'
 require 'logger'
 
 
+# see https://github.com/rspec/rspec-rails/issues/1171
+# prevent Test::Unit's AutoRunner from executing during RSpec's rake task
+Test::Unit.run = true if defined?(Test::Unit) && Test::Unit.respond_to?(:run=)
+
+
 # For comparison
 class Hash
   def deep_include?(sub_hash)

metadata

@@ -1,201 +1,229 @@
 --- !ruby/object:Gem::Specification
 name: action_controller_tweaks
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - PikachuEXE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: ActionController is great, but could be better. Here are some tweaks
   for it.
 email:
@@ -204,9 +232,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -214,8 +242,10 @@ files:
 - README.md
 - Rakefile
 - action_controller_tweaks.gemspec
-- gemfiles/rails3_2.gemfile
-- gemfiles/rails4_0.gemfile
+- gemfiles/rails_3_2.gemfile
+- gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_2.gemfile
 - lib/action_controller_tweaks.rb
 - lib/action_controller_tweaks/caching.rb
 - lib/action_controller_tweaks/session.rb
@@ -234,17 +264,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.4.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Some Tweaks for ActionController

data/gemfiles/rails3_2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "3.2.17"
-gem "actionpack", "3.2.17"
-gem "activerecord", "3.2.17"
-
-gemspec :path=>"../"

data/gemfiles/rails4_0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "4.0.3"
-gem "actionpack", "4.0.3"
-gem "activerecord", "4.0.3"
-
-gemspec :path=>"../"