jpmobile 1.0.0.pre → 1.0.0.pre.1

data/README.rdoc

@@ -217,7 +217,7 @@ Androidの場合はindex_smart_phone_android.html.erb、Windows Phoneの場合
 自動振り分けを無効化するには、アクションにおいて以下のように設定する
 
   def index
-    self.lookup_context.mobile = nil
+    disable_mobile_view!
   end
 
 === 位置情報の取得用リンクの生成

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :patch: 0
-:build: pre
+:build: pre.1

data/lib/jpmobile/hook_action_controller.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+require 'jpmobile/lookup_context'
+
 module ActionController
   class Base
     include Jpmobile::Helpers
@@ -16,4 +18,3 @@ module ActionController
 end
 
 ActionController::Request.send :include, Jpmobile::Encoding
-ActionView::LookupContext.register_detail(:mobile) {nil}

data/lib/jpmobile/hook_action_view.rb

@@ -6,6 +6,7 @@ ActionView::Base.class_eval { include Jpmobile::Helpers }
 
 # :stopdoc:
 # accept-charset に charset を変更できるようにする
+# ActionView で trans_sid を有効にする
 module ActionView
   module Helpers
     module FormTagHelper
@@ -24,5 +25,9 @@ module ActionView
       end
     end
   end
+
+  class Base
+    delegate :default_url_options, :to => :controller unless respond_to?(:default_url_options)
+  end
 end
 #:startdoc:

data/lib/jpmobile/lookup_context.rb

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+ActionView::LookupContext.register_detail(:mobile) {nil}

data/lib/jpmobile/mail.rb

@@ -313,4 +313,18 @@ module Mail
     alias_method :encoded_without_jpmobile, :encoded
     alias_method :encoded, :encoded_with_jpmobile
   end
+
+  class Sendmail
+    def Sendmail.call(path, arguments, destinations, mail)
+      encoded_mail = mail.encoded
+      if Jpmobile::Util.jis?(encoded_mail)
+        encoded_mail = Jpmobile::Util.ascii_8bit(encoded_mail)
+      end
+
+      IO.popen("#{path} #{arguments} #{destinations}", "w+") do |io|
+        io.puts encoded_mail.gsub(/\r\r\n/, "\n").to_lf
+        io.flush
+      end
+    end
+  end
 end

data/lib/jpmobile/mailer.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'jpmobile/mail'
+require 'jpmobile/lookup_context'
 
 module Jpmobile
   module Mailer
@@ -26,6 +27,15 @@ module Jpmobile
 
         m
       end
+
+      class << self
+        protected
+        def set_payload_for_mail(payload, mail) #:nodoc:
+          super
+
+          payload[:mail] = Jpmobile::Util.ascii_8bit(mail.encoded).gsub(/\r\n/, "\n")
+        end
+      end
     end
   end
 end

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -103,6 +103,7 @@ module Jpmobile::Mobile
       (charset.nil? or charset == "") ? self.class::MAIL_CHARSET : charset
     end
     def to_mail_encoding(str)
+      str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
       str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_PC_EMAIL, false)
       Jpmobile::Util.encode(str, mail_charset)
     end

data/lib/jpmobile/util.rb

@@ -11,6 +11,9 @@ module Jpmobile
     WAVE_DASH = [0x301c].pack("U")
     FULLWIDTH_TILDE = [0xff5e].pack("U")
 
+    OVERLINE = [0x203e].pack("U")
+    FULLWIDTH_MACRON = [0xffe3].pack("U")
+
     module_function
     def deep_apply(obj, &proc)
       case obj
@@ -85,6 +88,8 @@ module Jpmobile
     def utf8_to_sjis(utf8_str)
       # 波ダッシュ対策
       utf8_str = wavedash_to_fullwidth_tilde(utf8_str)
+      # オーバーライン対策(不可逆的)
+      utf8_str = overline_to_fullwidth_macron(utf8_str)
 
       if utf8_str.respond_to?(:encode)
         utf8_str.encode(SJIS, :crlf_newline => true)
