mmangino-facebooker 1.0.12 → 1.0.13

data/TODO.txt

@@ -1,10 +1,4 @@
-[ ] Refactor facebook form builder so erbout won't be deeply nested, causing erubis to break
-[ ] Support missing parameters on methods---most notably authentication-related parameters such as next and canvas
-[ ] Finish FQL Querying
-[ ] Refactor FQL Querying
-[ ] Transform incoming data into appropriate classes (Integers, Dates, etc.)
+[ ] Document session handling. Come up with different cases and paths for the flow and create tests for each
+[ ] Verify that sessions are used only where required. Raise exceptions on User methods that require a session when none is available
+[ ] Refactor setup / Adapter loading code
 
-[x] Specify fields wanted when getting user info (defaults to all now) [shane]
-[x] Create facebooker.yml config file and merge with tunnel.yml [shane]
-[X] Remove facebook prefix from resource routes, making them worth with facebook and regular Rails controllers [mike]
-[X] Use fb_sig_request_method to make facebook routes more Rails-like [mike]

data/lib/facebooker/model.rb

@@ -77,6 +77,18 @@ module Facebooker
           end)
         end
       end      
+
+      def id_is(attribute)
+        class_eval <<-EOS
+        def #{attribute}=(value)
+          @#{attribute} = value.to_i
+        end
+
+        attr_reader #{attribute.inspect}
+        alias :id #{attribute.inspect}
+        alias :id= #{"#{attribute}=".to_sym.inspect}
+        EOS
+      end
     end
     
     ##

data/lib/facebooker/models/event.rb

@@ -22,5 +22,7 @@ module Facebooker
     
     include Model
     attr_accessor :eid, :pic, :pic_small, :pic_big, :name, :creator, :update_time, :description, :tagline, :venue, :host, :event_type, :nid, :location, :end_time, :start_time, :event_subtype
+
+    id_is :eid
   end
 end

data/lib/facebooker/models/friend_list.rb

@@ -6,6 +6,8 @@ module Facebooker
     include Model
     attr_accessor :flid, :name
     
+    id_is :flid
+
     # We need this to be an integer, so do the conversion
     def flid=(f)
       @flid= ( f.nil? ? nil : f.to_i)

data/lib/facebooker/models/group.rb

@@ -10,6 +10,7 @@ module Facebooker
     include Model
     attr_accessor :pic, :pic_small, :pic_big, :name, :creator, :recent_news, :gid, :update_time, :group_subtype, :group_type, :website, :office, :description, :venue, :nid
     
+    id_is :gid
     
     ##
     # Get the full list of members as populated User objects.  First time fetches group members via Facebook API call.  

data/lib/facebooker/models/photo.rb

@@ -6,5 +6,7 @@ module Facebooker
                   :link, :caption, :created,
                   :src, :src_big, :src_small,
                   :story_fbid
+
+    id_is :pid
   end
 end

data/lib/facebooker/models/user.rb

@@ -12,7 +12,6 @@ module Facebooker
     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, :uid, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email,:email_hashes]
     STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url]
-    attr_accessor :session
     populating_attr_accessor *FIELDS
     attr_reader :affiliations
     populating_hash_settable_accessor :current_location, Location
@@ -39,17 +38,8 @@ module Facebooker
       end     
     end
 
-    def uid
-      @uid
-    end
-
-    def uid=(uid)
-      @uid = uid.to_i
-    end
-
-    alias :id :uid
-    alias :id= :uid=
-    alias :facebook_id :uid
+    id_is :uid
+    alias :facebook_id :id
 
     # Returns a user's events, params correspond to API call parameters (except UID):
     # http://wiki.developers.facebook.com/index.php/Events.get
@@ -282,7 +272,7 @@ module Facebooker
     # requires extended permission. 
     def set_status(message)
       self.status=message
-      session.post('facebook.users.setStatus',:status=>message,:status_includes_verb=>1) do |ret|
+      session.post('facebook.users.setStatus',{:status=>message,:status_includes_verb=>1,:uid => uid}, false) do |ret|
         ret
       end
     end

