jpmobile 0.0.7 → 0.0.8

data/.gitignore

@@ -0,0 +1,6 @@
+doc
+tmp
+pkg
+.bundle
+Gemfile
+Gemfile.lock

data/README.rdoc

@@ -16,25 +16,35 @@
 
 == インストール
 Rails の Version に応じて選択してください。
-=== Rails 2.3.3, 2.3.4, 2.3.5, 2.3.6, 2.3.7, 2.3.8
+=== Rails 2.3.3 〜 2.3.8
+==== pluginとしてインストールする場合
 開発版:
-  % ./script/plugin install git://github.com/darashi/jpmobile.git
+  % ./script/plugin install git://github.com/jpmobile/jpmobile.git
+
+==== gemでインストールする場合
+
+  # gem install jpmobile -v 0.0.8
+としてgemをインストールした後
+
+RAILS_ROOT/config/environment.rb の Rails::Initializer.run do |config| 〜 end 内に
+  config.gem "jpmobile"
+の行を追加する。
 
 === Rails 2.3.2
 ==== pluginとしてインストールする場合
 
 リリース版: (Version 0.0.6)
-  % git clone git://github.com/darashi/jpmobile.git vendor/plugins/jpmobile
+  % git clone git://github.com/jpmobile/jpmobile.git vendor/plugins/jpmobile
   % cd vendor/plugins/jpmobile
   % git checkout 0.0.6
   % rm -rf .git
 
 開発版:
-  % ./script/plugin install git://github.com/darashi/jpmobile.git
+  % ./script/plugin install git://github.com/jpmobile/jpmobile.git
 
 ==== gemでインストールする場合
 
-  # gem install jpmobile
+  # gem install jpmobile -v 0.0.8
 としてgemをインストールした後
 
 RAILS_ROOT/config/environment.rb の Rails::Initializer.run do |config| 〜 end 内に
@@ -43,7 +53,7 @@ RAILS_ROOT/config/environment.rb の Rails::Initializer.run do |config| 〜 end
 
 === Rails 2.2.x 以前
 リリース版:
-  % git clone git://github.com/darashi/jpmobile.git vendor/plugins/jpmobile
+  % git clone git://github.com/jpmobile/jpmobile.git vendor/plugins/jpmobile
   % cd vendor/plugins/jpmobile
   % git checkout 0.0.5
   % rm -rf .git

data/Rakefile

@@ -114,3 +114,17 @@ end
 
 task :test => ['test:legacy', 'spec:unit', 'test:rails']
 load 'tasks/jpmobile_tasks.rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "jpmobile"
