mmangino-facebooker 1.0.21 → 1.0.22

data/Manifest.txt

@@ -1,11 +1,8 @@
-CHANGELOG.txt
-COPYING
-History.txt
-Manifest.txt
-README
-README.txt
+COPYING.rdoc
+History.rdoc
+README.rdoc
 Rakefile
-TODO.txt
+TODO.rdoc
 generators/publisher/publisher_generator.rb
 generators/facebook/facebook_generator.rb
 generators/facebook/templates/config/facebooker.yml

data/{README.txt → README.rdoc}

@@ -1,4 +1,4 @@
-= facebooker
+= Facebooker
 
 * http://facebooker.rubyforge.org
 
@@ -30,7 +30,7 @@ None
 
 == INSTALL:
 
- * Non Rails
+=== Non Rails
 
 The best way is:
 
@@ -40,7 +40,7 @@ If, for some reason, you can't/won't use RubyGems, you can do:
 
   (sudo) ruby setup.rb
 
-  * Rails
+=== Rails
 
 Facebooker can be installed as a Rails plugin by:
 
@@ -76,7 +76,13 @@ end
 
 (The MIT License)
 
-Copyright (c) 2008 FIX
+Copyright (c) 2008-2009:
+
+* Chad Fowler
+* Patrick Ewing
+* Mike Mangino
+* Shane Vitarana
+* Corey Innis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -17,9 +17,9 @@ Hoe.new('facebooker', Facebooker::VERSION::STRING) do |p|
   p.author = ['Chad Fowler', 'Patrick Ewing', 'Mike Mangino', 'Shane Vitarana', 'Corey Innis']
   p.email = 'mmangino@elevatedrails.com'
   p.summary = 'Pure, idiomatic Ruby wrapper for the Facebook REST API.'
-  p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
-  p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  p.description = p.paragraphs_of('README.rdoc', 2..5).join("\n\n")
+  p.url = p.paragraphs_of('README.rdoc', 0).first.split(/\n/)[1..-1]
+  p.changes = p.paragraphs_of('History.rdoc', 0..1).join("\n\n")
   p.remote_rdoc_dir = '' # Release to root
   p.test_globs = 'test/**/*_test.rb'
   p.extra_deps << ['json', '>= 1.0.0'] 

data/lib/facebooker/logging.rb

@@ -44,7 +44,7 @@ module Facebooker
     def self.log_info(message, dump, seconds = 0)
       return unless Facebooker.logger
       log_message = "#{message} (#{seconds}) #{dump}"
-      Facebooker.logger.debug(log_message)
+      Facebooker.logger.info(log_message)
     end
     
   end  

data/lib/facebooker/models/user.rb

@@ -377,6 +377,28 @@ module Facebooker
         ret
       end
     end
+
+    # Get a count of unconnected friends
+    def getUnconnectedFriendsCount
+      session.post("facebook.connect.getUnconnectedFriendsCount")
+    end
+
+
+    # Unregister a bunch of users
+    def self.unregister(emails)
+      emails = emails.collect {|e| hash_email(e)}
+      Facebooker::Session.create.post("facebook.connect.unregisterUsers",:email_hashes=>emails.to_json) do |ret|
+        ret.each do |hash|
+          emails.delete(hash)
+        end
+        unless emails.empty?
+          e=Facebooker::Session::UserUnRegistrationFailed.new
+          e.failed_users = emails
+          raise e
+        end
+        ret
+      end      
+    end
     
     def self.hash_email(email)
       email = email.downcase.strip

data/lib/facebooker/parser.rb

@@ -96,6 +96,18 @@ module Facebooker
       array_of_text_values(element("connect_registerUsers_response", data), "connect_registerUsers_response_elt")
     end
   end
+  
+  class UnregisterUsers < Parser
+    def self.process(data)
+      array_of_text_values(element("connect_unregisterUsers_response", data), "connect_unregisterUsers_response_elt")
+    end
+  end
+
+  class GetUnconnectedFriendsCount < Parser
+    def self.process(data)
+      hash_or_value_for(element("connect_getUnconnectedFriendsCount_response",data)).to_i 
+    end
+  end
 
   class GetSession < Parser#:nodoc:
     def self.process(data)      
@@ -530,6 +542,8 @@ module Facebooker
       'facebook.auth.createToken' => CreateToken,
       'facebook.auth.getSession' => GetSession,
       'facebook.connect.registerUsers' => RegisterUsers,
+      'facebook.connect.unregisterUsers' => UnregisterUsers,
+      'facebook.connect.getUnconnectedFriendsCount' => GetUnconnectedFriendsCount,
       'facebook.users.getInfo' => UserInfo,
       'facebook.users.getStandardInfo' => UserStandardInfo,
       'facebook.users.setStatus' => SetStatus,

data/lib/facebooker/rails/facebook_url_helper.rb

@@ -50,7 +50,7 @@ module ActionView
     module UrlHelper
       # Alters one and only one line of the Rails button_to.  See below.
       def button_to_with_facebooker(name, options={}, html_options = {})
-        if !request_comes_from_facebook?
+        if !respond_to?(:request_comes_from_facebook?) || !request_comes_from_facebook?
            button_to_without_facebooker(name,options,html_options)
         else
           html_options = html_options.stringify_keys
@@ -125,7 +125,7 @@ module ActionView
 	# link_to("Facebooker", "http://rubyforge.org/projects/facebooker", :confirm=>{:title=>"the page says:, :content=>"Go to Facebooker?"})
 	# link_to("Facebooker", "http://rubyforge.org/projects/facebooker", :confirm=>{:title=>"the page says:, :content=>"Go to Facebooker?", :color=>"pink"})
   def confirm_javascript_function_with_facebooker(confirm, fun = nil)
-    if !request_comes_from_facebook?
+    if !respond_to?(:request_comes_from_facebook?) || !request_comes_from_facebook?
       confirm_javascript_function_without_facebooker(confirm)
     else
       if(confirm.is_a?(Hash))
@@ -157,7 +157,7 @@ module ActionView
 	# Dynamically creates a form for link_to with method.  Calls confirm_javascript_function if and 
 	# only if (confirm && method) for link_to
         def method_javascript_function_with_facebooker(method, url = '', href = nil, confirm = nil)
-          if !request_comes_from_facebook?
+          if !respond_to?(:request_comes_from_facebook?) || !request_comes_from_facebook?
             method_javascript_function_without_facebooker(method,url,href)
  	  else
             action = (href && url.size > 0) ? "'#{url}'" : 'a.getHref()'

data/lib/facebooker/rails/helpers/fb_connect.rb

@@ -59,6 +59,7 @@ module Facebooker
 
           content_tag("fb:login-button",nil, options)
         end
+
         def fb_login_and_redirect(url)
           js = update_page do |page|
             page.redirect_to url
@@ -70,16 +71,16 @@ module Facebooker
           content_tag "fb:unconnected-friends-count",nil
         end
         
-        def fb_logout_link(text,url)
+        def fb_logout_link(text,url,*args)
           js = update_page do |page|
             page.call "FB.Connect.logoutAndRedirect",url
           end
-          link_to_function text, js
+          link_to_function text, js, *args
         end
         
-        def fb_user_action(action)
+        def fb_user_action(action, user_message = "", prompt = "", callback = nil)
           update_page do |page|
-            page.call "FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,"FB.RequireConnect.promptConnect"
+            page.call "FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,"FB.RequireConnect.promptConnect",callback,prompt,user_message
           end
         end
         

data/lib/facebooker/session.rb

@@ -6,7 +6,15 @@ module Facebooker
   # other than the logged in user (if that's unallowed)
   class NonSessionUser < StandardError;  end
   class Session
+    
+    #
+    # Raised when a facebook session has expired.  This 
+    # happens when the timeout is reached, or when the
+    # user logs out of facebook
+    # can be handled with:
+    # rescue_from Facebooker::Session::SessionExpired, :with => :some_method_name
     class SessionExpired < StandardError; end
+
     class UnknownError < StandardError; end
     class ServiceUnavailable < StandardError; end
     class MaxRequestsDepleted < StandardError; end
@@ -48,6 +56,9 @@ module Facebooker
     class TooManyUnapprovedPhotosPending < StandardError; end
     class ExtendedPermissionRequired < StandardError; end
     class InvalidFriendList < StandardError; end
+    class UserUnRegistrationFailed < StandardError
+      attr_accessor :failed_users
+    end
     class UserRegistrationFailed < StandardError
       attr_accessor :failed_users
     end

data/lib/facebooker/version.rb

@@ -2,7 +2,7 @@ module Facebooker #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 19
+    TINY  = 22
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/facebooker/logging_test.rb

@@ -19,7 +19,7 @@ class Facebooker::LoggingTest < Test::Unit::TestCase
   end
 
   def test_does_not_crash_outside_rails
-    flexmock(Facebooker.logger, :logger).should_receive(:debug).once.with(String)
+    flexmock(Facebooker.logger, :logger).should_receive(:info).once.with(String)
     Facebooker::Logging.log_fb_api('sample.api.call',
                           {'param1' => true, 'param2' => 'value2'})
   end
@@ -32,7 +32,7 @@ class Facebooker::LoggingTest < Test::Unit::TestCase
   end 
   
   def test_plain_format
-    flexmock(Facebooker.logger, :logger).should_receive(:debug).once.with(
+    flexmock(Facebooker.logger, :logger).should_receive(:info).once.with(
         'sample.api.call (0) param1 = true')
     Facebooker::Logging.log_fb_api('sample.api.call',
                           {'param1' => true})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mmangino-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors: 
 - Chad Fowler
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-26 00:00:00 -07:00
+date: 2009-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,23 +32,20 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- CHANGELOG.txt
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
-- TODO.txt
+- README.rdoc
+- TODO.rdoc
 - test/fixtures/multipart_post_body_with_only_parameters.txt
 - test/fixtures/multipart_post_body_with_single_file.txt
 - test/fixtures/multipart_post_body_with_single_file_that_has_nil_key.txt
 files: 
-- CHANGELOG.txt
-- COPYING
-- History.txt
-- Manifest.txt
-- README
-- README.txt
+- CHANGELOG.rdoc
+- COPYING.rdoc
+- History.rdoc
+- README.rdoc
 - Rakefile
-- TODO.txt
+- TODO.rdoc
 - generators/publisher/publisher_generator.rb
 - generators/facebook/facebook_generator.rb
 - generators/facebook/templates/config/facebooker.yml
@@ -168,12 +165,13 @@ files:
 - test/rails_test_helper.rb
 - test/test_helper.rb
 - test/facebooker/mobile_test.rb
+- Manifest.txt
 has_rdoc: true
 homepage: 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/README

@@ -1,46 +0,0 @@
-Copyright (c) 2007 Chad Fowler, Patrick Ewing
-
-= Facebooker
-
-Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://developer.facebook.com].  Its goals are:
-
-* Idiomatic Ruby
-* No dependencies outside of the Ruby standard library (This is true with Rails 2.1. Previous Rails versions require the JSON gem)
-* Concrete classes and methods modeling the Facebook data, so it's easy for a Rubyist to understand what's available
-* Well tested
-
-= Installing (Non Rails)
-
-The best way is:
-
-  gem install facebooker
-
-If, for some reason, you can't/won't use RubyGems, you can do:
-
-  (sudo) ruby setup.rb
-
-= Installing (Rails)
-
-Facebooker can be installed as a Rails plugin by:
-
-  script/plugin install git://github.com/mmangino/facebooker.git
-
-If you don't have git, the plugin can be downloaded from http://github.com/mmangino/facebooker/tarball/master
-
-Once the plugin is installed, you will need to configure your Facebook app in config/facebooker.yml. 
-
-Your application users will need to have added the application in facebook to access all of facebooker's features. You enforce this by adding
-
-  ensure_application_is_installed_by_facebook_user  
-
-to your application controller.
-
-
-== Work in Progress
-
-I'm not saying it meets its goals fully yet.  Please help.  I'm especially interested in feedback and criticism re: Ruby style and design and testing.  RCov has the library (at the time of this writing) at 100% coverage.  I take that with a grain of salt, but it's a good start.
-
-== Contribute
-
-Please visit the {GitHub page}[http://github.com/mmangino/facebooker/tree/] to get the latest source via svn, write some tests, add/fix features, and submit a patch via the tracker.  If you submit a good patch, it's likely that I'll add you to the project for commit access if you want to be added. 
-