data/lib/facebooker/parser.rb

@@ -58,23 +58,23 @@ module Facebooker
     
     def self.hashinate(response_element)
       response_element.children.reject{|c| c.kind_of? REXML::Text}.inject({}) do |hash, child|
-        # If the node hasn't any child, and is not a list, we want empty strings, not empty hashes.
-        hash[child.name] = if (child.children.size == 1 && child.children.first.kind_of?(REXML::Text)) || (child.children.size == 0 && child.attributes['list'] != 'true')
+        # 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.name] = 
+        if (child.attributes['nil'] == 'true')
+          nil 
+        elsif (child.children.size == 1 && child.children.first.kind_of?(REXML::Text)) || (child.children.size == 0 && child.attributes['list'] != 'true')
           anonymous_field_from(child, hash) || child.text_value
+        elsif child.attributes['list'] == 'true'
+          child.children.reject{|c| c.kind_of? REXML::Text}.map { |subchild| hash_or_value_for(subchild)}    
         else
-          if child.attributes['list'] == 'true'
-            child.children.reject{|c| c.kind_of? REXML::Text}.map do |subchild| 
-                hash_or_value_for(subchild)
-            end     
-          else
-            child.children.reject{|c| c.kind_of? REXML::Text}.inject({}) do |subhash, subchild|
-              subhash[subchild.name] = hash_or_value_for(subchild)
-              subhash
-            end
+          child.children.reject{|c| c.kind_of? REXML::Text}.inject({}) do |subhash, subchild|
+            subhash[subchild.name] = hash_or_value_for(subchild)
+            subhash
           end
-        end
+        end #if (child.attributes)
         hash
-      end      
+      end #do |hash, child|      
     end
     
     def self.anonymous_field_from(child, hash)

data/lib/facebooker/rails/controller.rb

@@ -252,7 +252,8 @@ module Facebooker
       end
       
       def application_is_not_installed_by_facebook_user
-        redirect_to session[:facebook_session].install_url
+        url_params = after_facebook_login_url.nil? ? {} : { :next => after_facebook_login_url }
+        redirect_to session[:facebook_session].install_url(url_params)
       end
       
       def set_fbml_format

data/lib/facebooker/session.rb

@@ -78,11 +78,11 @@ module Facebooker
     end
     
     def self.current
-      @current_session
+      Thread.current['facebook_session']
     end
     
     def self.current=(session)
-      @current_session=session
+      Thread.current['facebook_session'] = session
     end
     
     def login_url(options={})
@@ -319,24 +319,15 @@ module Facebooker
     # Register a template bundle with Facebook.
     # returns the template id to use to send using this template
     def register_template_bundle(one_line_story_templates,short_story_templates=nil,full_story_template=nil, action_links=nil)
-      if !one_line_story_templates.is_a?(Array)
-        one_line_story_templates = [one_line_story_templates]
-      end
-      parameters = {:one_line_story_templates=>one_line_story_templates.to_json}
+      parameters = {:one_line_story_templates => Array(one_line_story_templates).to_json}
       
-      if !action_links.blank?
-        parameters[:action_links] = action_links.to_json
-      end
+      parameters[:action_links] = action_links.to_json unless action_links.blank?
       
-      if !short_story_templates.blank?
-        short_story_templates = [short_story_templates] unless short_story_templates.is_a?(Array)
-        parameters[:short_story_templates]= short_story_templates.to_json
-      end
+      parameters[:short_story_templates] = Array(short_story_templates).to_json unless short_story_templates.blank?
 
-      if !full_story_template.blank?
-        parameters[:full_story_template]= full_story_template.to_json
-      end
-      post("facebook.feed.registerTemplateBundle", parameters,false)
+      parameters[:full_story_template] = full_story_template.to_json unless full_story_template.blank?
+
+      post("facebook.feed.registerTemplateBundle", parameters, false)
     end
     
     ##
@@ -546,7 +537,7 @@ module Facebooker
       end
       
       def uid?
-        ! @uid.nil?
+        !! @uid
       end
       
       def signature_for(params)

data/test/facebooker_test.rb

@@ -97,7 +97,14 @@ class TestFacebooker < Test::Unit::TestCase
     assert_equal('I rule', friend.status.message)
     assert_equal(nil, friend.hometown_location)
   end
-
+  
+  def test_can_handle_nil_data
+    friends = populate_session_friends_with_nil_data
+    friend = friends.detect{|f| f.id ==  222333}
+    assert_equal(nil,friend.current_location)
+    assert_equal(nil,friend.pic) 
+  end
+  
   def test_session_can_expire_on_server_and_client_handles_appropriately
     expect_http_posts_with_responses(example_session_expired_error_response)
     assert_raises(Facebooker::Session::SessionExpired) {
@@ -217,6 +224,7 @@ class TestFacebooker < Test::Unit::TestCase
     photos = @session.get_photos([97503428461115590, 97503428461115573])
     assert_equal 2, photos.size
     assert_equal "Rooftop barbecues make me act funny", photos.first.caption
+    assert_equal 97503428461115590, photos[0].id
   end
   
   def test_can_get_photos_by_subject_and_album
@@ -355,7 +363,12 @@ class TestFacebooker < Test::Unit::TestCase
     expect_http_posts_with_responses(example_friends_xml, example_limited_user_info_xml)
     @session.user.friends!(:affiliations, :status, :meeting_for)
   end
-  
+     
+  def populate_session_friends_with_nil_data
+    expect_http_posts_with_responses(example_friends_xml, example_nil_user_info_xml)
+    @session.user.friends!(:name, :current_location, :pic)
+  end
+    
   def sample_args_to_post
     {:method=>"facebook.auth.createToken", :sig=>"18b3dc4f5258a63c0ad641eebd3e3930"}
   end
@@ -636,6 +649,21 @@ class TestFacebooker < Test::Unit::TestCase
   end
 
   
+  def example_nil_user_info_xml
+    <<-XML
+    <?xml version="1.0" encoding="UTF-8"?>
+    <users_getInfo_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" list="true">
+      <user>
+        <uid>222333</uid>
+        <name>Kevin Lochner</name>
+        <current_location xsi:nil="true"/>
+        <pic xsi:nil="true"/>
+      </user>
+    </users_getInfo_response>    
+    XML
+  end
+
+  
   def example_friends_xml
     <<-XML
     <?xml version="1.0" encoding="UTF-8"?>

data/test/user_test.rb

@@ -71,6 +71,10 @@ class UserTest < Test::Unit::TestCase
     user=Facebooker::User.new(1)
     assert_equal("current",user.session)
   end
+
+  def test_raises_when_no_session_bound
+    assert_raises(Facebooker::Model::UnboundSessionException) { Facebooker::User.new(1, nil).populate }
+  end
   
   def test_can_set_mobile_fbml
     @user.expects(:set_profile_fbml).with(nil,"test",nil)
@@ -135,7 +139,7 @@ class UserTest < Test::Unit::TestCase
     @user.status="my status"
   end
   def test_can_set_status_with_string
-    @session.expects(:post).with('facebook.users.setStatus', :status=>"my status",:status_includes_verb=>1)
+    @session.expects(:post).with('facebook.users.setStatus', {:status=>"my status",:status_includes_verb=>1, :uid => @user.uid}, false)
     @user.set_status("my status")
   end
   
@@ -143,7 +147,7 @@ class UserTest < Test::Unit::TestCase
     @user = Facebooker::User.new(9507801, @session)
     expect_http_posts_with_responses(example_events_get_xml)
     events = @user.events
-    assert_equal "29511517904", events.first.eid
+    assert_equal 29511517904, events.first.eid
   end
 
   def test_events_caching_honors_params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mmangino-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors: 
 - Chad Fowler