galakei 0.4.0 → 0.4.1

data/lib/galakei.rb

@@ -4,6 +4,7 @@ if defined?(Rails)
 end
 require 'galakei/request'
 require 'galakei/docomo_css'
+require 'galakei/session_id_parameter'
 
 module Galakei
   autoload :Email, "galakei/email"
@@ -16,10 +17,5 @@ module Galakei
     autoload :ContentType, "galakei/filter/content_type"
     autoload :Haml, "galakei/filter/haml"
     autoload :Views, "galakei/filter/views"
-    autoload :SessionIdParameter, "galakei/filter/session_id_parameter"
-  end
-  module SessionIdParameter
-    autoload :InForm, "galakei/session_id_parameter/in_form"
-    autoload :InUrl, "galakei/session_id_parameter/in_url"
   end
 end

data/lib/galakei/session_id_parameter.rb

@@ -0,0 +1,6 @@
+module Galakei
+  module SessionIdParameter
+    autoload :InForm, "galakei/session_id_parameter/in_form"
+    autoload :InUrl, "galakei/session_id_parameter/in_url"
+  end
+end

data/lib/galakei/session_id_parameter/in_form.rb

@@ -1,10 +1,27 @@
+# When making a get request from a form, query string parameters are ignored.
+# Instead, the parameters must be added as hidden fields. This module ensures 
+# that the session id parameter is properly injected into forms.
 module Galakei::SessionIdParameter::InForm
   def extra_tags_for_form(html_options)
     s = super
     if !request.cookies? && html_options["method"] == "get"
-      key = ::Rails.application.config.session_options[:key]
-      s << tag(:input, :type => "hidden", :name => key, :value => request.session_options[:id])
+      s << session_input_tag
     end
     s
   end
+
+  def button_to(name, options = {}, html_options = {})
+    s = super
+    if !request.cookies? && html_options[:method] == :get
+      s.sub!("</form>",session_input_tag + "</form>".html_safe)
+    end
+    s
+  end
+
+  private
+
+  def session_input_tag
+    key = ::Rails.application.config.session_options[:key]
+    tag(:input, :type => "hidden", :name => key, :value => request.session_options[:id])
+  end
 end

data/lib/galakei/version.rb

@@ -1,3 +1,3 @@
 module Galakei
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/acceptance/session_spec.rb

@@ -15,7 +15,7 @@ class SessionsController < ApplicationController
     render :layout => true, :inline => <<-EOD
       <%= form_for @search, :url => "/sessions", :html => { :method => :get } do |f| %>"
         <%= f.text_field :query %>
-        <%= f.submit %>
+        <%= f.submit "in_get_form" %>
       <% end %>
     EOD
   end
@@ -23,7 +23,21 @@ class SessionsController < ApplicationController
   def link
     session[:previous_page] = "link"
     render :layout => true, :inline => <<-EOD
-      <%= link_to "Link", :action => :index %>
+      <%= link_to "link", :action => :index %>
+    EOD
+  end
+
+  def button_to_get
+    session[:previous_page] = "button_to_get"
+    render :layout => true, :inline => <<-EOD
+      <%= button_to "button_to_get", {:action => :index}, :method => :get %>
+    EOD
+  end
+
+  def button_to_post
+    session[:previous_page] = "button_to_post"
+    render :layout => true, :inline => <<-EOD
+      <%= button_to "button_to_post", :action => :index %>
     EOD
   end
 
@@ -37,34 +51,36 @@ end
 
 
 feature 'session' do
-  context 'in get form' do
-    scenario 'for au', :driver => :au do
-      visit '/sessions/in_get_form'
-      click_on "Create Search"
-      page.should have_content("Session Data: in_get_form")
-      page.should have_content("Session Param: false")
-    end
+  %w[in_get_form link button_to_post].each do |s|
+    context s do
+      scenario 'for au', :driver => :au do
+        visit "/sessions/#{s}"
+        click_on s
+        page.should have_content("Session Data: #{s}")
+        page.should have_content("Session Param: false")
+      end
 
-    scenario 'for docomo', :driver => :docomo do
-      visit '/sessions/in_get_form'
-      click_on "Create Search"
-      page.should have_content("Session Data: in_get_form")
-      page.should have_content("Session Param: true")
+      scenario 'for docomo', :driver => :docomo do
+        visit "/sessions/#{s}"
+        click_on s
+        page.should have_content("Session Data: #{s}")
+        page.should have_content("Session Param: true")
+      end
     end
   end
-
-  context 'clicking link' do
+  context "button_to_get" do
     scenario 'for au', :driver => :au do
-      visit '/sessions/link'
-      click_on "Link"
-      page.should have_content("Session Data: link")
+      visit "/sessions/button_to_get"
+      click_on "button_to_get"
+      page.should have_content("Session Data: button_to_get")
       page.should have_content("Session Param: false")
     end
 
     scenario 'for docomo', :driver => :docomo do
-      visit '/sessions/link'
-      click_on "Link"
-      page.should have_content("Session Data: link")
+      visit "/sessions/button_to_get"
+      page.find('form input[name="_myapp_session"]')["value"].should_not be_blank
+      click_on "button_to_get"
+      page.should have_content("Session Data: button_to_get")
       page.should have_content("Session Param: true")
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Paul McMahon
@@ -91,6 +91,7 @@ files:
 - lib/galakei/input_mode.rb
 - lib/galakei/railtie.rb
 - lib/galakei/request.rb
+- lib/galakei/session_id_parameter.rb
 - lib/galakei/session_id_parameter/in_form.rb
 - lib/galakei/session_id_parameter/in_url.rb
 - lib/galakei/session_id_parameter/railtie.rb