Skip to content

Commit

Permalink
backport for ruby 1.8.7
Browse files Browse the repository at this point in the history
  • Loading branch information
rossta committed May 7, 2012
1 parent f7a0285 commit eea25a7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion lib/open_sesame.rb
Expand Up @@ -6,7 +6,8 @@ module OpenSesame
autoload :ViewHelper, 'open_sesame/view_helper' autoload :ViewHelper, 'open_sesame/view_helper'
autoload :FailureApp, 'open_sesame/failure_app' 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 delegate :enabled?, :to => :configuration


mattr_accessor :configuration mattr_accessor :configuration
Expand Down
2 changes: 1 addition & 1 deletion lib/open_sesame/view_helper.rb
Expand Up @@ -2,7 +2,7 @@ module OpenSesame
module ViewHelper module ViewHelper


def login_image_link_to(provider) 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") + "<br/><span>#{provider}</span>".html_safe image_tag("open_sesame/#{provider}_64.png") + "<br/><span>#{provider}</span>".html_safe
end end
end end
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/config/initializers/session_store.rb
@@ -1,6 +1,6 @@
# Be sure to restart your server when you modify this file. # 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, # Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information # which shouldn't be used to store highly confidential information
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/config/initializers/wrap_parameters.rb
Expand Up @@ -5,7 +5,7 @@


# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActiveSupport.on_load(:action_controller) do ActiveSupport.on_load(:action_controller) do
wrap_parameters format: [:json] wrap_parameters :format => [:json]
end end


# Disable root element in JSON by default. # Disable root element in JSON by default.
Expand Down

0 comments on commit eea25a7

Please sign in to comment.