galakei 0.13.7 → 0.14.0

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'rails', '~> 3.1.0'
+  gem 'rails', '3.2.3'
   gem 'rspec', '>= 2.5.0'
   gem 'capybara', '~> 1.1.1'
   gem 'steak'

data/README.rdoc

@@ -1,5 +1,7 @@
 = Galakei: Japanese feature phone support
 
+{<img src="https://secure.travis-ci.org/mobalean/galakei.png?branch=master" alt="Build Status" />}[http://travis-ci.org/mobalean/galakei]
+
 {Japanese feature phones}[http://www.mobalean.com/en/keitai_web_technology_guide] (a.k.a., keitai, galakei) have a number of restrictions over normal web browsers.  This library adds support for them.
 
 galakeiは簡単にガラケー対応Rails Gem。「Doorkeeper」という {イベント運営}[http://www.doorkeeper.jp] サービスがこのgemを使っている。

data/galakei.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.rubyforge_project = "galakei"
 
-  s.add_dependency 'actionpack', '>= 3.0.3'
-  s.add_dependency 'rack', '>= 1.2.1'
+  s.add_dependency 'actionpack', '>= 3.2.0'
   s.add_dependency 'css_parser'
   s.add_dependency 'nokogiri'
   s.add_dependency 'sanitize'

data/lib/galakei.rb

@@ -24,6 +24,8 @@ module Galakei
   autoload :EmojiTable, "galakei/emoji_table"
   autoload :SessionIdParameterInForm, "galakei/session_id_parameter_in_form"
   autoload :Spacer, "galakei/spacer"
+  autoload :Lookup, "galakei/lookup"
+  autoload :RouteConstraints, "galakei/route_constraints"
   module Filter # :nodoc:
     autoload :Base, "galakei/filter/base"
     autoload :ContentType, "galakei/filter/content_type"
@@ -31,7 +33,6 @@ module Galakei
     autoload :Hankaku, "galakei/filter/hankaku"
     autoload :NonStandardChar, "galakei/filter/non_standard_char"
     autoload :Recode, "galakei/filter/recode"
-    autoload :Views, "galakei/filter/views"
   end
 end
 

data/lib/galakei/filter/base.rb

@@ -22,6 +22,10 @@ module Galakei
           super
         end
       end
+
+      def html_content_type?
+        response.content_type =~ %r{text/html|application/xhtml+xml}
+      end
     end
   end
 end

data/lib/galakei/filter/content_type.rb

@@ -5,7 +5,7 @@
 class Galakei::Filter::ContentType < Galakei::Filter::Base
   # :stopdoc:
   def condition?
-    request.docomo? && %r{text/html} =~ response.content_type
+    request.docomo? && html_content_type?
   end
 
   def filter

data/lib/galakei/filter/hankaku.rb

@@ -9,7 +9,7 @@ class Galakei::Filter::Hankaku < Galakei::Filter::Base
   MAPPING = zenkaku.zip(hankaku)
 
   def condition?
-    galakei? && response.content_type =~ %r{text/html|application/xhtml\+xml}
+    galakei? && html_content_type?
   end
 
   def filter

data/lib/galakei/filter/non_standard_char.rb

@@ -7,8 +7,7 @@ Some are supported on galakei, but others aren't. The correct version will be us
 class Galakei::Filter::NonStandardChar < Galakei::Filter::Base
   # :stopdoc:
   def condition?
-    response.content_type =~ %r{text/html|application/xhtml+xml} &&
-      (response.charset || Rails.application.config.encoding).downcase == "utf-8"
+    html_content_type? && (response.charset || Rails.application.config.encoding).downcase == "utf-8"
   end
 
   def filter

data/lib/galakei/lookup.rb

@@ -0,0 +1,11 @@
+module Galakei
+=begin
+In many cases you want to serve different templates for galakei handsets. Galakei registeres a browser detail for lookup, so you can use ":prefix/:action.{:browsers}{.:formats,}{.:handlers,}" for your templates.
+
+For instance: index.galakei.html.haml will be used (if present) for galakei and index.full.html.haml will be used for full featured browsers. If not present, it will use the usual templates.
+
+=end
+  module Lookup
+    autoload :BrowserDetail, "galakei/lookup/browser_detail"
+  end
+end

data/lib/galakei/lookup/browser_detail.rb

@@ -0,0 +1,11 @@
+module Galakei::Lookup::BrowserDetail
+  def details_for_lookup
+    super.merge(:browsers => browser_detail_for_request)
+  end
+
+  private
+
+  def browser_detail_for_request
+    (request.galakei? ? [ :galakei ] : [ :full ])
+  end
+end

data/lib/galakei/lookup/railtie.rb

@@ -0,0 +1,11 @@
+class Galakei::Lookup::Railtie < Rails::Railtie # :nodoc:
+  initializer "galakei.register.lookup" do
+    ActiveSupport.on_load :action_controller do
+      include Galakei::Lookup::BrowserDetail
+      prepend_view_path ActionView::FileSystemResolver.new(Rails.root.join("app","views"), ":prefix/:action.{:browsers}{.:formats,}{.:handlers,}")
+    end
+    ActiveSupport.on_load :action_view do
+      ActionView::LookupContext.register_detail(:browsers)  { [:full, :smartphone, :galakei] }
+    end
+  end
+end

data/lib/galakei/railtie.rb

@@ -4,7 +4,6 @@ module Galakei
     initializer "galakei.extend.action_controller" do |app|
       ActiveSupport.on_load :action_controller do
         include Galakei::HelperMethods
-        before_filter Galakei::Filter::Views, :if => :galakei?
         after_filter Galakei::Filter::ContentType, :if => lambda {|c| Galakei::Filter::ContentType.condition?(c) }
         before_filter Galakei::Filter::Recode::Params, :if => lambda {|c| Galakei::Filter::Recode.condition?(c) }
         after_filter Galakei::Filter::Recode::Response, :if => lambda {|c| Galakei::Filter::Recode.condition?(c) }
@@ -22,3 +21,4 @@ end
 require 'galakei/session_id_parameter/railtie'
 require 'galakei/docomo_css/railtie'
 require 'galakei/email/railtie'
+require 'galakei/lookup/railtie'

data/lib/galakei/route_constraints.rb

@@ -0,0 +1,3 @@
+module Galakei::RouteConstraints
+  autoload :GalakeiOnly, "galakei/route_constraints/galakei_only"
+end

data/lib/galakei/route_constraints/galakei_only.rb

@@ -0,0 +1,16 @@
+module Galakei::RouteConstraints
+=begin
+Galakei usually doesn't support PUT / DELETE requests, so you sometimes need to define somes for galakei. Use this route constraint to restrict those routes to requests from galakei only.
+
+Example routes:
+
+  put 'resend'
+  get 'resend', :constraints => Galakei::RouteConstraints::GalakeiOnly
+
+=end
+  module GalakeiOnly
+    def self.matches?(request)
+      request.galakei?
+    end
+  end
+end

data/lib/galakei/version.rb

@@ -1,4 +1,4 @@
 module Galakei
   # The version of Galakei you are using
-  VERSION = "0.13.7"
+  VERSION = "0.14.0"
 end

data/spec/acceptance/acceptance_helper.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require "spec_helper"
 require "steak"
 require 'capybara/rspec'
 

data/spec/acceptance/au_mail_interceptor_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+require 'acceptance/acceptance_helper'
 
 class AuMailInterceptorMailer < ActionMailer::Base
   include ActionView::Helpers::TagHelper

data/spec/acceptance/content_type_spec.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+require 'acceptance/acceptance_helper'
+
+class ContentTypeController < ApplicationController
+  def index
+    render :layout => true, :inline => "Test"
+  end
+end
+
+feature 'content type' do
+  %w[au softbank].each do |d|
+    scenario d, :driver => d.to_sym do
+      visit '/content_type'
+      page.response_headers['Content-Type'].should == "text/html; charset=utf-8"
+    end
+  end
+  scenario "docomo", :driver => :docomo do
+    visit '/content_type'
+    page.response_headers['Content-Type'].should == 'application/xhtml+xml; charset=utf-8'
+  end
+end
+

data/spec/acceptance/docomo_css_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+require 'acceptance/acceptance_helper'
 require 'fakeweb'
 
 class DocomoCssController < ApplicationController

data/spec/acceptance/emoji_table_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+require 'acceptance/acceptance_helper'
 
 class EmojiController < ApplicationController
   def index

data/spec/acceptance/haml_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+require 'acceptance/acceptance_helper'
 
 class HamlController < ApplicationController
 end

data/spec/acceptance/handset_detection_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+require 'acceptance/acceptance_helper'
 
 class HandsetDetectionController < ApplicationController
   def index

data/spec/acceptance/hankaku_filter_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+require 'acceptance/acceptance_helper'
 
 class HankakuController < ApplicationController
   def index
@@ -40,5 +40,4 @@ feature 'hankaku conversion' do
     visit '/hankaku'
     page.find("#hankaku").text.should == "メインガギ漢字ひらがな"
   end
-
 end

data/spec/acceptance/input_mode_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+require 'acceptance/acceptance_helper'
 
 class InputModeController < ApplicationController
   class User

data/spec/acceptance/lookup_spec.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+require 'acceptance/acceptance_helper'
+
+class LookupController < ApplicationController
+  def index
+  end
+end
+
+feature 'template lookup' do
+  scenario 'full browser' do
+    visit '/lookup'
+    page.body.should match("full browser")
+  end
+  scenario 'for docomo', :driver => :docomo do
+    visit '/lookup'
+    page.body.should match("galakei")
+  end
+  scenario 'for au', :driver => :au do
+    visit '/lookup'
+    page.body.should match("galakei")
+  end
+  scenario 'for softbank', :driver => :softbank do
+    visit '/lookup'
+    page.body.should match("galakei")
+  end
+end

data/spec/acceptance/non_standard_char_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+require 'acceptance/acceptance_helper'
 
 class NonStandardCharController < ApplicationController
   def self.character(name, value, options = {})
@@ -23,6 +23,14 @@ class NonStandardCharController < ApplicationController
   character :nakaguro_half, "\uFF65"
   character :nakaguro_full, "\u30FB"
   character :sdot, "\u22C5", named: true
+
+  def gif
+    respond_to do |format|
+      format.gif do
+        send_data("\u00B7", :disposition => "inline", :type => :gif)
+      end
+    end
+  end
 end
 
 shared_examples_for "convert character" do |type, path|
@@ -50,4 +58,11 @@ feature 'nakaguro' do
   it_should_behave_like "convert character", :half, :sdot_hex
   it_should_behave_like "convert character", :half, :sdot_dec
   it_should_behave_like "convert character", :half, :sdot_named
+
+  %w[au docomo softbank].each do |driver|
+    scenario "should not convert gif containing matching data for #{driver}", :driver => driver.to_sym do
+      visit "/non_standard_char/gif.gif"
+      page.source.should == "\u00B7"
+    end
+  end
 end

data/spec/acceptance/recode_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+require 'acceptance/acceptance_helper'
 
 class RecodeController < ApplicationController
   class << self
@@ -22,6 +22,7 @@ class RecodeController < ApplicationController
   def create
     self.class.string = params[:string]
   end
+
 end
 
 feature 'recode' do

data/spec/acceptance/session_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+require 'acceptance/acceptance_helper'
 
 class SessionsController < ApplicationController
   class Search

data/spec/app/app/views/lookup/index.full.html.haml

@@ -0,0 +1 @@
+full browser

data/spec/app/app/views/lookup/index.galakei.html.haml

@@ -0,0 +1 @@
+galakei

data/spec/app/app/views/lookup/index.html.haml

@@ -0,0 +1 @@
+no browser

data/spec/galakei/route_constraints/galakei_only.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Galakei::RouteConstraints::GalakeiOnly do
+  describe "from Firefox" do
+    let(:req) { Rack::Request.new(env_for_firefox) }
+    it { Galakei::RouteConstraints::GalakeiOnly.matches?(req).should be_false }
+  end
+  describe "from Docomo SH-06A" do
+    let(:req) { Rack::Request.new(env_for_docomo_1_0) }
+    it { Galakei::RouteConstraints::GalakeiOnly.matches?(req).should be_true }
+  end
+  describe "from AU W54SH" do
+    let(:req) { Rack::Request.new(env_for_au_7_2) }
+    it { Galakei::RouteConstraints::GalakeiOnly.matches?(req).should be_true }
+  end
+  describe "from Vodafone" do
+    let(:req) { Rack::Request.new(env_for_vodafone) }
+    it { Galakei::RouteConstraints::GalakeiOnly.matches?(req).should be_true }
+  end
+  describe "from Softbank 709SC" do
+    let(:req) { Rack::Request.new(env_for_softbank) }
+    it { Galakei::RouteConstraints::GalakeiOnly.matches?(req).should be_true }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galakei
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,33 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2152214920 !ruby/object:Gem::Requirement
+  requirement: &70108572136700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152214920
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2152213800 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152213800
+  version_requirements: *70108572136700
 - !ruby/object:Gem::Dependency
   name: css_parser
-  requirement: &2152194540 !ruby/object:Gem::Requirement
+  requirement: &70108572136040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152194540
+  version_requirements: *70108572136040
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152193480 !ruby/object:Gem::Requirement
+  requirement: &70108572134920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152193480
+  version_requirements: *70108572134920
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &2152191020 !ruby/object:Gem::Requirement
+  requirement: &70108572133560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +56,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152191020
+  version_requirements: *70108572133560
 description: Japanese feature phones (a.k.a., keitai, galakei) have a number of restrictions
   over normal web browsers.  This library adds support for them
 email: info@mobalean.com
@@ -76,12 +65,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - app/controllers/galakei/spacer_controller.rb
-- config/initializers/mime_types.rb
 - config/routes.rb
 - galakei.gemspec
 - lib/galakei.rb
@@ -100,11 +89,15 @@ files:
 - lib/galakei/filter/hankaku.rb
 - lib/galakei/filter/non_standard_char.rb
 - lib/galakei/filter/recode.rb
-- lib/galakei/filter/views.rb
 - lib/galakei/helper_methods.rb
 - lib/galakei/input_mode.rb
+- lib/galakei/lookup.rb
+- lib/galakei/lookup/browser_detail.rb
+- lib/galakei/lookup/railtie.rb
 - lib/galakei/railtie.rb
 - lib/galakei/request.rb
+- lib/galakei/route_constraints.rb
+- lib/galakei/route_constraints/galakei_only.rb
 - lib/galakei/session_id_parameter.rb
 - lib/galakei/session_id_parameter/in_form.rb
 - lib/galakei/session_id_parameter/in_url.rb
@@ -116,23 +109,27 @@ files:
 - spec/.gitignore
 - spec/acceptance/acceptance_helper.rb
 - spec/acceptance/au_mail_interceptor_spec.rb
+- spec/acceptance/content_type_spec.rb
 - spec/acceptance/docomo_css_spec.rb
 - spec/acceptance/emoji_table_spec.rb
 - spec/acceptance/haml_spec.rb
 - spec/acceptance/handset_detection_spec.rb
 - spec/acceptance/hankaku_filter_spec.rb
 - spec/acceptance/input_mode_spec.rb
+- spec/acceptance/lookup_spec.rb
 - spec/acceptance/non_standard_char_spec.rb
 - spec/acceptance/recode_spec.rb
 - spec/acceptance/session_spec.rb
 - spec/acceptance/support/capybara_ssl_fix.rb
 - spec/acceptance/support/handsets.rb
 - spec/acceptance/support/input_mode_matchers.rb
-- spec/acceptance/views_spec.rb
 - spec/app/.gitignore
 - spec/app/app/assets/stylesheets/docomo_css/simple.css
 - spec/app/app/views/haml/index.html.haml
 - spec/app/app/views/layouts/application.html.haml
+- spec/app/app/views/lookup/index.full.html.haml
+- spec/app/app/views/lookup/index.galakei.html.haml
+- spec/app/app/views/lookup/index.html.haml
 - spec/app/fake.rb
 - spec/controllers/galakei/spacer_controller_spec.rb
 - spec/galakei/docomo_css/stylesheet_spec.rb
@@ -141,6 +138,7 @@ files:
 - spec/galakei/filter/content_type_spec.rb
 - spec/galakei/filter/hankaku_spec.rb
 - spec/galakei/request_spec.rb
+- spec/galakei/route_constraints/galakei_only.rb
 - spec/galakei/spacer_spec.rb
 - spec/spec_helper.rb
 homepage: http://galakei.mobalean.com/
@@ -163,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: galakei
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Japanese feature phones support

data/config/initializers/mime_types.rb

@@ -1 +0,0 @@
-Mime::Type.register 'image/gif', :gif

data/lib/galakei/filter/views.rb

@@ -1,10 +0,0 @@
-=begin
-Have a PC site that you want to add galakei templates for? Put your views in app/views.galakei and they'll be used in preference to your normal app/views
-=end
-class Galakei::Filter::Views < Galakei::Filter::Base
-  # :stopdoc:
-  def filter
-    logger.debug("appending galakei views")
-    prepend_view_path(::Rails.root.join('app','views.galakei'))
-  end
-end

data/spec/acceptance/views_spec.rb

@@ -1,13 +0,0 @@
-# encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
-
-class ViewsController < ApplicationController
-  def index
-  end
-end
-
-feature 'View path appending' do
-  scenario 'for docomo', :driver => :docomo do
-    visit '/views'
-  end
-end