galakei 0.3.2 → 0.3.3

data/.gitignore

@@ -1,3 +1,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+log

data/Gemfile

@@ -5,4 +5,8 @@ gemspec
 
 group :development do
   gem 'rspec', '>= 2.5.0'
+  gem 'capybara'
+  gem 'steak'
+  gem 'sqlite3'
+  gem 'rspec-rails'
 end

data/lib/galakei/input_mode.rb

@@ -41,7 +41,7 @@ module Galakei
           else
             options[:istyle] = inputmode[:istyle]
             options[:mode] = inputmode[:mode]
-            options[:style] ||= %Q{-wap-input-format:*#{inputmode[:other_wap_input_format]};}
+            options[:style] ||= %Q{-wap-input-format:*#{inputmode[:other_wap_input_format]}}
           end
         end
       end

data/lib/galakei/railtie.rb

@@ -1,20 +1,21 @@
+require 'docomo_css'
+
 module Galakei
   class Railtie < Rails::Railtie
     config.galakei = ActiveSupport::OrderedOptions.new
-    config.galakei.session_id_parameter = false
     initializer "galakei.extend.action_controller", :after => "docomo_css.extend.action_controller" do |app|
       ActiveSupport.on_load :action_controller do
         include Galakei::HelperMethods
         docomo_filter
         filters = %w[Views ContentType]
         filters << :Haml if defined?(Haml)
-        filters << :SessionIdParameter if app.config.galakei.session_id_parameter
         filters.each {|f| Galakei::Filter.const_get(f).inject(self) }
       end
       ActiveSupport.on_load :action_view do
         include Galakei::InputMode
-        include Galakei::SessionIdParameterInForm
       end
     end
   end
 end
+
+require 'galakei/session_id_parameter/railtie'

data/lib/galakei/session_id_parameter/in_form.rb

@@ -0,0 +1,10 @@
+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])
+    end
+    s
+  end
+end

data/lib/galakei/{filter/session_id_parameter.rb → session_id_parameter/in_url.rb}

@@ -1,8 +1,4 @@
-class Galakei::Filter::SessionIdParameter < Galakei::Filter::Base
-  def self.inject(klass)
-    klass.before_filter self
-  end
-
+class Galakei::SessionIdParameter::InUrl < Galakei::Filter::Base
   def filter
     key = ::Rails.application.config.session_options[:key]
     if device_needs_session_param_in_url?

data/lib/galakei/session_id_parameter/railtie.rb

@@ -0,0 +1,19 @@
+require 'docomo_css'
+
+module Galakei
+  module SessionIdParameter
+    class Railtie < Rails::Railtie
+      config.galakei.session_id_parameter = false
+      initializer "galakei.session_id_parameter" do |app|
+        if app.config.galakei.session_id_parameter
+          ActiveSupport.on_load :action_controller do
+            before_filter Galakei::SessionIdParameter::InUrl
+          end
+          ActiveSupport.on_load :action_view do
+            include Galakei::SessionIdParameter::InForm
+          end
+        end
+      end
+    end
+  end
+end

data/lib/galakei/version.rb

@@ -1,3 +1,3 @@
 module Galakei
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/galakei.rb

@@ -18,4 +18,8 @@ module Galakei
     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/spec/acceptance/acceptance_helper.rb

@@ -0,0 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require "steak"
+require 'capybara/rspec'
+require File.expand_path(File.dirname(__FILE__) + "/app/fake")
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+require 'rspec/rails'

data/spec/acceptance/app/fake.rb

@@ -0,0 +1,20 @@
+require 'rails'
+require 'active_record'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'galakei/railtie'
+
+# database
+ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+ActiveRecord::Base.establish_connection('test')
+
+# config
+app = Class.new(Rails::Application)
+app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
+app.config.session_store :cookie_store, :key => "_myapp_session"
+app.config.active_support.deprecation = :log
+app.config.galakei.session_id_parameter = true
+app.initialize!
+
+app.routes.draw { match ':controller(/:action(/:id))' }
+class ApplicationController < ActionController::Base; end

