ie_iframe_cookies 0.1.0 → 0.1.1

data/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
 
 group :dev do # not development <-> would add unneeded development dependencies in gemspec
-  gem 'rails', '~>2'
+  gem 'rails', ENV['RAILS']
   gem 'redgreen'
   gem 'rake'
   gem 'jeweler'

data/Gemfile.lock

@@ -1,37 +1,96 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
+    actionmailer (3.1.2)
+      actionpack (= 3.1.2)
+      mail (~> 2.3.0)
+    actionpack (3.1.2)
+      activemodel (= 3.1.2)
+      activesupport (= 3.1.2)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.0)
+    activemodel (3.1.2)
+      activesupport (= 3.1.2)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.2)
+      activemodel (= 3.1.2)
+      activesupport (= 3.1.2)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.2)
+      activemodel (= 3.1.2)
+      activesupport (= 3.1.2)
+    activesupport (3.1.2)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    erubis (2.7.0)
     git (1.2.5)
+    hike (1.2.1)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rack (1.1.2)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
-      rake (>= 0.8.3)
+    json (1.6.1)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.0.3)
+    polyglot (0.3.3)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.2)
+      actionmailer (= 3.1.2)
+      actionpack (= 3.1.2)
+      activerecord (= 3.1.2)
+      activeresource (= 3.1.2)
+      activesupport (= 3.1.2)
+      bundler (~> 1.0)
+      railties (= 3.1.2)
+    railties (3.1.2)
+      actionpack (= 3.1.2)
+      activesupport (= 3.1.2)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
     rake (0.9.2)
+    rdoc (3.11)
+      json (~> 1.4)
     redgreen (1.2.2)
+    sprockets (2.1.1)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   jeweler
-  rails (~> 2)
+  rails
   rake
   redgreen

data/Rakefile

@@ -1,10 +1,18 @@
 require 'rake/testtask'
-Rake::TestTask.new(:default) do |test|
+Rake::TestTask.new(:test) do |test|
   test.libs << 'lib'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
+task :default do
+  sh "RAILS=2.3.12 && (bundle || bundle install) && bundle exec rake test"
+  sh "RAILS=3.0.10 && (bundle || bundle install) && exec rake test"
+  sh "RAILS=3.1.2 && (bundle || bundle install) && exec rake test"
+  sh "git checkout Gemfile.lock"
+end
+
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/ie_iframe_cookies.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ie_iframe_cookies}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-09-08}
+  s.date = %q{2011-11-18}
   s.email = %q{michael@grosser.it}
   s.files = [
     "Gemfile",

data/lib/ie_iframe_cookies.rb

@@ -2,6 +2,7 @@ class IEIframeCookies
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
 end
 
+
 module ActionController
   class Base
     before_filter :normal_cookies_for_ie_in_iframes
@@ -17,24 +18,32 @@ module ActionController
       headers['P3P'] = 'CP="ALL DSP COR CURa ADMa DEVa OUR IND COM NAV"' if request.normal_cookies_for_ie_in_iframes? or options[:force]
     end
   end
+end
 
-  class Request
-    def ie_iframe_cookies_browser_is_ie?
-      (env['HTTP_USER_AGENT'] || "").include?("MSIE")
-    end
+if ActionPack::VERSION::MAJOR > 2
+  request = ActionDispatch::Http::Cache::Request
+  method = :module_eval
+else
+  request = ActionController::Request
+  method = :class_eval
+end
 
-    def normal_cookies_for_ie_in_iframes?
-      ie_iframe_cookies_browser_is_ie? and cookies["using_iframes_in_ie"]
-    end
+request.send(method) do
+  def ie_iframe_cookies_browser_is_ie?
+    (env['HTTP_USER_AGENT'] || "").include?("MSIE")
+  end
 
-    alias_method :etag_matches_without_ie_iframe_cookies?, :etag_matches?
-    def etag_matches?(*args)
-      not normal_cookies_for_ie_in_iframes? and etag_matches_without_ie_iframe_cookies?(*args)
-    end
+  def normal_cookies_for_ie_in_iframes?
+    ie_iframe_cookies_browser_is_ie? and cookies["using_iframes_in_ie"]
+  end
 
-    alias_method :not_modified_without_ie_iframe_cookies?, :not_modified?
-    def not_modified?(*args)
-      not normal_cookies_for_ie_in_iframes? and not_modified_without_ie_iframe_cookies?(*args)
-    end
+  alias_method :etag_matches_without_ie_iframe_cookies?, :etag_matches?
+  def etag_matches?(*args)
+    not normal_cookies_for_ie_in_iframes? and etag_matches_without_ie_iframe_cookies?(*args)
+  end
+
+  alias_method :not_modified_without_ie_iframe_cookies?, :not_modified?
+  def not_modified?(*args)
+    not normal_cookies_for_ie_in_iframes? and not_modified_without_ie_iframe_cookies?(*args)
   end
 end

data/test/ie_iframe_cookies_test.rb

@@ -65,7 +65,7 @@ class IEIFrameCookiesTest < ActionController::TestCase
     set_ie
     get :activate
     is_ok!
-    assert_equal "true", cookies['using_iframes_in_ie']
+    assert_equal "true", cookies['using_iframes_in_ie'].to_s
   end
 
   test "does not set tracking cookie for nice users" do

data/test/test_helper.rb

@@ -1,9 +1,43 @@
-require 'rubygems'
 require 'action_pack'
 require 'action_controller'
-require 'action_controller/test_process'
+
+if ActionPack::VERSION::MAJOR > 2
+  require 'action_dispatch/testing/test_process'
+
+  ROUTES = ActionDispatch::Routing::RouteSet.new
+  ROUTES.draw do
+    match ':controller(/:action(/:id(.:format)))'
+  end
+  ROUTES.finalize!
+
+  # funky patch to get @routes working, in 'setup' did not work
+  module ActionController::TestCase::Behavior
+    def process_with_routes(*args)
+      @routes = ROUTES
+      process_without_routes(*args)
+    end
+    alias_method_chain :process, :routes
+  end
+
+  class ActionController::Base
+    self.view_paths = 'test/views'
+
+    def self._routes
+      ROUTES
+    end
+  end
+
+  class ActionController::TestRequest
+    def cookie_jar
+      cookies
+    end
+  end
+else
+  require 'action_controller/test_process'
+  ActionController::Routing::Routes.reload rescue nil
+end
+
 require 'test/unit'
-require 'redgreen' rescue nil
 
 $LOAD_PATH << 'lib'
 
@@ -11,6 +45,4 @@ $LOAD_PATH << 'lib'
 # when Rails is defined, backtrace_cleaner is used, when assert fails
 RAILS_ENV='development'
 
-ActionController::Routing::Routes.reload
-
 require "init"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ie_iframe_cookies
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 +02:00
+date: 2011-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: []