cookieless 0.1.1 → 0.2.0

data/README.rdoc

@@ -11,7 +11,7 @@
 
 2, Add it as middleware to your application.rb
 
-  config.middleware.use Rack::Cookieless
+  config.middleware.insert_before ActionDispatch::Cookies, Rack::Cookieless, :session_id => :si
 
 3, Enjoy it!
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/cookieless.rb

@@ -9,22 +9,23 @@ module Rack
 
     def call(env)
       # have cookies or not
-      support_cookie = env["action_dispatch.cookies"].present?
+      support_cookie = env["HTTP_COOKIE"].present?
 
       if support_cookie
         @app.call(env)
       else
-        session_id, session = get_session_by_query(env["QUERY_STRING"], env) || get_session_by_query((URI.parse(env['HTTP_REFERER']).query rescue nil), env)
-        env["rack.session"].update(session) if session
+        session_id, cookies = get_cookies_by_query(env["QUERY_STRING"], env) || get_cookies_by_query((URI.parse(env['HTTP_REFERER']).query rescue nil), env)
+        env["HTTP_COOKIE"] = cookies if cookies
 
         status, header, response = @app.call(env)
 
-        session_id = save_session_by_id(session_id || env["rack.session"]["session_id"], env)
-
-        ## fix 3xx redirect
-        header["Location"] = convert_url(header["Location"], session_id) if header["Location"]
-        ## only process html page
-        response.body = process_body(response.body, session_id) if env['action_dispatch.request.path_parameters'][:format].to_s =~ /\A(html)?\Z/ && response.respond_to?(:body)
+        if %w(css js).exclude?(env['action_dispatch.request.path_parameters'][:format].to_s)
+          session_id = save_cookies_by_session_id(session_id || env["rack.session"]["session_id"], env, header["Set-Cookie"])
+          ## fix 3xx redirect
+          header["Location"] = convert_url(header["Location"], session_id) if header["Location"]
+          ## only process html page
+          response.body = process_body(response.body, session_id) if response.respond_to?(:body)
+        end
 
         [status, header, response]
       end
@@ -39,25 +40,33 @@ module Rack
       (@options[:session_id] || :session_id).to_s
     end
 
-    def get_session_by_query(query, env)
+    def get_cookies_by_query(query, env)
       session_id = Rack::Utils.parse_query(query, "&")[session_key].to_s
       return nil if session_id.blank?
 
-      cache_id = Digest::SHA1.hexdigest(session_id + env["HTTP_USER_AGENT"] + env["REMOTE_ADDR"])
+      cache_id = generate_cookie_id(session_id, env)
       return nil unless Rails.cache.exist?(cache_id)
       return [session_id, cache_store.read(cache_id)]
     end
 
-    def save_session_by_id(session_id, env)
-      cache_id = Digest::SHA1.hexdigest(session_id + env["HTTP_USER_AGENT"] + env["REMOTE_ADDR"])
-      cache_store.write(cache_id, env["rack.session"].to_hash)
+    def save_cookies_by_session_id(session_id, env, cookie)
+      cache_store.write(generate_cookie_id(session_id, env), cookie)
       session_id
     end
 
+    def generate_cookie_id(session_id, env)
+      Digest::SHA1.hexdigest(session_id + env["HTTP_USER_AGENT"].to_s + env["REMOTE_ADDR"].to_s)
+    end
+
     def process_body(body, session_id)
       body_doc = Nokogiri::HTML(body)
       body_doc.css("a").map { |a| a["href"] = convert_url(a['href'], session_id) if a["href"] }
-      body_doc.css("form").map { |form| form["action"] = convert_url(form["action"], session_id) if form["action"] }
+      body_doc.css("form").map do |form|
+        if form["action"]
+          form["action"] = convert_url(form["action"], session_id)
+          form.add_child("<input type='hidden' name='#{session_key}' value='#{session_id}'>")
+        end
+      end
       body_doc.to_html
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cookieless
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jinzhu
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 +08:00
+date: 2011-09-04 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: nokogiri
-  version_requirements: *id001
+  requirement: *id001
   prerelease: false
+  name: nokogiri
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +45,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id002
+  requirement: *id002
   prerelease: false
+  name: bundler
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +61,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  name: jeweler
-  version_requirements: *id003
+  requirement: *id003
   prerelease: false
+  name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,9 +75,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id004
+  requirement: *id004
   prerelease: false
+  name: rcov
 description: Cookieless is a rack middleware to make your application works with cookie-less devices/browsers without change your application
 email: wosmvp@gmail.com
 executables: []
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Cookieless is a rack middleware to make your application works with cookie-less devices/browsers without change your application