From eea25a752c64ee15fddaab0af05401ae627546a1 Mon Sep 17 00:00:00 2001 From: Ross Kaffenberger Date: Mon, 7 May 2012 19:09:03 -0400 Subject: [PATCH] backport for ruby 1.8.7 --- lib/open_sesame.rb | 3 ++- lib/open_sesame/view_helper.rb | 2 +- spec/dummy/config/initializers/session_store.rb | 2 +- spec/dummy/config/initializers/wrap_parameters.rb | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/open_sesame.rb b/lib/open_sesame.rb index a977105..a1c0157 100644 --- a/lib/open_sesame.rb +++ b/lib/open_sesame.rb @@ -6,7 +6,8 @@ module OpenSesame autoload :ViewHelper, 'open_sesame/view_helper' autoload :FailureApp, 'open_sesame/failure_app' - delegate *Configuration::CONFIGURABLE_ATTRIBUTES, :to => :configuration + @to_configuration = Configuration::CONFIGURABLE_ATTRIBUTES + [:to => :configuration] + delegate *@to_configuration delegate :enabled?, :to => :configuration mattr_accessor :configuration diff --git a/lib/open_sesame/view_helper.rb b/lib/open_sesame/view_helper.rb index 44abf2f..05f3832 100644 --- a/lib/open_sesame/view_helper.rb +++ b/lib/open_sesame/view_helper.rb @@ -2,7 +2,7 @@ module OpenSesame module ViewHelper def login_image_link_to(provider) - link_to identity_request_path(provider), class: "btn btn-large" do + link_to identity_request_path(provider), :class => "btn btn-large" do image_tag("open_sesame/#{provider}_64.png") + "
#{provider}".html_safe end end diff --git a/spec/dummy/config/initializers/session_store.rb b/spec/dummy/config/initializers/session_store.rb index 952473f..aa2f512 100644 --- a/spec/dummy/config/initializers/session_store.rb +++ b/spec/dummy/config/initializers/session_store.rb @@ -1,6 +1,6 @@ # Be sure to restart your server when you modify this file. -Dummy::Application.config.session_store :cookie_store, key: '_dummy_session' +Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session' # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information diff --git a/spec/dummy/config/initializers/wrap_parameters.rb b/spec/dummy/config/initializers/wrap_parameters.rb index 999df20..da4fb07 100644 --- a/spec/dummy/config/initializers/wrap_parameters.rb +++ b/spec/dummy/config/initializers/wrap_parameters.rb @@ -5,7 +5,7 @@ # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] + wrap_parameters :format => [:json] end # Disable root element in JSON by default.