galakei 0.12.0 → 0.12.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    galakei (0.11.3)
+    galakei (0.12.1)
       actionpack (>= 3.0.3)
       css_parser
       nokogiri

data/lib/galakei/docomo_css/inline_stylesheet.rb

@@ -8,6 +8,7 @@ class Galakei::DocomoCss::InlineStylesheet
     doc = Nokogiri::HTML(controller.response.body)
     stylesheets = doc.xpath('//link[@rel="stylesheet"]')
     return if stylesheets.empty?
+    Galakei.logger.info("[galakei] DoCoMo browser 1.0 and external stylesheets detected, inlining CSS")
     stylesheets.each do |e|
       e.unlink
       stylesheet = Galakei::DocomoCss::Stylesheet.new(parser(e['href']))
@@ -22,9 +23,13 @@ class Galakei::DocomoCss::InlineStylesheet
     uri = URI.parse(href)
     if uri.host && uri.scheme && uri.port
       parser.load_uri!(uri)
-    elsif /^\/assets\/(.+)/=~ href
+    elsif /^\/assets\/([^?]+)/=~ href
       asset = Rails.application.assets.find_asset($1)
-      parser.add_block!(asset.to_s, {:media_types => :all, :base_dir => File.dirname(href)})
+      if asset
+        parser.add_block!(asset.to_s, {:media_types => :all, :base_dir => File.dirname(href)})
+      else
+        Galakei.logger.warn("[galakei] asset lookup for #{$1} failed, skipping")
+      end
     else
       parser.load_file!(path(href))
     end

data/lib/galakei/filter/content_type.rb

@@ -13,6 +13,7 @@ class Galakei::Filter::ContentType < Galakei::Filter::Base
   end
 
   def filter
+    Galakei.logger.info("[galakei] DoCoMo browser 1.0 and HTML detected, changing content type to application/xhtml+xml")
     response.content_type = 'application/xhtml+xml'
   end
 end

data/lib/galakei/filter/haml.rb

@@ -6,7 +6,8 @@ class Galakei::Filter::Haml < Galakei::Filter::Base
   end
 
   def filter
-    old_format = ::Haml::Template.options[:format] 
+    old_format = ::Haml::Template.options[:format]
+    Galakei.logger.info("[galakei] galakei detected, switching HAML to use :xhtml")
     ::Haml::Template.options[:format] = :xhtml
     yield
   ensure

data/lib/galakei/filter/recode.rb

@@ -11,6 +11,7 @@ class Galakei::Filter::Recode < Galakei::Filter::Base
   end
 
   def filter
+    Galakei.logger.info("[galakei] AU handset over SSL detected, recoding everything to Shift_JIS")
     deep_apply(controller.params) do |param|
       NKF.nkf('-Sw', param)
     end

data/lib/galakei/request.rb

@@ -3,20 +3,20 @@ require "rack/request"
 module Galakei
   module Request
     def docomo?
-      /^DoCoMo/ =~ user_agent
+      !! (/^DoCoMo/ =~ user_agent)
     end
 
     def au?
       # doesn't detect some 2G phones, but as they will be discontinued soon, doesn't really matter
-      /KDDI/ =~ user_agent
+      !! (/KDDI/ =~ user_agent)
     end
 
     def softbank?
-      /^(SoftBank|Vodafone)/ =~ user_agent
+      !! (/^(SoftBank|Vodafone)/ =~ user_agent)
     end
 
     def imode_browser_1_0?
-      if /docomo(.*\((.*;)?c(\d+)\;)?/i =~ user_agent
+      if /^DoCoMo(.*\((.*;)?c(\d+)\;)?/ =~ user_agent
         $3.to_i < 500
       else
         false

data/lib/galakei/version.rb

@@ -1,3 +1,3 @@
 module Galakei
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/lib/galakei.rb

@@ -23,4 +23,16 @@ if defined?(Rails)
   require 'galakei/railtie'
   require 'galakei/engine'
   require 'galakei/use_rack_request_to_extract_sid'
+
+  module Galakei
+    def self.logger
+      Rails.logger
+    end
+  end
+else
+  module Galakei
+    def self.logger
+      @logger ||= Logger.new(STDERR)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galakei
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000 +09:00
+date: 2011-10-05 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &17711400 !ruby/object:Gem::Requirement
+  requirement: &18595660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *17711400
+  version_requirements: *18595660
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &17710880 !ruby/object:Gem::Requirement
+  requirement: &18595000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *17710880
+  version_requirements: *18595000
 - !ruby/object:Gem::Dependency
   name: css_parser
-  requirement: &17710500 !ruby/object:Gem::Requirement
+  requirement: &18594460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17710500
+  version_requirements: *18594460
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &17710000 !ruby/object:Gem::Requirement
+  requirement: &18593840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17710000
+  version_requirements: *18593840
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &17709560 !ruby/object:Gem::Requirement
+  requirement: &18567560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,7 +68,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17709560
+  version_requirements: *18567560
 description: Japanese feature phones (a.k.a., keitai, galakei) have a number of restrictions
   over normal web browsers.  This library adds support for them
 email: info@mobalean.com