data/spec/acceptance/emoji_table_spec.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+
+class EmojiController < ApplicationController
+  def index
+    render :inline => "<%= emoji_table.black_sun_with_rays %>"
+  end
+end
+
+feature 'emoji table' do
+  scenario 'for docomo', :driver => :docomo do
+    visit '/emoji'
+    page.body.should match("&#xE63E;")
+  end
+
+  scenario 'for au', :driver => :au do
+    visit '/emoji'
+    page.body.should match("&#xE488;")
+  end
+
+  scenario 'for softbank', :driver => :softbank do
+    visit '/emoji'
+    page.body.should match("&#xE04A;")
+  end
+
+  scenario 'for non galakei' do
+    visit '/emoji'
+    page.body.should match("&#x2600;")
+  end
+end

data/spec/acceptance/handset_detection_spec.rb

@@ -0,0 +1,43 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+
+class HandsetDetectionController < ApplicationController
+  def index
+    render :inline => <<-ERB
+      <% if galakei? %>
+        <% if request.docomo? %>
+          docomo
+        <% elsif request.au? %>
+          au
+        <% elsif request.softbank? %>
+          softbank
+        <% end %>
+      <% else %>
+        not galakei
+      <% end %>
+    ERB
+  end
+end
+
+
+feature 'handset detection' do
+  scenario 'for docomo', :driver => :docomo do
+    visit '/handset_detection'
+    page.body.should match("docomo")
+  end
+
+  scenario 'for au', :driver => :au do
+    visit '/handset_detection'
+    page.body.should match("au")
+  end
+
+  scenario 'for softbank', :driver => :softbank do
+    visit '/handset_detection'
+    page.body.should match("softbank")
+  end
+
+  scenario 'for non galakei' do
+    visit '/handset_detection'
+    page.body.should match("not galakei")
+  end
+end

data/spec/acceptance/input_mode_spec.rb

@@ -0,0 +1,72 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+
+class InputModeController < ApplicationController
+  class User
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+    attr_accessor :hiragana, :hankaku_kana, :alphabet, :number_input_mode, :number_type
+    def persisted?; false end
+  end
+  def index
+    @user = User.new
+    render :inline => <<-EOD
+      <%= form_for @user, :url => "/" do |f| %>"
+        <%= f.text_field :hiragana, :inputmode => "hiragana" %>
+        <%= f.text_field :hankaku_kana, :inputmode => "hankaku_kana" %>
+        <%= f.text_field :alphabet, :inputmode => "alphabet" %>
+        <%= f.text_field :number_input_mode, :inputmode => "number" %>
+        <%= f.text_field :number_type, :type => "number" %>
+      <% end %>
+    EOD
+  end
+end
+
+feature 'input mode' do
+  scenario 'for docomo', :driver => :docomo do
+    visit '/input_mode'
+    within 'form' do
+      hiragana_input = page.find("#input_mode_controller_user_hiragana")
+      hiragana_input["style"].should == '-wap-input-format:"*<ja:h>"'
+      hankaku_kana_input = page.find("#input_mode_controller_user_hankaku_kana")
+      hankaku_kana_input["style"].should == '-wap-input-format:"*<ja:hk>"'
+      alphabet_input = page.find("#input_mode_controller_user_alphabet")
+      alphabet_input["style"].should == '-wap-input-format:"*<ja:en>"'
+      %w[input_mode type].each do |s|
+        e = page.find("#input_mode_controller_user_number_#{s}")
+        e["style"].should == '-wap-input-format:"*<ja:n>"'
+      end
+    end
+  end
+
+  # Although this markup should work for both au and softbank, since we are
+  # dynamicly determining this, perhaps we should just put in appropriate stuff
+  %w[au softbank].each do |carrier|
+    scenario "for #{carrier}", :driver => carrier.to_sym do
+      visit '/input_mode'
+      within 'form' do
+        e = page.find("#input_mode_controller_user_hiragana")
+        e["style"].should == '-wap-input-format:*M'
+        e["mode"].should == 'hiragana'
+        e["istyle"].should == '1'
+
+        e = page.find("#input_mode_controller_user_hankaku_kana")
+        e["style"].should == '-wap-input-format:*M'
+        e["mode"].should == 'hankakukana'
+        e["istyle"].should == '2'
+
+        e = page.find("#input_mode_controller_user_alphabet")
+        e["style"].should == '-wap-input-format:*m'
+        e["mode"].should == 'alphabet'
+        e["istyle"].should == '3'
+
+        %w[input_mode type].each do |s|
+          e = page.find("#input_mode_controller_user_number_#{s}")
+          e["style"].should == '-wap-input-format:*N'
+          e["mode"].should == 'numeric'
+          e["istyle"].should == '4'
+        end
+      end
+    end
+  end
+end

