koala 0.7.3 → 0.8.0

data/CHANGELOG

@@ -1,3 +1,11 @@
+v0.8.0
+-- Breaking interface changes
+  -- Removed string overloading for the methods, per 0.7.3, which caused Marshaling issues
+  -- Removed ability to provide a string as the second argument to url_for_access_token, per 0.5.0
+
+v0.7.4 
+-- Fixed bug with get_user_from_cookies
+
 v0.7.3
 -- Added support for picture sizes -- thanks thhermansen for the patch!
 -- Adjusted the return values for several methods (get_access_token, get_app_access_token, get_token_from_session_key, get_tokens_from_session_keys, get_user_from_cookies)
@@ -8,7 +16,7 @@ v0.7.3
   -- There are new info methods (get_access_token_info, get_app_access_token_info, get_token_info_from_session_keys, and get_user_info_from_cookies) that natively return hashes, for when you want the expiration date
 -- Responses with HTTP status 500+ now properly throw errors under Net::HTTP 
 -- Updated changelog
--- Added license and copyright
+-- Added license
 
 v0.7.2
 -- Added support for exchanging session keys for OAuth access tokens (get_token_from_session_key for single keys, get_tokens_from_session_keys for multiple)

data/Manifest

@@ -2,21 +2,8 @@ CHANGELOG
 LICENSE
 Manifest
 Rakefile
-examples/oauth_playground/Capfile
-examples/oauth_playground/LICENSE
-examples/oauth_playground/Rakefile
-examples/oauth_playground/config.ru
-examples/oauth_playground/config/deploy.rb
-examples/oauth_playground/config/facebook.yml
-examples/oauth_playground/lib/load_facebook.rb
-examples/oauth_playground/lib/oauth_playground.rb
-examples/oauth_playground/readme.md
-examples/oauth_playground/spec/oauth_playground_spec.rb
-examples/oauth_playground/spec/spec_helper.rb
-examples/oauth_playground/tmp/restart.txt
-examples/oauth_playground/views/index.erb
-examples/oauth_playground/views/layout.erb
 init.rb
+koala.gemspec
 lib/koala.rb
 lib/koala/graph_api.rb
 lib/koala/http_services.rb

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake'
 require 'echoe'
 
 # gem management
-Echoe.new('koala', '0.7.3') do |p|
+Echoe.new('koala', '0.8.0') do |p|
   p.summary    = "A lightweight, flexible library for Facebook with support for the Graph API, the old REST API, realtime updates, and OAuth validation."
   p.description = "Koala is a lightweight, flexible Ruby SDK for Facebook.  It allows read/write access to the social graph via the Graph API and the older REST API, as well as support for realtime updates and OAuth and Facebook Connect authentication.  Koala is fully tested and supports Net::HTTP and Typhoeus connections out of the box and can accept custom modules for other services."
   p.url            = "http://github.com/arsduo/koala"

