facebooker 1.0.64 → 1.0.65

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.64"
+  s.version = "1.0.65"
 
   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{2010-02-26}
+  s.date = %q{2010-03-17}
   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/models/education_info.rb

@@ -6,6 +6,6 @@ module Facebooker
     end
     
     include Model
-    attr_accessor :concentrations, :name, :year, :degree
+    attr_accessor :concentrations, :name, :year, :degree, :school_type
   end
 end

data/lib/facebooker/models/user.rb

@@ -9,7 +9,7 @@ module Facebooker
     include Model
     class Status
       include Model
-      attr_accessor :message, :time, :status_id
+      attr_accessor :uid, :message, :time, :status_id, :source
     end
     FIELDS = [:status, :political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :birthday_date, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email, :email_hashes, :allowed_restrictions, :pic_with_logo, :pic_big_with_logo, :pic_small_with_logo, :pic_square_with_logo, :online_presence, :verified, :profile_blurb, :username, :website, :is_blocked, :family, :email]
     STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url, :proxied_email, :email]
@@ -297,6 +297,17 @@ module Facebooker
       end
     end
 
+    ###
+    # Retrieve user's facebook stream
+    # See http://wiki.developers.facebook.com/index.php/Stream.get for options
+    #
+
+    def stream(options = {})
+      @stream = session.post('facebook.stream.get', prepare_get_stream_options(options)) do |response|
+        response
+      end
+    end
+
     def create_album(params)
       @album = session.post('facebook.photos.createAlbum', params) {|response| Album.from_hash(response)}
     end
@@ -532,24 +543,12 @@ module Facebooker
     
     # Facebooker::User.dashboard_multi_increment_count ['1234', '5678']
     def self.dashboard_multi_increment_count(*uids)
-      Facebooker::Session.create.post("facebook.dashboard.multiIncrementCount", :uids => uids.flatten.to_json)
+      Facebooker::Session.create.post("facebook.dashboard.multiIncrementCount", :uids => uids.flatten.collect{ |uid| uid.to_s }.to_json)
     end
     
     # Facebooker::User.dashboard_multi_decrement_count ['1234', '5678']
     def self.dashboard_multi_decrement_count(*uids)
-      Facebooker::Session.create.post("facebook.dashboard.multiDecrementCount", :uids => uids.flatten.to_json)
-    end
-    
-    def self.dashboard_multi_set_count(ids)
-      Facebooker::Session.create.post("facebook.dashboard.multiSetCount", :ids => ids.to_json)
-    end
-    
-    def self.dashboard_multi_increment_count(uids)
-      Facebooker::Session.create.post("facebook.dashboard.multiIncrementCount", :uids => uids.to_json)
-    end
-    
-    def self.dashboard_multi_decrement_count(uids)
-      Facebooker::Session.create.post("facebook.dashboard.multiDecrementCount", :uids => uids.to_json)
+      Facebooker::Session.create.post("facebook.dashboard.multiDecrementCount", :uids => uids.flatten.collect{ |uid| uid.to_s }.to_json)
     end
     
     
@@ -730,5 +729,17 @@ module Facebooker
       (uid << 32) + (aid & 0xFFFFFFFF)
     end
 
+    def prepare_get_stream_options(options)
+        opts = {}
+
+        opts[:viewer_id] = self.id
+        opts[:source_ids] = options[:source_ids] if options[:source_ids]
+        opts[:start_time] = options[:start_time].to_i if options[:start_time]
+        opts[:end_time] = options[:end_time].to_i if options[:end_time]
+        opts[:limit] = options[:limit] if options[:limit].is_a?(Integer)
+        opts[:metadata] = Facebooker.json_encode(options[:metadata]) if options[:metadata]
+        opts
+      end
+
   end
 end

data/lib/facebooker/parser.rb

@@ -296,6 +296,12 @@ module Facebooker
     end
   end
 
+  class UploadNativeStrings < Parser#:nodoc:
+    def self.process(data)
+      element('intl_uploadNativeStrings_response', data).content.strip
+    end
+  end
+
   class PublishActionOfUser < Parser#:nodoc:
     def self.process(data)
       element('feed_publishActionOfUser_response', data).content.strip
@@ -962,7 +968,8 @@ module Facebooker
       'facebook.dashboard.multiClearNews' => DashboardMultiClearNews,
       'facebook.dashboard.publishActivity' => DashboardPublishActivity,
       'facebook.dashboard.removeActivity' => DashboardRemoveActivity,
-      'facebook.dashboard.getActivity' => DashboardGetActivity
+      'facebook.dashboard.getActivity' => DashboardGetActivity,
+      'facebook.intl.uploadNativeStrings' => UploadNativeStrings
     }
   end
 end

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

@@ -42,6 +42,7 @@ module Facebooker
              init_string = <<-FBML
              #{case options[:js]
                when :jquery then "jQuery(document).ready("
+               when :mootools then "window.addEvent('domready',"
                when :dojo then "dojo.addOnLoad("
                else "Element.observe(window,'load',"
                end} function() {
@@ -65,37 +66,64 @@ module Facebooker
           end
         end
 
+        #
         # Render an <fb:login-button> element
         #
         # ==== Examples
         #
-        # <%= fb_login_button%>
-        # => <fb:login-button></fb:login-button>
+        #   <%= fb_login_button%>
+        #   => <fb:login-button></fb:login-button>
         #
         # Specifying a javascript callback
         #
-        # <%= fb_login_button 'update_something();'%>
-        # => <fb:login-button onlogin='update_something();'></fb:login-button>
+        #   <%= fb_login_button 'update_something();'%>
+        #   => <fb:login-button onlogin='update_something();'></fb:login-button>
         #
         # Adding options <em>See:</em> http://wiki.developers.facebook.com/index.php/Fb:login-button
         #
-        # <%= fb_login_button 'update_something();', :size => :small, :background => :dark%>
-        # => <fb:login-button background='dark' onlogin='update_something();' size='small'></fb:login-button>
+        #   <%= fb_login_button 'update_something();', :size => :small, :background => :dark%>
+        #   => <fb:login-button background='dark' onlogin='update_something();' size='small'></fb:login-button>
+        #
+        # :text option allows you to set the text value of the
+        # button.  *A note!* This will only do what you expect it to do
+        # if you set :v => 2 as well.
         #
+        #   <%= fb_login_button 'update_somethign();',
+        #        :text => 'Loginto Facebook', :v => 2 %>
+        #   => <fb:login-button v='2' onlogin='update_something();'>Login to Facebook</fb:login-button>
         def fb_login_button(*args)
 
           callback = args.first
           options = args[1] || {}
-          options.merge!(:onlogin=>callback)if callback
+          options.merge!(:onlogin=>callback) if callback
+
+          text = options.delete(:text)
 
-          content_tag("fb:login-button",nil, options)
+          content_tag("fb:login-button",text, options)
         end
 
+        #
+        # Render an <fb:login-button> element, similar to
+        # fb_login_button. Adds a js redirect to the onlogin event via rjs.
+        #
+        # ==== Examples
+        #
+        #   fb_login_and_redirect '/other_page'
+        #   => <fb:login-button onlogin="window.location.href = &quot;/other_page&quot;;"></fb:login-button>
+        #
+        # Like #fb_login_button, this also supports the :text option
+        #
+        #   fb_login_and_redirect '/other_page', :text => "Login with Facebook", :v => '2'
+        #   => <fb:login-button onlogin="window.location.href = &quot;/other_page&quot;;" v="2">Login with Facebook</fb:login-button>
+        #
         def fb_login_and_redirect(url, options = {})
           js = update_page do |page|
             page.redirect_to url
           end
-          content_tag("fb:login-button",nil,options.merge(:onlogin=>js))
+
+          text = options.delete(:text)
+          
+          content_tag("fb:login-button",text,options.merge(:onlogin=>js))
         end
 
         def fb_unconnected_friends_count

data/lib/facebooker/rails/publisher.rb

@@ -108,6 +108,7 @@ module Facebooker
         @from                 = nil
         @full_story_template  = nil
         @recipients           = nil
+        @action_links         = nil
         @controller           = PublisherController.new(self)
         @action_links         = nil
       end
@@ -338,7 +339,7 @@ module Facebooker
         if links.blank?
           @action_links
         else
-          @action_links = links
+          @action_links = *links
         end
       end
       
@@ -521,6 +522,14 @@ module Facebooker
           end
         end
         
+        def respond_to?(method_symbol, include_private=false)
+          if match = /^(create|deliver|register)_([_a-z]\w*)/.match(method_symbol.to_s)
+            instance_methods.include?(match[2])
+          else
+            super(method_symbol, include_private)
+          end
+        end
+        
         def method_missing(name,*args)
           should_send = false
           method = ''

data/lib/facebooker/service.rb

@@ -7,6 +7,7 @@ module Facebooker
       @api_key = api_key
     end
 
+    @active_service = nil
     def self.active_service
       unless @active_service
         if Facebooker.use_curl?

data/lib/facebooker/session.rb

@@ -533,6 +533,21 @@ module Facebooker
       post("facebook.feed.publishUserAction", parameters)
     end
 
+    ##
+    # Upload strings in native locale to facebook for translations.
+    #
+    # e.g. facebook_session.upload_native_strings([:text => "Welcome {user}", :description => "Welcome message to currently logged in user."])
+    # returns the number of strings uploaded
+    #
+    # See http://wiki.developers.facebook.com/index.php/Intl.uploadNativeStrings for method options
+    #
+    def upload_native_strings(native_strings)
+      raise ArgumentError, "You must provide strings to upload" if native_strings.nil?
+
+      post('facebook.intl.uploadNativeStrings', :native_strings => Facebooker.json_encode(native_strings)) do |response|
+        response
+      end
+    end
 
     ##
     # Send email to as many as 100 users at a time

data/lib/facebooker/version.rb

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

data/test/facebooker/models/user_test.rb

@@ -439,7 +439,17 @@ class Facebooker::UserTest < Test::Unit::TestCase
     assert_equal({ '1234' => '11', '4321' => '22' }, Facebooker::User.dashboard_multi_get_count(['1234', '4321']))
   end
   
-  def test_can_dashboard_multi_increment_count
+  def test_can_dashboard_multi_increment_count_with_single_uid
+    Facebooker::Session.any_instance.expects(:post).with('facebook.dashboard.multiIncrementCount', :uids => ['8675309'].to_json)
+    Facebooker::User.dashboard_multi_increment_count 8675309
+  end
+  
+  def test_can_dashboard_multi_increment_count_with_multiple_uids
+    Facebooker::Session.any_instance.expects(:post).with('facebook.dashboard.multiIncrementCount', :uids => ['8675309', '555'].to_json)
+    Facebooker::User.dashboard_multi_increment_count 8675309, 555
+  end
+  
+  def test_can_dashboard_multi_increment_count_with_array_of_uids
     Facebooker::Session.any_instance.expects(:post).with('facebook.dashboard.multiIncrementCount', :uids => ['1234', '4321'].to_json)
     Facebooker::User.dashboard_multi_increment_count ['1234', '4321']
   end
@@ -449,12 +459,17 @@ class Facebooker::UserTest < Test::Unit::TestCase
     assert_equal({ '1234' => '1', '4321' => '1' }, Facebooker::User.dashboard_multi_increment_count(['1234', '4321']))
   end
   
-  def test_can_dashboard_multi_decrement_count
-    Facebooker::Session.any_instance.expects(:post).with('facebook.dashboard.multiDecrementCount', :uids => ['1234', '4321'].to_json)
-    Facebooker::User.dashboard_multi_decrement_count ['1234', '4321']
+  def test_can_dashboard_multi_decrement_count_with_single_uid
+    Facebooker::Session.any_instance.expects(:post).with('facebook.dashboard.multiDecrementCount', :uids => ['99999999'].to_json)
+    Facebooker::User.dashboard_multi_decrement_count 99999999
+  end
+  
+  def test_can_dashboard_multi_decrement_count_with_multiple_uids
+    Facebooker::Session.any_instance.expects(:post).with('facebook.dashboard.multiDecrementCount', :uids => ['1111', '2222'].to_json)
+    Facebooker::User.dashboard_multi_decrement_count 1111, 2222
   end
 
-  def test_parse_dashboard_multi_decrement_count
+  def test_parse_dashboard_multi_decrement_count_with_array_of_uids
     expect_http_posts_with_responses(dashboard_multi_decrement_count_xml)
     assert_equal({ '1234' => '1', '4321' => '1' }, Facebooker::User.dashboard_multi_decrement_count(['1234', '4321']))
   end

data/test/facebooker/rails/publisher_test.rb

@@ -232,6 +232,12 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
   def teardown
     super
   end
+  
+  def test_respond_to
+    assert TestPublisher.respond_to?(:create_action)
+    assert TestPublisher.respond_to?(:deliver_action)
+    assert TestPublisher.respond_to?(:register_action)
+  end
 
   def test_create_action
     action=TestPublisher.create_action(@user)

data/test/facebooker/rails_integration_test.rb

@@ -1032,6 +1032,8 @@ class RailsHelperTest < Test::Unit::TestCase
   
   def test_fb_login_button
     assert_equal "<fb:login-button onlogin=\"somejs\"></fb:login-button>",@h.fb_login_button("somejs")
+
+    assert_equal "<fb:login-button onlogin=\"somejs\">Custom</fb:login-button>",@h.fb_login_button("somejs", :text => 'Custom')
   end
   
   def test_init_fb_connect_no_features
@@ -1076,6 +1078,10 @@ class RailsHelperTest < Test::Unit::TestCase
     assert ! @h.init_fb_connect(:js => :jquery).match(/\$\(document\).ready\(/)
   end
   
+  def test_init_fb_connect_with_options_js_mootools
+    assert @h.init_fb_connect("XFBML", :js => :mootools).match(/window.addEvent\('domready',/)
+  end
+  
   def test_init_fb_connect_with_features_and_options_js_jquery
     assert @h.init_fb_connect("XFBML", :js => :jquery).match(/XFBML.*/)
     assert @h.init_fb_connect("XFBML", :js => :jquery).match(/\jQuery\(document\).ready\(/)
@@ -1092,6 +1098,8 @@ class RailsHelperTest < Test::Unit::TestCase
   
   def test_fb_login_and_redirect
     assert_equal @h.fb_login_and_redirect("/path"),"<fb:login-button onlogin=\"window.location.href = &quot;/path&quot;;\"></fb:login-button>"
+    
+    assert_equal @h.fb_login_and_redirect("/path", :text => 'foo'),"<fb:login-button onlogin=\"window.location.href = &quot;/path&quot;;\">foo</fb:login-button>"
   end
   
   def test_fb_logout_link

data/test/facebooker_test.rb

@@ -273,6 +273,13 @@ class TestFacebooker < Test::Unit::TestCase
     assert_equal('The bbc home page', stream[:posts].first['message'])
   end
 
+  def test_can_get_user_stream
+    expect_http_posts_with_responses(example_user_stream_xml)
+    stream = @session.user.stream
+    assert stream[:albums].empty?
+    assert_equal('The bbc home page', stream[:posts].first['message'])
+  end
+
   def test_can_create_album
     expect_http_posts_with_responses(example_new_album_xml)
     assert_equal "My Empty Album", @session.user.create_album(:name => "My Empty Album", :location => "Limboland").name
@@ -285,6 +292,11 @@ class TestFacebooker < Test::Unit::TestCase
     assert_equal "Under the sunset", @session.user.upload_photo(f).caption
   end
 
+  def test_can_upload_native_strings
+    expect_http_posts_with_responses(example_upload_native_string_xml)
+    assert_equal "1", @session.upload_native_strings([:text => "Hello!", :description => "A common salutation."])
+  end
+
   def test_can_get_photo_tags
     expect_http_posts_with_responses(example_photo_tags_xml)
     assert_instance_of Facebooker::Tag, @session.get_tags(:pids => 97503428461115571 ).first
@@ -1154,6 +1166,13 @@ class TestFacebooker < Test::Unit::TestCase
   </video_upload_response>
     XML
   end
+
+  def example_upload_native_string_xml
+    <<-XML
+    <?xml version="1.0" encoding="UTF-8"?>
+    <intl_uploadNativeStrings_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</intl_uploadNativeStrings_response>
+    XML
+  end
   
   def example_revoke_authorization_true
     "1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.64
+  version: 1.0.65
 platform: ruby
 authors: 
 - Chad Fowler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 -05:00
+date: 2010-03-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency