galakei 0.13.2 → 0.13.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    galakei (0.13.2)
+    galakei (0.13.3)
       actionpack (>= 3.0.3)
       css_parser
       nokogiri
@@ -112,7 +112,7 @@ GEM
       rspec (~> 2.6.0)
     rubyzip (0.9.4)
     sanitize (2.0.3)
-      nokogiri (< 1.6, >= 1.4.4)
+      nokogiri (>= 1.4.4, < 1.6)
     selenium-webdriver (2.7.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
@@ -121,7 +121,7 @@ GEM
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     steak (2.0.0)
       capybara (>= 1.0.0)
       rspec-rails (>= 2.5.0)

data/lib/galakei/docomo_css/inline_stylesheet.rb

@@ -21,15 +21,20 @@ class Galakei::DocomoCss::InlineStylesheet # :nodoc: all
   def self.parser(href)
     parser = CssParser::Parser.new
     uri = URI.parse(href)
-    if uri.host && uri.scheme && uri.port
-      parser.load_uri!(uri)
-    elsif /^\/assets\/([^?]+)/=~ href
-      asset = Rails.application.assets.find_asset($1)
+    asset_host = ActionController::Base.asset_host
+    # Hack to handle if asset host is a proc. Call it with nil for all arguments.
+    if asset_host.respond_to?(:call)
+      asset_host = asset_host.call(*asset_host.arity.times.map { nil })
+    end
+    if /(#{asset_host}|^)\/assets\/([^?]+)/ =~ href
+      asset = Rails.application.assets.find_asset($2)
       if asset
         parser.add_block!(asset.to_s, {:media_types => :all, :base_dir => File.dirname(href)})
       else
-        Rails.logger.warn("[galakei] asset lookup for #{$1} failed, skipping")
+        Rails.logger.warn("[galakei] asset lookup for #{$2} failed, skipping")
       end
+    elsif uri.host && uri.scheme && uri.port && uri.host
+      parser.load_uri!(uri)
     else
       parser.load_file!(path(href))
     end

data/lib/galakei/version.rb

@@ -1,4 +1,4 @@
 module Galakei
   # The version of Galakei you are using
-  VERSION = "0.13.2"
+  VERSION = "0.13.3"
 end

data/spec/acceptance/docomo_css_spec.rb

@@ -27,7 +27,6 @@ class DocomoCssController < ApplicationController
     render :inline => html, :layout => true
   end
 
-
   def japanese
     html = <<-EOD
       <% content_for(:head, stylesheet_link_tag("docomo_css/simple.css")) %>
@@ -51,6 +50,31 @@ feature 'inlining of css' do
     page.should_not have_xpath("//link")
   end
 
+  scenario 'requesting simple page for docomo with asset host', :driver => :docomo do
+    old_asset_host = ActionController::Base.asset_host
+    begin
+      ActionController::Base.asset_host = 'assets.example.com'
+      visit '/docomo_css/simple'
+      find("span")["style"].should == "color: red;"
+      page.should_not have_xpath("//link")
+    ensure
+      ActionController::Base.asset_host = old_asset_host
+    end
+  end
+
+  scenario 'requesting simple page for docomo with proc asset host', :driver => :docomo do
+    old_asset_host = ActionController::Base.asset_host
+    begin
+      ActionController::Base.asset_host = lambda {|scope, req| 'assets.example.com' unless req && req.ssl? }
+      visit '/docomo_css/simple'
+      find("span")["style"].should == "color: red;"
+      page.should_not have_xpath("//link")
+    ensure
+      ActionController::Base.asset_host = old_asset_host
+    end
+  end
+
+
   %w[au softbank docomo_2_0].each do |carrier|
     scenario "requesting simple page for #{carrier}", :driver => carrier.to_sym do
       visit '/docomo_css/simple'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galakei
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000 Z
+date: 2011-11-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &19282940 !ruby/object:Gem::Requirement
+  requirement: &2152194740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *19282940
+  version_requirements: *2152194740
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &19221820 !ruby/object:Gem::Requirement
+  requirement: &2152185080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *19221820
+  version_requirements: *2152185080
 - !ruby/object:Gem::Dependency
   name: css_parser
-  requirement: &19218900 !ruby/object:Gem::Requirement
+  requirement: &2152183620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19218900
+  version_requirements: *2152183620
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &18728440 !ruby/object:Gem::Requirement
+  requirement: &2152181580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18728440
+  version_requirements: *2152181580
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &18723820 !ruby/object:Gem::Requirement
+  requirement: &2152179600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18723820
+  version_requirements: *2152179600
 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