e4u 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/e4u/base.rb

@@ -1,4 +1,5 @@
 require 'rexml/document'
+require 'nkf'
 
 module E4U
   class Base
@@ -52,6 +53,7 @@ module E4U
 
   class Base::Emoji
     def initialize attributes
+      @fallback_text = nil
       attributes.each do |key, value|
         next if key =~ /\A(id|object_id|__(id|send)__)\z/
         instance_variable_set("@#{key}", value)
@@ -59,17 +61,24 @@ module E4U
       end
     end
 
+    attr_reader :fallback_text
+    def fallback?
+      !!fallback_text
+    end
+
     def alternate?
       !!(unicode =~ /\A>/)
     end
 
     def utf8
+      return fallback_text if fallback?
       hex = unicode.sub(/\A[\>\*\+]/, '')
       raise if hex.size == 0
       hex.split(/\+/, -1).map{ |ch| ch.hex }.pack('U*')
     end
 
     def cp932
+      return NKF.nkf('-Wsm0x', fallback_text) if fallback?
       hex = unicode.sub(/\A[\>\*\+]/, '')
       raise if hex.size == 0
       chr = hex.split(/\+/, -1).map{ |ch| unicode_to_cp932(ch.hex) }.pack('n*')

data/lib/e4u/google.rb

@@ -15,19 +15,19 @@ module E4U
 
   module Google::Emojinize
     def docomo_emoji
-      DoCoMo::Emoji.new :unicode => self[:docomo]
+      DoCoMo::Emoji.new attribute_with_fallback_text(:docomo)
     end
 
     def kddi_emoji
-      KDDI::Emoji.new :unicode => self[:kddi]
+      KDDI::Emoji.new attribute_with_fallback_text(:kddi)
     end
 
     def kddiweb_emoji
-      KDDIWeb::Emoji.new :unicode => self[:kddi]
+      KDDIWeb::Emoji.new attribute_with_fallback_text(:kddi)
     end
 
     def softbank_emoji
-      Softbank::Emoji.new :unicode => self[:softbank]
+      Softbank::Emoji.new attribute_with_fallback_text(:softbank)
     end
 
     def unicode_emoji
@@ -37,6 +37,18 @@ module E4U
     def google_emoji
       Google::Emoji.new self.merge(:unicode => self[:google])
     end
+
+    private
+
+    def attribute_with_fallback_text type
+      attributes = { :unicode => self[type] }
+      unless attributes[:unicode]
+        attributes[:fallback_text]   = self[:text_fallback]
+        attributes[:fallback_text] ||= self[:text_repr]
+        attributes[:fallback_text] ||= [0x3013].pack('U')
+      end
+      attributes
+    end
   end
 
   class Google::Emoji < Base::Emoji
@@ -61,11 +73,20 @@ module E4U
     def translate carrier
       case carrier.to_s.downcase
       when 'docomo'
-        E4U.docomo.find{ |e| e[:unicode] == docomo }.docomo_emoji
+        emoji = E4U.docomo.find{ |e| e[:unicode] == docomo }
+        return emoji.docomo_emoji if emoji
+        E4U.google.find{ |e| e[:google] == google }.docomo_emoji
+
       when 'kddi'
-        E4U.kddi.find{ |e| e[:unicode] == kddi }.kddi_emoji
+        emoji = E4U.kddi.find{ |e| e[:unicode] == kddi }
+        return emoji.kddi_emoji if emoji
+        E4U.google.find{ |e| e[:google] == google }.kddi_emoji
+
       when 'softbank'
-        E4U.softbank.find{ |e| e[:unicode] == softbank }.softbank_emoji
+        emoji = E4U.softbank.find{ |e| e[:unicode] == softbank }
+        return emoji.softbank_emoji if emoji
+        E4U.google.find{ |e| e[:google] == google }.softbank_emoji
+
       else
         raise ArgumentError
       end

data/spec/docomo_spec.rb

@@ -34,6 +34,14 @@ describe E4U::DoCoMo do
     emj.docomo_emoji.should be_instance_of E4U::DoCoMo::Emoji
   end
 
