galakei 0.5.1 → 0.6.0

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
+  gem 'rails'
   gem 'rspec', '>= 2.5.0'
   gem 'capybara'
   gem 'steak'

data/README.md

@@ -22,6 +22,44 @@ Old docomo handsets [don't support external stylesheets](http://www.keitai-dev.n
     # outputted html
     <div style="background-color: blue;"><h1><span style="color:red;">Foo</span></h1>/div>
 
+Furthermore, the css border property is supported through the "spacer.gif" technique.
+
+    # css file
+    div { border-bottom: 5px solid #000000; }
+
+    # source html
+    <div>Foo</div>
+
+    # outputted html
+    <div>Foo</div>
+    <img src="/galakei/spacer/000000" width="100%" height="5">
+
+This will generate a 1px by 1px image, emulating the effect of borders on old docomo handsets.
+
+### Maintaing sessions
+
+Old docomo handsets [don't support cookies](http://www.keitai-dev.net/Cookies). Furthermore, although Softbank and Au handsets support cookies, when accessing SSL pages, different cookies may be used. Galakei works around this by injecting a session id parameter into your URLs and forms (as long as you use a standard rails method for creating them). To enable this functionality, you will need to modify your session_store.rb initializer to allow the use of session parameters and use a non cookie-based store.
+
+     MyApp::Application.config.session_store :active_record_store, :key => '_sid', :cookie_only => false
+
+You'll also need to enable this option in galakei
+
+    config.galakei.session_id_parameter = true
+
+### Emoji
+
+Easily use [Emoji](http://www.keitai-dev.net/Emoji) in your templates with emoji_table! emoji_table will return the correct emoji for your browser, including normal PC browsers:
+
+    emoji_table.white_smiling_face # "☺"
+
+### Alternate galakei views
+
+Have a PC site that you want to add galakei templates for? Put your views in app/views.galakei and they'll be used in preference to your normal app/views
+
+### haml
+
+haml is great for building galakei sites, as it enforces well formed markup. galakei takes care of setting the haml template format for you, so you'll generate xhtml.
+
 ## Thanks
 
  * To [jpmobile](https://github.com/jpmobile/jpmobile) for offering the most mature Rails plugin for Rails

data/app/controllers/galakei/spacer_controller.rb

@@ -0,0 +1,9 @@
+class Galakei::SpacerController < ActionController::Base
+  def create
+    respond_to do |format|
+      format.gif do
+        send_data(Galakei::Spacer.new(params[:color]).create, :disposition => "inline", :type => :gif)
+      end
+    end
+  end
+end

data/config/initializers/mime_types.rb

@@ -0,0 +1 @@
+Mime::Type.register 'image/gif', :gif

data/config/routes.rb

@@ -0,0 +1,3 @@
+ Rails.application.routes.draw do
+   match 'galakei/spacer/:color' => 'galakei/spacer#create', :defaults => { :format => :gif }
+ end

data/galakei.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name         = "galakei"
   s.version      = Galakei::VERSION
   s.platform     = Gem::Platform::RUBY
-  s.authors      = ["Paul McMahon", "Michael Reinsch"]
+  s.authors      = ["Paul McMahon", "Michael Reinsch", "Yuki Akamatsu"]
   s.email        = "info@mobalean.com"
   s.homepage     = "http://www.mobalean.com"
   s.summary      = "Japanese feature phones support"

data/lib/galakei/docomo_css/inline_stylesheet.rb

@@ -9,15 +9,26 @@ class Galakei::DocomoCss::InlineStylesheet
     return if stylesheets.empty?
     stylesheets.each do |e|
       e.unlink
-      parser = CssParser::Parser.new
-      uri = URI.parse(e['href'])
-      uri.scheme = controller.request.scheme unless uri.scheme
-      uri.host = controller.request.host unless uri.host
-      uri.port = controller.request.port unless uri.port
-      parser.load_uri!(uri)
-      stylesheet = Galakei::DocomoCss::Stylesheet.new(parser)
+      stylesheet = Galakei::DocomoCss::Stylesheet.new(parser(e['href']))
       stylesheet.apply(doc)
     end
     controller.response.body = doc.to_xhtml(:encoding => doc.encoding)
   end
+
+  private
+  def self.parser(href)
+    parser = CssParser::Parser.new
+    uri = URI.parse(href)
+    if uri.host && uri.scheme && uri.port
+      parser.load_uri!(uri)
+    else
+      parser.load_file!(path(href))
+    end
+    return parser
+  end
+
+  def self.path(href)
+    base_path = href.gsub(ActionController::Base.asset_host || '', '').gsub(/\?\d+/,'')
+    File.join(Rails.root, 'public', base_path)
+  end
 end

data/lib/galakei/docomo_css/stylesheet.rb

@@ -30,40 +30,103 @@ EOD
 
   private
 
-  def merge_style(e, s)
-    if e["style"] 
-      e['style'] += ";" unless e['style'] =~ /;\Z/
-        e['style'] += s
+  def embed_style(doc, ruleset, selector)
+    doc.css(selector).each do |e| 
+      styles = []
+      ruleset.each_declaration do |property, value, is_important|
+        styles << [property,value]
+      end
+      apply_element_specific_style(e, styles)
+    end
+  end
+
+  def apply_element_specific_style(element, styles)
+    style_adapters = case element.name
+    when /^h\d$/
+      [BorderAdapter, BackGroundAdapter, FontAdapter]
+    when 'p'
+      [BackGroundAdapter, FontAdapter]
+    when 'div'
+      [BorderAdapter]
     else
-      e["style"] = s
+      []
+    end
+    styles.each do |property,value|
+      applicable_styles = style_adapters.find_all {|s| s.apply?(property)}
+      applicable_styles = [ CssInliner ] if applicable_styles.empty?
+      applicable_styles.each {|s| s.apply(element, property, value) }
     end
   end
 
-  def wrap_all_children(e, s)
-    new_parent = e.document.parse(s).first
-    e.children.each {|f| new_parent.add_child(f)}
-    e.add_child(new_parent)
+  class GenericAdapter
+    private
+    def self.merge_style(element,property, value)
+      style = "#{property}: #{value};"
+      if element['style']
+        element['style'] += ";" unless element['style'] =~ /;\Z/
+        element['style'] += style
+      else
+        element["style"] = style
+      end
+    end
   end
 
-  def embed_style(doc, ruleset, selector)
-    doc.css(selector).each do |e| 
-      ruleset.each_declaration do |property, value, is_important|
-        s = "#{property}: #{value};"
-        if selector =~ /^(h\d|p)[^\s]*$/
-          if %w[color font-size].include?(property)
-            wrap_all_children(e, '<span>')
-            merge_style(e.children.first, s)
-          elsif %w[background-color].include?(property)
-            div = Nokogiri.make("<div>")
-            merge_style(div, s)
-            e.replace(div)
-            div.add_child(e)
-          else
-            merge_style(e, s)
-          end
-        else
-          merge_style(e, s)
-        end
+  class CssInliner < GenericAdapter
+    def self.apply(element, property, value)
+      merge_style(element,property,value)
+    end
+  end
+
+  class FontAdapter < GenericAdapter
+    def self.apply?(property)
+      %w[color font-size].include?(property)
+    end
+
+    def self.apply(element, property, value)
+      wrap_all_children(element, '<span>')
+      merge_style(element.children.first, property, value)
+    end
+
+    private
+
+    def self.wrap_all_children(element, tag)
+      new_parent = element.document.parse(tag).first
+      element.children.each {|f| new_parent.add_child(f)}
+      element.add_child(new_parent)
+    end
+  end
+
+  class BackGroundAdapter < GenericAdapter
+    def self.apply?(property)
+      property == 'background-color'
+    end
+
+    def self.apply(element, property, value)
+      div = Nokogiri.make("<div>")
+      merge_style(div,property,value)
+      element.replace(div)
+      div.add_child(element)
+    end
+  end
+
+  class BorderAdapter < GenericAdapter
+    def self.apply?(property)
+      %w[border border-top border-bottom].include?(property)
+    end
+
+    def self.apply(element, property,value)
+      color = value.split(/\s/).last.split('#').last
+      thickness = value.match(/(\d+)px/)[1]
+      img = Galakei::Spacer.new(color).img_tag(:height => thickness)
+
+      case property
+      when 'border'
+        element.after(img)
+        element.before(img)
+      when 'border-top'
+        element.before(img)
+      when 'border-bottom'
+        element.after(img)
       end
     end
   end

data/lib/galakei/emoji_table.rb

@@ -2,44 +2,44 @@ require 'active_support/core_ext/string/output_safety'
 module Galakei
   class EmojiTable
     MAPPING = { 
-      :black_sun_with_rays => %w[2600 E63E E488 E04A],
-      :cloud => %w[2601 E63F E48D E049],
-      :black_telephon => %w[260E E687 E596 E009],
-      :white_smiling_face => %w[263A E6F0 E4FB E414],
-      :persevering_face => %w[1F623 E72B EAC2 E406],
-      :left_pointing_magnifying_glass => %w[1F50D E6DC E518 E114],
-      :envelope => %w[2709 E6D3 E521 E103],
-      :envelope_with_downwards_arrow_above => %w[1F4E9 E6CF EB62 E103],
-      :footprints => %w[1F463 E698 EB2A E536],
-      :pencil => %w[270F E719 E4A1 E301],
-      :key => %w[1F511 E6D9 E519 E03F],
-      :alarm_clock => %w[23F0 E6BA E594 E02D],
-      :four_leaf_clover => %w[1F340 E741 E513 E110],
-      :warning_sign => %w[26A0 E737 E481 E252],
-      :winking_face => %w[1F609 E729 E5C3 E405],
-      :smiling_face_with_open_mouth => %w[1F603 E6F0 E471 E057],
-      :house_building => %w[1F3E0 E663 E4AB E036],
-      :squared_new => %w[1F195 E6DD E5B5 E212],
-      :sparkle => %w[2747 E6FA E46C E32E],
-      :copyright_sign => %w[00A9 E731 E558 E24E],
-      :registered_sign => %w[00AE E736 E559 E24F],
-      :trade_mark_sign => %w[2122 E732 E54E E537],
-      :hash_key => [ %w[0023 20E3] ] + %w[E6E0 EB84 E210],
-      :keycap_1 => [ %w[0031 20E3] ] + %w[E6E2 E522 E21C],
-      :keycap_2 => [ %w[0032 20E3] ] + %w[E6E3 E523 E21D],
-      :keycap_3 => [ %w[0033 20E3] ] + %w[E6E4 E524 E21E],
-      :keycap_4 => [ %w[0034 20E3] ] + %w[E6E5 E525 E21F],
-      :keycap_5 => [ %w[0035 20E3] ] + %w[E6E6 E526 E220],
-      :keycap_6 => [ %w[0036 20E3] ] + %w[E6E7 E527 E221],
-      :keycap_7 => [ %w[0037 20E3] ] + %w[E6E8 E528 E222],
-      :keycap_8 => [ %w[0040 20E3] ] + %w[E6E9 E529 E223],
-      :keycap_9 => [ %w[0041 20E3] ] + %w[E6EA E52A E224],
-      :keycap_0 => [ %w[0030 20E3] ] + %w[E6EB E52C E225],
+      :black_sun_with_rays => %w[2600 E63E E488 E04A EF60],
+      :cloud => %w[2601 E63F E48D E049 EF65],
+      :black_telephon => %w[260E E687 E596 E009 F0B3],
+      :white_smiling_face => %w[263A E6F0 E4FB E414 EFD4],
+      :persevering_face => %w[1F623 E72B EAC2 E406 EC96],
+      :left_pointing_magnifying_glass => %w[1F50D E6DC E518 E114 EFF1],
+      :envelope => %w[2709 E6D3 E521 E103 EFFA],
+      :envelope_with_downwards_arrow_above => %w[1F4E9 E6CF EB62 E103 ED66],
+      :footprints => %w[1F463 E698 EB2A E536 ECEB],
+      :pencil => %w[270F E719 E4A1 E301 EF79],
+      :key => %w[1F511 E6D9 E519 E03F EFF2],
+      :alarm_clock => %w[23F0 E6BA E594 E02D F0B1],
+      :four_leaf_clover => %w[1F340 E741 E513 E110 EFEC],
+      :warning_sign => %w[26A0 E737 E481 E252 EF59],
+      :winking_face => %w[1F609 E729 E5C3 E405 F0F3],
+      :smiling_face_with_open_mouth => %w[1F603 E6F0 E471 E057 EF49],
+      :house_building => %w[1F3E0 E663 E4AB E036 EF84],
+      :squared_new => %w[1F195 E6DD E5B5 E212 F0E5],
+      :sparkle => %w[2747 E6FA E46C E32E EF44],
+      :copyright_sign => %w[00A9 E731 E558 E24E F074],
+      :registered_sign => %w[00AE E736 E559 E24F F075],
+      :trade_mark_sign => %w[2122 E732 E54E E537 F06A],
+      :hash_key => [ %w[0023 20E3] ] + %w[E6E0 EB84 E210 ED89],
+      :keycap_1 => [ %w[0031 20E3] ] + %w[E6E2 E522 E21C EFFB],
+      :keycap_2 => [ %w[0032 20E3] ] + %w[E6E3 E523 E21D EFFC],
+      :keycap_3 => [ %w[0033 20E3] ] + %w[E6E4 E524 E21E F040],
+      :keycap_4 => [ %w[0034 20E3] ] + %w[E6E5 E525 E21F F041],
+      :keycap_5 => [ %w[0035 20E3] ] + %w[E6E6 E526 E220 F042],
+      :keycap_6 => [ %w[0036 20E3] ] + %w[E6E7 E527 E221 F043],
+      :keycap_7 => [ %w[0037 20E3] ] + %w[E6E8 E528 E222 F044],
+      :keycap_8 => [ %w[0040 20E3] ] + %w[E6E9 E529 E223 F045],
+      :keycap_9 => [ %w[0041 20E3] ] + %w[E6EA E52A E224 F046],
+      :keycap_0 => [ %w[0030 20E3] ] + %w[E6EB E52C E225 F047],
     }
     MAPPING.each do |k,v|
       MAPPING[k] = v.map do |a| 
         a = [ a ] if a.is_a?(String)
-        a.map {|s| "&#x#{s};"}.join.html_safe
+        a.map{|s| ("0x" + s).hex}.pack("U*")
       end
       define_method k do
         MAPPING[k][@carrier]
@@ -59,9 +59,11 @@ module Galakei
     end
 
     def self.au
-      @au ||= EmojiTable.new(2)
+      @au ||= EmojiTable.new(4)
     end
 
+
+
     def self.softbank
       @softbank ||= EmojiTable.new(3)
     end

data/lib/galakei/engine.rb

@@ -0,0 +1,4 @@
+module Galakei
+  class Engine < ::Rails::Engine #:nodoc:
+  end
+end

data/lib/galakei/filter/non_standard_char.rb

@@ -0,0 +1,23 @@
+# coding: utf-8
+class Galakei::Filter::NonStandardChar < Galakei::Filter::Base
+  def self.inject(klass)
+    this_class = self
+    klass.after_filter self, :if => lambda {|c| this_class.condition?(c) }
+  end  
+
+  def condition?
+    response.content_type =~ %r{text/html|application/xhtml+xml}
+  end
+
+  def filter
+    body = response.body
+    full_dot = "\u30FB"
+    half_dot = "\uFF65"
+    body.gsub!("&middot;", full_dot) if request.docomo?
+    body.gsub!("\u00B7",   half_dot) unless request.softbank?
+    body.gsub!("&#xFF65;", half_dot) if request.au?
+    body.gsub!("&#x30FB;", full_dot) if request.au?
+    body.gsub!("&sdot;",   half_dot)
+    response.body = body
+  end
+end

data/lib/galakei/helper_methods.rb

@@ -1,10 +1,10 @@
 module Galakei
   module HelperMethods
+    include ActionView::Helpers::RawOutputHelper
     def self.included(klass)
       klass.helper_method :galakei?
       klass.helper_method :emoji_table
-    end
-
+    end 
     protected
 
     def galakei?

data/lib/galakei/railtie.rb

@@ -1,10 +1,10 @@
 module Galakei
-  class Railtie < Rails::Railtie
+  class Railtie < ::Rails::Railtie
     config.galakei = ActiveSupport::OrderedOptions.new
     initializer "galakei.extend.action_controller" do |app|
       ActiveSupport.on_load :action_controller do
         include Galakei::HelperMethods
-        filters = %w[Views ContentType]
+        filters = %w[Views ContentType NonStandardChar]
         filters << :Haml if defined?(Haml)
         filters.each {|f| Galakei::Filter.const_get(f).inject(self) }
       end

data/lib/galakei/spacer.rb

@@ -0,0 +1,33 @@
+module Galakei
+  class Spacer
+    HEX = [
+      '47494638396101000100f70000',
+      'f'*1530,
+      '2c000000000100010000080400010404003b'
+    ]
+
+    def initialize(color)
+      @color = color.gsub('#','')
+    end
+
+    def create
+      num = hex.size
+      raise 'invalid hex' if num % 2 != 0
+      bin = ''
+      (num/2).times do |i|
+        bin += (hex[2 * (i + 1) - 2,2]).to_i(16).chr
+      end
+      return bin
+    end
+
+    def hex
+      HEX[0] + @color + HEX[1] + HEX[2]
+    end
+
+    def img_tag(options = {})
+      width = options[:width] || '100%'
+      height = options[:height] || 1
+      "<img src='/galakei/spacer/#{@color}' width='#{width}' height='#{height}'>"
+    end
+  end
+end

data/lib/galakei/version.rb

@@ -1,3 +1,3 @@
 module Galakei
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/lib/galakei.rb

@@ -1,5 +1,6 @@
 if defined?(Rails)
   require 'galakei/railtie'
+  require 'galakei/engine'
   require 'galakei/use_rack_request_to_extract_sid'
 end
 require 'galakei/request'
@@ -12,10 +13,12 @@ module Galakei
   autoload :InputMode, "galakei/input_mode"
   autoload :EmojiTable, "galakei/emoji_table"
   autoload :SessionIdParameterInForm, "galakei/session_id_parameter_in_form"
+  autoload :Spacer, "galakei/spacer"
   module Filter
     autoload :Base, "galakei/filter/base"
     autoload :ContentType, "galakei/filter/content_type"
     autoload :Haml, "galakei/filter/haml"
     autoload :Views, "galakei/filter/views"
+    autoload :NonStandardChar, "galakei/filter/non_standard_char"
   end
 end

data/spec/acceptance/acceptance_helper.rb

@@ -1,7 +1,6 @@
 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}
 

data/spec/acceptance/docomo_css_spec.rb

@@ -30,17 +30,21 @@ end
 
 feature 'inlining of css' do
   scenario 'requesting simple page for docomo', :driver => :docomo do
-    FakeWeb.register_uri(:get, 'http://www.example.com/stylesheets/docomo_css/simple.css', :body => "span { color: red }")
+    parser = CssParser::Parser.new
+    parser.add_block!('span { color: red}') 
+    Galakei::DocomoCss::InlineStylesheet.stub(:parser) { parser }
     visit '/docomo_css/simple'
     find("span")["style"].should == "color: red;"
     page.should_not have_xpath("//link")
   end
+
   scenario 'requesting external page for docomo', :driver => :docomo do
     FakeWeb.register_uri(:get, 'http://www.galakei.com/external.css', :body => "span { color: red }")
     visit '/docomo_css/external'
     find("span")["style"].should == "color: red;"
     page.should_not have_xpath("//link")
   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'

data/spec/acceptance/emoji_table_spec.rb

@@ -10,21 +10,21 @@ end
 feature 'emoji table' do
   scenario 'for docomo', :driver => :docomo do
     visit '/emoji'
-    page.body.should match("")
+    page.body.should match("\uE63E")
   end
 
   scenario 'for au', :driver => :au do
     visit '/emoji'
-    page.body.should match("")
+    page.body.should match("\uEF60")
   end
 
   scenario 'for softbank', :driver => :softbank do
     visit '/emoji'
-    page.body.should match("")
+    page.body.should match("\uE04A")
   end
 
   scenario 'for non galakei' do
     visit '/emoji'
-    page.body.should match("☀")
+    page.body.should match("\u2600")
   end
 end

data/spec/acceptance/non_standard_char_spec.rb

@@ -0,0 +1,81 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+
+class NonStandardCharController < ApplicationController
+  def middot
+    render :inline => '&middot;'
+  end
+
+  def latin
+    render :inline => "\u00B7"
+  end
+
+  def harf_entity
+    render :inline => "&#xFF65;"
+  end
+
+  def full_entity
+    render :inline => "&#x30FB;"
+  end
+
+  def sdot
+    render :inline => "&sdot;"
+  end
+end
+
+feature 'nakaguro' do
+  scenario "Do convert &middot for docomo", :driver => :docomo  do
+    visit '/non_standard_char/middot'
+    page.body.should == "\u30FB"
+  end
+
+  %w[softbank au].each do |s|
+    scenario "Do not convert &middot for #{s}", :driver => s.to_sym do
+      visit '/non_standard_char/middot'
+      page.body.should == "&middot;"
+    end
+  end
+
+  %w[au docomo].each do |s|
+    scenario "Do convert latin dot(\u00B7) for #{s}", :driver => s.to_sym  do
+      visit '/non_standard_char/latin'
+      page.body.should == "\uFF65"
+    end
+  end
+
+  scenario "Do not convert latin dot(\u00B7) for softbank", :driver => :softbank  do
+    visit '/non_standard_char/latin'
+    page.body.should == "\u00B7"
+  end
+
+  %w[softbank docomo].each do |s|
+    scenario "Do not convert &#xFF65 for #{s}", :driver => s.to_sym  do
+      visit '/non_standard_char/harf_entity'
+      page.body.should == "&#xFF65;"
+    end
+  end
+
+  scenario "Do convert &#xFF65 for au", :driver => :au  do
+    visit '/non_standard_char/harf_entity'
+    page.body.should == "\uFF65"
+  end
+
+  %w[docomo softbank].each do |s|
+    scenario "Do not convert &#x30FB for #{s}", :driver => s.to_sym  do
+      visit '/non_standard_char/full_entity'
+      page.body.should == "&#x30FB;"
+    end
+  end
+
+  scenario "Do convert &#x30FB for au", :driver => :au  do
+    visit '/non_standard_char/full_entity'
+    page.body.should == "\u30FB"
+  end
+
+  %w[softbank au docomo].each do |s|
+    scenario "Do convert &sdot; to \uFF65 for #{s}", :driver => s.to_sym  do
+      visit '/non_standard_char/sdot'
+      page.body.should == "\uFF65"
+    end
+  end
+end

data/spec/{acceptance/app → app}/fake.rb

@@ -4,6 +4,7 @@ require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'haml'
 require 'galakei/railtie'
+require 'galakei/engine'
 
 # database
 ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}

data/spec/controllers/galakei/spacer_controller_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Galakei::SpacerController do
+  before do
+    get :create, :color => '#000000', :format => :gif
+  end
+  subject { response }
+  its(:content_type) { should eq 'image/gif' }
+end

data/spec/galakei/docomo_css/stylesheet_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require "nokogiri"
+require 'nokogiri'
 
 describe Galakei::DocomoCss::Stylesheet do
   context "simple stylesheet" do
@@ -45,6 +45,7 @@ describe Galakei::DocomoCss::Stylesheet do
       doc.to_s.should == %q{<div class="alC" style="background-color: red;text-align: center;">foo</div>}
     end
   end
+
   context "stylesheet with pseudo style" do
     before do
       parser = CssParser::Parser.new
@@ -86,6 +87,7 @@ EOD
           #{tag}.color { color: red; }
           #{tag}.fontsize { font-size: x-small; }
           #{tag}.backgroundcolor { background-color: blue; }
+          .classonly { line-height: 1px; }
         EOD
         @stylesheet = described_class.new(parser)
       end
@@ -113,6 +115,12 @@ EOD
         @stylesheet.apply(doc)
         doc.at("//div").to_s.should == %Q{<div style="background-color: blue;"><#{tag} class="backgroundcolor">foo</#{tag}></div>}
       end
+
+      it "should applied css of tag omitted" do
+        doc = Nokogiri::HTML("<#{tag} class='classonly'>foo</#{tag}>")
+        @stylesheet.apply(doc)
+        doc.at("//#{tag}").to_s.should == %Q{<#{tag} class="classonly" style="line-height: 1px;">foo</#{tag}>}
+      end
     end
   end
 
@@ -137,4 +145,121 @@ EOD
       doc.at("//h1").to_s.should == %q{<h1><span style="color: red;">foo</span></h1>}
     end
   end
+
+  shared_examples_for 'border' do
+    it 'applied border' do
+      elm = subject
+      elm.previous_sibling.to_s.should == @img
+      elm.next_sibling.to_s.should == @img
+    end
+  end
+
+  shared_examples_for 'not border' do
+    it "don't applied border" do
+      elm = subject
+      elm.previous_sibling.to_s.should_not == @img
+      elm.next_sibling.to_s.should_not == @img
+    end
+  end
+
+  shared_examples_for 'border bottom' do
+    it 'applied border bottom' do
+      elm = subject
+      elm.previous_sibling.to_s.should_not == @img
+      elm.next_sibling.to_s.should == @img
+    end
+  end
+
+  shared_examples_for 'border top' do
+    it 'applied border top' do
+      elm = subject
+      elm.previous_sibling.to_s.should == @img
+      elm.next_sibling.to_s.should_not == @img
+    end
+  end
+
+  context 'border css applied to div' do
+    let(:body) { "<div>test</div>" }
+    before do
+      parser = CssParser::Parser.new
+      parser.add_block!(css)
+      @stylesheet = described_class.new(parser)
+      @doc = Nokogiri::HTML(body)
+      @stylesheet.apply(@doc)
+      @img = %q[<img src="/galakei/spacer/000000" width="100%" height="1">]
+    end
+    subject { @doc.at('//div') }
+
+    context 'border' do
+      let(:css) { "div { border: 1px solid #000000; } "}
+      it_should_behave_like 'border'
+    end
+
+    context 'border-top' do
+      let(:css) { "div { border-top: 1px solid #000000; } "}
+      it_should_behave_like 'border top'
+    end
+
+    context 'border-bottom' do
+      let(:css) { "div { border-bottom: 1px solid #000000; } "}
+      it_should_behave_like 'border bottom'
+    end
+
+    context 'bordre with class' do
+      let(:css) { ".border { border: 1px solid #000000; }" }
+      let(:body) { "<div class='border'>test</div>" }
+      it_should_behave_like 'border'
+    end
+
+    context 'border-bottom with height' do
+      let(:css) { "div { border-bottom: 5px solid #000000; } "}
+      it 'applied border bottom' do
+        subject.next_sibling.to_s.should == %q[<img src="/galakei/spacer/000000" width="100%" height="5">]
+      end
+    end
+  end
+
+  context 'border css applied to h(n)' do
+    before do
+      parser = CssParser::Parser.new
+      parser.add_block!(css)
+      @stylesheet = described_class.new(parser)
+      @doc = Nokogiri::HTML("<h1>test</h1>")
+      @stylesheet.apply(@doc)
+      @img = %q[<img src="/galakei/spacer/000000" width="100%" height="1">]
+    end
+    subject { @doc.at("//h1") }
+
+    context 'border' do
+      let(:css) { "h1 { border: 1px solid #000000; } "}
+      it_should_behave_like 'border'
+    end
+
+    context 'border-top' do
+      let(:css) { "h1 { border-top: 1px solid #000000; } "}
+      it_should_behave_like 'border top'
+    end
+
+    context 'border-bottom' do
+      let(:css) { "h1 { border-bottom: 1px solid #000000; } "}
+      it_should_behave_like 'border bottom'
+    end
+  end
+
+  context 'border css applied to p' do
+    before do
+      parser = CssParser::Parser.new
+      parser.add_block!(css)
+      @stylesheet = described_class.new(parser)
+      @doc = Nokogiri::HTML("<p>test</p>")
+      @stylesheet.apply(@doc)
+      @img = %q[<img src="/galakei/spacer/000000" width="100%" height="1">]
+    end
+    subject { @doc.at("//p") }
+
+    context 'border' do
+      let(:css) { "p { border: 1px solid #000000; } "}
+      it_should_behave_like 'not border'
+    end
+  end
 end

data/spec/galakei/emoji_table_spec.rb

@@ -6,14 +6,14 @@ describe Galakei::EmojiTable do
   end
 
   it "should handle single-character unicode" do
-    @unicode.black_sun_with_rays.should == "☀"
-    @docomo.black_sun_with_rays.should == ""
-    @softbank.black_sun_with_rays.should == ""
-    @au.black_sun_with_rays.should == ""
+    @unicode.black_sun_with_rays.should == "\u2600"
+    @docomo.black_sun_with_rays.should == "\uE63E"
+    @softbank.black_sun_with_rays.should == "\uE04A"
+    @au.black_sun_with_rays.should == "\uEF60"
   end
 
   it "should handle multi-character unicode" do
-    @unicode.hash_key.should == "#⃣"
-    @docomo.hash_key.should == ""
+    @unicode.hash_key.should == "\u{0023 20E3}"
+    @docomo.hash_key.should == "\uE6E0"
   end
 end

data/spec/galakei/spacer_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Galakei::Spacer do
+  describe 'initialize' do
+    it 'should can initialize' do
+      expect {
+        described_class.new('#000000')
+      }.to_not raise_error
+    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

@@ -1,6 +1,8 @@
 $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'galakei'
+require File.expand_path(File.dirname(__FILE__) + "/app/fake")
+require 'rspec/rails'
 
 def env_for(device_name)
   user_agent = { 

metadata

@@ -4,18 +4,19 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Paul McMahon
 - Michael Reinsch
+- Yuki Akamatsu
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +09:00
+date: 2011-04-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +76,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/galakei/spacer_controller.rb
+- config/initializers/mime_types.rb
+- config/routes.rb
 - galakei.gemspec
 - lib/galakei.rb
 - lib/galakei/docomo_css.rb
@@ -83,9 +87,11 @@ files:
 - lib/galakei/docomo_css/stylesheet.rb
 - lib/galakei/email.rb
 - lib/galakei/emoji_table.rb
+- lib/galakei/engine.rb
 - lib/galakei/filter/base.rb
 - lib/galakei/filter/content_type.rb
 - lib/galakei/filter/haml.rb
+- lib/galakei/filter/non_standard_char.rb
 - lib/galakei/filter/views.rb
 - lib/galakei/helper_methods.rb
 - lib/galakei/input_mode.rb
@@ -96,26 +102,30 @@ files:
 - lib/galakei/session_id_parameter/in_url.rb
 - lib/galakei/session_id_parameter/railtie.rb
 - lib/galakei/shoulda_macros.rb
+- lib/galakei/spacer.rb
 - lib/galakei/use_rack_request_to_extract_sid.rb
 - lib/galakei/version.rb
 - spec/acceptance/acceptance_helper.rb
-- spec/acceptance/app/.gitignore
-- spec/acceptance/app/app/views/haml/index.html.haml
-- spec/acceptance/app/app/views/layouts/application.html.haml
-- spec/acceptance/app/fake.rb
 - spec/acceptance/docomo_css_spec.rb
 - spec/acceptance/emoji_table_spec.rb
 - spec/acceptance/haml_spec.rb
 - spec/acceptance/handset_detection_spec.rb
 - spec/acceptance/input_mode_spec.rb
+- spec/acceptance/non_standard_char_spec.rb
 - spec/acceptance/session_spec.rb
 - spec/acceptance/support/capybara_ssl_fix.rb
 - spec/acceptance/support/handsets.rb
 - spec/acceptance/views_spec.rb
+- spec/app/.gitignore
+- spec/app/app/views/haml/index.html.haml
+- spec/app/app/views/layouts/application.html.haml
+- spec/app/fake.rb
+- spec/controllers/galakei/spacer_controller_spec.rb
 - spec/galakei/docomo_css/stylesheet_spec.rb
 - spec/galakei/emoji_table_spec.rb
 - spec/galakei/filter/content_type_spec.rb
 - spec/galakei/request_spec.rb
+- spec/galakei/spacer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://www.mobalean.com