@@ -197,6 +202,14 @@ module Jpmobile
       utf8_str.gsub(FULLWIDTH_TILDE, WAVE_DASH)
     end
 
+    def overline_to_fullwidth_macron(utf8_str)
+      utf8_str.gsub(OVERLINE, FULLWIDTH_MACRON)
+    end
+
+    def fullwidth_macron_to_overline(utf8_str)
+      utf8_str.gsub(FULLWIDTH_MACRON, OVERLINE)
+    end
+
     def force_encode(str, from, to)
       s = str.dup
       return str if detect_encoding(str) == to

data/spec/unit/util_spec.rb

@@ -42,6 +42,10 @@ describe Jpmobile::Util, ".deep_apply" do
     utf8_to_sjis([0xffe3].pack("U")).should == sjis("\x81\x50")
   end
 
+  it "U+203Eが0x8150に変換されること" do
+    utf8_to_sjis([0x203e].pack("U")).should == sjis("\x81\x50")
+  end
+
   it "jis_string_regexpでISO-2022-JPの文字列がマッチすること" do
     jis_string_regexp.match(ascii_8bit(utf8_to_jis("abcしからずんばこじをえずdef"))).should_not be_nil
     jis_to_utf8(jis("\x1b\x24\x42#{$1}\x1b\x28\x42")).should == "しからずんばこじをえず"

data/test/rails/rails_root/config/boot.rb

@@ -1,13 +1,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/rails/rails_root/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-RailsRoot::Application.config.secret_token = '23417af8bf908eea220f39faa992f7a25a753df87b6f0f4bfd9fec3ccf0dad629004cc608a9aaed4532f58231f16dfa9875cd21fbb4c58bde26bdc4aa9103979'
+RailsRoot::Application.config.secret_token = '3092a5d3b9fa0a566c76906c744a1cec4b95b0702622918a932fa39c4c5f2b74fb6bd1ca243162c51ed5e5622cfe249e0798bc05fde2660255f29bf2451df095'

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_controller.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+require 'jpmobile/lookup_context'
+
 module ActionController
   class Base
     include Jpmobile::Helpers
@@ -16,4 +18,3 @@ module ActionController
 end
 
 ActionController::Request.send :include, Jpmobile::Encoding
-ActionView::LookupContext.register_detail(:mobile) {nil}

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_view.rb

@@ -6,6 +6,7 @@ ActionView::Base.class_eval { include Jpmobile::Helpers }
 
 # :stopdoc:
 # accept-charset に charset を変更できるようにする
+# ActionView で trans_sid を有効にする
 module ActionView
   module Helpers
     module FormTagHelper
@@ -24,5 +25,9 @@ module ActionView
       end
     end
   end
+
+  class Base
+    delegate :default_url_options, :to => :controller unless respond_to?(:default_url_options)
+  end
 end
 #:startdoc:

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/lookup_context.rb

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+ActionView::LookupContext.register_detail(:mobile) {nil}

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mail.rb

@@ -313,4 +313,18 @@ module Mail
     alias_method :encoded_without_jpmobile, :encoded
     alias_method :encoded, :encoded_with_jpmobile
   end
+
+  class Sendmail
+    def Sendmail.call(path, arguments, destinations, mail)
+      encoded_mail = mail.encoded
+      if Jpmobile::Util.jis?(encoded_mail)
+        encoded_mail = Jpmobile::Util.ascii_8bit(encoded_mail)
+      end
+
+      IO.popen("#{path} #{arguments} #{destinations}", "w+") do |io|
+        io.puts encoded_mail.gsub(/\r\r\n/, "\n").to_lf
+        io.flush
+      end
+    end
+  end
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mailer.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'jpmobile/mail'
+require 'jpmobile/lookup_context'
 
 module Jpmobile
   module Mailer
@@ -26,6 +27,15 @@ module Jpmobile
 
         m
       end
