e4u-encode 0.0.0 → 0.0.1

data/spec/docomo_spec.rb

@@ -131,100 +131,3 @@ describe E4U::Encode::DoCoMo do
     end
   end
 end
-
-
-describe E4U do
-describe E4U::Encode do
-
-describe E4U::Encode::DoCoMo do
-  before :all do
-    @utf8_str_ary = %w(本日は 晴天 なり)
-    @sjis_str_ary = @utf8_str_ary.map { |e| NKF.nkf('-Wm0x --oc=CP932', e) }
-
-    @webcode = "\x1B\x24\x47\x6A\x0F"
-
-    @sun = E4U.google.find{ |e| e[:id] == '000' }
-  end
-
-  it "SJISなDoCoMo絵文字を、UTF-8なDoCoMo絵文字に変換できること" do
-    sjis = @sjis_str_ary.join @sun.docomo_emoji.sjis
-    utf8 = @utf8_str_ary.join @sun.docomo_emoji.utf8
-
-    got = E4U.encode(sjis, :docomo, :sjis => :utf8)
-    got.should == utf8
-  end
-
-  it "SJISなDoCoMo絵文字を、UTF-8な数値文字参照に変換できること" do
-    sjis = @sjis_str_ary.join @sun.docomo_emoji.sjis
-    utf8 = @utf8_str_ary.join "&#x#{@sun.docomo_emoji.unicode};"
-
-    got = E4U.encode(sjis, :docomo, :sjis => :unicode)
-    got.should == utf8
-  end
-
-  it "UTF-8なDoCoMo絵文字を、SJISなDoCoMo絵文字に変換できること" do
-    sjis = @sjis_str_ary.join @sun.docomo_emoji.sjis
-    utf8 = @utf8_str_ary.join @sun.docomo_emoji.utf8
-
-    got = E4U.encode(utf8, :docomo, :utf8 => :sjis)
-    got.should == sjis
-  end
-
-  it "SJISなDoCoMo絵文字を、UTF-8なKDDI絵文字に変換できること" do
-    sjis = @sjis_str_ary.join @sun.docomo_emoji.sjis
-    utf8 = @utf8_str_ary.join @sun.kddi_emoji.utf8
-
-    got = E4U.encode(sjis, :docomo => :kddi, :sjis => :utf8)
-    got.should == utf8
-  end
-
-  it "SJISなDoCoMo絵文字を、SJISなKDDI絵文字に変換できること" do
-    sjis = @sjis_str_ary.join @sun.docomo_emoji.sjis
-    kddi = @sjis_str_ary.join @sun.kddi_emoji.sjis
-
-    got = E4U.encode(sjis, :sjis, :docomo => :kddi)
-    got.should == kddi
-  end
-
-  it "SJISなDoCoMo絵文字を、SJISなSoftbank絵文字に変換できること" do
-    sjis = @sjis_str_ary.join @sun.docomo_emoji.sjis
-    softbank = @sjis_str_ary.join @sun.softbank_emoji.sjis
-
-    got = E4U.encode(sjis, :sjis, :docomo => :softbank)
-    got.should == softbank
-  end
-
-  it "SJISなDoCoMo絵文字を、WebcodeなSoftbank絵文字に変換できること" do
-    sjis = @sjis_str_ary.join @sun.docomo_emoji.sjis
-    softbank = @sjis_str_ary.join @webcode
-
-    got = E4U.encode(sjis, :sjis => :webcode, :docomo => :softbank)
-    got.should == softbank
-  end
-
-  it "SJISなDoCoMo絵文字を、UTF-8なSoftbank絵文字に変換できること" do
-    sjis = @sjis_str_ary.join @sun.docomo_emoji.sjis
-    softbank = @utf8_str_ary.join @sun.softbank_emoji.utf8
-
-    got = E4U.encode(sjis, :sjis => :utf8, :docomo => :softbank)
-    got.should == softbank
-  end
-
-  it "SJISなDoCoMo絵文字を、UTF-8なGoogle絵文字に変換できること" do
-    sjis = @sjis_str_ary.join @sun.docomo_emoji.sjis
-    google = @utf8_str_ary.join @sun.google_emoji.utf8
-
-    got = E4U.encode(sjis, :sjis => :utf8, :docomo => :google)
-    got.should == google
-  end
-
-  it "UTF-8なDoCoMo絵文字を、UTF-8なGoogle絵文字に変換できること" do
-    utf8 = @utf8_str_ary.join @sun.docomo_emoji.utf8
-    google = @utf8_str_ary.join @sun.google_emoji.utf8
-
-    got = E4U.encode(utf8, :utf8, :docomo => :google)
-    got.should == google
-  end
-end
-end
-end

data/spec/e4u_spec.rb

@@ -167,6 +167,78 @@ describe E4U do
         E4U.encode(@softbank, :utf8, :softbank => :docomo).should_not == @docomo
       end
     end
+
+    context "DoCoMoの複合絵文字" do
+      it "KDDIに変換できること" do
+        emoji = E4U.google.find{ |e| e[:docomo] =~ /\+/ && !e[:kddi].nil? }
+        @docomo = "#{emoji[:name]} #{emoji.docomo_emoji.utf8}"
+        @docomo.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+        @kddi   = "#{emoji[:name]} #{emoji.kddi_emoji.utf8}"
+        @kddi.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+
+        E4U.encode(@docomo, :utf8, :docomo => :kddi).should == @kddi
+        E4U.encode(@kddi, :utf8, :kddi => :docomo).should == @docomo
+      end
+
+      it "Softbankに変換できること" do
+        emoji = E4U.google.find{ |e| e[:docomo] =~ /\+/ && !e[:softbank].nil? }
+        @docomo   = "#{emoji[:name]} #{emoji.docomo_emoji.utf8}"
+        @docomo.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+        @softbank = "#{emoji[:name]} #{emoji.softbank_emoji.utf8}"
+        @softbank.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+
+        E4U.encode(@docomo, :utf8, :docomo => :softbank).should == @softbank
+        E4U.encode(@softbank, :utf8, :softbank => :docomo).should == @docomo
+      end
+    end
+
+    context "KDDIの複合絵文字" do
+      it "DoCoMoに変換できること" do
+        emoji = E4U.google.find{ |e| e[:kddi] =~ /\+/ && !e[:docomo].nil? }
+        @kddi   = "#{emoji[:name]} #{emoji.kddi_emoji.utf8}"
+        @kddi.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+        @docomo = "#{emoji[:name]} #{emoji.docomo_emoji.utf8}"
+        @docomo.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+
+        E4U.encode(@kddi, :utf8, :kddi => :docomo).should == @docomo
+        E4U.encode(@docomo, :utf8, :docomo => :kddi).should == @kddi
+      end
+
+      it "Softbankに変換できること" do
+        emoji = E4U.google.find{ |e| e[:kddi] =~ /\+/ && !e[:softbank].nil? }
+        @kddi     = "#{emoji[:name]} #{emoji.kddi_emoji.utf8}"
+        @kddi.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+        @softbank = "#{emoji[:name]} #{emoji.softbank_emoji.utf8}"
+        @softbank.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+
+        E4U.encode(@kddi, :utf8, :kddi => :softbank).should == @softbank
+        E4U.encode(@softbank, :utf8, :softbank => :kddi).should == @kddi
+      end
+    end
+
+    context "Softbankの複合絵文字" do
+      it "DoCoMoに変換できること" do
+        emoji = E4U.google.find{ |e| e[:softbank] =~ /\+/ && !e[:docomo].nil? }
+        @softbank = "#{emoji[:name]} #{emoji.softbank_emoji.utf8}"
+        @softbank.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+        @docomo   = "#{emoji[:name]} #{emoji.docomo_emoji.utf8}"
+        @docomo.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+
+        E4U.encode(@softbank, :utf8, :softbank => :docomo).should == @docomo
+        E4U.encode(@docomo, :utf8, :docomo => :softbank).should == @softbank
+      end
+
+      it "KDDIに変換できること" do
+        emoji = E4U.google.find{ |e| e[:softbank] =~ /\+/ && !e[:kddi].nil? }
+        @softbank = "#{emoji[:name]} #{emoji.softbank_emoji.utf8}"
+        @softbank.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+        @kddi     = "#{emoji[:name]} #{emoji.kddi_emoji.utf8}"
+        @kddi.encode('UTF-8') if RUBY_VERSION >= '1.9.1'
+
+        E4U.encode(@softbank, :utf8, :softbank => :kddi).should == @kddi
+        E4U.encode(@kddi, :utf8, :kddi => :softbank).should == @softbank
+      end
+    end
   end
 
   it "detect"

