galakei 0.6.2 → 0.6.3

data/lib/galakei/filter/recode.rb

@@ -6,7 +6,7 @@ class Galakei::Filter::Recode < Galakei::Filter::Base
   end
 
   def condition?
-    request.ssl? && request.au?
+    request.ssl? && request.au_browser_6?
   end
 
   def filter

data/lib/galakei/request.rb

@@ -23,6 +23,14 @@ module Galakei
       end
     end
 
+    def au_browser_6?
+      /KDDI.* UP\.Browser\/6\./ =~ user_agent && /UP\.Browser\/6\.2_7/ !~ user_agent
+    end
+
+    def different_cookie_in_ssl?
+      au? || softbank?
+    end
+
     def galakei?
       docomo? || au? || softbank?
     end

data/lib/galakei/session_id_parameter/in_url.rb

@@ -19,9 +19,12 @@ module Galakei::SessionIdParameter::InUrl
     return false unless options.is_a?(Hash) && request
     return true if request.imode_browser_1_0?
 
+    # cookies on older AU handsets using SSL are unreliable
+    return true if request.au_browser_6? && request.ssl?
+
     # au and softbank have two forms of cookies depending on if it is
     # http or https, so carry over session id when switching protocols
     return false unless options[:protocol]
-    (request.au? || request.softbank?) && (request.protocol != options[:protocol])
+    request.different_cookie_in_ssl? && (request.protocol != options[:protocol])
   end
 end

data/lib/galakei/spacer.rb

@@ -21,7 +21,28 @@ module Galakei
     end
 
     def hex
-      HEX[0] + @color + HEX[1] + HEX[2]
+      hex_color = case @color
+                  when 'maroon'; '800000' 
+                  when 'red'; 'ff0000' 
+                  when 'orange'; 'ffA500'
+                  when 'yellow'; 'ffff00' 
+                  when 'olive'; '808000'
+                  when 'purple'; '800080'
+                  when 'fuchsia'; 'ff00ff'
+                  when 'white'; 'ffffff'
+                  when 'lime'; '00ff00'
+                  when 'green'; '008000'
+                  when 'navy'; '000080'
+                  when 'blue'; '0000ff'
+                  when 'aqua'; '00ffff'
+                  when 'teal'; '008080'
+                  when 'black'; '000000'
+                  when 'silver'; 'c0c0c0'
+                  when 'gray'; '808080'
+                  when 'black'; '000000'
+                  else @color
+                  end
+      HEX[0] + hex_color + HEX[1] + HEX[2]
     end
 
     def img_tag(options = {})

data/lib/galakei/use_rack_request_to_extract_sid.rb

@@ -1,5 +1,11 @@
 require "action_dispatch/middleware/session/abstract_store"
 
+# Patch the abstract session store to accomplish the following things:
+#
+# - avoid issue https://rails.lighthouseapp.com/projects/8994/tickets/6108-activerecord-session-store-clobbers-params#ticket-6108-2 by using Rack::Request instead of ActionDispatch::Request
+# - session ID in the params overwrites session ID in the cookie
+# - make sure we always set the session ID in SSL in case the handset uses different cookies for HTTP/HTTPS
+
 module ActionDispatch
   module Session
     class AbstractStore
@@ -7,9 +13,18 @@ module ActionDispatch
         def extract_session_id(env)
           stale_session_check! do
             request = Rack::Request.new(env)
-            sid = request.cookies[@key]
-            sid ||= request.params[@key] unless @cookie_only
-            sid
+            if ! @cookie_only && request.params[@key]
+              request.params[@key]
+            else
+              request.cookies[@key]
+            end
+          end
+        end
+
+        def set_cookie(request, options)
+          original_condition = request.cookie_jar[@key] != options[:value] || !options[:expires].nil?
+          if original_condition || (request.ssl? && request.different_cookie_in_ssl?)
+            request.cookie_jar[@key] = options
           end
         end
     end

data/lib/galakei/version.rb

@@ -1,3 +1,3 @@
 module Galakei
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/acceptance/docomo_css_spec.rb

@@ -19,6 +19,15 @@ class DocomoCssController < ApplicationController
     render :inline => html, :layout => true
   end
 
+  def div
+    html = <<-EOD
+      <% content_for(:head, stylesheet_link_tag("http://www.galakei.com/external.css")) %>
+      <div>test</div>
+    EOD
+    render :inline => html, :layout => true
+  end
+
+
   def japanese
     html = <<-EOD
       <% content_for(:head, stylesheet_link_tag("docomo_css/simple.css")) %>
@@ -56,4 +65,16 @@ feature 'inlining of css' do
     visit '/docomo_css/japanese'
     page.body.should include("ほげ")
   end
