jpmobile 2.0.0.pre.2 → 2.0.0

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 group :development, :test do
   gem 'jeweler'
-  gem 'rails', '3.1.0.rc5'
+  gem 'rails', '>= 3.1.0'
   gem 'rspec'
   gem 'rspec-rails'
   gem 'webrat'

data/Rakefile

@@ -20,7 +20,9 @@ begin
 
     gem.files.exclude 'test'
     gem.files.exclude 'spec'
+    gem.files.exclude 'vendor'
 
+    gem.add_development_dependency('rails', '>=3.1.0')
     gem.add_development_dependency('jeweler', '>=1.5.1')
     gem.add_development_dependency('rspec', '>=2.6.0')
     gem.add_development_dependency('rspec-rails', '>=2.6.0')
@@ -29,7 +31,6 @@ begin
     gem.add_development_dependency('sqlite3-ruby', '>=1.3.2')
     gem.add_development_dependency('hpricot', '>=0.8.3')
     gem.add_development_dependency('git', '>=1.2.5')
-    gem.add_development_dependency('rails', '>=3.1.0.rc5')
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"

data/VERSION.yml

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

data/lib/jpmobile/filter.rb

@@ -64,7 +64,7 @@ module Jpmobile
 
         doc = convert_text_content(doc)
 
-        doc.to_html
+        doc.to_html.gsub("\xc2\xa0"," ")
       end
     end
 

data/lib/jpmobile/mail.rb

@@ -406,6 +406,48 @@ module Mail
     alias_method :encoded, :encoded_with_jpmobile
   end
 
+  class ContentTypeElement # :nodoc:
+    def initialize_with_jpmobile(string)
+      if m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/) and
+          m[4].each_byte.detect { |b| (b == 0 || b > 127)}
+        name = [m[4]].pack('m').strip
+        string = "#{m[1]}#{m[2]}=#{m[3]}#{name}#{m[5]}#{m[6]}"
+      end
+
+      initialize_without_jpmobile(string)
+    end
+    alias_method :initialize_without_jpmobile, :initialize
+    alias_method :initialize, :initialize_with_jpmobile
+  end
+
+  class ContentDispositionElement # :nodoc:
+    def initialize_with_jpmobile(string)
+      if m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/) and
+          m[4].each_byte.detect { |b| (b == 0 || b > 127)}
+        name = [m[4]].pack('m').strip
+        string = "#{m[1]}#{m[2]}=#{m[3]}#{name}#{m[5]}#{m[6]}"
+      end
+
+      initialize_without_jpmobile(string)
+    end
+    alias_method :initialize_without_jpmobile, :initialize
+    alias_method :initialize, :initialize_with_jpmobile
+  end
+
+  class ContentLocationElement # :nodoc:
+    def initialize_with_jpmobile(string)
+      if m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/) and
+          m[4].each_byte.detect { |b| (b == 0 || b > 127)}
+        name = [m[4]].pack('m').strip
+        string = "#{m[1]}#{m[2]}=#{m[3]}#{name}#{m[5]}#{m[6]}"
+      end
+
+      initialize_without_jpmobile(string)
+    end
+    alias_method :initialize_without_jpmobile, :initialize
+    alias_method :initialize, :initialize_with_jpmobile
+  end
+
   class Sendmail
     def Sendmail.call(path, arguments, destinations, mail)
       encoded_mail = mail.encoded

data/lib/jpmobile/trans_sid.rb

@@ -2,27 +2,50 @@
 # = セッションIDの付与
 require 'active_support/version'
 
-module ParamsOverCookie
-  def self.included(base)
-    base.class_eval do
-      # cookie よりも params を先に見るパッチ
-      def extract_session_id_with_jpmobile(env)
-        request = ActionDispatch::Request.new(env.dup)
-        if request.params[@key] and !@cookie_only
-          sid = request.params[@key]
+module Jpmobile
+  module TransSid
+    module ParamsOverCookie
+      def self.included(base)
+        base.class_eval do
+          # cookie よりも params を先に見るパッチ
+          def extract_session_id_with_jpmobile(env)
+            request = ::Rack::Request.new(env)
+            if request.params[@key] and !@cookie_only
+              sid = request.params[@key]
+            end
+            sid ||= request.cookies[@key]
+            sid
+          end
+          alias_method_chain :extract_session_id, :jpmobile
         end
-        sid ||= request.cookies[@key]
-        sid
       end
-      alias_method_chain :extract_session_id, :jpmobile
     end
+
+    ActionDispatch::Session::AbstractStore.send :include, ParamsOverCookie
+  end
+
+  module SessionID
+    module_function
+
+    include ActionDispatch::Session::Compatibility
   end
 end
 
-module ActionDispatch
+
+module Rack
   module Session