data/tasks/mk_docomo_unicode.rb

@@ -2,24 +2,34 @@ require File.expand_path(File.dirname(__FILE__) + '/task_helper')
 module Update
   class Table
     def self.mk_docomo_unicode target
+
+      dat = { }
+      E4U.docomo.each do |e|
+        google = E4U.google.find{ |g| g[:docomo] == e.docomo_emoji.unicode }
+        docomo = e.docomo_emoji.utf8.unpack('U*').map{ |f| "&#x%04X;" % [f] }.join
+        dat[docomo] = google[:google].upcase
+      end
+
+      E4U.google.each do |e|
+        next unless e[:google]
+        next unless e[:docomo]
+        docomo = e.docomo_emoji.utf8.unpack('U*').map{ |f| "&#x%04X;" % [f] }.join
+        next if dat[docomo]
+        dat[docomo] =  e[:google].upcase
+      end
+
       File.open(target, 'wb') do |out|
-        out.print ERB.new(<<'ERB', nil, '-').result
-module E4U
-  module Encode
-    module DoCoMo
-    end
-  end
-end
+        out.print ERB.new(<<'ERB', nil, '-').result(binding)
 class E4U::Encode::DoCoMo::Unicode
   GOOGLE_UNICODE = {
-<% E4U.docomo.each do |e| -%>
-<%   docomo = e.docomo_emoji -%>
-<%   google = E4U.google.find{|emoji| docomo.unicode == emoji[:docomo] } -%>
-    '<%= docomo.unicode.upcase %>' => '<%= google[:google].upcase %>'.freeze,
+<% dat.sort.each do |k,v| -%>
+    '<%= k %>' => '&#x<%= v %>;'.freeze,
 <% end -%>
   }.freeze
 