data/spec/acceptance/session_spec.rb

@@ -0,0 +1,71 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+
+class SessionsController < ApplicationController
+  class Search
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+    attr_accessor :query
+    def persisted?; false end
+  end
+
+  def in_get_form
+    session[:previous_page] = "in_get_form"
+    @search = Search.new
+    render :inline => <<-EOD
+      <%= form_for @search, :url => "/sessions", :html => { :method => :get } do |f| %>"
+        <%= f.text_field :query %>
+        <%= f.submit %>
+      <% end %>
+    EOD
+  end
+
+  def link
+    session[:previous_page] = "link"
+    render :inline => <<-EOD
+      <%= link_to "Link", :action => :index %>
+    EOD
+  end
+
+  def index
+    render :inline => <<-EOD
+      Session Data: #{session[:previous_page]}
+      Session Param: #{params.key?(:_myapp_session)}
+    EOD
+  end
+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
+
+    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")
+    end
+  end
+
+  context 'clicking link' do
+    scenario 'for au', :driver => :au do
+      visit '/sessions/link'
+      click_on "Link"
+      page.should have_content("Session Data: link")
+      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")
+      page.should have_content("Session Param: true")
+    end
+  end
+end

data/spec/acceptance/support/handsets.rb

@@ -0,0 +1,22 @@
+class Capybara::Driver::RackTestWithUserAgent < Capybara::Driver::RackTest
+  def initialize(app, user_agent)
+    super(app)
+    @user_agent = user_agent
+  end
+  private
+  def env
+    super.tap {|env| env['HTTP_USER_AGENT'] = @user_agent }
+  end
+end
+
+Capybara.register_driver :docomo do |app|
+  Capybara::Driver::RackTestWithUserAgent.new(app, "DoCoMo/2.0 P903i(c100;TB;W24H12)")
+end
+
+Capybara.register_driver :au do |app|
+  Capybara::Driver::RackTestWithUserAgent.new(app, "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
+end
+
+Capybara.register_driver :softbank do |app|
+  Capybara::Driver::RackTestWithUserAgent.new(app, "SoftBank/1.0/943SH/SHJ001/SN*************** Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Paul McMahon
@@ -84,16 +84,24 @@ files:
 - lib/galakei/filter/base.rb
 - lib/galakei/filter/content_type.rb
 - lib/galakei/filter/haml.rb
-- lib/galakei/filter/session_id_parameter.rb
 - lib/galakei/filter/views.rb
 - lib/galakei/helper_methods.rb
 - lib/galakei/input_mode.rb
 - lib/galakei/railtie.rb
 - lib/galakei/request.rb
-- lib/galakei/session_id_parameter_in_form.rb
+- lib/galakei/session_id_parameter/in_form.rb
+- lib/galakei/session_id_parameter/in_url.rb
+- lib/galakei/session_id_parameter/railtie.rb
 - lib/galakei/shoulda_macros.rb
 - lib/galakei/use_rack_request_to_extract_sid.rb
 - lib/galakei/version.rb
+- spec/acceptance/acceptance_helper.rb
+- spec/acceptance/app/fake.rb
+- spec/acceptance/emoji_table_spec.rb
+- spec/acceptance/handset_detection_spec.rb
+- spec/acceptance/input_mode_spec.rb
+- spec/acceptance/session_spec.rb
+- spec/acceptance/support/handsets.rb
 - spec/galakei/filter/content_type_spec.rb
 - spec/galakei/request_spec.rb
 - spec/spec_helper.rb

data/lib/galakei/session_id_parameter_in_form.rb

@@ -1,12 +0,0 @@
-module Galakei
-  module SessionIdParameterInForm
-    def extra_tags_for_form(html_options)
-      s = super
-      if html_options["method"] == "get"
-        key = ::Rails.application.config.session_options[:key]
-        s << tag(:input, :type => "hidden", :name => key, :value => request.session_options[:id])
-      end
-      s
-    end
-  end
-end