data/koala.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{koala}
-  s.version = "0.7.3"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Koppel, Chris Baclig, Rafi Jacoby, Context Optional"]
-  s.date = %q{2010-06-22}
+  s.date = %q{2010-06-27}
   s.description = %q{Koala is a lightweight, flexible Ruby SDK for Facebook.  It allows read/write access to the social graph via the Graph API and the older REST API, as well as support for realtime updates and OAuth and Facebook Connect authentication.  Koala is fully tested and supports Net::HTTP and Typhoeus connections out of the box and can accept custom modules for other services.}
   s.email = %q{alex@alexkoppel.com}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "lib/koala.rb", "lib/koala/graph_api.rb", "lib/koala/http_services.rb", "lib/koala/realtime_updates.rb", "lib/koala/rest_api.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "Rakefile", "examples/oauth_playground/Capfile", "examples/oauth_playground/LICENSE", "examples/oauth_playground/Rakefile", "examples/oauth_playground/config.ru", "examples/oauth_playground/config/deploy.rb", "examples/oauth_playground/config/facebook.yml", "examples/oauth_playground/lib/load_facebook.rb", "examples/oauth_playground/lib/oauth_playground.rb", "examples/oauth_playground/readme.md", "examples/oauth_playground/spec/oauth_playground_spec.rb", "examples/oauth_playground/spec/spec_helper.rb", "examples/oauth_playground/tmp/restart.txt", "examples/oauth_playground/views/index.erb", "examples/oauth_playground/views/layout.erb", "init.rb", "lib/koala.rb", "lib/koala/graph_api.rb", "lib/koala/http_services.rb", "lib/koala/realtime_updates.rb", "lib/koala/rest_api.rb", "readme.md", "spec/facebook_data.yml", "spec/koala/api_base_tests.rb", "spec/koala/graph_and_rest_api/graph_and_rest_api_no_token_tests.rb", "spec/koala/graph_and_rest_api/graph_and_rest_api_with_token_tests.rb", "spec/koala/graph_api/graph_api_no_access_token_tests.rb", "spec/koala/graph_api/graph_api_with_access_token_tests.rb", "spec/koala/live_testing_data_helper.rb", "spec/koala/net_http_service_tests.rb", "spec/koala/oauth/oauth_tests.rb", "spec/koala/realtime_updates/realtime_updates_tests.rb", "spec/koala/rest_api/rest_api_no_access_token_tests.rb", "spec/koala/rest_api/rest_api_with_access_token_tests.rb", "spec/koala_spec.rb", "spec/koala_spec_helper.rb", "spec/koala_spec_without_mocks.rb", "spec/mock_facebook_responses.yml", "spec/mock_http_service.rb", "koala.gemspec"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "Rakefile", "init.rb", "koala.gemspec", "lib/koala.rb", "lib/koala/graph_api.rb", "lib/koala/http_services.rb", "lib/koala/realtime_updates.rb", "lib/koala/rest_api.rb", "readme.md", "spec/facebook_data.yml", "spec/koala/api_base_tests.rb", "spec/koala/graph_and_rest_api/graph_and_rest_api_no_token_tests.rb", "spec/koala/graph_and_rest_api/graph_and_rest_api_with_token_tests.rb", "spec/koala/graph_api/graph_api_no_access_token_tests.rb", "spec/koala/graph_api/graph_api_with_access_token_tests.rb", "spec/koala/live_testing_data_helper.rb", "spec/koala/net_http_service_tests.rb", "spec/koala/oauth/oauth_tests.rb", "spec/koala/realtime_updates/realtime_updates_tests.rb", "spec/koala/rest_api/rest_api_no_access_token_tests.rb", "spec/koala/rest_api/rest_api_with_access_token_tests.rb", "spec/koala_spec.rb", "spec/koala_spec_helper.rb", "spec/koala_spec_without_mocks.rb", "spec/mock_facebook_responses.yml", "spec/mock_http_service.rb"]
   s.homepage = %q{http://github.com/arsduo/koala}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Koala", "--main", "readme.md"]
   s.require_paths = ["lib"]

data/lib/koala/realtime_updates.rb

@@ -44,7 +44,7 @@ module Koala
         # fetch the access token if we're provided a secret
         if @secret && !@app_access_token
           oauth = Koala::Facebook::OAuth.new(@app_id, @secret)
-          @app_access_token = oauth.get_app_access_token["access_token"]
+          @app_access_token = oauth.get_app_access_token
         end
       end
       

data/lib/koala.rb

@@ -107,7 +107,7 @@ module Koala
         @app_secret = app_secret
         @oauth_callback_url = oauth_callback_url 
       end
-    
+
       def get_user_info_from_cookie(cookie_hash)
         # Parses the cookie set by the official Facebook JavaScript SDK.
         # 
@@ -139,12 +139,9 @@ module Koala
       alias_method :get_user_info_from_cookies, :get_user_info_from_cookie
     
       def get_user_from_cookie(cookies)
-        # overload this to be backward compatible with older implementations
-        # icky ruby magic, but it's _really_ cool we can do this
-        info = get_user_info_from_cookies(cookies)
-        string = info["uid"]
-
-        overload_as_hash(string, info)
+        if info = get_user_info_from_cookies(cookies)
+          string = info["uid"]
+        end
       end
       alias_method :get_user_from_cookies, :get_user_from_cookie
     
@@ -164,10 +161,6 @@ module Koala
         
       def url_for_access_token(code, options = {})
         # Creates the URL for the token corresponding to a given code generated by Facebook
-        if options.is_a?(String) # changing the arguments
-          puts "Deprecation warning: url_for_access_token now takes an options hash as the second argument; pass the callback as :callback."
-          options = {:callback => options}
-        end
         callback = options[:callback] || @oauth_callback_url
         raise ArgumentError, "url_for_access_token must get a callback either from the OAuth object or in the parameters!" unless callback
         "https://#{GRAPH_SERVER}/oauth/access_token?client_id=#{@app_id}&redirect_uri=#{callback}&client_secret=#{@app_secret}&code=#{code}"
@@ -180,11 +173,10 @@ module Koala
       end
       
       def get_access_token(code)
-        info = get_access_token_info(code)
         # upstream methods will throw errors if needed
-        string = info["access_token"]
-
-        overload_as_hash(string, info)          
+        if info = get_access_token_info(code) 
+          string = info["access_token"]        
+        end
       end
       
       def get_app_access_token_info
@@ -193,12 +185,11 @@ module Koala
       end
       
       def get_app_access_token
-        info = get_app_access_token_info
-        string = info["access_token"]
-
-        overload_as_hash(string, info)
+        if info = get_app_access_token_info
+          string = info["access_token"] 
+        end
       end
-      
+
       # from session keys
       def get_token_info_from_session_keys(sessions)
         # fetch the OAuth tokens from Facebook
@@ -219,13 +210,8 @@ module Koala
       def get_tokens_from_session_keys(sessions)
         # get the original hash results
         results = get_token_info_from_session_keys(sessions)
-        # now recollect them as backward-compatible strings
-        # for easier use
-        results.collect do |r|
-          string = r["access_token"]
-
-          overload_as_hash string, r
-        end
+        # now recollect them as just the access tokens
+        results.collect { |r| string = r["access_token"] }
       end
       
       def get_token_from_session_key(session)
@@ -261,23 +247,6 @@ module Koala
           :client_secret => @app_secret
         }.merge!(args), post ? "post" : "get").body
       end
-
-      # overload the object to be accessible as a hash
-      # used to make get_*_token methods backward compatible
-      # icky ruby magic, but it's _really_ cool we can do this
-      def overload_as_hash(obj, hash)
-        command = <<-EOS
-          def [](index)
-            puts "WARNING: get_app_access_token now provides the access token as a string; use get_app_access_token_info if you want the hash with expirations.  Otherwise you no longer need to call [] to get the token itself."
-            hash = #{hash.inspect}
-            hash[index]
-          end
-        EOS
-        
-        (class << obj; self; end).class_eval command
-        
-        obj
-      end
     end
   end
   

data/spec/koala/api_base_tests.rb

@@ -77,35 +77,4 @@ class ApiBaseTests < Test::Unit::TestCase
       @service.api('anything').should be_false
     end
   end
-end
-
-shared_examples_for "methods that return overloaded strings" do
-  before :each do
-    @key ||= "access_token"
-  end
-  
-  it "should be overloaded to be backward compatible" do
-    @result.respond_to?(:[]).should be_true
-  end
-
-  it "should allow hash access to the access token info" do
-    @result[@key].should == @result
-  end
-
-  it "should output a deprecation warning when the result is used as a hash" do 
-    out = nil
-  
-    begin
-      # we want to capture the deprecation warning as well as the output
-      # credit to http://thinkingdigitally.com/archive/capturing-output-from-puts-in-ruby/ for the technique
-      out = StringIO.new
-      $stdout = out
-      @result[@key]
-    ensure
-      $stdout = STDOUT
-    end
-  
-    # ensure we got a warning
-    out.should_not be_nil
-  end
 end

data/spec/koala/oauth/oauth_tests.rb

@@ -97,19 +97,17 @@ class FacebookOAuthTests < Test::Unit::TestCase
           @oauth.get_user_from_cookies(data)
         end
 
-        it "should use return a string" do
+        it "should use return a string if the cookies are valid" do
           result = @oauth.get_user_from_cookies(@oauth_data["valid_cookies"])
           result.should be_a(String)
         end
         
-        describe "backward compatibility" do
-          before :each do
-            @result = @oauth.get_user_from_cookies(@oauth_data["valid_cookies"])
-            @key = "uid"
-          end
-          
-          it_should_behave_like "methods that return overloaded strings"
-        end
+        it "should return nil if the cookies are invalid" do
+          # make an invalid string by replacing some values
+          bad_cookie_hash = @oauth_data["valid_cookies"].inject({}) { |hash, value| hash[value[0]] = value[1].gsub(/[0-9]/, "3") }
+          result = @oauth.get_user_from_cookies(bad_cookie_hash)
+          result.should be_nil
+        end        
       end
     end
     
@@ -163,25 +161,6 @@ class FacebookOAuthTests < Test::Unit::TestCase
       url.should == "https://#{Koala::Facebook::GRAPH_SERVER}/oauth/access_token?client_id=#{@app_id}&redirect_uri=#{callback}&client_secret=#{@secret}&code=#{@code}"
     end
     
-    it "should output a deprecation warning but generate a properly formatted OAuth token URL when provided a callback in the deprecated fashion" do 
-      callback = "foo.com"
-      url = out = nil
-      
-      begin
-        # we want to capture the deprecation warning as well as the output
-        # credit to http://thinkingdigitally.com/archive/capturing-output-from-puts-in-ruby/ for the technique
-        out = StringIO.new
-        $stdout = out
-        url = @oauth.url_for_access_token(@code, callback)
-      ensure
-        $stdout = STDOUT
-      end
-      
-      # two assertions may be bad test writing, but this is for a deprecated method
-      url.should == "https://#{Koala::Facebook::GRAPH_SERVER}/oauth/access_token?client_id=#{@app_id}&redirect_uri=#{callback}&client_secret=#{@secret}&code=#{@code}"
-      out.should_not be_nil
-    end
-
     describe "get_access_token_info" do
       it "should properly get and parse an access token token results into a hash" do
         result = @oauth.get_access_token_info(@code)
@@ -209,18 +188,10 @@ class FacebookOAuthTests < Test::Unit::TestCase
         original = @oauth.get_access_token_info(@code)
         result.should == original["access_token"]
       end
-
+      
       it "should raise an error when get_access_token is called with a bad code" do
         lambda { @oauth.get_access_token("foo") }.should raise_error(Koala::Facebook::APIError) 
       end
-
-      describe "backwards compatibility" do
-        before :each do
-          @result = @oauth.get_access_token(@code)
-        end
-
-        it_should_behave_like "methods that return overloaded strings"
-      end
     end
 
     describe "get_app_access_token_info" do
@@ -246,14 +217,6 @@ class FacebookOAuthTests < Test::Unit::TestCase
         original = @oauth.get_app_access_token_info
         result.should == original["access_token"]
       end
-      
-      describe "backwards compatibility" do
-        before :each do
-          @result = @oauth.get_app_access_token    
-        end
-        
-        it_should_behave_like "methods that return overloaded strings"
-      end
     end
 
     describe "exchanging session keys" do
@@ -288,15 +251,6 @@ class FacebookOAuthTests < Test::Unit::TestCase
           result = @oauth.get_tokens_from_session_keys(args)
           result.each {|r| r.should be_a(String) }
         end
-        
-        describe "backwards compatibility" do
-          before :each do
-            args = @oauth_data["multiple_session_keys"]
-            @result = @oauth.get_tokens_from_session_keys(args)[0]
-          end
-
-          it_should_behave_like "methods that return overloaded strings"
-        end
       end
 
       describe "get_token_from_session_key" do
@@ -316,14 +270,6 @@ class FacebookOAuthTests < Test::Unit::TestCase
           array = @oauth.get_tokens_from_session_keys([@oauth_data["session_key"]])
           result.should == array[0]
         end
-        
-        describe "backwards compatibility" do
-          before :each do
-            @result = @oauth.get_token_from_session_key(@oauth_data["session_key"])       
-          end
-
-          it_should_behave_like "methods that return overloaded strings"
-        end
       end    
     end
     

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 3
-  version: 0.7.3
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Alex Koppel, Chris Baclig, Rafi Jacoby, Context Optional
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -07:00
+date: 2010-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -37,21 +37,8 @@ files:
 - LICENSE
 - Manifest
 - Rakefile
-- examples/oauth_playground/Capfile
-- examples/oauth_playground/LICENSE
-- examples/oauth_playground/Rakefile
-- examples/oauth_playground/config.ru
-- examples/oauth_playground/config/deploy.rb
-- examples/oauth_playground/config/facebook.yml
-- examples/oauth_playground/lib/load_facebook.rb
-- examples/oauth_playground/lib/oauth_playground.rb
-- examples/oauth_playground/readme.md
-- examples/oauth_playground/spec/oauth_playground_spec.rb
-- examples/oauth_playground/spec/spec_helper.rb
-- examples/oauth_playground/tmp/restart.txt
-- examples/oauth_playground/views/index.erb
-- examples/oauth_playground/views/layout.erb
 - init.rb
+- koala.gemspec
 - lib/koala.rb
 - lib/koala/graph_api.rb
 - lib/koala/http_services.rb
@@ -75,7 +62,6 @@ files:
 - spec/koala_spec_without_mocks.rb
 - spec/mock_facebook_responses.yml
 - spec/mock_http_service.rb
-- koala.gemspec
 has_rdoc: true
 homepage: http://github.com/arsduo/koala
 licenses: []

data/examples/oauth_playground/Capfile

@@ -1,2 +0,0 @@
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-load 'config/deploy' # remove this line to skip loading any of the default tasks

data/examples/oauth_playground/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2010 Alex Koppel
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

data/examples/oauth_playground/Rakefile

@@ -1,4 +0,0 @@
-namespace :oauth_playground do
-  
-  
-end

data/examples/oauth_playground/config/deploy.rb

@@ -1,39 +0,0 @@
-set :application, "oauth_playground"
-set :repository,  "git://github.com/arsduo/oauth_playground.git"
-set :domain, "oauth.twoalex.com"
-set :deploy_to, "$HOME/rails_apps/#{application}/"
-
-# authentication
-set :scm, "git"
-set :user, "alexkm"
-set :use_sudo, false
-ssh_options[:forward_agent] = true
-
-# web server
-role :web, "oauth.twoalex.com"                          # Your HTTP server, Apache/etc
-role :app, "oauth.twoalex.com"                          # This may be the same as your `Web` server
-role :db,  "oauth.twoalex.com", :primary => true  # This is where Rails migrations will run
-
-
-# other git-related commands
-set :branch, "master"
-default_run_options[:pty] = true
-# cache the repository locally to speed updates
-set :repository_cache, "git_cache" 
-set :deploy_via, :remote_cache
-
-
-# passenger-specific deploy tasks
-namespace :deploy do
-  task :start do
-    run "#{try_sudo} touch #{File.join(current_path,'tmp','restart.txt')}"
-  end
-  
-  task :stop do
-    # nothing
-  end
-  
-  task :restart, :roles => :app, :except => { :no_release => true } do
-    run "touch #{File.join(current_path,'tmp','restart.txt')}"
-  end
-end

data/examples/oauth_playground/config/facebook.yml

@@ -1,13 +0,0 @@
-development:
-  api_key: 171e3563d4fee42e0ba27450838bba32
-  secret_key: c81302ccef57cbdd2e68b2229e54cd2f
-  app_id: 119347844754245
-
-test:
-  api_key: 
-  secret_key: 
-
-production:
-  api_key: 25e1cec0df2b3bfa781da3ed78da3a1e
-  secret_key: e45e55a333eec232d4206d2703de1307
-  app_id: 119908831367602

