buddy 2.0.8 → 2.0.9

data/lib/buddy/middleware.rb

@@ -62,7 +62,7 @@ module Buddy
           end
 
           signed_params = Yajl::Parser.new.parse(base64_url_decode(signed_params))
-          @request.params[:fb] = signed_params
+          env['rack.request.form_hash'].merge!({'fb' => signed_params})
           set_session(signed_params)
         elsif @request.cookies["fbs_#{Buddy.current_config['app_id']}"]
           payload = @request.cookies["fbs_#{Buddy.current_config['app_id']}"].chomp('"')

data/lib/buddy/rails/controller.rb

@@ -1,7 +1,7 @@
 module Buddy
   module Rails
     module Controller
-      include Buddy::Rails::UrlHelper
+      include Buddy::Helpers::UrlFor
 
       def self.included(controller)
         controller.helper_method :request_comes_from_facebook?

data/lib/buddy/rails/{url_helper.rb → helpers.rb}

@@ -1,15 +1,16 @@
 module Buddy
-  module Rails
-    module UrlHelper
-      def url_for(options = {})
-        only_path = options[:only_path] || false
-        options.merge!({ :only_path => true }) if options.is_a?(Hash) && options[:canvas] != false
+  module Helpers
+    module UrlFor
+      def url_for(options = nil)
+        canvas = options.is_a?(Hash) && options.delete(:canvas)
+        options.merge!({ :only_path => true }) if options.is_a?(Hash) && canvas != false
 
         url = super(options)
 
         if url[0..6] == 'http://' or url[0..7] == 'https://'
           url
-        elsif options.is_a?(Hash) && options[:canvas] == false
+        elsif options.is_a?(Hash) && canvas == false
+          only_path = options[:only_path] || false
           base = only_path ? '' : Buddy.current_config["callback_url"]
           base + url
         else

data/lib/buddy/railtie.rb

@@ -1,5 +1,5 @@
 require 'buddy'
-require 'buddy/rails/url_helper'
+require 'buddy/rails/helpers'
 require 'rails'
 
 module Buddy
@@ -8,9 +8,14 @@ module Buddy
       app.config.middleware.swap(::Rails::Rack::Logger, Buddy::Middleware::Logger)
       app.config.middleware.insert_before(Buddy::Middleware::Logger, Buddy::Middleware::MethodOverride)
       app.config.middleware.insert_before(ActionDispatch::ParamsParser, Buddy::Middleware::ParamsParser)
+    end
 
-      ActionView::Helpers::UrlHelper.send(:include, Buddy::Rails::UrlHelper)
+    initializer "buddy.configure_logger", :after => :initialize_logger do |app|
       Buddy.logger = ::Rails.logger
     end
+
+    ActionView::Helpers::UrlHelper.send(:include, Buddy::Helpers::UrlFor)
+    ActionController::Base.send(:include, Buddy::Helpers::UrlFor)
+    ActionController::Base.send(:include, Buddy::Rails::Controller)
   end
 end

data/lib/buddy/version.rb

@@ -1,3 +1,3 @@
 module Buddy
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 end

data/lib/buddy.rb

@@ -44,11 +44,9 @@ end
 buddy_config = File.join(Bundler.root, "config", "buddy.yml")
 
 BUDDY = Buddy.load_configuration(buddy_config)
-Buddy.logger = Rails.logger
 Buddy.rest_api_client = Buddy::Service::RestApiClient.new
 
-require 'buddy/rails/url_helper'
+require 'buddy/rails/helpers'
 require 'buddy/rails/controller'
-require 'buddy/rails/controller_extensions'
 
 require 'buddy/railtie'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buddy
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2011-10-05 00:00:00.000000000Z
 dependencies: []
 description: Facebook library focusing on getting the work done.
 email:
@@ -27,8 +27,7 @@ files:
 - lib/buddy.rb
 - lib/buddy/middleware.rb
 - lib/buddy/rails/controller.rb
-- lib/buddy/rails/controller_extensions.rb
-- lib/buddy/rails/url_helper.rb
+- lib/buddy/rails/helpers.rb
 - lib/buddy/railtie.rb
 - lib/buddy/service.rb
 - lib/buddy/session.rb

data/lib/buddy/rails/controller_extensions.rb

@@ -1,11 +0,0 @@
-module ::ActionController
-  class Base
-    def self.inherited_with_buddy(subclass)
-      inherited_without_buddy(subclass)
-      subclass.send(:include, Buddy::Rails::Controller)
-    end
-    class << self
-      alias_method_chain :inherited, :buddy
-    end
-  end
-end