jpmobile 0.0.4 → 0.0.6

data/lib/jpmobile/version.rb

@@ -2,7 +2,7 @@ module Jpmobile #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/{emoticon_functional_test.rb → legacy/emoticon_functional_test.rb}

@@ -29,7 +29,7 @@ class EmoticonTestController < ActionController::Base
   end
 end
 
-class EmoticonFunctionalTest < Test::Unit::TestCase
+class EmoticonFunctionalTest < ActionController::TestCase
   def setup
     init EmoticonTestController
   end

data/test/{helper.rb → legacy/helper.rb}

@@ -4,7 +4,7 @@ require 'action_controller'
 require 'rack'
 
 RAILS_ENV = "test"
-require File.dirname(__FILE__)+'/../lib/jpmobile'
+require File.dirname(__FILE__)+'/../../lib/jpmobile'
 
 # ActionPackのTestのためのrequire
 action_pack_full_path = Gem.cache.search('actionpack').sort_by { |g| g.version.version }.last
@@ -20,17 +20,16 @@ end
 
 def request_with_ua(user_agent, env={})
   fake_cgi = FakeCgi.new(user_agent, env)
-  [ 
-    ActionController::CgiRequest.new(fake_cgi), 
+  [
     Rack::Request.new(
       Rack::MockRequest.env_for('http://www.example.jp', fake_cgi.env_table)
-    ).extend(Jpmobile::RequestWithMobile) 
+    ).extend(Jpmobile::RequestWithMobile)
   ]
 end
 
 ## add helper methods to rails testing framework
 module ActionController
-  class TestRequest < AbstractRequest
+  class TestRequest < Request
     attr_accessor :user_agent
   end
 end

data/test/{helpers_test.rb → legacy/helpers_test.rb}

@@ -208,7 +208,7 @@ class HelpersTest < Test::Unit::TestCase
     results = []
     (Hpricot(str)/:a).each do |link|
       path, query = link["href"].split(/\?/, 2)
-      params = query.nil? ? nil : ActionController::AbstractRequest.parse_query_parameters(query)
+      params = query.nil? ? nil : Rack::Utils.parse_query(query)
       results << [link.inner_html, link.attributes, path, params]
     end
     return results

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

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'action_controller'
+
+class ApplicationController < ActionController::Base
+end

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

@@ -0,0 +1,13 @@
+class DocomoGuidBaseController < ApplicationController
+  def link
+    render :inline=>%{<%= link_to "linkto" %>}
+  end
+end
+
+class DocomoGuidAlwaysController < DocomoGuidBaseController
+  docomo_guid :always
+end
+
+class DocomoGuidDocomoController < DocomoGuidBaseController
+  docomo_guid :docomo
+end

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

@@ -0,0 +1,26 @@
+class FilterControllerBase < ApplicationController
+  def abracadabra_utf8
+    render :text => "アブラカダブラ"
+  end
+  def abracadabra_xhtml_utf8
+    response.content_type = "application/xhtml+xml"
+    render :text => "アブラカダブラ"
+  end
+  def index
+    @q = params[:q]
+  end
+  def empty
+    render :text => ""
+  end
+  def rawdata
+    send_data "アブラカダブラ", :type => 'application/octet-stream'
+  end
+end
+
+class FilterController < FilterControllerBase
+  mobile_filter
+end
+
+class HankakuFilterController < FilterControllerBase
+  mobile_filter :hankaku => true
+end

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

@@ -0,0 +1,5 @@
+class MobileSpecController < ApplicationController
+  def hello
+    render :text=>"Hello, world."
+  end
+end

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

@@ -0,0 +1,6 @@
+class TemplatePathController < ApplicationController
+  def index
+    @q = params[:q]
+  end
+end
+

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

@@ -0,0 +1,28 @@
+class TransSidBaseController < ApplicationController
+  ActionController::Base.session_options[:key] = '_session_id'
+  def form
+    render :inline=>%{<% form_tag do %>Hello<% end %>}
+  end
+  def link
+    render :inline=>%{<%= link_to "linkto" %>}
+  end
+  def redirect
+    redirect_to('/')
+  end
+end
+
+class TransSidAlwaysController < TransSidBaseController
+  trans_sid :always
+end
+
+class TransSidNoneController < TransSidBaseController
+  trans_sid :none
+end
+
+class TransSidMobileController < TransSidBaseController
+  trans_sid :mobile
+end
+
+class TransSidAlwaysAndSessionOffController < TransSidBaseController
+  trans_sid :always
+end

