meal_ticket 0.1.0 → 0.1.1

data/README.rdoc

@@ -75,7 +75,7 @@ Create global constants that look something like this:
 Now, redirect users to facebook_auth_url, passing the permissions you want to ask for. Like so:
 
   # For a full list of permissions, see https://developers.facebook.com/docs/authentication/permissions/
-  redirect_to facebook_auth_url("user_photos,publish_stream")
+  redirect_to facebook_auth_url(root_url, "user_photos,publish_stream")
 
 
 After they authenticate, they'll be redirected to your +FACEBOOK_CALLBACK+ URL with query string params like:

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/meal_ticket.rb

@@ -8,12 +8,12 @@ module MealTicketRoutes
   # [root_url] The base url of your app, eg "http://www.google.com/". If you're running a rails app, you can literally type root_url
   # [scope] A comma-separated list of permissions. For a full list of permissions, see https://developers.facebook.com/docs/authentication/permissions/
   def facebook_auth_url(root_url, scope)
-    "https://graph.facebook.com/oauth/authorize?client_id=#{FACEBOOK_APP_ID}&redirect_uri=#{root_url}meal_ticket/facebook_callback&scope=#{scope}"
+    "https://graph.facebook.com/oauth/authorize?client_id=#{MealTicket::Config.facebook_app_id}&redirect_uri=#{root_url}meal_ticket/facebook_callback&scope=#{scope}"
   end
 
   # Generates the URL for the 2nd step of Facebook auth - exchanging the code for user data
   def facebook_exchange_url(root_url, code) # :nodoc:
-    "https://graph.facebook.com/oauth/access_token?client_id=#{FACEBOOK_APP_ID}&redirect_uri=#{root_url}meal_ticket/facebook_callback&client_secret=#{FACEBOOK_SECRET}&code=#{CGI::escape code}"
+    "https://graph.facebook.com/oauth/access_token?client_id=#{MealTicket::Config.facebook_app_id}&redirect_uri=#{root_url}meal_ticket/facebook_callback&client_secret=#{MealTicket::Config.facebook_secret}&code=#{CGI::escape code}"
   end
 
   # [perm] A single permission level. Permissions can be read, write, or delete. Each successive permission implies the ones before it, eg "write" implies "read". For more information, see http://www.flickr.com/services/api/auth.spec.html
@@ -29,7 +29,7 @@ module MealTicketRoutes
   private
 
   def flickr_url(arg_hash, endpoint = "rest")
-    arg_hash.merge!({"api_key" => FLICKR_TOKEN})
+    arg_hash.merge!({"api_key" => MealTicket::Config.flickr_token})
     arg_list = []
     arg_hash.each do |key, value|
       arg_list << "#{key}=#{value}"
@@ -43,7 +43,7 @@ module MealTicketRoutes
       arg_list << key
       arg_list << arg_hash[key]
     end
-    Digest::MD5.hexdigest("#{FLICKR_SECRET}#{arg_list.join()}")
+    Digest::MD5.hexdigest("#{MealTicket::Config.flickr_secret}#{arg_list.join()}")
   end
 end
 
@@ -53,6 +53,12 @@ require 'net/https'
 require 'crack'
 require 'json'
 class MealTicket
+
+  class Config
+    cattr_accessor :facebook_app_id, :facebook_secret, :facebook_callback
+    cattr_accessor :flickr_token, :flickr_secret, :flickr_callback
+  end
+
   include MealTicketRoutes
 
   def initialize(app)
@@ -71,21 +77,25 @@ class MealTicket
   end
 
   def facebook_callback
-    response = get facebook_exchange_url(get_root_url, get_query_string_parameter("code"))
-
-    if response.body.include? "access_token"
-      response.body =~ /access_token=([^&]+)(?:&expires=(.*))?/ # TODO: genericize get_query_string_parameter to handle this?
-      token = $1 || ""
-      expires = $2 || ""
-      query_string = "facebook[token]=#{CGI.escape(token)}&facebook[expires]=#{CGI.escape(expires)}"
+    if get_query_string_parameter("code")
+      response = get facebook_exchange_url(get_root_url, get_query_string_parameter("code"))
+
+      if response.body.include? "access_token"
+        response.body =~ /access_token=([^&]+)(?:&expires=(.*))?/ # TODO: genericize get_query_string_parameter to handle this?
+        token = $1 || ""
+        expires = $2 || ""
+        query_string = "facebook[token]=#{CGI.escape(token)}&facebook[expires]=#{CGI.escape(expires)}"
+      else
+        parsed = JSON.parse(response.body)
+        query_string = to_params({:facebook => parsed})
+      end
     else
-      parsed = JSON.parse(response.body)
-      query_string = to_params({:facebook => parsed})
+      query_string = "facebook[error]=#{get_query_string_parameter("error")}"
     end
 
     body = %(<html><body>You are being redirected.</body></html>)
     headers = {
-          'Location' => "#{get_root_url}#{FACEBOOK_CALLBACK}?#{query_string}",
+          'Location' => "#{get_root_url}#{MealTicket::Config.facebook_callback}?#{query_string}",
           'Content-Type' => 'text/html',
           'Content-Length' => body.length.to_s
     }
@@ -109,7 +119,7 @@ class MealTicket
 
     body = %(<html><body>You are being redirected.</body></html>)
     headers = {
-          'Location' => "#{get_root_url}#{FLICKR_CALLBACK}?#{query_string}",
+          'Location' => "#{get_root_url}#{MealTicket::Config.flickr_callback}?#{query_string}",
           'Content-Type' => 'text/html',
           'Content-Length' => body.length.to_s
     }

data/meal_ticket.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meal_ticket}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Doyle", "Kerri Miller", "John Postlethwait"]
-  s.date = %q{2011-03-08}
+  s.date = %q{2011-05-26}
   s.description = %q{Meal Ticket is the easiest way to authenticate users for 3rd-party social APIs. Built to be used in conjunction with Buffet.}
   s.email = %q{archslide@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: meal_ticket
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Chris Doyle
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -08:00
+date: 2011-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency