galakei 0.15.1 → 0.15.2

data/Gemfile

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

data/README.rdoc

@@ -6,10 +6,6 @@
 
 galakeiは簡単にガラケー対応Rails Gem。「Doorkeeper」という {イベント運営}[http://www.doorkeeper.jp] サービスがこのgemを使っている。
 
-== Documentation
-
-See {the galakei site}[http://galakei.mobalean.com/] for more details.
-
 == Thanks
 
 * To {jpmobile}[https://github.com/jpmobile/jpmobile] for offering the most mature Rails plugin for Rails

data/lib/galakei/session_id_parameter.rb

@@ -10,6 +10,5 @@ You'll also need to enable this option in galakei
 =end
   module SessionIdParameter
     autoload :InForm, "galakei/session_id_parameter/in_form"
-    autoload :InUrl, "galakei/session_id_parameter/in_url"
   end
 end

data/lib/galakei/session_id_parameter/in_url.rb

@@ -1,5 +1,6 @@
-module Galakei::SessionIdParameter::InUrl # :nodoc:
+require 'action_dispatch/routing/url_for'
 
+ActionDispatch::Routing::UrlFor.class_eval do
   if Rails::VERSION::MINOR == 0
     ENV_SESSION_OPTIONS_KEY = ActionDispatch::Session::AbstractStore::ENV_SESSION_OPTIONS_KEY
   else
@@ -7,8 +8,8 @@ module Galakei::SessionIdParameter::InUrl # :nodoc:
     ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY
   end
 
-  def url_for(options = {})
-    return super unless inject_session_id_parameter?(options)
+  def url_for_with_session_id(options = {})
+    return url_for_without_session_id(options) unless inject_session_id_parameter?(options)
     session_opts = request.env[ENV_SESSION_OPTIONS_KEY]
     # if we don't have a session ID yet, create one
     if session_opts[:id].blank?
@@ -18,8 +19,9 @@ module Galakei::SessionIdParameter::InUrl # :nodoc:
       # create a new session ID
       session_opts[:id] = SecureRandom.hex(8)
     end
-    super(options.merge(::Rails.application.config.session_options[:key] => session_opts[:id]))
+    url_for_without_session_id(options.merge(::Rails.application.config.session_options[:key] => session_opts[:id]))
   end
+  alias_method_chain :url_for, :session_id
 
   private
 

data/lib/galakei/session_id_parameter/railtie.rb

@@ -4,9 +4,7 @@ module Galakei
       config.galakei.session_id_parameter = false
       initializer "galakei.session_id_parameter" do |app|
         if app.config.galakei.session_id_parameter
-          Rails.application.routes.url_helpers.class_eval do
-            include Galakei::SessionIdParameter::InUrl
-          end
+          require "galakei/session_id_parameter/in_url"
           ActiveSupport.on_load :action_view do
             include Galakei::SessionIdParameter::InForm
           end

data/lib/galakei/version.rb

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

data/spec/acceptance/emoji_table_spec.rb

@@ -21,12 +21,12 @@ feature 'emoji table' do
     page.source.should match("\uEF60")
   end
 
-  scenario 'for au SSL', :driver => :au do
+  pending 'for au SSL', :driver => :au do
     visit 'https://www.example.com/emoji'
     page.source.should match([0xF660].pack("n").force_encoding("Shift_JIS"))
   end
 
-  scenario 'for au SSL with unicode source', :driver => :au do
+  pending 'for au SSL with unicode source', :driver => :au do
     visit 'https://www.example.com/emoji/with_unicode'
     expected = "てすと".encode("Shift_JIS") + [0xF660].pack("n").force_encoding("Shift_JIS")
     page.source.should match(expected)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galakei
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -174,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2410560636642683119
+      hash: 4401509877869676688
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2410560636642683119
+      hash: 4401509877869676688
 requirements: []
 rubyforge_project: galakei
 rubygems_version: 1.8.24