+  it "E4U.docomoから取得した絵文字にfallback_textがないこと" do
+    @docomo.each do |data|
+      emoji = data.docomo_emoji
+      emoji.fallback_text.should be_nil
+      emoji.should_not be_fallback
+    end
+  end
+
   describe E4U::DoCoMo::Emoji do
     before :all do
       @emj = @docomo.find{ |e| e[:unicode] == 'E63E' }.docomo_emoji

data/spec/google_spec.rb

@@ -48,6 +48,47 @@ describe E4U::Google do
     end
   end
 
+  context "DoCoMoの該当絵文字が無い場合" do
+    it "fallback?が真になること" do
+      @google.each do |e|
+        next if e[:docomo]
+        de = e.docomo_emoji
+        de.should be_fallback
+      end
+    end
+
+    it "fallback_textで長さ1以上の文字列が返ってくること" do
+      @google.each do |e|
+        next if e[:docomo]
+        de = e.docomo_emoji
+        de.fallback_text.should be_instance_of String
+        de.fallback_text.size.should >= 1
+      end
+    end
+
+    it "utf8でfallback_textが返ってくること" do
+      @google.each do |e|
+        next if e[:docomo]
+        except   = e[:text_fallback]
+        except ||= e[:text_repr]
+        except ||= [0x3013].pack('U')
+
+        e.docomo_emoji.utf8.should == except
+      end
+    end
+
+    it "sjisでfallback_textが返ってくること" do
+      @google.each do |e|
+        next if e[:docomo]
+        except   = e[:text_fallback]
+        except ||= e[:text_repr]
+        except ||= [0x3013].pack('U')
+
+        e.docomo_emoji.sjis.should == NKF.nkf('-Wsm0x', except)
+      end
+    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
@@ -57,9 +98,9 @@ describe E4U::Google do
 
   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
+      ke = @google.find{ |e| e[:id] == id }.kddi_emoji
+      ke.utf8.should == utf8
+      ke.sjis.should == sjis
     end
   end
 
@@ -71,6 +112,47 @@ describe E4U::Google do
     end
   end
 
+  context "KDDIの該当絵文字が無い場合" do
+    it "fallback?が真になること" do
+      @google.each do |e|
+        next if e[:kddi]
+        ke = e.kddi_emoji
+        ke.should be_fallback
+      end
+    end
+
+    it "fallback_textで長さ1以上の文字列が返ってくること" do
+      @google.each do |e|
+        next if e[:kddi]
+        ke = e.kddi_emoji
+        ke.fallback_text.should be_instance_of String
+        ke.fallback_text.size.should >= 1
+      end
+    end
+
+    it "utf8でfallback_textが返ってくること" do
+      @google.each do |e|
+        next if e[:kddi]
+        except   = e[:text_fallback]
+        except ||= e[:text_repr]
+        except ||= [0x3013].pack('U')
+
+        e.kddi_emoji.utf8.should == except
+      end
+    end
+
+    it "sjisでSJISのfallback_textが返ってくること" do
+      @google.each do |e|
+        next if e[:kddi]
+        except   = e[:text_fallback]
+        except ||= e[:text_repr]
+        except ||= [0x3013].pack('U')
+
+        e.kddi_emoji.sjis.should == NKF.nkf('-Wsm0x', except)
+      end
+    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
@@ -82,9 +164,50 @@ describe E4U::Google 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
+      se = @google.find{ |e| e[:id] == id }.softbank_emoji
+      se.utf8.should == utf8
+      se.sjis.should == sjis
+    end
+  end
+
+  context "Softbankの該当絵文字が無い場合" do
+    it "fallback?が真になること" do
+      @google.each do |e|
+        next if e[:softbank]
+        se = e.softbank_emoji
+        se.should be_fallback
+      end
+    end
+
+    it "fallback_textで長さ1以上の文字列が返ってくること" do
+      @google.each do |e|
+        next if e[:softbank]
+        se = e.softbank_emoji
+        se.fallback_text.should be_instance_of String
+        se.fallback_text.size.should >= 1
+      end
+    end
+
+    it "utf8でfallback_textが返ってくること" do
+      @google.each do |e|
+        next if e[:softbank]
+        except   = e[:text_fallback]
+        except ||= e[:text_repr]
+        except ||= [0x3013].pack('U')
+
+        e.softbank_emoji.utf8.should == except
+      end
+    end
+
+    it "sjisでSJISのfallback_textが返ってくること" do
+      @google.each do |e|
+        next if e[:softbank]
+        except   = e[:text_fallback]
+        except ||= e[:text_repr]
+        except ||= [0x3013].pack('U')
+
+        e.softbank_emoji.sjis.should == NKF.nkf('-Wsm0x', except)
+      end
     end
   end
 
@@ -123,23 +246,43 @@ describe E4U::Google do
       @emj.desc.should match(/clear weather/i)
     end
 
-    it "translate(:docomo)でDoCoMo絵文字に変換できること" do
-      de = @emj.translate :docomo
-      de.utf8.should == [0xE63E].pack('U')
-    end
+    context "translate" do
+      it ":docomoでDoCoMo絵文字に変換できること" do
+        de = @emj.translate :docomo
+        de.utf8.should == [0xE63E].pack('U')
+      end
 
-    it "translate(:kddi)でKDDI絵文字に変換できること" do
-      de = @emj.translate :kddi
-      de.utf8.should == [0xE488].pack('U')
-    end
+      it ":kddiでKDDI絵文字に変換できること" do
+        de = @emj.translate :kddi
+        de.utf8.should == [0xE488].pack('U')
+      end
 
-    it "translate(:softbank)でSoftbank絵文字に変換できること" do
-      de = @emj.translate :softbank
-      de.utf8.should == [0xE04A].pack('U')
-    end
+      it ":softbankでSoftbank絵文字に変換できること" do
+        de = @emj.translate :softbank
+        de.utf8.should == [0xE04A].pack('U')
+      end
+
+      it "translateでArgumentErrorが起こること" do
+        lambda{ @emj.translate :emobile }.should raise_error ArgumentError
+      end
 
-    it "translateでArgumentErrorが起こること" do
-      lambda{ @emj.translate :emobile }.should raise_error ArgumentError
+      it "該当絵文字がなくても fallback_text に変換できること" do
+        # e4u/lib/e4u/google.rb:76:in `translate': undefined method `docomo_emoji' for nil:NilClass (NoMethodError)
+        lambda{
+          @google.find{ |e| e[:docomo].nil? }.google_emoji.translate(:docomo)
+        }.should_not raise_error NoMethodError
+
+        @google.each do |e|
+          next unless e[:google]
+          next if e[:docomo]
+
+          except   = e[:text_fallback]
+          except ||= e[:text_repr]
+          except ||= [0x3013].pack('U')
+
+          e.google_emoji.translate(:docomo).utf8.should == except
+        end
+      end
     end
 
     it "proposal?が返ってくること" do

data/spec/kddi_spec.rb

@@ -64,6 +64,14 @@ describe E4U::KDDI do
     end
   end
 
+  it "E4U.kddiから取得した絵文字にfallback_textがないこと" do
+    @kddi.each do |data|
+      emoji = data.kddi_emoji
+      emoji.fallback_text.should be_nil
+      emoji.should_not be_fallback
+    end
+  end
+
   describe E4U::KDDIWeb::Emoji do
     before :all do
       @emj = @kddi.find{ |e| e[:number] == '44' }.kddiweb_emoji

data/spec/softbank_spec.rb

@@ -33,6 +33,14 @@ describe E4U::Softbank do
     emj.softbank_emoji.should be_instance_of E4U::Softbank::Emoji
   end
 
+  it "E4U.softbankから取得した絵文字にfallback_textがないこと" do
+    @softbank.each do |data|
+      emoji = data.softbank_emoji
+      emoji.fallback_text.should be_nil
+      emoji.should_not be_fallback
+    end
+  end
+
   describe E4U::Softbank::Emoji do
     before :all do
       @emj = @softbank.find{ |e| e[:number] == '81' }.softbank_emoji

data/spec/spec.opts

@@ -1 +1,2 @@
 --color
+--loadby mtime

data/spec/spec_helper.rb

@@ -1,9 +1,10 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'nkf'
 require 'e4u'
 require 'spec'
 require 'spec/autorun'
 
 Spec::Runner.configure do |config|
-  
+
 end

metadata

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