-    class AbstractStore
-      include ParamsOverCookie
+    module Abstract
+      class SessionHash
+        def destroy_with_jpmobile
+          destroy_without_jpmobile
+
+          options = @env[::Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY] if @env
+          options ||= {}
+          options[:id] = Jpmobile::SessionID.generate_sid
+        end
+
+        alias_method_chain :destroy, :jpmobile
+      end
     end
   end
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -47,7 +47,7 @@ namespace :test do
     # setup jpmobile
     plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile')
     FileUtils.mkdir_p(plugin_path)
-    FileList["*"].exclude("test").exclude("spec").each do |file|
+    FileList["*"].exclude("test").exclude("spec").exclude('vendor').each do |file|
       FileUtils.cp_r(file, plugin_path)
     end
 

data/test/rails/overrides/app/controllers/filter_controller_base.rb

@@ -22,4 +22,7 @@ class FilterControllerBase < ApplicationController
   def input_tag
     render :text => '<input hoge="fuu" value="アブラカダブラ" />'
   end
+  def nbsp_char
+    render :text => '<a>アブラ&nbsp;カダブラ</a>'
+  end
 end

data/test/rails/overrides/spec/requests/filter_spec.rb

@@ -13,6 +13,10 @@ describe "jpmobile integration spec" do
       get "/#{@controller}/input_tag", {}, {"HTTP_USER_AGENT" => @user_agent}
       body.should == send(@conversion_method, '<input hoge="fuu" value="アブラカダブラ">')
     end
+    it "は&nbsp;変換されない" do
+      get "/#{@controller}/nbsp_char", {}, {"HTTP_USER_AGENT" => @user_agent}
+      body.should == send(@conversion_method, '<a>ｱﾌﾞﾗ&nbsp;ｶﾀﾞﾌﾞﾗ</a>')
+    end
   end
 
   shared_examples_for "hankaku_filter :input => false のとき" do
@@ -24,6 +28,10 @@ describe "jpmobile integration spec" do
       get "/#{@controller}/input_tag", {}, {"HTTP_USER_AGENT" => @user_agent}
       body.should == send(@conversion_method, '<input hoge="fuu" value="ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ" />')
     end
+    it "は&nbsp;変換されない" do
+      get "/#{@controller}/nbsp_char", {}, {"HTTP_USER_AGENT" => @user_agent}
+      body.should == send(@conversion_method, '<a>ｱﾌﾞﾗ&nbsp;ｶﾀﾞﾌﾞﾗ</a>')
+    end
   end
 
   shared_examples_for "文字コードフィルタが動作しているとき" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.2
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Yoji Shidara
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17709120 !ruby/object:Gem::Requirement
+  requirement: &13235520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +22,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17709120
+  version_requirements: *13235520
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &28200840 !ruby/object:Gem::Requirement
+  requirement: &13235040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc5
+        version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *28200840
+  version_requirements: *13235040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &28200360 !ruby/object:Gem::Requirement
+  requirement: &13234560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28200360
+  version_requirements: *13234560
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &28199880 !ruby/object:Gem::Requirement
+  requirement: &13097940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28199880
+  version_requirements: *13097940
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &28199400 !ruby/object:Gem::Requirement
+  requirement: &13097360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28199400
+  version_requirements: *13097360
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &28198920 !ruby/object:Gem::Requirement
+  requirement: &13096760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28198920
+  version_requirements: *13096760
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &28198440 !ruby/object:Gem::Requirement
+  requirement: &13096180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28198440
+  version_requirements: *13096180
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &28197960 !ruby/object:Gem::Requirement
+  requirement: &13095580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28197960
+  version_requirements: *13095580
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &13094980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: *13094980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &28197480 !ruby/object:Gem::Requirement
+  requirement: &13094460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +121,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *28197480
+  version_requirements: *13094460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &28197000 !ruby/object:Gem::Requirement
+  requirement: &13093880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +132,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *28197000
+  version_requirements: *13093880
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &28196520 !ruby/object:Gem::Requirement
+  requirement: &13093280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +143,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *28196520
+  version_requirements: *13093280
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &28196040 !ruby/object:Gem::Requirement
+  requirement: &13092700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +154,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *28196040
+  version_requirements: *13092700
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &28195560 !ruby/object:Gem::Requirement
+  requirement: &13092140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +165,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *28195560
+  version_requirements: *13092140
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &28195080 !ruby/object:Gem::Requirement
+  requirement: &13091660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +176,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *28195080
+  version_requirements: *13091660
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &28194600 !ruby/object:Gem::Requirement
+  requirement: &13091180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +187,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *28194600
+  version_requirements: *13091180
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &28194120 !ruby/object:Gem::Requirement
+  requirement: &13090700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,18 +198,7 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *28194120
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &28193640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0.rc5
-  type: :development
-  prerelease: false
-  version_requirements: *28193640
+  version_requirements: *13090700
 description: A Rails plugin for Japanese mobile-phones
 email: dara@shidara.net
 executables: []
@@ -421,9 +421,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6