jpmobile 2.0.5 → 2.0.6

data/Gemfile

@@ -1,8 +1,9 @@
 source 'http://rubygems.org'
 
 group :development, :test do
+  gem 'mail', '~> 2.3.0'
   gem 'jeweler'
-  gem 'rails', '>= 3.1.0'
+  gem 'rails', '~> 3.1.0'
   gem 'rspec'
   gem 'rspec-rails'
   gem 'webrat'

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 0
-:patch: 5
-:build: !!null 
+:patch: 6
+:build: 

data/jpmobile.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jpmobile}
-  s.version = "1.0.0.pre"
+  s.version = "2.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoji Shidara", "Shin-ichiro OGAWA"]

data/lib/jpmobile/mail.rb

@@ -67,7 +67,16 @@ module Mail
         self.body.charset = @charset
         self.body.mobile  = @mobile
         self.header['Content-Transfer-Encoding'] = @mobile.content_transfer_encoding(self.header)
-        self.header['Content-ID'] = nil if @mobile.decorated? and !self.content_type.match(/image\//)
+        if @mobile.decorated?
+          unless self.content_type.match(/image\//)
+            self.header['Content-ID'] = nil
+          end
+
+          unless self.header['Content-Type'].sub_type == 'mixed'
+            self.header['Date']         = nil
+            self.header['Mime-Version'] = nil
+          end
+        end
 
         buffer = header.encoded
         buffer << "\r\n"
@@ -173,7 +182,9 @@ module Mail
         attached_files = []
         attachments.each do |p|
           if p.content_type.match(/^image\//)  and p.content_disposition.match(/^inline/)
-            p.header['Content-Disposition'] = nil
+            if p.header['Content-Type'].parameters['filename']
+              p.header['Content-Type'].parameters['name'] = p.header['Content-Type'].parameters['filename'].to_s
+            end
             inline_images << p
           elsif p.content_disposition
             attached_files << p

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -101,7 +101,7 @@ module Jpmobile::Mobile
         @_variants = @_variants.reject{|v| v == "mobile"}.map{|v| v.gsub(/mobile/, "smart_phone")}
       end
 
-      @_variants
+      @_variants || []
     end
 
     # メール送信用

data/lib/jpmobile/resolver.rb

@@ -1,36 +1,38 @@
 module Jpmobile
   class Resolver < ActionView::FileSystemResolver
-    def find_templates(name, prefix, partial, details)
-      path = build_path(name, prefix, partial, details)
-      query(path, EXTENSIONS.map { |ext| details[ext] }, details[:formats], details[:mobile])
-    end
+    EXTENSIONS = [:locale, :formats, :handlers, :mobile]
+    DEFAULT_PATTERN = ":prefix/:action{_:mobile,}{.:locale,}{.:formats,}{.:handlers,}"
 
-    def build_path(name, prefix, partial, details)
-      path = ""
-      path << "#{prefix}/" unless prefix.empty?
-      path << (partial ? "_#{name}" : name)
-      path
+    def initialize(path, pattern=nil)
+      raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
+      super(path, pattern || DEFAULT_PATTERN)
+      @path = File.expand_path(path)
     end
 
-    def query(path, exts, formats, mobile)
-      query = File.join(@path, path)
-      query << '{' << mobile.map {|v| "_#{v}"}.join(',') << ',}' if mobile and mobile.respond_to?(:map)
-      exts.each do |ext|
-        query << '{' << ext.map {|e| e && ".#{e}" }.join(',') << ',}'
-      end
+    private
 
-      query.gsub!(/\{\.html,/, "{.html,.text.html,")
-      query.gsub!(/\{\.text,/, "{.text,.text.plain,")
+    def query(path, details, formats)
+      query = build_query(path, details)
+      templates = []
+      sanitizer = Hash.new { |h,k| h[k] = Dir["#{File.dirname(k)}/*"] }
+
+      Dir[query].each do |p|
+        next if File.directory?(p) || !sanitizer[p].include?(p)
 
-      Dir[query].reject { |p| File.directory?(p) }.map do |p|
         handler, format = extract_handler_and_format(p, formats)
+        contents = File.open(p, "rb") { |io| io.read }
 
-        contents = File.open(p, "rb") {|io| io.read }
-        variant = p.match(/.+#{path}(.+)\.#{format.to_sym.to_s}.*$/) ? $1 : ''
+        if format
+          variant = p.match(/.+#{path}(.+)\.#{format.to_sym.to_s}.*$/) ? $1 : ''
+        else
+          variant = ''
+        end
 
-        ActionView::Template.new(contents, File.expand_path(p), handler,
-          :virtual_path => path + variant, :format => format)
+        templates << ActionView::Template.new(contents, File.expand_path(p), handler,
+          :virtual_path => path.name + variant, :format => format, :updated_at => mtime(p))
       end
+
+      templates
     end
   end
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -39,6 +39,7 @@ namespace :test do
 
     unless skip
       # generate rails app
+      FileUtils.rm_rf("Gemfile.lock")
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
       `bundle exec rails new #{rails_root}`

data/test/rails/overrides/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
-gem 'rails', '>= 3.0.3'
+gem 'rails', '~> 3.1.0'
+gem 'mail', '2.3.0'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

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

@@ -3,4 +3,8 @@ class MobileSpecController < ApplicationController
 
   def index
   end
+
+  def file_render
+    render :file => File.join(Rails.public_path, '422')
+  end
 end

data/test/rails/overrides/spec/controllers/mobile_spec_controller_spec.rb

@@ -25,4 +25,28 @@ describe MobileSpecController do
       end
     end
   end
+
+  describe "GET 'file_render'" do
+    context 'PC access' do
+      it "should be successful" do
+        request.user_agent = 'Mozilla'
+        get 'file_render'
+
+        response.should be_success
+        response.should render_template('422')
+        request.mobile?.should be_false
+      end
+    end
+
+    context 'mobile access' do
+      it "should be successful" do
+        request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+        get 'file_render'
+        response.should be_success
+        response.should render_template('422')
+        request.mobile?.should be_true
+        request.mobile.should be_a(Jpmobile::Mobile::Docomo)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: &21551080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *21551080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &27410000 !ruby/object:Gem::Requirement
+  requirement: &21548260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +33,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27410000
+  version_requirements: *21548260
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &27409440 !ruby/object:Gem::Requirement
+  requirement: &21546540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *27409440
+  version_requirements: *21546540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27408960 !ruby/object:Gem::Requirement
+  requirement: &21560960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27408960
+  version_requirements: *21560960
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &27408480 !ruby/object:Gem::Requirement
+  requirement: &21559180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27408480
+  version_requirements: *21559180
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &27404040 !ruby/object:Gem::Requirement
+  requirement: &21557180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27404040
+  version_requirements: *21557180
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &27403540 !ruby/object:Gem::Requirement
+  requirement: &21556340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27403540
+  version_requirements: *21556340
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &27402960 !ruby/object:Gem::Requirement
+  requirement: &21554780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27402960
+  version_requirements: *21554780
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &27402440 !ruby/object:Gem::Requirement
+  requirement: &21569000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27402440
+  version_requirements: *21569000
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &27401940 !ruby/object:Gem::Requirement
+  requirement: &21566580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +121,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *27401940
+  version_requirements: *21566580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &27401460 !ruby/object:Gem::Requirement
+  requirement: &21565660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +132,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *27401460
+  version_requirements: *21565660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27400940 !ruby/object:Gem::Requirement
+  requirement: &21564960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +143,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *27400940
+  version_requirements: *21564960
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &27400460 !ruby/object:Gem::Requirement
+  requirement: &21564200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +154,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *27400460
+  version_requirements: *21564200
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &27399960 !ruby/object:Gem::Requirement
+  requirement: &21563460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +165,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *27399960
+  version_requirements: *21563460
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &27399460 !ruby/object:Gem::Requirement
+  requirement: &21562720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +176,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *27399460
+  version_requirements: *21562720
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &27398960 !ruby/object:Gem::Requirement
+  requirement: &21578260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +187,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *27398960
+  version_requirements: *21578260
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &27398440 !ruby/object:Gem::Requirement
+  requirement: &21577620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +198,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *27398440
+  version_requirements: *21577620
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &27397940 !ruby/object:Gem::Requirement
+  requirement: &21576920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,7 +209,7 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *27397940
+  version_requirements: *21576920
 description: A Rails plugin for Japanese mobile-phones
 email: dara@shidara.net
 executables: []
@@ -441,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Rails plugin for Japanese mobile-phones