+
+      class << self
+        protected
+        def set_payload_for_mail(payload, mail) #:nodoc:
+          super
+
+          payload[:mail] = Jpmobile::Util.ascii_8bit(mail.encoded).gsub(/\r\n/, "\n")
+        end
+      end
     end
   end
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/abstract_mobile.rb

@@ -103,6 +103,7 @@ module Jpmobile::Mobile
       (charset.nil? or charset == "") ? self.class::MAIL_CHARSET : charset
     end
     def to_mail_encoding(str)
+      str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
       str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_PC_EMAIL, false)
       Jpmobile::Util.encode(str, mail_charset)
     end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/util.rb

@@ -11,6 +11,9 @@ module Jpmobile
     WAVE_DASH = [0x301c].pack("U")
     FULLWIDTH_TILDE = [0xff5e].pack("U")
 
+    OVERLINE = [0x203e].pack("U")
+    FULLWIDTH_MACRON = [0xffe3].pack("U")
+
     module_function
     def deep_apply(obj, &proc)
       case obj
@@ -85,6 +88,8 @@ module Jpmobile
     def utf8_to_sjis(utf8_str)
       # 波ダッシュ対策
       utf8_str = wavedash_to_fullwidth_tilde(utf8_str)
+      # オーバーライン対策(不可逆的)
+      utf8_str = overline_to_fullwidth_macron(utf8_str)
 
       if utf8_str.respond_to?(:encode)
         utf8_str.encode(SJIS, :crlf_newline => true)
@@ -197,6 +202,14 @@ module Jpmobile
       utf8_str.gsub(FULLWIDTH_TILDE, WAVE_DASH)
     end
 
+    def overline_to_fullwidth_macron(utf8_str)
+      utf8_str.gsub(OVERLINE, FULLWIDTH_MACRON)
+    end
+
+    def fullwidth_macron_to_overline(utf8_str)
+      utf8_str.gsub(FULLWIDTH_MACRON, OVERLINE)
+    end
+
     def force_encode(str, from, to)
       s = str.dup
       return str if detect_encoding(str) == to

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: jpmobile
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 1
-  - 0
-  - 0
-  - pre
-  version: 1.0.0.pre
+  prerelease: 6
+  version: 1.0.0.pre.1
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +09:00
+date: 2011-02-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -39,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
   type: :development
   prerelease: false
@@ -54,10 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :development
   prerelease: false
@@ -69,10 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :development
   prerelease: false
@@ -84,8 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -97,8 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -110,8 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -123,8 +98,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -136,10 +109,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
         version: 1.5.1
   type: :development
   prerelease: false
@@ -151,10 +120,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :development
   prerelease: false
@@ -166,10 +131,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :development
   prerelease: false
@@ -181,10 +142,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 2
         version: 0.7.2
   type: :development
   prerelease: false
@@ -196,10 +153,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 0
         version: 1.5.0
   type: :development
   prerelease: false
@@ -211,10 +164,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 2
         version: 1.3.2
   type: :development
   prerelease: false
@@ -226,10 +175,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 3
         version: 0.8.3
   type: :development
   prerelease: false
@@ -241,10 +186,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 5
         version: 1.2.5
   type: :development
   prerelease: false
@@ -256,10 +197,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
   type: :development
   prerelease: false
@@ -298,6 +235,7 @@ files:
 - lib/jpmobile/helpers.rb
 - lib/jpmobile/hook_action_controller.rb
 - lib/jpmobile/hook_action_view.rb
+- lib/jpmobile/lookup_context.rb
 - lib/jpmobile/mail.rb
 - lib/jpmobile/mailer.rb
 - lib/jpmobile/mobile/abstract_mobile.rb
@@ -473,6 +411,7 @@ files:
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/helpers.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_controller.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_view.rb
+- test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/lookup_context.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mail.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mailer.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/abstract_mobile.rb
@@ -534,23 +473,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A Rails plugin for Japanese mobile-phones
@@ -698,6 +631,7 @@ test_files:
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/helpers.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_controller.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_view.rb
+- test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/lookup_context.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mail.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mailer.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/abstract_mobile.rb