e4u 0.0.4 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.6

data/lib/e4u.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift File.dirname(__FILE__)
-
 require 'e4u/base'
 require 'e4u/docomo'
 require 'e4u/kddi'

data/lib/e4u/base.rb

@@ -78,7 +78,7 @@ module E4U
     end
 
     def cp932
-      return NKF.nkf('-Wsm0x', fallback_text) if fallback?
+      return NKF.nkf('-m0xWs --oc=CP932', 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/docomo.rb

@@ -5,7 +5,7 @@ module E4U
     private
 
     def path
-      File.expand_path(File.join('..', '..', 'data', 'docomo', 'carrier_data.xml'), File.dirname(__FILE__))
+      File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data', 'docomo', 'carrier_data.xml'))
     end
 
     def emojinize object

data/lib/e4u/google.rb

@@ -5,7 +5,7 @@ module E4U
     private
 
     def path
-      File.expand_path(File.join('..', '..', 'data', 'emoji4unicode.xml'), File.dirname(__FILE__))
+      File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data', 'emoji4unicode.xml'))
     end
 
     def emojinize object
@@ -38,15 +38,15 @@ module E4U
       Google::Emoji.new self.merge(:unicode => self[:google])
     end
 
+    def text_fallback
+      self[:text_fallback] || self[:text_repr] || [0x3013].pack('U')
+    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[:fallback_text] = text_fallback unless attributes[:unicode]
       attributes
     end
   end

data/lib/e4u/kddi.rb

@@ -5,7 +5,7 @@ module E4U
     private
 
     def path
-      File.expand_path(File.join('..', '..', 'data', 'kddi', 'carrier_data.xml'), File.dirname(__FILE__))
+      File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data', 'kddi', 'carrier_data.xml'))
     end
 
     def emojinize object

data/lib/e4u/softbank.rb

@@ -5,7 +5,7 @@ module E4U
     private
 
     def path
-      File.expand_path(File.join('..', '..', 'data', 'softbank', 'carrier_data.xml'), File.dirname(__FILE__))
+      File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data', 'softbank', 'carrier_data.xml'))
     end
 
     def emojinize object
@@ -24,6 +24,30 @@ module E4U
     def number; nil end
     def unicode; nil end
 
+    def webcode
+      return NKF.nkf('-m0xWs --oc=CP932', fallback_text) if fallback?
+      hex = unicode.sub(/\A[\>\*\+]/, '')
+      raise if hex.size == 0
+      buf = []
+      prev = nil
+      hex.split(/\+/, -1).each do |e|
+        code = e.hex
+        high = (code & 0x0700) >> 8
+        low  = (code & 0x00FF) + 32
+        page = %w(G E F O P Q)[high]
+        raise unless page
+        unless page == prev
+          buf << "\x0F" if buf.size > 0
+          buf << "\x1B\x24#{page}"
+        end
+        buf << low.chr
+        prev = page
+      end
+      buf << "\x0F"
+      str = buf.join
+      #str.force_encoding(???) if str.respond_to? :force_encoding
+    end
+
     private
 
     def unicode_to_cp932 octet

data/spec/google_spec.rb

@@ -32,6 +32,17 @@ describe E4U::Google do
     emj[:unicode].should == '2600'
   end
 
+  # TODO: 紛らわしい
+  it "text_fallbackでfallback_textが返ってくること" do
+    @google.each do |e|
+      except   = e[:text_fallback]
+      except ||= e[:text_repr]
+      except ||= [0x3013].pack('U')
+
+      e.text_fallback.should == except
+    end
+  end
+
   it "docomo_emojiでE4U::DoCoMo::Emojiが返ってくること" do
     de = @google.find{ |e| e[:id] == '000' }.docomo_emoji
     de.should be_instance_of E4U::DoCoMo::Emoji
@@ -44,7 +55,7 @@ describe E4U::Google do
       '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
+      de.sjis.dump.should == sjis.dump
     end
   end
 
@@ -69,22 +80,14 @@ describe E4U::Google do
     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
+        e.docomo_emoji.utf8.should == e.text_fallback
       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)
+        e.docomo_emoji.sjis.should == NKF.nkf('-m0xWs --oc=CP932', e.text_fallback)
       end
     end
   end
@@ -100,7 +103,7 @@ describe E4U::Google do
     { '331' => [[0xE471, 0xE5B1].pack('U*'), [0xF649, 0xF7CE].pack('n*')], }.each do |id, (utf8, sjis)|
       ke = @google.find{ |e| e[:id] == id }.kddi_emoji
       ke.utf8.should == utf8
-      ke.sjis.should == sjis
+      ke.sjis.dump.should == sjis.dump
     end
   end
 
@@ -108,7 +111,7 @@ describe E4U::Google 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
+      de.sjis.dump.should == sjis.dump
     end
   end
 
@@ -133,22 +136,14 @@ describe E4U::Google do
     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
+        e.kddi_emoji.utf8.should == e.text_fallback
       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)
+        e.kddi_emoji.sjis.should == NKF.nkf('-m0xWs --oc=CP932', e.text_fallback)
       end
     end
   end
@@ -161,12 +156,19 @@ describe E4U::Google do
   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)|
+    { '00F' => [[0xE04A, 0xE049].pack('U*'),
+                [0xF98B, 0xF98A].pack('n*'),
+                "\x1B$Gji\x0F"],
+      '331' => [[0xE415, 0xE331].pack('U*'),
+                [0xFB55, 0xF9D1].pack('n*'),
+                "\x1B$P5\x0F\x1B$OQ\x0F"],
+      '824' => [[0xE103, 0xE328].pack('U*'),
+                [0xF743, 0xF9C8].pack('n*'),
+                "\x1B$E#\x0F\x1B$OH\x0F"], }.each do |id, (utf8, sjis, webcode)|
       se = @google.find{ |e| e[:id] == id }.softbank_emoji
       se.utf8.should == utf8
-      se.sjis.should == sjis
+      se.sjis.dump.should == sjis.dump
+      se.webcode.should == webcode
     end
   end
 
@@ -191,22 +193,14 @@ describe E4U::Google do
     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
+        e.softbank_emoji.utf8.should == e.text_fallback
       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)
+        e.softbank_emoji.sjis.should == NKF.nkf('-m0xWs --oc=CP932', e.text_fallback)
       end
     end
   end
@@ -275,12 +269,7 @@ describe E4U::Google do
         @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
+          e.google_emoji.translate(:docomo).utf8.should == e.text_fallback
         end
       end
     end

data/spec/softbank_spec.rb

@@ -57,5 +57,9 @@ describe E4U::Softbank do
     it "alternate?が返ってくること" do
       @emj.alternate?.should be_false
     end
+
+    it "webcodeが返ってくること" do
+      @emj.webcode.should == "\x1B\x24Gj\x0F"
+    end
   end
 end

data/spec/spec.opts

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: e4u
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.6
 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-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency