facebooker 1.0.48 → 1.0.50

data/Rakefile

@@ -23,7 +23,7 @@ HOE = Hoe.spec('facebooker') do
   self.readme_file   = 'README.rdoc'
   self.history_file  = 'CHANGELOG.rdoc'
   self.remote_rdoc_dir = '' # Release to root
-  self.test_globs = 'test/**/*_test.rb'
+  self.test_globs = ['test/**/*_test.rb']
   extra_deps << ['json', '>= 1.0.0']
   self.extra_rdoc_files  = FileList['*.rdoc']
 end

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.48"
+  s.version = "1.0.50"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Fowler", "Patrick Ewing", "Mike Mangino", "Shane Vitarana", "Corey Innis", "Mike Mangino"]
-  s.date = %q{2009-08-26}
+  s.date = %q{2009-09-08}
   s.description = %q{Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API].  Its goals are:
 
 * Idiomatic Ruby

data/lib/facebooker.rb

@@ -164,7 +164,7 @@ module Facebooker
       @timeout
     end
 
-    [:api_key,:secret_key, :www_server_base_url,:login_url_base,:install_url_base,:permission_url_base,:api_rest_path,:api_server_base,:api_server_base_url,:canvas_server_base, :video_server_base].each do |delegated_method|
+    [:api_key,:secret_key, :www_server_base_url,:login_url_base,:install_url_base,:permission_url_base,:connect_permission_url_base,:api_rest_path,:api_server_base,:api_server_base_url,:canvas_server_base, :video_server_base].each do |delegated_method|
       define_method(delegated_method){ return current_adapter.send(delegated_method)}
     end
 

data/lib/facebooker/adapters/facebook_adapter.rb

@@ -45,8 +45,12 @@ module Facebooker
       "http://#{www_server_base_url}/install.php?api_key=#{api_key}&v=1.0"
     end
 
+    def connect_permission_url_base
+      "http://#{www_server_base_url}/connect/prompt_permissions.php?api_key=#{api_key}&v=1.0"      
+    end
+
     def permission_url_base
-      "http://#{www_server_base_url}/connect/prompt_permissions.php?api_key=#{api_key}&v=1.0"
+      "http://#{www_server_base_url}/authorize.php?api_key=#{api_key}&v=1.0"
     end
     
   end

data/lib/facebooker/models/group.rb

@@ -8,7 +8,7 @@ module Facebooker
       attr_accessor :position, :gid, :uid
     end
     include Model
-    attr_accessor :pic, :pic_small, :pic_big, :name, :creator, :recent_news, :update_time, :group_subtype, :group_type, :website, :office, :description, :venue, :nid
+    attr_accessor :pic, :pic_small, :pic_big, :name, :creator, :recent_news, :update_time, :group_subtype, :group_type, :website, :office, :description, :venue, :nid, :privacy
 
     id_is :gid
 

data/lib/facebooker/models/user.rb

@@ -137,21 +137,25 @@ module Facebooker
     #     :text => 'my website',
     #     :href => 'http://tenderlovemaking.com/'
     #   ])
-    def publish_to target, options = {}
-      
-      attachment = options[:attachment]
-      links = options[:action_links]
-      @session.post('facebook.stream.publish',
-                    { :uid        => self.id,
-                      :target_id  => target.id,
-                      :message    => options[:message],
-                      :attachment => attachment && Facebooker.json_encode(attachment),
-                      :action_links => links && Facebooker.json_encode(links) }, 
-                    false
-                   )
+    def publish_to(target, options = {})
+      @session.post('facebook.stream.publish', prepare_publish_to_options(target, options), false)
+    end
+   
+    # Prepares options for the stream.publish
+    def prepare_publish_to_options(target, options)
+      opts = {:uid          => self.id,
+              :target_id    => target.id,
+              :message      => options[:message]} 
+
+      if(attachment = options[:attachment] && Facebooker.json_encode(options[:attachment]))
+        opts[:attachment] = attachment
+      end
+      if (links = options[:action_links] && Facebooker.json_encode(options[:action_links]))
+        opts[:action_links] = links
+      end
+      opts
     end
     
-    
     ###
     # Publish a comment on a post
     #

data/lib/facebooker/parser.rb

@@ -459,6 +459,12 @@ module Facebooker
       array_of_hashes(element('data_getCookie_response', data), 'cookies')
     end
   end
+  
+  class EventsRsvp < Parser#:nodoc:
+     def self.process(data)
+       element('events_rsvp_response', data).content.strip
+     end
+   end
 
   class EventsGet < Parser#:nodoc:
     def self.process(data)
@@ -662,6 +668,7 @@ module Facebooker
       'facebook.stream.publish' => StreamPublish,
       'facebook.stream.addComment' => StreamAddComment,      
       'facebook.events.get' => EventsGet,
+      'facebook.events.rsvp' => EventsRsvp,
       'facebook.groups.get' => GroupsGet,
       'facebook.events.getMembers' => EventMembersGet,
       'facebook.groups.getMembers' => GroupGetMembers,

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

@@ -33,9 +33,9 @@ module Facebooker
           end
 
           if request.ssl?
-            init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver_ssl.html', #{options[:app_settings]});"
+            init_string = "FB.init('#{Facebooker.api_key}','/xd_receiver_ssl.html', #{options[:app_settings]});"
           else
-            init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver.html', #{options[:app_settings]});"
+            init_string = "FB.init('#{Facebooker.api_key}','/xd_receiver.html', #{options[:app_settings]});"
           end
           unless required_features.blank?
              init_string = <<-FBML

data/lib/facebooker/rails/publisher.rb

@@ -4,7 +4,7 @@ module Facebooker
     # 
     # To use, create a subclass and define methods
     # Each method should start by calling send_as to specify the type of message
-    # Valid options are  :email and :notification, :user_action, :profile, :ref
+    # Valid options are  :email and :notification, :user_action, :profile, :ref, :publish_stream
     # 
     #
     # Below is an example of each type
@@ -78,6 +78,16 @@ module Facebooker
     #       handle "a_ref_handle"
     #   end
     #
+    #     #  Publish a post into the stream on the user's Wall and News Feed.
+    #     def publish_stream(user_with_session_to_use, user_to_update, params)
+    #       send_as :publish_stream
+    #       from  user_with_session_to_use
+    #       target user_to_update
+    #       attachment params[:attachment]
+    #       message params[:message]
+    #       action_links params[:action_links]
+    #     end
+    #
     #
     # To send a message, use ActionMailer like semantics
     #    TestPublisher.deliver_action(@user)
@@ -250,6 +260,13 @@ module Facebooker
         end
       end
 
+      class PublishStream
+        attr_accessor :target
+        attr_accessor :attachment
+        attr_accessor :action_links
+        attr_accessor :message
+      end
+
       cattr_accessor :ignore_errors
       attr_accessor :_body
 
@@ -288,6 +305,8 @@ module Facebooker
           Ref.new
         when :user_action
           UserAction.new
+        when :publish_stream
+          PublishStream.new
         else
           raise UnknownBodyType.new("Unknown type to publish")
         end
@@ -399,6 +418,8 @@ module Facebooker
           Facebooker::Session.create.server_cache.set_ref_handle(_body.handle,_body.fbml)
         when UserAction
           @from.session.publish_user_action(_body.template_id,_body.data_hash,_body.target_ids,_body.body_general,_body.story_size)
+        when PublishStream
+         @from.publish_to(_body.target, {:attachment => _body.attachment, :action_links => @action_links, :message => _body.message })
         else
           raise UnspecifiedBodyType.new("You must specify a valid send_as")
         end
@@ -529,7 +550,7 @@ module Facebooker
           args.each do |arg|
             case arg
             when Symbol,String
-              add_template_helper("#{arg.to_s.classify}Helper".constantize)
+              add_template_helper("#{arg.to_s.camelcase}Helper".constantize)
             when Module
               add_template_helper(arg)
             end

data/lib/facebooker/session.rb

@@ -127,6 +127,13 @@ module Facebooker
       "#{Facebooker.permission_url_base}#{options.join}"
     end
 
+    def connect_permission_url(permission,options={})
+      options = default_login_url_options.merge(options)
+      options = add_next_parameters(options)
+      options << "&ext_perm=#{permission}"
+      "#{Facebooker.connect_permission_url_base}#{options.join}"
+    end
+
     def install_url_optional_parameters(options)
       optional_parameters = []      
       optional_parameters += add_next_parameters(options)

data/lib/facebooker/version.rb

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

data/test/facebooker/models/user_test.rb

@@ -130,6 +130,14 @@ class Facebooker::UserTest < Test::Unit::TestCase
     assert_equal "2357384227378429949", photos.first.aid
   end
 
+  def test_prepare_publish_to_options_pass_only_neccessary_parameters
+    options = @user.prepare_publish_to_options(@user, {:message => 'Hey there', :action_links => [:text => 'Link', :href => 'http://example.com']})
+    assert_equal(options[:uid], @user.uid)
+    assert_equal(options[:target_id], @user.id)
+    assert_equal(options[:message], 'Hey there')
+    assert_nil(options[:attachment])
+    assert_equal(options[:action_links], [:text => 'Link', :href => 'http://example.com'].to_json )
+  end
   def test_publish_to
     @user = Facebooker::User.new(548871286, @session)
     expect_http_posts_with_responses(example_profile_publish_to_get_xml)
@@ -369,4 +377,13 @@ class Facebooker::UserTest < Test::Unit::TestCase
 <stream_addComment_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/ http://api.facebook.com/1.0/facebook.xsd">703826862_78463536863</stream_addComment_response>
     eoxml
   end  
+  
+  def example_events_rsvp_xml
+      <<-E
+      <?xml version="1.0" encoding="UTF-8"?>
+      <events_rsvp_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+          xsi:schemaLocation="http://api.facebook.com/1.0/ http://api.facebook.com/1.0/facebook.xsd">1
+      </events_rsvp_response>
+    E
+  end
 end

data/test/facebooker/rails/publisher_test.rb

@@ -137,6 +137,23 @@ class TestPublisher < Facebooker::Rails::Publisher
     recipients to
   end
 
+  def publish_post_to_own_stream(user)
+    send_as :publish_stream
+    from  user
+    target user
+    attachment({:name => "Facebooker", :href => "http://www.exampple.com"})
+    message "Posting post to own stream"
+    action_links([{:text => "Action Link", :href => "http://www.example.com/action_link"}])
+  end
+
+  def publish_post_to_friends_stream(from, to)
+    send_as :publish_stream
+    from  from
+    target to
+    attachment({:name => "Facebooker", :href => "http://www.exampple.com"})
+    message "Posting post to friends stream"
+    action_links([{:text => "Action Link", :href => "http://www.example.com/action_link"}])
+  end
 end
 
 class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
@@ -413,6 +430,20 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     }
   end
 
+  def test_publish_post_to_own_stream
+    @user = Facebooker::User.new
+    @user.expects(:publish_to).with(@user, has_entry(:attachment=>instance_of(Hash)))
+
+    TestPublisher.deliver_publish_post_to_own_stream(@user)
+  end
+
+  def test_publish_post_to_friends_stream
+    @from_user = Facebooker::User.new
+    @to_user = Facebooker::User.new
+    @from_user.expects(:publish_to).with(@to_user, has_entry(:action_links=>instance_of(Array)))
+
+    TestPublisher.deliver_publish_post_to_friends_stream(@from_user, @to_user)
+  end
 
   def test_keeps_class_method_missing
     assert_raises(NoMethodError) {

data/test/facebooker/session_test.rb

@@ -24,7 +24,7 @@ class Facebooker::SessionTest < Test::Unit::TestCase
 
   def test_permission_url_returns_correct_url_and_parameters
     fb_url = "http://www.facebook.com/connect/prompt_permissions.php?api_key=#{ENV['FACEBOOK_API_KEY']}&v=1.0&next=next_url&ext_perm=publish_stream,email"
-    url = Facebooker::Session.new(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']).permission_url('publish_stream,email', {:next => 'next_url'})
+    url = Facebooker::Session.new(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']).connect_permission_url('publish_stream,email', {:next => 'next_url'})
     assert_equal url, fb_url
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.48
+  version: 1.0.50
 platform: ruby
 authors: 
 - Chad Fowler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -04:00
+date: 2009-09-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency