buddy 1.1.0 → 2.0.0

data/buddy.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   Gem::Specification.new do |s|
-    s.add_dependency(%q<mini_fb>, [">= 0.2.2"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
-    s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_runtime_dependency('mini_fb', '>= 0.2.2')
+    s.add_runtime_dependency('yajl-ruby', '>= 0')
+    s.add_runtime_dependency('httparty', '>= 0')
   end
 end

data/lib/buddy/middleware.rb

@@ -50,10 +50,10 @@ module Buddy
       def call(env)
         return @app.call(env) unless @condition.nil? || @condition.call(env)
 
-        request = Rack::Request.new(env)
+        @request = Rack::Request.new(env)
 
         signed_request = env['HTTP_X_SIGNED_REQUEST'].split(',').first if env['HTTP_X_SIGNED_REQUEST']
-        signed_request = request.params["signed_request"] unless signed_request
+        signed_request = @request.params["signed_request"] unless signed_request
         if signed_request
           signature, signed_params = signed_request.split('.')
 
@@ -62,7 +62,12 @@ module Buddy
           end
 
           signed_params = Yajl::Parser.new.parse(base64_url_decode(signed_params))
-          request.params[:fb] = signed_params
+          @request.params[: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('"')
+          payload.sub!('"', '') if payload.start_with?('"')
+          set_session(payload)
         end
 
         @app.call(env)
@@ -85,6 +90,15 @@ module Buddy
         str = str + "=" * (6 - str.size % 6) unless str.size % 6 == 0
         return Base64.decode64(str.tr("-_", "+/"))
       end
+
+      def set_session(payload)
+        uid          = payload['user_id'] || payload['uid']
+        access_token = payload['oauth_token'] || payload['access_token']
+        expires      = payload['expires']
+
+        @request.session['facebook_session'] = Buddy::Session.create(Buddy.current_config['app_id'], Buddy.current_config['secret'])
+        @request.session['facebook_session'].secure!(uid.to_i, access_token, expires)
+      end
     end
   end
 end

data/lib/buddy/rails/controller.rb

@@ -21,7 +21,7 @@ module Buddy
 
       private
       def facebook_session
-        @facebook_session
+        session[:facebook_session]
       end
 
       def request_comes_from_facebook?
@@ -29,7 +29,7 @@ module Buddy
       end
 
       def application_is_installed?
-        !params[:fb][:oauth_token].blank?
+        facebook_session && facebook_session.secured?
       end
 
       def request_is_facebook_canvas?
@@ -49,22 +49,9 @@ module Buddy
         Buddy::Session.create(Buddy.current_config['app_id'], Buddy.current_config['secret'])
       end
 
-      def create_facebook_session
-        @facebook_session = new_facebook_session
-        @facebook_session.secure!(params[:fb][:user_id], params[:fb][:oauth_token], params[:fb][:expires])
-        @facebook_session.secured?
-      end
-
       def set_facebook_session
-        session_set = !@facebook_session.blank? && @facebook_session.secured?
-        unless session_set
-          session_set = create_facebook_session
-          session[:facebook_session] = @facebook_session if session_set
-        end
-        if session_set
-          Session.current = @facebook_session
-        end
-        return session_set
+        Session.current = facebook_session
+        return facebook_session.secured?
       end
 
       def ensure_facebook_session

data/lib/buddy/service.rb

@@ -23,7 +23,7 @@ module Buddy
         time = Benchmark.realtime do
           result = GraphApiClient.send(method, resource, :query => params).parsed_response
         end
-        Buddy.logger.info("GraphAPI: #{method} #{resource} - #{time}")
+        Buddy.logger.info("GraphAPI: #{method} #{resource} - #{time}") if Buddy.config['logging_enabled']
 
         raise OAuthException.new(result["error"]["message"]) if result["error"]
         result
@@ -70,7 +70,7 @@ module Buddy
         time = Benchmark.realtime do
           result = fun.call
         end
-        Buddy.logger.info("RestAPI: #{api_method} (#{params.inspect}) - #{time}")
+        Buddy.logger.info("RestAPI: #{api_method} (#{params.inspect}) - #{time}") if Buddy.config['logging_enabled']
         result
       end
     end

data/lib/buddy/session.rb

@@ -43,7 +43,7 @@ module Buddy
     end
 
     def install_url(options = {})
-      "http://www.facebook.com/connect/uiserver.php?app_id=#{Buddy.current_config['app_id']}&next=#{options[:next]}&display=page&canvas=1&legacy_return=1&method=permissions.request#{"&perms="+Buddy.current_config['perms'] if Buddy.current_config['perms']}"
+      "https://www.facebook.com/dialog/oauth?client_id=#{Buddy.current_config['app_id']}&redirect_uri=#{options[:next]}#{"&scope="+Buddy.current_config['perms'] if Buddy.current_config['perms']}"
     end
 
     def initialize(app_id, secret_key)

data/lib/buddy/version.rb

@@ -1,3 +1,3 @@
 module Buddy
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/lib/buddy.rb

@@ -21,37 +21,22 @@ module Buddy
     def load_configuration(yaml)
       return false unless File.exist?(yaml)
       @buddy_config = YAML.load(ERB.new(File.read(yaml)).result)[::Rails.env]
-      self.current_config = buddy_config['default']
 
-      buddy_config
-    end
-
-    def buddy_config
-      @buddy_config
-    end
-
-    def set_asset_host_to_callback_url
-      buddy_config[app]['set_asset_host_to_callback_url']
-    end
-
-    def timeout(app = 'default')
-      buddy_config[app]['timeout']
-    end
-
-    def use_application(api_key)
-      buddy_config.each do |c|
-        if c[1]["api_key"] == api_key
-          return self.current_config = c[1]
-        end
+      unless self.config['default'].nil?
+        ActiveSupport::Deprecation.warn('Support for multiple apps has been removed and your config format is deprecated. Please remove your app keys (or just the "default" key)')
+        self.config = self.config['default']
       end
+      self.config
     end
 
-    def current_config
-      Thread.current['current_buddy_config']
+    def config
+      @buddy_config
     end
+    alias :buddy_config :config
+    alias :current_config :config
 
-    def current_config=(config)
-      Thread.current['current_buddy_config'] = config
+    def config=(c)
+      @buddy_config = c
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buddy
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Ole Riesenberg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
+date: 2011-07-01 00:00:00 +02:00
 default_executable: 
 dependencies: []