data/examples/oauth_playground/config.ru

@@ -1,27 +0,0 @@
-# gems
-require 'sinatra'
-require 'logger'
-require 'yaml'
-
-# app files
-require 'koala'
-require File.join(File.dirname(__FILE__), 'lib', 'load_facebook.rb')
-require File.join(File.dirname(__FILE__), 'lib', 'oauth_playground.rb')
-
-# LOGGING
-# set up the logfile
-Dir.mkdir('log') unless File.exists?('log')
-log_filename = File.join(File.dirname(__FILE__), "log", "sinatra.log")
-log = File.new(log_filename, "a+")
-
-# log requests
-use Rack::CommonLogger, log 
-# log application-generated code
-LOGGER = Logger.new(log_filename) 
-# log output to stdout and stderr as well
-$stdout.reopen(log)
-$stderr.reopen(log)
-
-# activate the app
-disable :run
-run OAuthPlayground

data/examples/oauth_playground/lib/load_facebook.rb

@@ -1,3 +0,0 @@
-# load Facebook info for this environment
-FACEBOOK_INFO = YAML.load_file(File.join(File.dirname(__FILE__), "..", "config", "facebook.yml"))[ENV["RACK_ENV"]]
-

data/examples/oauth_playground/lib/oauth_playground.rb