data/test/rails/overrides/app/views/template_path/_partial.html.erb

@@ -0,0 +1 @@
+<h2>_partial.html.erb</h2>

data/test/rails/overrides/app/views/template_path/_partial_mobile.html.erb

@@ -0,0 +1 @@
+<h2>_partial_mobile.html.erb</h2>

data/test/rails/overrides/app/views/template_path/_partial_mobile_docomo.html.erb

@@ -0,0 +1 @@
+<h2>_partial_mobile_docomo.html.erb</h2>

data/test/rails/overrides/app/views/template_path/index.html.erb

@@ -0,0 +1 @@
+<h1>index.html.erb<h1>

data/test/rails/overrides/app/views/template_path/index_mobile.html.erb

@@ -0,0 +1 @@
+<h1>index_mobile.html.erb</h1>

data/test/rails/overrides/app/views/template_path/index_mobile_docomo.html.erb

@@ -0,0 +1 @@
+<h1>index_mobile_docomo.html.erb</h1>

data/test/rails/overrides/app/views/template_path/partial.html.erb

@@ -0,0 +1,2 @@
+<h1>partial.html.erb</h1>
+<%= render :partial => 'partial' %>

data/test/rails/overrides/lib/tasks/rspec.rake

@@ -0,0 +1,165 @@
+gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
+
+# Don't load rspec if running "rake gems:*"
+unless ARGV.any? {|a| a =~ /^gems/}
+
+begin
+  require 'spec/rake/spectask'
+rescue MissingSourceFile
+  module Spec
+    module Rake
+      class SpecTask
+        def initialize(name)
+          task name do
+            # if rspec-rails is a configured gem, this will output helpful material and exit ...
+            require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
+
+            # ... otherwise, do this:
+            raise <<-MSG
+
+#{"*" * 80}
+*  You are trying to run an rspec rake task defined in
+*  #{__FILE__},
+*  but rspec can not be found in vendor/gems, vendor/plugins or system gems.
+#{"*" * 80}
+MSG
+          end
+        end
+      end
+    end
+  end
+end
+
+Rake.application.instance_variable_get('@tasks').delete('default')
+
+spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+task :noop do
+end
+
+task :default => :spec
+task :stats => "spec:statsetup"
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+  t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+  t.spec_files = FileList['spec/**/*/*_spec.rb']
+end
+
+namespace :spec do
+  desc "Run all specs in spec directory with RCov (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/**/*/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = lambda do
+      IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+    end
+  end
+
+  desc "Print Specdoc for all specs (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['spec/**/*/*_spec.rb']
+  end
+
+  desc "Print Specdoc for all plugin examples"
+  Spec::Rake::SpecTask.new(:plugin_doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+  end
+
+  [:models, :controllers, :views, :helpers, :lib].each do |sub|
+    desc "Run the code examples in spec/#{sub}"
+    Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
+    end
+  end
+
+  desc "Run the code examples in vendor/plugins (except RSpec's own)"
+  Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
+  end
+
+  namespace :plugins do
+    desc "Runs the examples for rspec_on_rails"
+    Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*/*_spec.rb']
+    end
+  end
+
+  # Setup specs for stats
+  task :statsetup do
+    require 'code_statistics'
+    ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
+    ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
+    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
+    ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
+    ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
+    ::STATS_DIRECTORIES << %w(Routing\ specs spec/lib) if File.exist?('spec/routing')
+    ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
+    ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
+    ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
+    ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
+    ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
+    ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
+  end
+
+  namespace :db do
+    namespace :fixtures do
+      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
+      task :load => :environment do
+        ActiveRecord::Base.establish_connection(Rails.env)
+        base_dir = File.join(Rails.root, 'spec', 'fixtures')
+        fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
+        
+        require 'active_record/fixtures'
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
+        end
+      end
+    end
+  end
+
+  namespace :server do
+    daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/pids/spec_server.pid")
+    
+    desc "start spec_server."
+    task :start do
+      if File.exist?(daemonized_server_pid)
+        $stderr.puts "spec_server is already running."
+      else
+        $stderr.puts %Q{Starting up spec_server ...}
+        FileUtils.mkdir_p('tmp/pids') unless test ?d, 'tmp/pids'
+        system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
+      end
+    end
+
+    desc "stop spec_server."
+    task :stop do
+      unless File.exist?(daemonized_server_pid)
+        $stderr.puts "No server running."
+      else
+        $stderr.puts "Shutting down spec_server ..."
+        system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
+        File.delete(daemonized_server_pid)
+      end
+    end
+
+    desc "restart spec_server."
+    task :restart => [:stop, :start]
+    
+    desc "check if spec server is running"
+    task :status do
+      if File.exist?(daemonized_server_pid)
+        $stderr.puts %Q{spec_server is running (PID: #{File.read(daemonized_server_pid).gsub("\n","")})}
+      else
+        $stderr.puts "No server running."
+      end
+    end
+  end
+end
+
+end

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

@@ -0,0 +1,77 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "docomo_guid が起動しないとき", :shared => true do
+  it "で link_to の自動書き換えが行われない" do
+    get :link
+    response.body.should =~ %r{^<a href="/.+?/link">linkto</a>$}
+  end
+end
+
+describe "docomo_guid が起動するとき", :shared => true do
+  it "で link_to の自動書き換えが行われる" do
+    get :link
+    response.body.should =~ %r{^<a href="/.+?/link\?guid=ON">linkto</a>$}
+  end
+end
+
+describe DocomoGuidBaseController, "という docomo_guid が有効になっていないコントローラ" do
+  controller_name :docomo_guid_base
+  it "の docomo_guid_mode は nil" do
+    controller.docomo_guid_mode.should be_nil
+  end
+  it_should_behave_like "docomo_guid が起動しないとき"
+end
+
+describe DocomoGuidAlwaysController, "という docomo_guid :always が指定されているコントローラ" do
+  controller_name :docomo_guid_always
+  it "の trans_sid_mode は :always" do
+    controller.docomo_guid_mode.should == :always
+  end
+  it_should_behave_like "docomo_guid が起動するとき"
+end
+
+describe DocomoGuidDocomoController, "という docomo_guid :docomo が指定されているコントローラ" do
+  controller_name :docomo_guid_docomo
+  it "の docomo_guid_mode は :docomo" do
+    controller.docomo_guid_mode.should == :docomo
+  end
+end
+
+def describe_mobile_with_ua(user_agent, &block)
+  describe("trans_sid :docomo が指定されているコントローラに #{user_agent} からアクセスしたとき") do
+    controller_name :docomo_guid_docomo
+    before do
+      request.user_agent = user_agent
+    end
+    instance_eval(&block)
+  end
+end
+
+describe_mobile_with_ua "DoCoMo/2.0 SH902i(c100;TB;W24H12)" do
+  it_should_behave_like "docomo_guid が起動するとき"
+end
+
+describe_mobile_with_ua "J-PHONE/3.0/V301D" do
+  it_should_behave_like "docomo_guid が起動しないとき"
+end
+
+describe_mobile_with_ua "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0" do
+  it_should_behave_like "docomo_guid が起動しないとき"
+end
+
+describe_mobile_with_ua "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1" do
+  it_should_behave_like "docomo_guid が起動しないとき"
+end
+
+describe_mobile_with_ua "Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0" do
+  it_should_behave_like "docomo_guid が起動しないとき"
+end
+
+describe_mobile_with_ua "DoCoMo/1.0/N505i/c20/TB/W20H10 (compatible; Googlebot-Mobile/2.1; +http://www.google.com/bot.html)" do
+  it_should_behave_like "docomo_guid が起動しないとき"
+end
+
+
+describe_mobile_with_ua "DoCoMo/2.0/SO502i (compatible; Y!J-SRD/1.0; http://help.yahoo.co.jp/help/jp/search/indexing/indexing-27.html)" do
+  it_should_behave_like "docomo_guid が起動しないとき"
+end