fbauth 1.2.0.1 → 1.2.0.2

data/app/controllers/facebook_auth_functions.rb

@@ -11,11 +11,11 @@ module FacebookAuthFunctions
   def require_facebook_auth
     setup_facebook_auth
     if @facebook_auth.nil?
-      redirect_to build_auth_url and return
+      redirect_to build_auth_url
     end
     if signed_params_present? && request.post?
       # If Facebook POST with signed_params, redirect to original URI using GET
-      redirect_to request.request_uri and return
+      redirect_to request.request_uri
     end
   end
 

data/lib/fbauth.rb

@@ -9,9 +9,9 @@
   end
 end
 
-require 'facebook_decoder.rb'
-require 'facebook_auth.rb'
-require 'facebook_config.rb'
-require 'facebook_http.rb'
-require 'facebook_graph.rb'
-require 'facebook_query.rb'
+require 'fbauth/decoder.rb'
+require 'fbauth/auth.rb'
+require 'fbauth/config.rb'
+require 'fbauth/http.rb'
+require 'fbauth/graph.rb'
+require 'fbauth/query.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: fbauth
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 75
   prerelease: false
   segments: 
   - 1
   - 2
   - 0
-  - 1
-  version: 1.2.0.1
+  - 2
+  version: 1.2.0.2
 platform: ruby
 authors: 
 - Three Wise Men Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -05:00
+date: 2011-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -29,12 +29,6 @@ extensions: []
 extra_rdoc_files: 
 - README.mdown
 files: 
-- lib/facebook_auth.rb
-- lib/facebook_config.rb
-- lib/facebook_decoder.rb
-- lib/facebook_graph.rb
-- lib/facebook_http.rb
-- lib/facebook_query.rb
 - lib/fbauth.rb
 - app/controllers/facebook_auth_functions.rb
 - app/helpers/fbauth_helper.rb

data/lib/facebook_auth.rb

@@ -1,88 +0,0 @@
-class FacebookAuth
-
-  attr_accessor :access_token, :expires, :uid
-  attr_accessor :user_data, :validation_error
-
-  def self.create parms
-    auth = self.new
-    # Sense old-style FB auth structure, or new-style
-    if parms.has_key?('access_token')
-      auth.access_token = parms['access_token']
-      auth.uid = parms['uid']
-      auth.expires_epoch = parms['expires'].to_i unless parms['expires'].nil?
-    elsif parms.has_key?('oauth_token')
-      auth.access_token = parms['oauth_token']
-      auth.uid = parms['user_id']
-      auth.expires_epoch = parms['expires'].to_i if parms.has_key?('expires')
-    end
-    auth
-  end
-
-  def expires_epoch= epoch
-    # Need to convolve for SanFran TZ?
-    self.expires = Time.at(epoch)
-  end
-
-  def is_expired?
-    if self.expires.nil?
-      true
-    else
-      self.expires < Time.now
-    end
-  end
-
-  def validate
-    valid = false
-    msgs = []
-    unless self.uid.nil? || self.access_token.nil?
-      begin
-        self.user_data = FacebookGraph.new(self.access_token).call(self.uid)
-      rescue => e
-        msgs << "Error calling FacebookGraph - #{e}"
-      end
-      if self.user_data && self.user_data.has_key?('error')
-        msgs << self.user_data['error'].inspect
-        self.user_data = nil
-      elsif self.user_data
-        valid = true
-      end
-    else
-      msgs << "UID provided is nil" if self.uid.nil?
-      msgs << "access_token provided is nil" if self.access_token.nil?
-    end
-    self.validation_error = msgs.join(", ") unless valid
-    return valid
-  end
-
-  def session_data
-    return {
-      'access_token' => self.access_token,
-      'uid' => self.uid,
-      'expires' => self.expires.to_i
-    }.to_json
-  end
-
-end
-
-# User data typically looks like this:
-#
-# {
-#   "id"=>"849395216",
-#   "name"=>"Steven Vetzal",
-#   "first_name"=>"Steven"
-#   "last_name"=>"Vetzal",
-#   "gender"=>"male",
-#   "verified"=>true,
-#   "link"=>"http://www.facebook.com/svetzal",
-#   "timezone"=>-5,
-#   "locale"=>"en_US",
-#   "location"=>{
-#     "name"=>"Oshawa, Ontario",
-#     "id"=>"114418101908145"
-#   },
-#   "hometown"=>{
-#     "name"=>"Oshawa, Ontario",
-#     "id"=>"114418101908145"
-#   },
-#   "updated_time"=>"2010-04-28T12:57:20+0000",
-# }

data/lib/facebook_config.rb

@@ -1,20 +0,0 @@
-class FacebookConfig
-  def self.[](key)
-    get_environment[key].value
-  end
-
-  private
-
-  def self.get_environment
-    read_yaml[ENV["RAILS_ENV"]]
-  end
-
-  def self.read_yaml
-    file = File.join(::RAILS_ROOT, 'config', 'facebook.yml')
-    YAML.parse(ERB.new(IO.read(file)).result)
-  end
-
-  def self.app_url
-    "http://apps.facebook.com/#{self['app_context']}/"
-  end
-end

data/lib/facebook_decoder.rb

@@ -1,30 +0,0 @@
-require 'active_support'
-require 'digest/sha2'
-
-class FacebookDecoder
-
-  def self.decode data
-    unless data.nil?
-      sig, b64udata = data.split('.')
-      unless b64udata.nil?
-        json = b64udata.tr('-_', '+/').unpack('m')[0]
-        begin
-          parms = JSON.parse(json)
-        rescue => e
-          begin
-            parms = JSON.parse(json + '"}')
-          rescue => e2
-            begin
-              parms = JSON.parse(json + '}')
-            rescue => e3
-              raise "Unable to parse json structure - '#{json}'"
-              parms = {}
-            end
-          end
-        end
-      end
-    end
-    parms
-  end
-
-end

data/lib/facebook_graph.rb

@@ -1,26 +0,0 @@
-require 'net/http'
-require 'uri'
-
-class FacebookGraph
-  include FacebookHttp
-
-  FB_GRAPH_URL = "https://graph.facebook.com"
-
-  def initialize(access_token = nil, options = {})
-    @options = options.merge({ :access_token => access_token })
-  end
-
-  # Generic Graph call to lookup data for any path
-  def call(path, options = {})
-    get "#{FB_GRAPH_URL}/#{path}", merged_options(options)
-  end
-
-  # Post item to member's wall
-  #   Available options: message, picture, link, name, caption, description
-  def publish_to_member_feed(uid, options)
-    raise "access_token required" unless has_access_token?(options)
-    if %w{staging production}.include? Rails.env
-      post "#{FB_GRAPH_URL}/#{uid}/feed", merged_options(options)
-    end
-  end
-end

data/lib/facebook_http.rb

@@ -1,97 +0,0 @@
-require 'benchmark'
-require 'net/http'
-require 'net/https' # Required for Ruby 1.8.7
-require 'uri'
-require 'cgi'
-
-module FacebookHttp
-
-  def build_get_url(url, params = {})
-    q = build_query_string(params)
-    if q
-      url + q
-    else
-      url
-    end
-  end
-
-  def caching_enabled?
-    ActionController::Base.cache_store.class.name == "ActiveSupport::Cache::MemCacheStore"
-  end
-
-  def get(url, params = {})
-    json = nil
-    uri = URI.parse(build_get_url(url, params))
-
-    json = Rails.cache.read(uri.to_s) if caching_enabled?
-    if json.nil?
-      bench = Benchmark.measure do
-        http = Net::HTTP.new uri.host, uri.port
-        begin
-          http.use_ssl = (uri.scheme == "https")
-          req = Net::HTTP::Get.new(uri.request_uri)
-          response = http.request(req)
-          raise "Facebook error response #{response.code} - #{response.body}" unless response.code == '200'
-          begin
-            json = JSON.parse(response.body)
-          rescue => e
-            raise "Error parsing facebook response: #{response.body}"
-          end
-        ensure
-          http.finish if http.started?
-        end
-      end
-      logger.warn("Facebook GET call to #{uri.to_s} completed in #{bench.real} seconds")
-      Rails.cache.write(uri.to_s, json, :expires_in => 60) if json && caching_enabled?
-    end
-    json
-  end
-
-  def post(url, params = {})
-    json = nil
-    uri = URI.parse(url)
-    bench = Benchmark.measure do
-      http = Net::HTTP.new uri.host, uri.port
-      begin
-        http.use_ssl = (uri.scheme == "https")
-        req = Net::HTTP::Post.new(uri.path)
-        req.set_form_data(params)
-        response = http.request(req)
-        raise "Facebook error response #{response.code} - #{response.body}" unless response.code == '200'
-        begin
-          json = JSON.parse(response.body)
-        rescue => e
-          raise "Error parsing Facebook response: #{response.body}"
-        end
-      ensure
-        http.finish if http.started?
-      end
-    end
-    logger.warn("Facebook POST call to #{uri.to_s} completed in #{bench.real} seconds")
-    json
-  end
-
-  def build_query_string options={}
-    params = []
-    str_keys = options.keys.collect{ |k| k.to_s }
-    str_keys.sort.each do |str_key|
-      key = str_key.to_sym
-      value = options[key]
-      params << "#{key.to_s}=#{URI.escape(value.to_s)}" unless value.nil?
-    end
-    "?#{params.join('&')}" unless params.empty?
-  end
-
-  def merged_options(options = {})
-    options.merge!(@options) if @options
-    options
-  end
-
-  def has_access_token?(options = {})
-    merged_options.has_key? :access_token
-  end
-
-  def logger
-    Rails.logger
-  end
-end

data/lib/facebook_query.rb

@@ -1,16 +0,0 @@
-require 'uri'
-
-class FacebookQuery
-  include FacebookHttp
-
-  FB_API_URL = "https://api.facebook.com/method/fql.query"
-
-  def initialize(access_token = nil, options = {})
-    @options = options.merge({ :access_token => access_token })
-    @options.merge!({ :format => "JSON" }) unless @options.has_key?(:format)
-  end
-
-  def fql(query, options = {})
-    get FB_API_URL, merged_options(options.merge({ :query => query }))
-  end
-end