e4u 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/e4u/base.rb

@@ -66,13 +66,13 @@ module E4U
     def utf8
       hex = unicode.sub(/\A[\>\*\+]/, '')
       raise if hex.size == 0
-      hex.split(/\+/, -1).map{ |ch| ch.hex }.pack('U')
+      hex.split(/\+/, -1).map{ |ch| ch.hex }.pack('U*')
     end
 
     def cp932
       hex = unicode.sub(/\A[\>\*\+]/, '')
       raise if hex.size == 0
-      chr = hex.split(/\+/, -1).map{ |ch| unicode_to_cp932(ch.hex) }.pack('n')
+      chr = hex.split(/\+/, -1).map{ |ch| unicode_to_cp932(ch.hex) }.pack('n*')
       chr.force_encoding('CP932') if chr.respond_to? :force_encoding
       chr
     end

data/lib/e4u/google.rb

@@ -31,11 +31,11 @@ module E4U
     end
 
     def unicode_emoji
-      Google::Emoji.new :unicode => self[:unicode]
+      Google::Emoji.new self
     end
 
     def google_emoji
-      Google::Emoji.new self
+      Google::Emoji.new self.merge(:unicode => self[:google])
     end
   end
 

data/spec/google_spec.rb

@@ -39,6 +39,15 @@ describe E4U::Google do
     de.sjis.dump.should == "\xF8\x9F".dump
   end
 
+  it "DoCoMoの複合絵文字が返ってくること" do
+    { '00F' => [[0xE63E, 0xE63F].pack('U*'), [0xF89F, 0xF8A0].pack('n*')],
+      '4B8' => [[0xE669, 0xE6EF].pack('U*'), [0xF8CA, 0xF994].pack('n*')] }.each do |id, (utf8, sjis)|
+      de = @google.find{ |e| e[:id] == id }.docomo_emoji
+      de.utf8.should == utf8
+      de.sjis.should == sjis
+    end
+  end
+
   it "kddi_emojiでE4U::KDDI::Emojiが返ってくること" do
     ke = @google.find{ |e| e[:id] == '000' }.kddi_emoji
     ke.should be_instance_of E4U::KDDI::Emoji
@@ -46,6 +55,22 @@ describe E4U::Google do
     ke.sjis.dump.should == "\xF6\x60".dump
   end
 
+  it "KDDIの複合絵文字が返ってくること" do
+    { '331' => [[0xE471, 0xE5B1].pack('U*'), [0xF649, 0xF7CE].pack('n*')], }.each do |id, (utf8, sjis)|
+      de = @google.find{ |e| e[:id] == id }.kddi_emoji
+      de.utf8.should == utf8
+      de.sjis.should == sjis
+    end
+  end
+
+  it "KDDI(Web)の複合絵文字が返ってくること" do
+    { '331' => [[0xEF49, 0xF0CE].pack('U*'), [0xF649, 0xF7CE].pack('n*')], }.each do |id, (utf8, sjis)|
+      de = @google.find{ |e| e[:id] == id }.kddiweb_emoji
+      de.utf8.should == utf8
+      de.sjis.should == sjis
+    end
+  end
+
   it "softbank_emojiでE4U::Softbank::Emojiが返ってくること" do
     se = @google.find{ |e| e[:id] == '000' }.softbank_emoji
     se.should be_instance_of E4U::Softbank::Emoji
@@ -53,6 +78,26 @@ describe E4U::Google do
     se.sjis.dump.should == "\xF9\x8B".dump
   end
 
+  it "Softbankの複合絵文字が返ってくること" do
+    { '00F' => [[0xE04A, 0xE049].pack('U*'), [0xF98B, 0xF98A].pack('n*')],
+      '331' => [[0xE415, 0xE331].pack('U*'), [0xFB55, 0xF9D1].pack('n*')],
+      '824' => [[0xE103, 0xE328].pack('U*'), [0xF743, 0xF9C8].pack('n*')], }.each do |id, (utf8, sjis)|
+      de = @google.find{ |e| e[:id] == id }.softbank_emoji
+      de.utf8.should == utf8
+      de.sjis.should == sjis
+    end
+  end
+
+  it "Unicode絵文字が返ってくること" do
+    ue = @google.find{ |e| e[:id] == '000' }.unicode_emoji
+    ue.utf8.should == [0x2600].pack('U')
+  end
+
+  it "Google絵文字が返ってくること" do
+    ue = @google.find{ |e| e[:id] == '000' }.google_emoji
+    ue.utf8.should == [0xFE000].pack('U')
+  end
+
   describe E4U::Google::Emoji do
     before :all do
       @emj = @google.find{ |e| e[:id] == '000' }.google_emoji
@@ -106,7 +151,8 @@ describe E4U::Google do
     end
 
     it "utf8が返ってくること" do
-      @emj.utf8.should == [0x2600].pack('U')
+      @emj.unicode.should == 'FE000'
+      @emj.utf8.should == [0xFE000].pack('U')
     end
 
     it "should respond to in_proposal" do

metadata

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