+    gemspec.summary = %q{A Rails plugin for Japanese mobile-phones}
+    gemspec.description = %q{A Rails plugin for Japanese mobile-phones}
+    gemspec.email = %q{dara@shidara.net}
+    gemspec.homepage = %q{http://github.com/jpmobile/jpmobile}
+    gemspec.authors = ["Yoji Shidara", "Shin-ichiro OGAWA"]
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
+end

data/VERSION.yml

@@ -0,0 +1,4 @@
+---
+:major: 0
+:minor: 0
+:patch: 8

data/init.rb

@@ -0,0 +1,3 @@
+# Include hook code here
+
+require 'jpmobile'

data/install.rb

@@ -0,0 +1 @@
+# Install hook code here

data/jpmobile.gemspec

@@ -0,0 +1,299 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{jpmobile}
+  s.version = "0.0.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Yoji Shidara", "Shin-ichiro OGAWA"]
+  s.date = %q{2010-08-31}
+  s.description = %q{A Rails plugin for Japanese mobile-phones}
+  s.email = %q{dara@shidara.net}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG",
+     "MIT-LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "init.rb",
+     "install.rb",
+     "jpmobile.gemspec",
+     "lib/jpmobile.rb",
+     "lib/jpmobile/datum_conv.rb",
+     "lib/jpmobile/docomo_guid.rb",
+     "lib/jpmobile/email.rb",
+     "lib/jpmobile/emoticon.rb",
+     "lib/jpmobile/emoticon/au.rb",
+     "lib/jpmobile/emoticon/conversion_table.rb",
+     "lib/jpmobile/emoticon/docomo.rb",
+     "lib/jpmobile/emoticon/softbank.rb",
+     "lib/jpmobile/emoticon/z_combine.rb",
+     "lib/jpmobile/filter.rb",
+     "lib/jpmobile/helpers.rb",
+     "lib/jpmobile/hook_action_controller.rb",
+     "lib/jpmobile/hook_action_view.rb",
+     "lib/jpmobile/hook_request.rb",
+     "lib/jpmobile/mobile/abstract_mobile.rb",
+     "lib/jpmobile/mobile/au.rb",
+     "lib/jpmobile/mobile/display.rb",
+     "lib/jpmobile/mobile/docomo.rb",
+     "lib/jpmobile/mobile/emobile.rb",
+     "lib/jpmobile/mobile/softbank.rb",
+     "lib/jpmobile/mobile/willcom.rb",
+     "lib/jpmobile/mobile/z_display_info_docomo.rb",
+     "lib/jpmobile/mobile/z_ip_addresses_au.rb",
+     "lib/jpmobile/mobile/z_ip_addresses_docomo.rb",
+     "lib/jpmobile/mobile/z_ip_addresses_emobile.rb",
+     "lib/jpmobile/mobile/z_ip_addresses_softbank.rb",
+     "lib/jpmobile/mobile/z_ip_addresses_willcom.rb",
+     "lib/jpmobile/position.rb",
+     "lib/jpmobile/rack/auth.rb",
+     "lib/jpmobile/rack/combined_logger.rb",
+     "lib/jpmobile/rack/request.rb",
+     "lib/jpmobile/rack/trans_sid.rb",
+     "lib/jpmobile/request_with_mobile.rb",
+     "lib/jpmobile/trans_sid.rb",
+     "lib/jpmobile/util.rb",
+     "lib/jpmobile/version.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/unit/detect_by_email_spec.rb",
+     "spec/unit/detect_by_ua_spec.rb",
+     "spec/unit/is_carrier_spec.rb",
+     "spec/unit/spec_helper.rb",
+     "spec/unit/util_spec.rb",
+     "spec/unit/valid_ip_spec.rb",
+     "tasks/jpmobile_tasks.rake",
+     "test/legacy/au_test.rb",
+     "test/legacy/autoload_test.rb",
+     "test/legacy/docomo_test.rb",
+     "test/legacy/emoticon_functional_test.rb",
+     "test/legacy/emoticon_test.rb",
+     "test/legacy/filter_test.rb",
+     "test/legacy/helper.rb",
+     "test/legacy/helpers_test.rb",
+     "test/legacy/softbank_test.rb",
+     "test/legacy/willcom_test.rb",
+     "test/rails/.gitignore",
+     "test/rails/2.3.2/spec/controllers/trans_sid_spec.rb",
+     "test/rails/overrides/app/controllers/application_controller.rb",
+     "test/rails/overrides/app/controllers/docomo_guid_controller.rb",
+     "test/rails/overrides/app/controllers/filter_controller.rb",
+     "test/rails/overrides/app/controllers/mobile_spec_controller.rb",
+     "test/rails/overrides/app/controllers/template_path_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_controller.rb",
+     "test/rails/overrides/app/views/filter/index.html.erb",
+     "test/rails/overrides/app/views/hankaku_filter/index.html.erb",
+     "test/rails/overrides/app/views/template_path/_partial.html.erb",
+     "test/rails/overrides/app/views/template_path/_partial_mobile.html.erb",
+     "test/rails/overrides/app/views/template_path/_partial_mobile_docomo.html.erb",
+     "test/rails/overrides/app/views/template_path/index.html.erb",
+     "test/rails/overrides/app/views/template_path/index_mobile.html.erb",
+     "test/rails/overrides/app/views/template_path/index_mobile_docomo.html.erb",
+     "test/rails/overrides/app/views/template_path/partial.html.erb",
+     "test/rails/overrides/lib/tasks/rspec.rake",
+     "test/rails/overrides/spec/controllers/docomo_guid_spec.rb",
+     "test/rails/overrides/spec/controllers/docomo_spec.rb",
+     "test/rails/overrides/spec/controllers/emobile_spec.rb",
+     "test/rails/overrides/spec/controllers/filter_spec.rb",
+     "test/rails/overrides/spec/controllers/pc_spec.rb",
+     "test/rails/overrides/spec/controllers/softbank_emulator_spec.rb",
+     "test/rails/overrides/spec/controllers/template_path_spec.rb",
+     "test/rails/overrides/spec/controllers/trans_sid_spec.rb",
+     "test/rails/overrides/spec/helpers/helpers_spec.rb",
+     "test/rails/overrides/spec/rcov.opts",
+     "test/rails/overrides/spec/rspec.rake",
+     "test/rails/overrides/spec/spec.opts",
+     "test/rails/overrides/spec/spec_helper.rb",
+     "tools/disabled_update_display_info_docomo.rb",
+     "tools/emoji/genregexp.rb",
+     "tools/generate_au_emoticon_table.rb",
+     "tools/generate_docomo_emoticon_table.rb",
+     "tools/generate_emoticon_conversion_table.rb",
+     "tools/generate_softbank_emoticon_table.rb",
+     "tools/list_gps_unsupported_au.rb",
+     "tools/update_ip_addresses_au.rb",
+     "tools/update_ip_addresses_willcom.rb"
+  ]
+  s.homepage = %q{http://github.com/jpmobile/jpmobile}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{A Rails plugin for Japanese mobile-phones}
+  s.test_files = [
+    "spec/unit/detect_by_email_spec.rb",
+     "spec/unit/detect_by_ua_spec.rb",
+     "spec/unit/spec_helper.rb",
+     "spec/unit/valid_ip_spec.rb",
+     "spec/unit/util_spec.rb",
+     "spec/unit/is_carrier_spec.rb",
+     "spec/spec_helper.rb",
+     "test/legacy/filter_test.rb",
+     "test/legacy/autoload_test.rb",
+     "test/legacy/softbank_test.rb",
+     "test/legacy/au_test.rb",
+     "test/legacy/willcom_test.rb",
+     "test/legacy/emoticon_functional_test.rb",
+     "test/legacy/emoticon_test.rb",
+     "test/legacy/helpers_test.rb",
+     "test/legacy/docomo_test.rb",
+     "test/legacy/helper.rb",
+     "test/rails/rails_root/spec/helpers/helpers_spec.rb",
+     "test/rails/rails_root/spec/requests/softbank_emulator_spec.rb",
+     "test/rails/rails_root/spec/requests/docomo_spec.rb",
+     "test/rails/rails_root/spec/requests/helpers_spec.rb",
+     "test/rails/rails_root/spec/requests/docomo_guid_spec.rb",
+     "test/rails/rails_root/spec/requests/trans_sid_spec.rb",
+     "test/rails/rails_root/spec/requests/template_path_spec.rb",
+     "test/rails/rails_root/spec/requests/filter_spec.rb",
+     "test/rails/rails_root/spec/requests/pc_spec.rb",
+     "test/rails/rails_root/spec/requests/emobile_spec.rb",
+     "test/rails/rails_root/spec/spec_helper.rb",
+     "test/rails/rails_root/autotest/discover.rb",
+     "test/rails/rails_root/app/helpers/application_helper.rb",
+     "test/rails/rails_root/app/models/user.rb",
+     "test/rails/rails_root/app/controllers/trans_sid_always_controller.rb",
+     "test/rails/rails_root/app/controllers/hankaku_filter_controller.rb",
+     "test/rails/rails_root/app/controllers/filter_controller_base.rb",
+     "test/rails/rails_root/app/controllers/links_controller.rb",
+     "test/rails/rails_root/app/controllers/trans_sid_base_controller.rb",
+     "test/rails/rails_root/app/controllers/trans_sid_none_controller.rb",
+     "test/rails/rails_root/app/controllers/trans_sid_always_and_session_off_controller.rb",
+     "test/rails/rails_root/app/controllers/template_path_controller.rb",
+     "test/rails/rails_root/app/controllers/docomo_guid_docomo_controller.rb",
+     "test/rails/rails_root/app/controllers/filter_controller.rb",
+     "test/rails/rails_root/app/controllers/mobile_spec_controller.rb",
+     "test/rails/rails_root/app/controllers/trans_sid_mobile_controller.rb",
+     "test/rails/rails_root/app/controllers/application_controller.rb",
+     "test/rails/rails_root/app/controllers/docomo_guid_always_controller.rb",
+     "test/rails/rails_root/app/controllers/docomo_guid_base_controller.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/install.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/emoticon_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/au_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/willcom_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/params_filter_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/docomo_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/filter_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/windows_phone.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/mobile_by_ua_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/iphone_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/softbank_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/android_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/detect_by_email_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/spec_helper.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/valid_ip_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/util_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/is_carrier_spec.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/spec_helper.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack_helper.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tools/generate_softbank_emoticon_table.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tools/update_ip_addresses_au.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tools/disabled_update_display_info_docomo.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tools/update_ip_addresses_willcom.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tools/emoji/genregexp.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tools/generate_emoticon_conversion_table.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tools/list_gps_unsupported_au.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tools/generate_au_emoticon_table.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tools/generate_docomo_emoticon_table.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/init.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/position.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/filter.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/request_with_mobile.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/docomo_guid.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/params_filter.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/filter.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/mobile_carrier.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/datum_conv.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/encoding.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/util.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/trans_sid.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_willcom.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/abstract_mobile.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/iphone.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_emobile.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/emobile.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_au.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/docomo.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/display.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/smart_phone.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_docomo.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_softbank.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/softbank.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/willcom.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_display_info_docomo.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/windows_phone.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/au.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/vodafone.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/android.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/ddipocket.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/helpers.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/z_combine.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/docomo.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/conversion_table.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/softbank.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/au.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_view.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/email.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rails.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_controller.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tmp/conversion-table.rb",
+     "test/rails/rails_root/vendor/plugins/jpmobile/tmp/utf8_to_image.rb",
+     "test/rails/rails_root/db/migrate/20100824062306_create_users.rb",
+     "test/rails/rails_root/db/migrate/001_add_sessions_table.rb",
+     "test/rails/rails_root/db/schema.rb",
+     "test/rails/rails_root/db/seeds.rb",
+     "test/rails/rails_root/config/environments/development.rb",
+     "test/rails/rails_root/config/environments/test.rb",
+     "test/rails/rails_root/config/environments/production.rb",
+     "test/rails/rails_root/config/environment.rb",
+     "test/rails/rails_root/config/routes.rb",
+     "test/rails/rails_root/config/application.rb",
+     "test/rails/rails_root/config/initializers/inflections.rb",
+     "test/rails/rails_root/config/initializers/mime_types.rb",
+     "test/rails/rails_root/config/initializers/backtrace_silencers.rb",
+     "test/rails/rails_root/config/initializers/session_store.rb",
+     "test/rails/rails_root/config/initializers/secret_token.rb",
+     "test/rails/rails_root/config/initializers/jpmobile_generator.rb",
+     "test/rails/rails_root/config/boot.rb",
+     "test/rails/rails_root/test/performance/browsing_test.rb",
+     "test/rails/rails_root/test/test_helper.rb",
+     "test/rails/overrides/spec/helpers/helpers_spec.rb",
+     "test/rails/overrides/spec/spec_helper.rb",
+     "test/rails/overrides/spec/controllers/softbank_emulator_spec.rb",
+     "test/rails/overrides/spec/controllers/docomo_spec.rb",
+     "test/rails/overrides/spec/controllers/docomo_guid_spec.rb",
+     "test/rails/overrides/spec/controllers/trans_sid_spec.rb",
+     "test/rails/overrides/spec/controllers/template_path_spec.rb",
+     "test/rails/overrides/spec/controllers/filter_spec.rb",
+     "test/rails/overrides/spec/controllers/pc_spec.rb",
+     "test/rails/overrides/spec/controllers/emobile_spec.rb",
+     "test/rails/overrides/app/controllers/trans_sid_controller.rb",
+     "test/rails/overrides/app/controllers/template_path_controller.rb",
+     "test/rails/overrides/app/controllers/filter_controller.rb",
+     "test/rails/overrides/app/controllers/mobile_spec_controller.rb",
+     "test/rails/overrides/app/controllers/docomo_guid_controller.rb",
+     "test/rails/overrides/app/controllers/application_controller.rb",
+     "test/rails/2.3.2/spec/controllers/trans_sid_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/lib/jpmobile.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
 module Jpmobile
   autoload :Email   , 'jpmobile/email'
   autoload :Emoticon, 'jpmobile/emoticon'

data/lib/jpmobile/emoticon.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+
+require 'scanf'
 require 'nkf'
 
 module Jpmobile
@@ -88,9 +90,21 @@ module Jpmobile
         when Integer
           # 変換先がUnicodeで指定されている。つまり対応する絵文字がある。
           if sjis = UNICODE_TO_SJIS[converted]
-            [sjis].pack('n')
+            if to_sjis
+              sjis_emotion = [sjis].pack('n')
+              if sjis_emotion.respond_to?(:force_encoding)
+                sjis_emotion.force_encoding("Shift_JIS")
+              end
+              sjis_emotion
+            else
+              [converted].pack("U")
+            end
           elsif webcode = SOFTBANK_UNICODE_TO_WEBCODE[converted-0x1000]
-            "\x1b\x24#{webcode}\x0f"
+            emotion = "\x1b\x24#{webcode}\x0f"
+            if emotion.respond_to?(:force_encoding)
+              emotion.force_encoding(str.encoding)
+            end
+            emotion
           else
             # キャリア変換テーブルに指定されていたUnicodeに対応する
             # 携帯側エンコーディングが見つからない(変換テーブルの不備の可能性あり)。

data/lib/jpmobile/emoticon/z_combine.rb

@@ -1,4 +1,7 @@
-$KCODE='u'
+unless Object.const_defined?(:Encoding)
+  $KCODE = 'u'
+end
+
 module Jpmobile
   module Emoticon
     SJIS_TO_UNICODE = {}
@@ -7,11 +10,21 @@ module Jpmobile
     SJIS_TO_UNICODE.freeze
     UNICODE_TO_SJIS = SJIS_TO_UNICODE.invert.freeze
 
-    SJIS_REGEXP = Regexp.union(*SJIS_TO_UNICODE.keys.map{|s| Regexp.compile(Regexp.escape([s].pack('n'),"s"),nil,'s')})
+    if Object.const_defined?(:Encoding)
+      sjis_regexp = Proc.new do |sjis|
+        Regexp.compile(Regexp.escape([sjis].pack('n').force_encoding("Shift_JIS")))
+      end
+    else
+      sjis_regexp = Proc.new do |sjis|
+        Regexp.compile(Regexp.escape([sjis].pack('n'),"s"),nil,'s')
+      end
+    end
+
+    SJIS_REGEXP = Regexp.union(*SJIS_TO_UNICODE.keys.map{|s| sjis_regexp[s]})
     SOFTBANK_WEBCODE_REGEXP = Regexp.union(*([/(?!)/n]+SOFTBANK_WEBCODE_TO_UNICODE.keys.map{|x| "\x1b\x24#{x}\x0f"}))
 
-    DOCOMO_SJIS_REGEXP      = Regexp.union(*DOCOMO_SJIS_TO_UNICODE.keys.map{|s| Regexp.compile(Regexp.escape([s].pack('n'),"s"),nil,'s')})
-    AU_SJIS_REGEXP          = Regexp.union(*AU_SJIS_TO_UNICODE.keys.map{|s| Regexp.compile(Regexp.escape([s].pack('n'),"s"),nil,'s')})
+    DOCOMO_SJIS_REGEXP      = Regexp.union(*DOCOMO_SJIS_TO_UNICODE.keys.map{|s| sjis_regexp[s]})
+    AU_SJIS_REGEXP          = Regexp.union(*AU_SJIS_TO_UNICODE.keys.map{|s| sjis_regexp[s]})
     SOFTBANK_UNICODE_REGEXP = Regexp.union(*SOFTBANK_UNICODE_TO_WEBCODE.keys.map{|x| [x].pack('U')}).freeze
 
     EMOTICON_UNICODES = UNICODE_TO_SJIS.keys|SOFTBANK_UNICODE_TO_WEBCODE.keys.map{|k|k+0x1000}