@@ -1,187 +0,0 @@
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-require 'rubygems'
-require 'sinatra'
-require 'erb'
-
-class OAuthPlayground < Sinatra::Application
-  
-  set :root, APP_ROOT  
-
-  include Koala
-
-  layout :layout
-
-  get "/" do
-    @app_data = FACEBOOK_INFO.merge("callback_url" => "#{request.scheme}://#{request.host}/")
-    @oauth = Facebook::OAuth.new(@app_data["app_id"], @app_data["secret_key"], @app_data["callback_url"])
-    
-    # get authentication info
-    set_facebook_cookies 
-    set_oauth_data
-    set_access_token
-    
-    unless (@permissions = params[:permissions]) && @permissions.length > 0
-      @active_permissions = (get_active_permissions || {}).inject([]) do |active, perm| 
-        # collect our active permissions
-        active << perm[0].to_sym if perm[1] == 1
-        active
-      end
-      @fetched_permissions = true
-    else
-      @active_permissions = @permissions.collect {|p| p.to_sym}
-    end
-        
-    @available_permissions = [
-      {:name => "User Activity", :perms => ACTIVITY_PERMISSIONS},
-      {:name => "User Info", :perms => USER_PERMISSIONS},
-      {:name => "Friend Info", :perms => FRIEND_PERMISSIONS}
-    ]
-  
-    erb :index
-  end
-  
-  get "/subscriptions" do
-    # validate that this is a valid response
-    # it will automatically render the result of the verification
-    # e.g. either the challenge phrase or false
-    subscription = Facebook::RealtimeUpdates.meet_challenge(params) do |verification_token|
-      token_parts = verification_token.split("|")
-      expected = Digest::MD5.hexdigest("#{token_parts.first}~koala")
-      logger.info "expected: #{expected}"
-      logger.info "got: #{token_parts.last}"
-      # determine if this is a valid token -- that is, if the send part is a properly encoding of the first
-      expected == token_parts.last
-    end
-  end
-  
-  helpers do
-    def logger
-      LOGGER
-    end 
-  end
-
-  # helpers
-
-  # set up our understanding of the user's session
-  
-  def set_access_token
-    # get the access token from wherever we can
-    @access_token ||= (set_oauth_data && @oauth_access_token) || (set_facebook_cookies && @cookie_access_token)
-  end
-  
-  def set_oauth_data
-    unless @oauth_access_token
-      if (@code = params[:code]) && @raw_access_response = @oauth.send(:fetch_token_string, {:code => @code, :redirect_uri => @app_data["callback_url"]})
-        parsed = @oauth.send(:parse_access_token, @raw_access_response)
-        @oauth_access_token = parsed["access_token"]
-        @expiration = parsed["expires"] || "Does not expire (offline)"
-      end
-    end
-    
-    @oauth_access_token
-  end
-  
-  def set_facebook_cookies
-    unless @facebook_cookies
-      if @facebook_cookies = @oauth.get_user_from_cookie(request.cookies)
-        @cookie_access_token = @facebook_cookies["access_token"]
-      end
-    end
-    
-    @facebook_cookies
-  end
-  
-  def set_uid
-    # get the OAuth data, including fetching the access token, if available and necessary
-    # e.g. if we have an OAuth token and no cookie data    
-    unless @uid 
-      if @facebook_cookies
-        @uid = @facebook_cookies["uid"]
-      elsif token = set_access_token
-        # we have to fetch the info
-        @graph = Facebook::GraphAPI.new(token)
-        result = @graph.get_object("me")
-        @uid = result["id"]
-      end
-    end
-    @uid
-  end
-  
-  # fetch the active permissions about the user    
-  def get_active_permissions
-    set_access_token
-    if @access_token && !@permissions && set_uid
-      # if we don't have permissions set but have an access token
-      # grab the user's info
-      @rest = Facebook::RestAPI.new(@access_token)      
-      result = @rest.fql_query("select #{all_permissions.join(",")} from permissions where uid = #{@uid.to_s}")
-      result.first
-    end  
-  end
-  
-  # list of permissions
-
-  def all_permissions
-    ACTIVITY_PERMISSIONS + USER_PERMISSIONS + FRIEND_PERMISSIONS
-  end
-  
-  ACTIVITY_PERMISSIONS = [
-    :publish_stream, # Enables your application to post content, comments, and likes to a user's stream and to the streams of the user's friends, without prompting the user each time.
-    :create_event, # Enables your application to create and modify events on the user's behalf
-    :rsvp_event, # Enables your application to RSVP to events on the user's behalf
-    :sms, # Enables your application to send messages to the user and respond to messages from the user via text message
-    :offline_access # Enables your application to perform authorized requests on behalf of the user at any time. By default, most access tokens expire after a short time period to ensure applications only make requests on behalf of the user when the are actively using the application. This permission makes the access token returned by our OAuth endpoint long-lived.
-  ]
-
-  USER_PERMISSIONS = [
-    :email, # Provides access to the user's primary email address in the email property. Do not spam users. Your use of email must comply both with Facebook policies and with the CAN-SPAM Act.
-    :read_insights, # Provides read access to the Insights data for pages, applications, and domains the user owns.
-    :read_stream, # Provides access to all the posts in the user's News Feed and enables your application to perform searches against the user's News Feed
-    :user_about_me, # Provides access to the "About Me" section of the profile in the about property
-    :user_activities, # Provides access to the user's list of activities as the activities connection
-    :user_birthday, # Provides access to the full birthday with year as the birthday_date property
-    :user_education_history, # Provides access to education history as the education property
-    :user_events, # Provides access to the list of events the user is attending as the events connection
-    :user_groups, # Provides access to the list of groups the user is a member of as the groups connection
-    :user_hometown, # Provides access to the user's hometown in the hometown property
-    :user_interests, # Provides access to the user's list of interests as the interests connection
-    :user_likes, # Provides access to the list of all of the pages the user has liked as the likes connection
-    :user_location, # Provides access to the user's current location as the current_location property
-    :user_notes, # Provides access to the user's notes as the notes connection
-    :user_online_presence, # Provides access to the user's online/offline presence
-    :user_photo_video_tags, # Provides access to the photos the user has been tagged in as the photos connection
-    :user_photos, # Provides access to the photos the user has uploaded
-    :user_relationships, # Provides access to the user's family and personal relationships and relationship status
-    :user_religion_politics, # Provides access to the user's religious and political affiliations
-    :user_status, # Provides access to the user's most recent status message
-    :user_videos, # Provides access to the videos the user has uploaded
-    :user_website, # Provides access to the user's web site URL
-    :user_work_history # Provides access to work history as the work property
-  ]
-  
-  FRIEND_PERMISSIONS = [
-    :read_friendlists, # Provides read access to the user's friend lists
-    :read_requests, # Provides read access to the user's friend requests
-    :friends_about_me, # Provides access to the "About Me" section of the profile in the about property
-    :friends_activities, # Provides access to the user's list of activities as the activities connection
-    :friends_birthday, # Provides access to the full birthday with year as the birthday_date property
-    :friends_education_history, # Provides access to education history as the education property
-    :friends_events, # Provides access to the list of events the user is attending as the events connection
-    :friends_groups, # Provides access to the list of groups the user is a member of as the groups connection
-    :friends_hometown, # Provides access to the user's hometown in the hometown property
-    :friends_interests, # Provides access to the user's list of interests as the interests connection
-    :friends_likes, # Provides access to the list of all of the pages the user has liked as the likes connection
-    :friends_location, # Provides access to the user's current location as the current_location property
-    :friends_notes, # Provides access to the user's notes as the notes connection
-    :friends_online_presence, # Provides access to the user's online/offline presence
-    :friends_photo_video_tags, # Provides access to the photos the user has been tagged in as the photos connection
-    :friends_photos, # Provides access to the photos the user has uploaded
-    :friends_relationships, # Provides access to the user's family and personal relationships and relationship status
-    :friends_religion_politics, # Provides access to the user's religious and political affiliations
-    :friends_status, # Provides access to the user's most recent status message
-    :friends_videos, # Provides access to the videos the user has uploaded
-    :friends_website, # Provides access to the user's web site URL
-    :friends_work_history # Provides access to work history as the work property
-  ]
-end

data/examples/oauth_playground/readme.md

@@ -1,8 +0,0 @@
-A simple OAuth Playground chock full of the info you need to test your OAuth-based Facebook application.
-
-To Do's
-=======
-
-* Extend the permissions controls to cover all available permissions
-* Make expiration dates human-readable
-* Let people plug in their own app (updating the app's connect properties through setAppProperties)

data/examples/oauth_playground/spec/oauth_playground_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-require 'ruby-debug'
-
-describe 'OAuthPlayground' do
-  before :each do
-    @hydra = Typhoeus::Hydra.hydra
-  end
-  
-  after :each do 
-    @hydra.clear_stubs
-  end
-  
-  it 'should load the index' do
-    get '/'
-    last_response.should be_ok
-  end
-
-=begin  
-  # unfortunately, this fails when you pass the get method a param named code!
-  # fixing this will require some mucking around in Rack::Test
-  
-  it "should make a request to Facebook's OAuth server when passed a code" do 
-    test_string = Regexp.new("The time is #{Time.now.to_i}")
-
-    # stub out the request and make sure it's returned
-    @hydra.stub("https://#{Koala::Facebook::GRAPH_SERVER}/oauth/access_token", "get").and_return(test_string)
-    
-    get "/", {"code" => "foo_bar"}
-
-    # make sure the body includes the request string
-    last_response.body.should =~ test_string
-  end
-=end
-end
-

data/examples/oauth_playground/spec/spec_helper.rb

@@ -1,36 +0,0 @@
-require 'rubygems'
-require 'sinatra'
-require 'rack/test'
-require 'typhoeus'
-require 'koala'
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'oauth_playground.rb')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'load_facebook.rb')
-
-OAuthPlayground.set(
-  :environment => :test,
-  :run => false,
-  :raise_errors => true,
-  :logging => false
-)
-
-module TestHelper
-  
-  def app
-    # change to your app class if using the 'classy' style
-    OAuthPlayground
-  end
-  
-  def body
-    last_response.body
-  end
-  
-  def status
-    last_response.status
-  end
-  
-  include Rack::Test::Methods
-
-end
-
-include TestHelper

data/examples/oauth_playground/views/index.erb

@@ -1,206 +0,0 @@
-<div id="header">
-	<h1>Facebook OAuth Playground</h1>
-	<h4>Powered by <a href="http://github.com/arsduo/koala" target="_blank">Koala</a></h2>
-	<h4>For novelty use only.  Remember, the application's secret key is public.</h4>
-</div>
-
-<style>
-	#header { 
-		text-align: center; 
-	} 
-	
-	h1, h2, h3, h4 { margin: 0; }
-
-	.section {
-		border: 1px solid black;
-		padding: 10px;
-		-moz-border-radius: 9px;
-		-webkit-border-radius: 9px;
-		margin-bottom: 10px;
-		width: 100%;
-	}
-	
-	#contents {
-		border: 2px solid #CCC;
-		border-width: 2px 0;
-		background-color: #EEE;
-		padding: 14px 3px 8px 8px;
-	}
-	
-	#configurationInfo {
-		float:left;
-		margin-right: 2.5%;
-		width: 25%;
-	}
-	
-	#configurationInfo .section {
-		background-color: #CCC;
-	}
-	
-	#permissions .header {
-		margin-bottom: 5px;
-	}
-	
-	#permissions .list {
-		height: 380px;
-		overflow: auto;
-	}
-	
-	#generatedInfo {
-		float: left;
-		width: 70%;
-	}
-	
-	#generatedInfo .section {
-		border-color: gray;
-		background: #DDD;
-		overflow: auto;
-	}
-	
-	.clearFloat {
-		height: 1px;
-		height: 0px;
-		clear: both;
-		overflow: hidden;
-	}
-	
-	ul, li { margin: 0; padding: 0; list-style: none; }
-	ul { margin: 12px 0; }
-
-	.code {
-		font-family: Courier, fixed;
-		font-size: 1.15em;
-		width: 100%;
-	}
-	
-	.explanation {
-		font-size: 0.9em;
-	}
-	
-	.datumName {
-		font-weight: bold;
-	}
-	
-	.permissionType {
-		font-style: italic;
-	}
-</style>
-	
-</style>
-
-<div id="contents">
-
-	<div id="configurationInfo">
-		<div id="fbApp" class="section">
-			<h3>Facebook App Info</h3>
-			<ul>
-				<% @app_data.each_pair do |key, value| %>
-					<li><span class="datumName"><%= key %>:</span> <%= value %></li>
-				<% end %>
-			</ul>
-		</div>
-		
-		<div id="permissions" class="section">
-			<form method="get">
-				<div class="header">
-					<h3>Permissions</h3>
-					<input type="submit" value="Update permissions" />
-					<a href="/">Reset Selection</a>
-					<div class="explanation">Choose permissions for the OAuth URL and the fb:login button.</div>
-					<% if @fetched_permissions %>
-						<div class="permissionType">Showing currently-active permissions</div>
-						<div class="explanation">(These were fetched by Koala as the page loaded!)</div>
-					<% else %>
-						<div class="permissionType">Showing selected permissions</div>
-					<% end %>
-				</div>
-		
-				<div class="list">
-					<% @available_permissions.each do |permissions| %>
-						<h4><%= permissions[:name] %> Permissions</h4>
-						<ul>
-							<% permissions[:perms].each do |p| %>
-								<li>
-									<input type="checkbox" id="permission<%= p %>" name="permissions[]" value="<%= p %>" <%= @active_permissions.include?(p) ? "checked='checked'" : "" %> />
-									<label for="permission<%= p %>"><%= p %></a> (<a href="#" onclick="FB.api({method: 'auth.revokeExtendedPermission', perm: '<%= p %>'}, function(response) { alert(response) }); return false;">revoke</a>)
-								</li>
-							<% end %>
-						</ul>
-					<% end %>
-				</div>
-			</form>
-		</div>
-	</div>
-
-	<div id="generatedInfo">		
-		<div id="oauthURLs" class="section">
-			<h3>OAuth URLs</h3>
-			<ul>
-				<li><span class="datumName">Generate a code:</span> <a href="<%= @oauth.url_for_oauth_code(:permissions => @permissions) %>"><%=  @oauth.url_for_oauth_code(:permissions => @permissions) %></a></li>
-				<li><span class="datumName">OAuth code:</span> <%= @code || "click on the link above" %></li>
-				<li>
-					<span class="datumName">Access token:</span> <%= @oauth_access_token || "click on the link above" %>
-					<% if @oauth_access_token %><div class="explanation">This was fetched by Koala as the page loaded!</div><% end %>
-				</li>
-				<li><span class="datumName">Expiration:</span> <%= @expiration || "click on the link above" %></li>
-				<li><span class="datumName">Raw access response:</span> <%= @raw_access_response || "click on the link above" %></li>
-				<li><span class="datumName">URL for access code:</span>
-					<% if @code %>
-						<a href="<%= @oauth.url_for_access_token(@code) %>"><%= @oauth.url_for_access_token(@code) %></a>
-					<% else %>
-						click on the link above
-					<% end %>
-				</li>
-			</ul>
-		</div>
-
-		<div id="jsLogin" class="section">
-			<h3>Javascript Login (e.g. Facebook Connect)</h3>
-			<p>
-				<fb:login-button onlogin="location.reload()" perms="<%= (@permissions || []).join(",") %>"></fb:login-button>
-				<% if @permissions %>
-					and prompt for <%= @permissions.join(", ") %>
-				<% end %>
-				<% if @facebook_cookies %>
-					<div class="logout">
-						<a href="#" onclick="FB.logout(function() { location.reload() }); return false;">Logout</a>
-					</div>
-				<% end %>
-			</p>
-		</div>
-
-		<div id="cookieInfo" class="section">
-			<h3>Cookie info</h3>
-			<ul>
-				<% if @facebook_cookies %>
-					<% @facebook_cookies.each_pair do |key, value| %>
-						<li><span class="datumName"><%= key %>:</span> <%= value %></li>
-					<% end %>
-				<% else %>
-					<li>You're not signed in via Javascript.  Login below.</li>
-				<% end %>
-				<li><span class="datumName">Raw hash</span>: 
-					<div class="code"><%= request.cookies.inspect %></div>
-				</li>
-			</ul>
-		</div>
-
-		<div id="koala" class="section">
-			<h3>Koala</h3>
-			<ul>
-				<li><span class="datumName">GraphAPI:</span>
-					<div class="code"><%= @access_token ? "@graph = Koala::Facebook::GraphAPI.new(\"#{@access_token}\")" : "sign in above" %></div>
-				</li>
-				<li><span class="datumName">OAuth:</span> 
-					<div class="code">@oauth = Koala::Facebook::OAuth.new(<%= @app_data["app_id"] %>, "<%= @app_data["secret_key"] %>", "<%= @app_data["callback_url"] %>")</div>
-				</li>
-			</ul>
-		</div>
-	</div>
-
-	<div class="clearFloat">&nbsp;</div>
-</div>
-
-<center>
-	<h5>Check out the playground's code at <a href="http://github.com/arsduo/oauth_playground">http://github.com/arsduo/oauth_playground</a>!</h5>
-</center>

data/examples/oauth_playground/views/layout.erb

@@ -1,39 +0,0 @@
-<html>
-<head>
-	<title>Facebook OAuth Playground</title>
-	<meta name="description" content="Making it easier to play with Facebook's new Graph API and OAuth authentication."></meta>
-	<style>
-		body {
-			font-family: verdana, arial, sans-serif;
-			font-size: 12px;
-			margin: 0px;
-		}
-	</style>
-</head>
-<body>
-
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-16395421-1']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-	
-<%= yield %>		
-		
-<div id="fb-root"></div>
-<script src="http://connect.facebook.net/en_US/all.js"></script>
-<script>
-	FB.init({ appId: <%= @app_data["app_id"] %>, cookie: true, status: true, xfbml: true });
-</script>
-
-</body>
-
-</html>