jpmobile 1.0.9 → 1.0.10

data/spec/rack/jpmobile/mobile_by_ua_spec.rb

@@ -19,6 +19,7 @@ describe Jpmobile::Rack::MobileCarrier do
     [ Jpmobile::Mobile::Iphone       , 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; ja-jp) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16' ],
     [ Jpmobile::Mobile::Android      , 'Mozilla/5.0 (Linux; U; Android 1.6; ja-jp; SonyEriccsonSO-01B Build/R1EA018) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1' ],
     [ Jpmobile::Mobile::WindowsPhone , 'Mozilla/4.0 (Compatible; MSIE 6.0; Windows NT 5.1 T-01A_6.5; Windows Phone 6.5)' ],
+    [ Jpmobile::Mobile::BlackBerry, 'BlackBerry9000/4.6.0.224 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/220' ],
     [ Jpmobile::Mobile::Ipad         , 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'],
     [ Jpmobile::Mobile::AndroidTablet, 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'],
     [ Jpmobile::Mobile::AndroidTablet, 'Mozilla/5.0 (Linux; U; Android 3.2; ja-jp; Sony Tablet S Build/THMAS11002) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13'],

data/spec/unit/emoticon_spec.rb

@@ -30,6 +30,38 @@ describe Jpmobile::Emoticon do
         Jpmobile::Emoticon::unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, true).should == [0xe04a, 0xe049].pack('U*')
       end
     end
+
+    it 'should convert docomo unicodecr to Unicode 6.0 emoticon' do
+      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x2600].pack('U')
+    end
+
+    it 'should convert au unicodecr to Unicode 6.0 emoticon' do
+      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x26C5].pack('U')
+    end
+
+    it 'should convert Softbank unicodecr to Unicode 6.0 emoticon' do
+      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x1F466].pack('U')
+    end
+
+    it 'should not convert 〓' do
+      Jpmobile::Emoticon.unicodecr_to_external("〓", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == '〓'
+    end
+
+    it 'should convert docomo unicodecr to Google emoticon' do
+      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE000].pack('U')
+    end
+
+    it 'should convert au unicodecr to Google emoticon' do
+      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE00F].pack('U')
+    end
+
+    it 'should convert Softbank unicodecr to Google emoticon' do
+      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE19B].pack('U')
+    end
+
+    it 'should not convert 〓' do
+      Jpmobile::Emoticon.unicodecr_to_external("〓", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == '〓'
+    end
   end
 
   describe "unicodecr_to_utf8" do
@@ -70,6 +102,34 @@ describe Jpmobile::Emoticon do
     it "should not convert docomo encoding of koukai-sjis emoticons to unicodecr" do
       Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\x8c\xf6\x8a\x4a")).should == sjis("\x8c\xf6\x8a\x4a")
     end
+
+    context 'at iPhone emoticon' do
+      it 'should convert iPhone Unicode emoticon to SoftBank emoticon' do
+        Jpmobile::Emoticon::external_to_unicodecr_unicode60("\342\230\200").should == ""
+      end
+
+      it 'should convert iPhone Unicode emoticon to multi SoftBank emoticons' do
+        Jpmobile::Emoticon::external_to_unicodecr_unicode60("\342\233\205").should == ","
+      end
+
+      it 'should not convert 〓' do
+        Jpmobile::Emoticon::external_to_unicodecr_unicode60('〓').should == "〓"
+      end
+    end
+
+    context 'at Android emoticon' do
+      it 'should convert Android Google Unicode emoticon to Docomo emoticon' do
+        Jpmobile::Emoticon::external_to_unicodecr_google("\363\276\200\200").should == ""
+      end
+
+      it 'should convert Android Google Unicode emoticon to multi Docomo emoticon' do
+        Jpmobile::Emoticon::external_to_unicodecr_google("\363\276\200\217").should == ""
+      end
+
+      it 'should not convert 〓' do
+        Jpmobile::Emoticon::external_to_unicodecr_google('〓').should == "〓"
+      end
+    end
   end
 
   context "for email" do

data/spec/unit/util_spec.rb

@@ -108,4 +108,28 @@ describe Jpmobile::Util do
     ascii_8bit(utf8_to_jis("\xef\xbd\x9e")).should == ascii_8bit("\x1b\x24\x42\x21\x41\x1b\x28\x42")
     ascii_8bit(encode("\xef\xbd\x9e", "ISO-2022-JP")).should == ascii_8bit("\x1b\x24\x42\x21\x41\x1b\x28\x42")
   end
+
+  describe 'invert_table' do
+    it 'pickups the first(least) of duplicated values when inverting hash table' do
+      hash = invert_table({
+          0xFE009 => 0xE63E,
+          0xFE00A => 0xE63E,
+          0xFE00B => 0x3013,
+          0xFE010 => 0xE6B3,
+          0xFE038 => 0xE73F})
+      hash[0xE63E].should == 0xFE009
+      hash[0x3013].should == 0xFE00B
+    end
+
+    it 'should not raise error when hash has Array keys' do
+      hash = invert_table({
+          [0x1F1E8, 0x1F1F3] => 0x3013,
+          0x1F1FF            => 0x3013,
+          0x1F526            => 0xE6FB,
+          [0x0023, 0x20E3]   => 0xE6E0,
+          0x1F354            => 0xE673})
+      hash[0x3013].should == [0x1F1E8, 0x1F1F3]
+      hash[0xE6FB].should == 0x1F526
+    end
+  end
 end

data/test/rails/overrides/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '>= 3.0.3'
+gem 'rails', '>= 3.0.17'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

data/tools/e4u_conv.rb

@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+require 'nokogiri'
+require 'scanf'
+require 'pp'
+
+xml = Nokogiri::XML(open(File.join(File.dirname(__FILE__), 'emoji4unicode.xml')).read)
+
+google_docomo    = []
+google_kddi      = []
+google_softbank  = []
+unicode_docomo   = []
+unicode_kddi     = []
+unicode_softbank = []
+
+xml.xpath('//e').each do |emoji|
+  # keycode
+  google   = emoji.attributes['google'].value   rescue nil
+  unicode  = emoji.attributes['unicode'].value  rescue nil
+
+  # carrier code
+  docomo   = emoji.attributes['docomo'].value   rescue '3013'
+  softbank = emoji.attributes['softbank'].value rescue '3013'
+  kddi     = emoji.attributes['kddi'].value     rescue '3013'
+
+  # fix google key
+  google = nil if google and google.match(/[^0-9a-fA-F\+]/)
+  # fix unicode key
+  if unicode
+    if unicode.match(/\+/)
+      unicodes = unicode.split(/\+/).delete_if{|e| e.strip == ''}
+      if unicodes.size == 1
+        unicode = '0x%s' % unicodes.first
+      else
+        unicode = '[' + unicodes.map{|e| '0x%s' % e.gsub(/[^0-9a-fA-F\+]/, '')}.join(', ') + ']'
+      end
+    else
+      unicode = '0x%s' % unicode
+    end
+  end
+
+  # fix docomo code
+  if docomo.match(/\+/)
+    docomo = '"' + docomo.split('+').map{|e| '&#x%s;' % e.gsub(/[^0-9a-fA-F\+]/, '')}.join('') + '"'
+  else
+    docomo = '0x%s' % docomo.gsub(/[^0-9a-fA-F]/, '')
+  end
+  # fix softbank code
+  if softbank.match(/\+/)
+    softbank = '"' + softbank.split('+').delete_if{|e| e.strip == ''}.map{|s| '&#x%X;' % (s.gsub(/[^0-9a-fA-F\+]/, '').scanf("%x").first + 0x1000)}.join('') + '"'
+  else
+    if softbank.match(/3013/)
+      softbank = '0x%s' % softbank
+    else
+      softbank = '0x%X' % (softbank.gsub(/[^0-9a-fA-F]/, '').scanf('%x').first + 0x1000)
+    end
+  end
+  # fix kddi code
+  if kddi.match(/\+/)
+    kddi = '"' + kddi.split('+').map{|e| '&#x%s;' % e.gsub(/[^0-9a-fA-F\+]/, '')}.join('') + '"'
+  else
+    kddi = '0x%s' % kddi.gsub(/[^0-9a-fA-F]/, '')
+  end
+
+  if google
+    google_docomo   << [google, docomo]
+    google_kddi     << [google, kddi]
+    google_softbank << [google, softbank]
+  end
+
+  if unicode
+    # Unicode 絵文字は SoftBank に寄せる
+    unicode_docomo   << [unicode, docomo]
+    unicode_kddi     << [unicode, kddi]
+    unicode_softbank << [unicode, softbank]
+  end
+end
+
+google_emoji_rb  = open(File.join(File.dirname(__FILE__), '/../lib/jpmobile/emoticon/google.rb'), 'w') do |f|
+  # docomo
+  f.puts 'Jpmobile::Emoticon::GOOGLE_TO_DOCOMO_UNICODE = {'
+  google_docomo.each do |google, docomo|
+    f.puts "  0x%s => %s," % [google, docomo]
+  end
+  f.puts '}'
+
+  # kddi
+  f.puts 'Jpmobile::Emoticon::GOOGLE_TO_AU_UNICODE = {'
+  google_kddi.each do |google, kddi|
+    f.puts "  0x%s => %s," % [google, kddi]
+  end
+  f.puts '}'
+
+  # softbank
+  f.puts 'Jpmobile::Emoticon::GOOGLE_TO_SOFTBANK_UNICODE = {'
+  google_softbank.each do |google, softbank|
+    f.puts "  0x%s => %s," % [google, softbank]
+  end
+  f.puts '}'
+end
+
+unicode_emoji_rb = open(File.join(File.dirname(__FILE__), '/../lib/jpmobile/emoticon/unicode.rb'), 'w') do |f|
+  # docomo
+  f.puts 'Jpmobile::Emoticon::UNICODE_TO_DOCOMO_UNICODE = {'
+  unicode_docomo.each do |unicode, docomo|
+    f.puts "  %s => %s," % [unicode, docomo]
+  end
+  f.puts '}'
+
+  # docomo
+  f.puts 'Jpmobile::Emoticon::UNICODE_TO_AU_UNICODE = {'
+  unicode_kddi.each do |unicode, kddi|
+    f.puts "  %s => %s," % [unicode, kddi]
+  end
+  f.puts '}'
+
+  # softbank
+  f.puts 'Jpmobile::Emoticon::UNICODE_TO_SOFTBANK_UNICODE = {'
+  unicode_softbank.each do |unicode, softbank|
+    f.puts "  %s => %s," % [unicode, softbank]
+  end
+  f.puts '}'
+end

metadata

@@ -1,297 +1,295 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jpmobile
-version: !ruby/object:Gem::Version
-  version: 1.0.9
+version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 10
+  version: 1.0.10
 platform: ruby
-authors:
+authors: 
 - Yoji Shidara
 - Shin-ichiro OGAWA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 3
+        - 0
+        - 17
+        version: 3.0.17
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  name: rails
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
-- !ruby/object:Gem::Dependency
+  prerelease: false
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
   name: webrat
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: geokit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-- !ruby/object:Gem::Dependency
+  prerelease: false
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
   type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 7
+        - 2
+        version: 0.7.2
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
   name: webrat
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.2
   type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.2
-- !ruby/object:Gem::Dependency
   name: geokit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
   type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-- !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.2
   type: :development
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
+        version: 0.8.3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-- !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.3
   type: :development
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 2
+        - 5
+        version: 1.2.5
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-- !ruby/object:Gem::Dependency
   name: git
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.5
   type: :development
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.5
-- !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.3
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.3
+  version_requirements: *id017
 description: A Rails plugin for Japanese mobile-phones
 email: dara@shidara.net
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README
 - README.rdoc
-files:
+files: 
 - .rspec
 - CHANGELOG
 - Gemfile
@@ -311,7 +309,9 @@ files:
 - lib/jpmobile/emoticon/au.rb
 - lib/jpmobile/emoticon/conversion_table.rb
 - lib/jpmobile/emoticon/docomo.rb
+- lib/jpmobile/emoticon/google.rb
 - lib/jpmobile/emoticon/softbank.rb
+- lib/jpmobile/emoticon/unicode.rb
 - lib/jpmobile/emoticon/z_combine.rb
 - lib/jpmobile/encoding.rb
 - lib/jpmobile/filter.rb
@@ -327,14 +327,17 @@ files:
 - lib/jpmobile/mobile/android.rb
 - lib/jpmobile/mobile/android_tablet.rb
 - lib/jpmobile/mobile/au.rb
+- lib/jpmobile/mobile/black_berry.rb
 - lib/jpmobile/mobile/ddipocket.rb
 - lib/jpmobile/mobile/docomo.rb
 - lib/jpmobile/mobile/emobile.rb
+- lib/jpmobile/mobile/google_emoticon.rb
 - lib/jpmobile/mobile/ipad.rb
 - lib/jpmobile/mobile/iphone.rb
 - lib/jpmobile/mobile/smart_phone.rb
 - lib/jpmobile/mobile/softbank.rb
 - lib/jpmobile/mobile/tablet.rb
+- lib/jpmobile/mobile/unicode_emoticon.rb
 - lib/jpmobile/mobile/vodafone.rb
 - lib/jpmobile/mobile/willcom.rb
 - lib/jpmobile/mobile/windows_phone.rb
@@ -353,6 +356,7 @@ files:
 - lib/tasks/jpmobile_tasks.rake
 - spec/rack/jpmobile/android_spec.rb
 - spec/rack/jpmobile/au_spec.rb
+- spec/rack/jpmobile/black_berry_spec.rb
 - spec/rack/jpmobile/docomo_spec.rb
 - spec/rack/jpmobile/emoticon_spec.rb
 - spec/rack/jpmobile/filter_spec.rb
@@ -507,6 +511,7 @@ files:
 - test/sinatra/test/filter_test.rb
 - test/sinatra/views/index.erb
 - test/sinatra/views/index_mobile.erb
+- tools/e4u_conv.rb
 - tools/emoji/genregexp.rb
 - tools/generate_au_emoticon_table.rb
 - tools/generate_docomo_emoticon_table.rb
@@ -515,29 +520,36 @@ files:
 - tools/list_gps_unsupported_au.rb
 homepage: http://jpmobile-rails.org
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 257980358287254125
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Rails plugin for Japanese mobile-phones
 test_files: []
+