+
+  %w[#000000 black].each do |s|
+    scenario "requesting page with #{s} border", :driver => :docomo do
+      FakeWeb.register_uri(:get, 'http://www.galakei.com/external.css', :body => "div { border-top: 1px solid #{s} }")
+      visit '/docomo_css/div'
+      div = find('img')
+      div["width"].should == "100%"
+      div["height"].should == "1"
+      visit div['src']
+      page.body.should include("GIF89a")
+    end
+  end
 end

data/spec/acceptance/session_spec.rb

@@ -105,13 +105,19 @@ feature 'session' do
     end
   end
 
-  scenario 'link https to https for au', :driver => :au do
+  scenario 'link https to https for au browser 7.2', :driver => :au_7 do
     visit "https://www.example.com/sessions/link"
     click_on 'link'
     page.should have_content("Session Param: false")
   end
 
-  %w[au softbank].each do |s|
+  scenario 'link https to https for au browser 6', :driver => :au do
+    visit "https://www.example.com/sessions/link"
+    click_on 'link'
+    page.should have_content("Session Param: true")
+  end
+
+  %w[au au_7 softbank].each do |s|
     scenario "link http to https for #{s}", :driver => s.to_sym do
       visit "http://www.example.com/sessions/secure_link"
       click_on 'secure_link'

data/spec/acceptance/support/handsets.rb

@@ -21,6 +21,10 @@ 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 :au_7 do |app|
+  Capybara::Driver::RackTestWithUserAgent.new(app, "KDDI-SA3B UP.Browser/6.2_7.2.7.1.K.1.3.101 (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

data/spec/app/fake.rb

@@ -21,6 +21,7 @@ app.initialize!
 
 app.routes.draw do
   match 'session_generation' => "sessions#session_generation"
+  match 'galakei/spacer/:color' => 'galakei/spacer#create', :defaults => { :format => :gif } # should be directly using config/routes
   match ':controller(/:action(/:id))'
 end
 class ApplicationController < ActionController::Base; end

data/spec/galakei/docomo_css/stylesheet_spec.rb

@@ -272,6 +272,13 @@ EOD
       let(:css) { "h1 { border-bottom: 1px solid #000000; } "}
       it_should_behave_like 'border bottom'
     end
+
+    context 'border bottom with !important' do
+      let(:css) { "h1 { border-bottom: 1px solid #96ca41 !important; } "}
+      it 'applied border bottom' do
+        subject.next_sibling.to_s.should == %q[<img src="/galakei/spacer/96ca41" width="100%" height="1">]
+      end
+    end
   end
 
   context 'border css applied to p' do

data/spec/galakei/request_spec.rb

@@ -34,6 +34,16 @@ describe Galakei::Request do
     before { @request = Rack::Request.new(env_for("AU W51SH")) }
     it_should_behave_like "non-docomo devices"
     it_should_behave_like "non-softbank devices"
+    it_should_behave_like "au devices"
+    it("should be browser 6") { @request.should be_au_browser_6 }
+  end
+
+  describe "from AU W54SH" do
+    before { @request = Rack::Request.new(env_for("AU W54SA")) }
+    it_should_behave_like "non-docomo devices"
+    it_should_behave_like "non-softbank devices"
+    it_should_behave_like "au devices"
+    it("should not be browser 6") { @request.should_not be_au_browser_6 }
   end
 
   describe "from Vodafone 802N" do

data/spec/galakei/spacer_spec.rb

@@ -1,21 +1,16 @@
 require 'spec_helper'
 
 describe Galakei::Spacer do
-  describe 'initialize' do
-    it 'should can initialize' do
-      expect {
-        described_class.new('#000000')
-      }.to_not raise_error
+  context "#000000" do
+    subject { described_class.new("#000000") }
+    it { subject.img_tag.should == %Q[<img src='/galakei/spacer/000000' width='100%' height='1'>] }
+    it { subject.create.should_not be_nil }
+  end
+  %w[000000 aqua black blue fuchsia gray green lime maroon navy olive orange purple red silver teal white yellow].each do |s|
+    context s do
+      subject { described_class.new(s) }
+      it { subject.img_tag.should == %Q[<img src='/galakei/spacer/#{s}' width='100%' height='1'>] }
+      it { subject.create.should_not be_nil }
     end
   end 
-
-  describe 'output img_tag' do
-    subject { described_class.new('#000000').img_tag }
-    it { should == %q[<img src='/galakei/spacer/000000' width='100%' height='1'>] }
-  end
-
-  describe 'create image binary' do
-    subject { described_class.new('#000000').create }
-    it { should_not be_nil }
-  end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ def env_for(device_name)
     "Firefox" => "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.16) Gecko/20101130 Firefox/3.5.16",
     "Docomo SH-06A" => "DoCoMo/2.0 SH06A3(c500;TB;W24H14)" ,
     "AU W51SH" => "KDDI-SH32 UP.Browser/6.2.0.11.2.1 (GUI) MMP/2.0",
+    "AU W54SA" => "KDDI-SA3B UP.Browser/6.2_7.2.7.1.K.1.3.101 (GUI) MMP/2.0",
     "Vodafone 802N" => "Vodafone/1.0/V802N/NJ001/SN*************** Browser/UP.Browser/7.0.2.1.307 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
     "Softbank 709SC" => "SoftBank/1.0/709SC/SCJ001/SN*************** Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
   }[device_name]

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: galakei
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 2
-  version: 0.6.2
+  prerelease: 
+  version: 0.6.3
 platform: ruby
 authors: 
 - Paul McMahon
@@ -16,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 +09:00
+date: 2011-04-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,10 +23,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
   type: :runtime
   version_requirements: *id001
@@ -42,10 +34,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
         version: 1.2.1
   type: :runtime
   version_requirements: *id002
@@ -57,8 +45,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -70,8 +56,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -156,21 +140,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: galakei
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Japanese feature phones support