rack-iframe 0.0.2 → 0.0.3

data/TODO

@@ -5,20 +5,20 @@ x [feature/issue]: Fix/Review "Last-Modified" HTTP cache header case - to comply
 
 - [feature]: Track if P3P-headers should be sent via cookie. Reason: We can't assume that only bodies that contain <iframe>-elements needs the P3P header (or so I think right now).
 
-- [feature]: Add option to send 304 headers but delete "Set-Cookie"-header - not allowed by spec, but seems to work in most browsers/servers anyway.
-
 
 == LOW-PRIO
 
-- [refactor/enhancement]: Use 'useragent' gem to parse 'USER_AGENT'-header - https://rubygems.org/gems/useragent
-
-- [refactor/test]: Use proper integration testing, i.e. mocks/env => Sinatra/headers.
+- [refactor/test]: Use pure integration testing, i.e. mocks/env => Sinatra/headers.
 
 
 == MAYBE
 
 - [feature]: Optionally silently/evily inject "the cross-domain iframe JavaScript hack" for Safari - or specified user agents - into the body response. >:)
 
+- [refactor/enhancement]: Use 'useragent' gem to parse 'USER_AGENT'-header - https://rubygems.org/gems/useragent
+
+- [feature]: Add option to send 304 headers but delete "Set-Cookie"-header - not allowed by spec, but seems to work in most browsers/servers anyway.
+
 - [feature]: Support for policy reference file. http://www.w3.org/TR/P3P/#ref_file
 
 - [feature]: Support for specifying compact policies by configuration. http://www.w3.org/TR/P3P/#compact_policies http://www.p3pwriter.com/LRN_111.asp

data/lib/rack/iframe.rb

@@ -7,11 +7,13 @@ module Rack
 
     DEFAULT_P3P = %(CP="ALL DSP COR CURa ADMa DEVa OUR IND COM NAV").freeze
     DEFAULT_IFRAME_SESSION_PATH = '/iframe_session'.freeze
+    DEFAULT_ENV_SESSION_KEY = 'rack.session'.freeze
 
     def initialize(app, options = {})
       @app, @options = app, options
       @options[:p3p] ||= DEFAULT_P3P
       @options[:iframe_session_path] ||= DEFAULT_IFRAME_SESSION_PATH
+      @options[:env_session_key] ||= DEFAULT_ENV_SESSION_KEY
     end
 
     def call(env)
@@ -20,7 +22,8 @@ module Rack
 
       # 2) Request
       if iframe_session_path?(env)
-        @status, @headers, @body = iframe_session_response
+        @app.call(env) # ...still call app as we want same ENV.
+        @status, @headers, @body = iframe_session_response(env)
       else
         @status, @headers, @body = @app.call(env)
       end
@@ -35,7 +38,7 @@ module Rack
     protected
 
       def user_agent(env)
-        env['HTTP_USER_AGENT']
+        env['HTTP_USER_AGENT'] || []
       end
 
       def set_invalid_etag!(env)
@@ -77,7 +80,14 @@ module Rack
         env['PATH_INFO'] == @options[:iframe_session_path]
       end
 
-      def iframe_session_response
+      def iframe_session_response(env)
+        begin
+          # Write a value into the session to ensure we get a session (cookie).
+          session_key = @options[:env_session_key]
+          env[session_key][:iframe_session] = true
+        rescue => e
+          env['rack.errors'].puts "[rack-iframe]: env[#{@options[:env_session_key]}] = #{env[@options[:env_session_key]]}"
+        end
         [200, {}, [""]]
       end
 

data/lib/rack/iframe/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Iframe
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/rack-iframe_spec.rb

@@ -203,6 +203,15 @@ describe Rack::Iframe do
             status.must_equal 200 # modified
           end
         end
+
+        it 'should set session variable :iframe_session on request to /iframe_session' do
+          @user_agents.each do |user_agent|
+            browser = Rack::Test::Session.new(Rack::MockSession.new(SessionIframeApp))
+            browser.get '/iframe_session', {}, 'HTTP_USER_AGENT' => user_agent_string(user_agent)
+            browser.get '/test_iframe_session', {}, 'HTTP_USER_AGENT' => user_agent_string(user_agent)
+            browser.last_response.body.must_equal "true"
+          end
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -19,9 +19,10 @@ require 'rack/iframe'
 ENV['RACK_ENV'] = 'test'
 
 class CachedApp < Sinatra::Base
-
   use Rack::Cache, :verbose => true, :meta_store => 'heap:/', :entitystore => 'heap:/'
 
+  enable :sessions
+
   get '/' do
     headers['Content-Type'] = 'text/plain'
     ""
@@ -40,6 +41,15 @@ class CachedApp < Sinatra::Base
   end
 end
 
+class SessionIframeApp < CachedApp
+  use Rack::Iframe
+
+  get '/test_iframe_session' do
+    headers['Content-Type'] = 'text/plain'
+    "#{session[:iframe_session]}"
+  end
+end
+
 def mock_app(headers = {}, env = {})
   default_headers = headers.merge({
       'Content-Type' => 'text/plain'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-iframe
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70224205432460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224205432460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70224205432020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205432020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70224205431400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205431400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70224205430820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205430820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70224205430400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +87,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205430400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70224205429980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +103,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205429980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70224205429480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +119,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205429480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70224205428980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +135,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205428980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70224205428420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +151,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205428420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70224205427620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +167,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205427620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70224205426500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +183,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205426500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70224205425760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,7 +199,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224205425760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rack middleware for enabling problematic web browsers (Internet Explorer
   and Safari) to use same cookies in iframes as in parent windows.
 email:
@@ -182,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3225928049267512743
+      hash: 2887272205395203645
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -191,10 +251,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3225928049267512743
+      hash: 2887272205395203645
 requirements: []
 rubyforge_project: rack-iframe
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rack middleware for enabling problematic web browsers (Internet Explorer