-  GOOGLE_UNICODE_REGEXP = Regexp.new("&#x((?i:#{GOOGLE_UNICODE.keys.join('|')}));").freeze
+  GOOGLE_UNICODE_REGEXP = Regexp.new(GOOGLE_UNICODE.keys.sort_by{ |k| -k.size }.map do |ncr|
+                                       "(?:" + ncr.gsub(/&#x(....);/){ "&#x(?i:#{$1});" } + ")"
+                                     end.join('|')).freeze
 end
 ERB
       end

data/tasks/mk_kddi_unicode.rb

@@ -2,26 +2,42 @@ require File.expand_path(File.dirname(__FILE__) + '/task_helper')
 module Update
   class Table
     def self.mk_kddi_unicode target
+
+      dat = { }
+      E4U.kddi.each do |e|
+        google = E4U.google.find{ |g| g[:kddi] == e.kddi_emoji.unicode }
+        kddi = e.kddi_emoji.utf8.unpack('U*').map{ |f| "&#x%04X;" % [f] }.join
+        dat[kddi] = google[:google].upcase
+        kddi = e.kddiweb_emoji.utf8.unpack('U*').map{ |f| "&#x%04X;" % [f] }.join
+        dat[kddi] = google[:google].upcase
+      end
+
+      E4U.google.each do |e|
+        next unless e[:google]
+        next unless e[:kddi]
+        kddi = e.kddi_emoji.utf8.unpack('U*').map{ |f| "&#x%04X;" % [f] }.join
+        unless dat[kddi]
+          dat[kddi] =  e[:google].upcase
+        end
+        kddi = e.kddiweb_emoji.utf8.unpack('U*').map{ |f| "&#x%04X;" % [f] }.join
+        unless dat[kddi]
+          dat[kddi] =  e[:google].upcase
+        end
+      end
+
       File.open(target, 'wb') do |out|
-        out.print ERB.new(<<'ERB', nil, '-').result
+        out.print ERB.new(<<'ERB', nil, '-').result(binding)
 require 'e4u/encode/docomo/unicode/google_unicode'
-module E4U
-  module Encode
-    module KDDI
-    end
-  end
-end
 class E4U::Encode::KDDI::Unicode
   GOOGLE_UNICODE = {
-<% E4U.kddi.each do |e| -%>
-<%   kddi = e.kddi_emoji -%>
-<%   kddiweb = e.kddiweb_emoji -%>
-<%   google = E4U.google.find{|emoji| kddi.unicode == emoji[:kddi] } -%>
-    '<%= kddiweb.unicode.upcase %>' => '<%= google[:google].upcase %>'.freeze,
+<% dat.sort.each do |k,v| -%>
+    '<%= k %>' => '&#x<%= v %>;'.freeze,
 <% end -%>
   }.merge(E4U::Encode::DoCoMo::Unicode::GOOGLE_UNICODE).freeze
 
-  GOOGLE_UNICODE_REGEXP = Regexp.new("&#x((?i:#{GOOGLE_UNICODE.keys.join('|')}));").freeze
+  GOOGLE_UNICODE_REGEXP = Regexp.new(GOOGLE_UNICODE.keys.sort_by{ |k| -k.size }.map do |ncr|
+                                       "(?:" + ncr.gsub(/&#x(....);/){ "&#x(?i:#{$1});" } + ")"
+                                     end.join('|')).freeze
 end
 ERB
       end

data/tasks/mk_softbank_unicode.rb

@@ -2,24 +2,34 @@ require File.expand_path(File.dirname(__FILE__) + '/task_helper')
 module Update
   class Table
     def self.mk_softbank_unicode target
+
+      dat = { }
+      E4U.softbank.each do |e|
+        google = E4U.google.find{ |g| g[:softbank] == e.softbank_emoji.unicode }
+        softbank = e.softbank_emoji.utf8.unpack('U*').map{ |f| "&#x%04X;" % [f] }.join
+        dat[softbank] = google[:google].upcase
+      end
+
+      E4U.google.each do |e|
+        next unless e[:google]
+        next unless e[:softbank]
+        softbank = e.softbank_emoji.utf8.unpack('U*').map{ |f| "&#x%04X;" % [f] }.join
+        next if dat[softbank]
+        dat[softbank] =  e[:google].upcase
+      end
+
       File.open(target, 'wb') do |out|
-        out.print ERB.new(<<'ERB', nil, '-').result
-module E4U
-  module Encode
-    module Softbank
-    end
-  end
-end
+        out.print ERB.new(<<'ERB', nil, '-').result(binding)
 class E4U::Encode::Softbank::Unicode
   GOOGLE_UNICODE = {
-<% E4U.softbank.each do |e| -%>
-<%   softbank = e.softbank_emoji -%>
-<%   google = E4U.google.find{|emoji| softbank.unicode == emoji[:softbank] } -%>
-    '<%= softbank.unicode.upcase %>' => '<%= google[:google].upcase %>'.freeze,
+<% dat.sort.each do |k,v| -%>
+    '<%= k %>' => '&#x<%= v %>;'.freeze,
 <% end -%>
   }.freeze
 
-  GOOGLE_UNICODE_REGEXP = Regexp.new("&#x((?i:#{GOOGLE_UNICODE.keys.join('|')}));").freeze
+  GOOGLE_UNICODE_REGEXP = Regexp.new(GOOGLE_UNICODE.keys.sort_by{ |k| -k.size }.map do |ncr|
+                                       "(?:" + ncr.gsub(/&#x(....);/){ "&#x(?i:#{$1});" } + ")"
+                                     end.join('|')).freeze
 end
 ERB
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: e4u-encode
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - fistfvck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +09:00
+date: 2010-01-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency