RubyGems - facebooker - Versions diffs - 1.0.65 → 1.0.66 - Mend

facebooker 1.0.65 → 1.0.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/facebooker.gemspec +2 -2
data/generators/xd_receiver/templates/xd_receiver.html +2 -2
data/lib/facebooker/models/user.rb +6 -0
data/lib/facebooker/parser.rb +24 -34
data/lib/facebooker/rails/helpers/fb_connect.rb +6 -3
data/lib/facebooker/version.rb +1 -1
data/test/facebooker/application_test.rb +1 -1
data/test/facebooker/models/user_test.rb +6 -7
data/test/facebooker_test.rb +11 -2
metadata +2 -2

data/facebooker.gemspec CHANGED

@@ -2,11 +2,11 @@
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.65"
+  s.version = "1.0.66"
   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-03-17}
+  s.date = %q{2010-03-24}
   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/generators/xd_receiver/templates/xd_receiver.html CHANGED

@@ -5,6 +5,6 @@
     <title>Cross-Domain Receiver Page</title>
 </head>
 <body>
-    <script src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.debug.js" type="text/javascript"></script>
+    <script src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.js" type="text/javascript"></script>
 </body>
-</html>
+</html>

data/lib/facebooker/models/user.rb CHANGED

@@ -477,6 +477,12 @@ module Facebooker
       ext_perms.all?{|p| has_permission?(p)}
     end
+    ##
+    ## Revoke any extended permission given by a user
+    def revoke_permission(ext_perm)
+      session.post('facebook.auth.revokeExtendedPermission', { :perm => ext_perm, :uid => uid }, false)
+    end
     ##
     # Convenience method to send email to the current user
     def send_email(subject, text=nil, fbml=nil)

data/lib/facebooker/parser.rb CHANGED

@@ -109,34 +109,35 @@ module Facebooker
       end #do |hash, child|
     end
-    def self.hash_by_key_or_value_for(element)
+    def self.hash_by_key_or_value_for(element, convert_1_to_true=false)
       if element.children.size == 0
         { element['key'] => nil }
       elsif element.children.size == 1 && element.children.first.text?
-        { element['key'] => element.content.strip }
+        { element['key'] => (convert_1_to_true ? element.content.strip == '1' : element.content.strip) }
       else
-        hashinate_by_key(element)
+        hashinate_by_key(element, convert_1_to_true)
       end
     end
     # A modification to hashinate. The new dashboard API returns XML in a different format than
     # the other calls.  What used to be the element name has become an attribute called "key".
-    def self.hashinate_by_key(response_element)
+    def self.hashinate_by_key(response_element, convert_1_to_true=false)
       response_element.children.reject{|c| c.text? }.inject({}) do |hash, child|
         # If the node hasn't any child, and is not a list, we want empty strings, not empty hashes,
         #   except if attributes['nil'] == true
         hash[child['key']] =
         if (child['nil'] == 'true')
           nil
         elsif (child.children.size == 1 && child.children.first.text?) || (child.children.size == 0 && child['list'] != 'true')
-          anonymous_field_from(child, hash) || child.content.strip
-        elsif child['list'] == 'true' && child.children.all? { |subchild| subchild['key'].nil? }
-          child.children.reject{|c| c.text? }.map { |subchild| hash_by_key_or_value_for(subchild)}
+          anonymous_field_from(child, hash) || (convert_1_to_true ? child.content.strip == '1' : child.content.strip)
+        elsif child['list'] == 'true' && child.children.reject {|subchild| subchild.text?}.all? { |subchild| !subchild.text? && subchild['key'].nil? }
+          child.children.reject{|c| c.text? }.map { |subchild| hash_by_key_or_value_for(subchild, convert_1_to_true)}
         elsif child['list'] == 'true'
-          hash_by_key_or_value_for(child)
+          hash_by_key_or_value_for(child, convert_1_to_true)
         else
           child.children.reject{|c| c.text? }.inject({}) do |subhash, subchild|
-            subhash[subchild['key']] = hash_by_key_or_value_for(subchild)
+            subhash[subchild['key']] = hash_by_key_or_value_for(subchild, convert_1_to_true)
             subhash
           end
         end
@@ -164,6 +165,12 @@ module Facebooker
     end
   end
+  class RevokeExtendedPermission < Parser#:nodoc:
+    def self.process(data)
+      booleanize(element('auth_revokeExtendedPermission_response', data).content.strip)
+    end
+  end
   class CreateToken < Parser#:nodoc:
     def self.process(data)
       element('auth_createToken_response', data).content.strip
@@ -711,40 +718,22 @@ module Facebooker
   class DashboardMultiSetCount < Parser
     def self.process(data)
-      hashinate_by_key(element('dashboard_multiSetCount_response', data))
+      hashinate_by_key(element('dashboard_multiSetCount_response', data), true)
     end
   end
   class DashboardMultiIncrementCount < Parser
     def self.process(data)
-      hashinate_by_key(element('dashboard_multiIncrementCount_response', data))
+      hashinate_by_key(element('dashboard_multiIncrementCount_response', data), true)
     end
   end
   class DashboardMultiDecrementCount < Parser
     def self.process(data)
-      hashinate_by_key(element('dashboard_multiDecrementCount_response', data))
+      hashinate_by_key(element('dashboard_multiDecrementCount_response', data), true)
     end
   end
-  class DashboardMultiSetCount < Parser
-     def self.process(data)
-       hashinate_by_key(element('dashboard_multiSetCount_response', data))
-     end
-   end
-   class DashboardMultiIncrementCount < Parser
-     def self.process(data)
-       hashinate_by_key(element('dashboard_multiIncrementCount_response', data))
-     end
-   end
-   class DashboardMultiDecrementCount < Parser
-     def self.process(data)
-       hashinate_by_key(element('dashboard_multiDecrementCount_response', data))
-     end
-   end
   class DashboardAddGlobalNews < Parser
     def self.process(data)
       element('dashboard_addGlobalNews_response', data).content.strip
@@ -760,7 +749,7 @@ module Facebooker
   class DashboardClearGlobalNews < Parser
     def self.process(data)
-      hashinate_by_key(element('dashboard_clearGlobalNews_response', data))
+      hashinate_by_key(element('dashboard_clearGlobalNews_response', data), true)
     end
   end
@@ -778,7 +767,7 @@ module Facebooker
   class DashboardClearNews < Parser
     def self.process(data)
-      hashinate_by_key(element('dashboard_clearNews_response', data))
+      hashinate_by_key(element('dashboard_clearNews_response', data), true)
     end
   end
@@ -790,7 +779,7 @@ module Facebooker
   class DashboardMultiClearNews < Parser
     def self.process(data)
-      hashinate_by_key(element('dashboard_multiClearNews_response', data))
+      hashinate_by_key(element('dashboard_multiClearNews_response', data), true)
     end
   end
@@ -808,7 +797,7 @@ module Facebooker
   class DashboardRemoveActivity < Parser
     def self.process(data)
-      hashinate_by_key(element('dashboard_removeActivity_response', data))
+      hashinate_by_key(element('dashboard_removeActivity_response', data), true)
     end
   end
@@ -875,6 +864,7 @@ module Facebooker
   class Parser
     PARSERS = {
       'facebook.auth.revokeAuthorization' => RevokeAuthorization,
+      'facebook.auth.revokeExtendedPermission' => RevokeExtendedPermission,
       'facebook.auth.createToken' => CreateToken,
       'facebook.auth.getSession' => GetSession,
       'facebook.connect.registerUsers' => RegisterUsers,

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

@@ -20,14 +20,18 @@ module Facebooker
         # and Rails' Hash#to_json always quotes strings so there is no way to indicate when the value should be a javascript function.
         # For this reason :app_settings needs to be a string that is valid JSON (including the {}'s).
         #
-        def init_fb_connect(*required_features,&proc)
+        def init_fb_connect(*required_features, &proc)
+          init_fb_connect_with_options({},*required_features, &proc)
+        end
+        def init_fb_connect_with_options(options = {},*required_features, &proc)
           additions = ""
           if block_given?
             additions = capture(&proc)
           end
           # Yes, app_settings is set to a string of an empty JSON element. That's intentional.
-          options = {:js => :prototype, :app_settings => '{}'}
+          options = options.merge({:app_settings => '{}'})
           if required_features.last.is_a?(Hash)
             options.merge!(required_features.pop.symbolize_keys)
@@ -42,7 +46,6 @@ 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() {

data/lib/facebooker/version.rb CHANGED

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

data/test/facebooker/application_test.rb CHANGED

@@ -41,7 +41,7 @@ class Facebooker::ApplicationTest < Test::Unit::TestCase
   def test_can_parse_global_news
     expect_http_posts_with_responses(clear_global_news_xml)
-    assert_equal({"342345290762"=>"1"}, @session.application.clear_global_news('342345290762'))
+    assert_equal({"342345290762"=>true}, @session.application.clear_global_news('342345290762'))
   end
   private

data/test/facebooker/models/user_test.rb CHANGED

@@ -356,7 +356,6 @@ class Facebooker::UserTest < Test::Unit::TestCase
   def test_parse_increment_dashboard_count
     expect_http_posts_with_responses(dashboard_increment_count_xml)
-    debugger
     assert_equal true, @user.dashboard_increment_count
   end
@@ -426,7 +425,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   def test_parse_dashboard_multi_set_count
     expect_http_posts_with_responses(dashboard_multi_set_count_xml)
-    assert_equal({ '1234' => '1', '4321' => '1' }, Facebooker::User.dashboard_multi_set_count({ '1234' => '11', '5678' => '22' }))
+    assert_equal({ '1234' => true, '4321' => true }, Facebooker::User.dashboard_multi_set_count({ '1234' => '11', '5678' => '22' }))
   end
   def test_can_dashboard_multi_get_count
@@ -456,7 +455,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   def test_parse_dashboard_multi_increment_count
     expect_http_posts_with_responses(dashboard_multi_increment_count_xml)
-    assert_equal({ '1234' => '1', '4321' => '1' }, Facebooker::User.dashboard_multi_increment_count(['1234', '4321']))
+    assert_equal({ '1234' => true, '4321' => true }, Facebooker::User.dashboard_multi_increment_count(['1234', '4321']))
   end
   def test_can_dashboard_multi_decrement_count_with_single_uid
@@ -471,7 +470,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   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']))
+    assert_equal({ '1234' => true, '4321' => true }, Facebooker::User.dashboard_multi_decrement_count(['1234', '4321']))
   end
   # Dashboard
@@ -507,7 +506,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   def test_parse_clear_news
     expect_http_posts_with_responses(clear_news_xml)
-    assert_equal({"362466171040"=>"1"}, @user.clear_news('362466171040'))
+    assert_equal({"362466171040"=>true}, @user.clear_news('362466171040'))
   end
   def test_can_multi_add_news
@@ -537,7 +536,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   def test_parse_multi_clear_news
     expect_http_posts_with_responses(multi_clear_news_xml)
-    assert_equal({"1234"=>{"319103117527"=>"1"}, "4321"=>{"313954287803"=>"1"}}, Facebooker::User.multi_clear_news({"1234"=>["319103117527"], "4321"=>["313954287803"]}))
+    assert_equal({"1234"=>{"319103117527"=>true}, "4321"=>{"313954287803"=>true}}, Facebooker::User.multi_clear_news({"1234"=>["319103117527"], "4321"=>["313954287803"]}))
   end
   def test_can_publish_activity
@@ -567,7 +566,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   def test_parse_remove_activity
     expect_http_posts_with_responses(remove_activity_xml)
-    assert_equal({"342454152268"=>"1"}, @user.remove_activity('123'))
+    assert_equal({"342454152268"=>true}, @user.remove_activity('123'))
   end

data/test/facebooker_test.rb CHANGED

@@ -403,7 +403,10 @@ class TestFacebooker < Test::Unit::TestCase
     assert_equal false, @session.post('facebook.auth.revokeAuthorization', :uid => 123)
   end
+  def test_revoke_extended_permission
+    expect_http_posts_with_responses(example_revoke_extended_permission)
+    assert_equal true, @session.post('facebook.auth.revokeExtendedPermission', {:perm => 'email', :uid => 123}, false)
+  end
   def test_remove_comment_true
     expect_http_posts_with_responses(example_remove_comment_true)
@@ -1182,7 +1185,13 @@ class TestFacebooker < Test::Unit::TestCase
     "0"
   end
+  def example_revoke_extended_permission
+    <<-XML
+    <?xml version="1.0" encoding="UTF-8"?>
+    <auth_revokeExtendedPermission_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</auth_revokeExtendedPermission_response>
+    XML
+  end
   def example_remove_comment_true
     "1"
   end

metadata CHANGED

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