ie_iframe_cookies 0.1.3 → 0.1.4

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3

data/Appraisals

@@ -0,0 +1,5 @@
+%w[2.3.14 3.1.8 3.2.9].each do |version|
+  appraise "rails-#{version}" do
+    gem "rails", "~> #{version}"
+  end
+end

data/Gemfile

@@ -1,7 +1,8 @@
 source :rubygems
 gemspec
 
-group :development do
-  gem 'rails', ENV['RAILS']
-  gem 'rake'
-end
+gem 'appraisal'
+gem 'bump'
+gem 'rails'
+gem 'rake'
+gem 'test-unit', '>= 2.5.3'

data/Gemfile.lock

@@ -1,94 +1,100 @@
 PATH
   remote: .
   specs:
-    ie_iframe_cookies (0.1.3)
+    ie_iframe_cookies (0.1.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.2)
-      actionpack (= 3.1.2)
-      mail (~> 2.3.0)
-    actionpack (3.1.2)
-      activemodel (= 3.1.2)
-      activesupport (= 3.1.2)
+    actionmailer (3.2.5)
+      actionpack (= 3.2.5)
+      mail (~> 2.4.4)
+    actionpack (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.0)
-    activemodel (3.1.2)
-      activesupport (= 3.1.2)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.5)
+      activesupport (= 3.2.5)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.2)
-      activemodel (= 3.1.2)
-      activesupport (= 3.1.2)
-      arel (~> 2.2.1)
+    activerecord (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.2)
-      activemodel (= 3.1.2)
-      activesupport (= 3.1.2)
-    activesupport (3.1.2)
+    activeresource (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+    activesupport (3.2.5)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
     builder (3.0.0)
+    bump (0.3.7)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.1)
-    mail (2.3.0)
+    journey (1.0.3)
+    json (1.7.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.3)
+    mime-types (1.18)
+    multi_json (1.3.6)
     polyglot (0.3.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       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)
+    rails (3.2.5)
+      actionmailer (= 3.2.5)
+      actionpack (= 3.2.5)
+      activerecord (= 3.2.5)
+      activeresource (= 3.2.5)
+      activesupport (= 3.2.5)
       bundler (~> 1.0)
-      railties (= 3.1.2)
-    railties (3.1.2)
-      actionpack (= 3.1.2)
-      activesupport (= 3.1.2)
+      railties (= 3.2.5)
+    railties (3.2.5)
+      actionpack (= 3.2.5)
+      activesupport (= 3.2.5)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.11)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
       json (~> 1.4)
-    sprockets (2.1.1)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
+    test-unit (2.5.3)
+    thor (0.15.2)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal
+  bump
   ie_iframe_cookies!
   rails
   rake
+  test-unit (>= 2.5.3)

data/Rakefile

@@ -1,5 +1,7 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+require 'bump/tasks'
+require 'appraisal'
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib'
@@ -8,25 +10,5 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task :default do
-  %w[2.3.13 3.0.12 3.1.4 3.2.2].each do |rails_version|
-    sh "RAILS=#{rails_version} && (bundle || bundle install) && bundle exec rake test"
-  end
-  sh "git checkout Gemfile.lock"
-end
-
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/ie_iframe_cookies/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
+  sh "bundle exec rake appraisal:install && bundle exec rake appraisal test"
 end

data/Readme.md

@@ -7,11 +7,8 @@ IFrames in IE only get the same cookies as normal pages when P3P headers are add
 
 Install
 =======
-    sudo gem install ie_iframe_cookies
-Or
-
-    rails plugin install git://github.com/grosser/ie_iframe_cookies.git
 
+    gem install ie_iframe_cookies
 
 Usage
 =====
@@ -20,6 +17,10 @@ To cookie-tag users as 'iframe-using', add this to all actions rendered inside I
 
     before_filter :normal_cookies_for_ie_in_iframes! # :only => [:foo, :bar]
 
+TIPS
+====
+ - Problems with Safari? try [this](http://saizai.livejournal.com/897522.html) or [that](http://stackoverflow.com/questions/2691864/facebook-iframe-app-with-multiple-pages-in-safari-session-variables-not-persisti/2725790#2725790)
+
 Authors
 =======
 
@@ -30,4 +31,5 @@ Authors
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>
-License: MIT
+License: MIT<br/>
+[![Build Status](https://travis-ci.org/grosser/ie_iframe_cookies.png)](https://travis-ci.org/grosser/ie_iframe_cookies)

data/gemfiles/rails_2.3.14.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "bump"
+gem "rake"
+gem "test-unit", ">= 2.5.3"
+gem "rails", "~> 2.3.14"
+
+gemspec :path=>"../"

data/gemfiles/rails_2.3.14.gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: /Users/mgrosser/code/tools/ie_iframe_cookies
+  specs:
+    ie_iframe_cookies (0.1.3)
+
+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)
+    appraisal (0.5.1)
+      bundler
+      rake
+    bump (0.3.7)
+    rack (1.1.3)
+    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)
+    rake (10.0.3)
+    test-unit (2.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bump
+  ie_iframe_cookies!
+  rails (~> 2.3.14)
+  rake
+  test-unit (>= 2.5.3)

data/gemfiles/rails_3.1.8.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "bump"
+gem "rake"
+gem "test-unit", ">= 2.5.3"
+gem "rails", "~> 3.1.8"
+
+gemspec :path=>"../"

data/gemfiles/rails_3.1.8.gemfile.lock

@@ -0,0 +1,102 @@
+PATH
+  remote: /Users/mgrosser/code/tools/ie_iframe_cookies
+  specs:
+    ie_iframe_cookies (0.1.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.8)
+      actionpack (= 3.1.8)
+      mail (~> 2.3.3)
+    actionpack (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+    activesupport (3.1.8)
+      multi_json (>= 1.0, < 1.3)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.2.3)
+    builder (3.0.4)
+    bump (0.3.7)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    json (1.7.5)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    multi_json (1.2.0)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.1.8)
+      actionmailer (= 3.1.8)
+      actionpack (= 3.1.8)
+      activerecord (= 3.1.8)
+      activeresource (= 3.1.8)
+      activesupport (= 3.1.8)
+      bundler (~> 1.0)
+      railties (= 3.1.8)
+    railties (3.1.8)
+      actionpack (= 3.1.8)
+      activesupport (= 3.1.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    test-unit (2.5.3)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bump
+  ie_iframe_cookies!
+  rails (~> 3.1.8)
+  rake
+  test-unit (>= 2.5.3)

data/gemfiles/rails_3.2.9.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "bump"
+gem "rake"
+gem "test-unit", ">= 2.5.3"
+gem "rails", "~> 3.2.9"
+
+gemspec :path=>"../"

data/gemfiles/rails_3.2.9.gemfile.lock

@@ -0,0 +1,101 @@
+PATH
+  remote: /Users/mgrosser/code/tools/ie_iframe_cookies
+  specs:
+    ie_iframe_cookies (0.1.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
+      mail (~> 2.4.4)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    bump (0.3.7)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    multi_json (1.5.0)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
+      bundler (~> 1.0)
+      railties (= 3.2.9)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    test-unit (2.5.3)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bump
+  ie_iframe_cookies!
+  rails (~> 3.2.9)
+  rake
+  test-unit (>= 2.5.3)

data/lib/ie_iframe_cookies/version.rb

@@ -1,3 +1,3 @@
 module IEIframeCookies
-  VERSION = Version = "0.1.3"
+  VERSION = Version = "0.1.4"
 end

data/lib/ie_iframe_cookies.rb

@@ -12,7 +12,12 @@ module ActionController
     end
 
     def normal_cookies_for_ie_in_iframes(options={})
-      headers['P3P'] = 'CP="ALL DSP COR CURa ADMa DEVa OUR IND COM NAV"' if request.normal_cookies_for_ie_in_iframes? or options[:force]
+      if request.normal_cookies_for_ie_in_iframes? or options[:force]
+        headers['P3P'] = 'CP="ALL DSP COR CURa ADMa DEVa OUR IND COM NAV"'
+        if request.get? or request.head?
+          fresh_when :etag => rand(100_000_000) + 1, :last_modified => Time.now
+        end
+      end
     end
   end
 end

data/test/ie_iframe_cookies_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class IETestController < ActionController::Base
   before_filter :normal_cookies_for_ie_in_iframes!, :only => :activate
@@ -25,10 +25,12 @@ class IETestController < ActionController::Base
 end
 
 class IEIFrameCookiesTest < ActionController::TestCase
-  def setup
-    @controller = IETestController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+  tests IETestController
+
+  DEFAULT_ETAG = ActionPack::VERSION::MAJOR > 2 ? nil : '"e0aa021e21dddbd6d8cecec71e9cf564"'
+
+  setup do
+    @request = ActionController::TestRequest.new
   end
 
   def is_ok!
@@ -74,6 +76,41 @@ class IEIFrameCookiesTest < ActionController::TestCase
     assert_equal nil, cookies['using_iframes_in_ie']
   end
 
+  # etag for get requests to trick rack::conditionalget
+  test "it adds a always-fresh ETAG for tracked IE users on get, so rack thinks its fresh" do
+    set_tracked
+    set_ie
+    get :visit
+    is_ok!
+    old = @response.headers['ETag']
+
+    get :visit
+    is_ok!
+    assert_not_equal old, @response.headers['ETag']
+  end
+
+  test "it does not add an etag if the request is not get" do
+    set_tracked
+    set_ie
+    post :visit
+    is_ok!
+    assert_equal DEFAULT_ETAG, @response.headers['ETag']
+  end
+
+  test "it does not add an etag if non ie" do
+    set_tracked
+    get :visit
+    is_ok!
+    assert_equal DEFAULT_ETAG, @response.headers['ETag']
+  end
+
+  test "it does not add an etag if not tracked" do
+    set_ie
+    get :visit
+    is_ok!
+    assert_equal DEFAULT_ETAG, @response.headers['ETag']
+  end
+
   # returning P3P headers
   test "it adds P3P headers for tracked IE users" do
     set_tracked

data/test/test_helper.rb

@@ -1,8 +1,10 @@
 require 'action_pack'
 require 'action_controller'
+require 'test/unit'
 
 if ActionPack::VERSION::MAJOR > 2
   require 'action_dispatch/testing/test_process'
+  ActionController::TestCase::Behavior # autoloads
 
   ROUTES = ActionDispatch::Routing::RouteSet.new
   ROUTES.draw do
@@ -10,40 +12,35 @@ if ActionPack::VERSION::MAJOR > 2
   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
+  # get routes working without having to mess in actual test
+  ActionController::TestCase.setup do
+    @routes = ROUTES
   end
 
-  class ActionController::TestRequest
+  ActionController::TestRequest.class_eval do
     def cookie_jar
+      cookies.instance_variable_set(:@set_cookies, {})
+      def cookies.recycle!
+      end
       cookies
     end
   end
 else
   require 'action_controller/test_process'
   ActionController::Routing::Routes.reload rescue nil
-end
 
-require 'test/unit'
+  # do not try to load helpers
+  ActionController::Helpers::ClassMethods.class_eval do
+    def inherited_with_helper(*args)
+      inherited_without_helper(*args)
+    end
+  end
+end
 
 $LOAD_PATH << 'lib'
 require 'ie_iframe_cookies/version'
+require 'ie_iframe_cookies'
 
 # fake rails env for initialisation
 # when Rails is defined, backtrace_cleaner is used, when assert fails
-RAILS_ENV='development'
-
-require "./init"
+RAILS_ENV = 'development'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ie_iframe_cookies
 version: !ruby/object:Gem::Version
-  version: 0.1.3
   prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -17,12 +17,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .travis.yml
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - Readme.md
+- gemfiles/rails_2.3.14.gemfile
+- gemfiles/rails_2.3.14.gemfile.lock
+- gemfiles/rails_3.1.8.gemfile
+- gemfiles/rails_3.1.8.gemfile.lock
+- gemfiles/rails_3.2.9.gemfile
+- gemfiles/rails_3.2.9.gemfile.lock
 - ie_iframe_cookies.gemspec
-- init.rb
 - lib/ie_iframe_cookies.rb
 - lib/ie_iframe_cookies/version.rb
 - test/ie_iframe_cookies_test.rb
@@ -35,26 +42,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3924685781872135299
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 2082685623061134999
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3924685781872135299
+      hash: 2082685623061134999
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'Rails: Enabled cookies inside IFrames for IE via p3p headers'

data/init.rb

@@ -1 +0,0 @@
-require 'ie_iframe_cookies'