buddy 2.0.9 → 2.1.0

data/lib/buddy/middleware.rb

@@ -62,7 +62,9 @@ module Buddy
           end
 
           signed_params = Yajl::Parser.new.parse(base64_url_decode(signed_params))
-          env['rack.request.form_hash'].merge!({'fb' => signed_params})
+
+          env['rack.request.form_hash'] ? env['rack.request.form_hash'].merge!({'fb' => signed_params}) : env['rack.request.form_hash'] = {'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/session/app.rb

@@ -0,0 +1,23 @@
+module Buddy
+  module Session
+    class App < Base
+      class << self
+        def current
+          Thread.current['facebook_app_session']
+        end
+
+        def current=(session)
+          Thread.current['facebook_app_session'] = session
+        end
+      end
+
+      def access_token
+        @access_token ||= Buddy::Service::GraphApiClient.get('/oauth/access_token', :query => {
+          :client_id => self.class.app_id,
+          :client_secret => self.class.secret_key,
+          :grant_type => 'client_credentials'
+        }).body.split('=').last
+      end
+    end
+  end
+end

data/lib/buddy/session/base.rb

@@ -0,0 +1,37 @@
+module Buddy
+  module Session
+    class Base
+      class << self
+        def create(app_id = nil, secret_key = nil)
+          app_id     ||= self.app_id
+          secret_key ||= self.secret_key
+          raise ArgumentError unless !app_id.nil? && !secret_key.nil?
+          new(app_id, secret_key)
+        end
+
+        def app_id
+          Buddy.config["app_id"]
+        end
+
+        def secret_key
+          Buddy.config["secret"]
+        end
+      end
+
+      def call(api_method, params = {}, options = {})
+        params.merge!(:uids => uid, :access_token => access_token)
+        Buddy::Service.call(api_method, params, options)
+      end
+
+      def get(resource, params = {})
+        params.merge!(:access_token => access_token) unless params[:access_token]
+        Buddy::Service.get(resource, params)
+      end
+
+      def post(resource, params = {})
+        params.merge!(:access_token => access_token) unless params[:access_token]
+        Buddy::Service.post(resource, params)
+      end
+    end
+  end
+end

data/lib/buddy/session/user.rb

@@ -0,0 +1,70 @@
+module Buddy
+  module Session
+    class User < Base
+
+      class << self
+        def app_id
+          Buddy.current_config["app_id"]
+        end
+
+        def secret_key
+           Buddy.current_config["secret"]
+        end
+
+        def current
+          Thread.current['facebook_session']
+        end
+
+        def current=(session)
+          Thread.current['facebook_session'] = session
+        end
+      end
+
+      def install_url(options = {})
+        "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)
+        @app_id         = app_id
+        @secret_key     = secret_key
+        @uid            = nil
+        @access_token   = nil
+        @expires        = nil
+      end
+
+      def secure!(uid, access_token, expires)
+        @uid          = uid
+        @access_token = access_token
+        @expires      = expires
+      end
+
+      def infinite?
+        @expires == 0
+      end
+
+      def expired?
+        @expires.nil? || (!infinite? && Time.at(@expires) <= Time.now)
+      end
+
+      def secured?
+        !@uid.nil? && !@access_token.nil? && !expired?
+      end
+
+      def user
+        @user ||= Buddy::User.new(@uid, self)
+      end
+
+      def uid
+        @uid
+      end
+
+      def access_token
+        @access_token
+      end
+
+      def expires
+        @expires
+      end
+    end
+  end
+end

data/lib/buddy/session.rb

@@ -1,91 +1,11 @@
+require 'buddy/session/base'
+require 'buddy/session/app'
+require 'buddy/session/user'
+
 module Buddy
-  class Session
+  module Session
     def self.create(app_id = nil, secret_key = nil)
-      app_id     ||= self.app_id
-      secret_key ||= self.secret_key
-      raise ArgumentError unless !app_id.nil? && !secret_key.nil?
-      new(app_id, secret_key)
-    end
-
-    def self.app_id
-      Buddy.current_config["app_id"]
-    end
-
-    def self.api_key
-      Buddy.current_config["api_key"]
-    end
-
-    def self.secret_key
-       Buddy.current_config["secret"]
-    end
-
-    def self.current
-      Thread.current['facebook_session']
-    end
-
-    def self.current=(session)
-      Thread.current['facebook_session'] = session
-    end
-
-    def call(api_method, params = {}, options = {})
-      params.merge!(:uids => uid, :access_token => access_token)
-      Buddy::Service.call(api_method, params, options)
-    end
-
-    def get(resource, params = {})
-      params.merge!(:access_token => access_token) unless params[:access_token]
-      Buddy::Service.get(resource, params)
-    end
-
-    def post(resource, params = {})
-      params.merge!(:access_token => access_token) unless params[:access_token]
-      Buddy::Service.post(resource, params)
-    end
-
-    def install_url(options = {})
-      "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)
-      @app_id         = app_id
-      @secret_key     = secret_key
-      @uid            = nil
-      @access_token   = nil
-      @expires        = nil
-    end
-
-    def secure!(uid, access_token, expires)
-      @uid          = uid
-      @access_token = access_token
-      @expires      = expires
-    end
-
-    def infinite?
-      @expires == 0
-    end
-
-    def expired?
-      @expires.nil? || (!infinite? && Time.at(@expires) <= Time.now)
-    end
-
-    def secured?
-      !@uid.nil? && !@access_token.nil? && !expired?
-    end
-
-    def user
-      @user ||= Buddy::User.new(@uid, self)
-    end
-
-    def uid
-      @uid
-    end
-
-    def access_token
-      @access_token
-    end
-
-    def expires
-      @expires
+      Buddy::Session::User.create(app_id, secret_key)
     end
   end
-end
+end

data/lib/buddy/version.rb

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

data/lib/buddy.rb

@@ -9,8 +9,9 @@ require 'httparty'
 require 'buddy/middleware'
 
 require 'buddy/user'
-require 'buddy/session'
 require 'buddy/service'
+require 'buddy/session'
+
 
 module Buddy
   @buddy_config = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buddy
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000Z
 dependencies: []
 description: Facebook library focusing on getting the work done.
 email:
@@ -31,6 +31,9 @@ files:
 - lib/buddy/railtie.rb
 - lib/buddy/service.rb
 - lib/buddy/session.rb
+- lib/buddy/session/app.rb
+- lib/buddy/session/base.rb
+- lib/buddy/session/user.rb
 - lib/buddy/user.rb
 - lib/buddy/version.rb
 - lib/generators/buddy_config/USAGE