al-facebooker 1.0.9 → 1.0.12

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.rb

@@ -168,4 +168,4 @@ require 'facebooker/models/info_section'
 require 'facebooker/adapters/adapter_base'
 require 'facebooker/adapters/facebook_adapter'
 require 'facebooker/adapters/bebo_adapter'
-require 'facebooker/models/friend_list'
+require 'facebooker/models/friend_list'

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 :id, :session
     populating_attr_accessor *FIELDS
     attr_reader :affiliations
     populating_hash_settable_accessor :current_location, Location
@@ -28,10 +27,10 @@ module Facebooker
     # attribute_hash
     def initialize(*args)
       if (args.first.kind_of?(String) || args.first.kind_of?(Integer)) && args.size==1
-        @id=Integer(args.shift)
+        self.uid = args.shift
         @session = Session.current
       elsif (args.first.kind_of?(String) || args.first.kind_of?(Integer)) && args[1].kind_of?(Session)
-        @id = Integer(args.shift)
+        self.uid = args.shift
         @session = args.shift
       end
       if args.last.kind_of?(Hash)
@@ -39,6 +38,9 @@ module Facebooker
       end     
     end
 
+    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
     # E.g:
@@ -86,7 +88,7 @@ module Facebooker
       
      	#use __blank instead of nil so that this is cached
      	cache_key = flid||"__blank"
-     	options = {:uid=>@id}
+     	options = {:uid=>self.id}
      	options[:flid] = flid unless flid.nil?
      	@friends_hash[cache_key] ||= @session.post('facebook.friends.get', options,false).map do |uid|
           User.new(uid, @session)
@@ -203,7 +205,7 @@ module Facebooker
     end
     
     def profile_fbml
-      session.post('facebook.profile.getFBML', :uid => @id)  
+      session.post('facebook.profile.getFBML', :uid => id)  
     end    
     
     ##
@@ -229,7 +231,7 @@ module Facebooker
     end
     
     def set_profile_fbml(profile_fbml, mobile_fbml, profile_action_fbml, profile_main = nil)
-      parameters = {:uid => @id}
+      parameters = {:uid => id}
       parameters[:profile] = profile_fbml if profile_fbml
       parameters[:profile_action] = profile_action_fbml if profile_action_fbml
       parameters[:mobile_profile] = mobile_fbml if mobile_fbml
@@ -243,12 +245,12 @@ module Facebooker
     # Note: using set_profile_info as I feel using user.set_info could be confused with the user.getInfo facebook method.
     #       Also, I feel it fits in line with user.set_profile_fbml.
     def set_profile_info(title, info_fields, format = :text)
-      session.post('facebook.profile.setInfo', :title => title, :uid => @id, 
+      session.post('facebook.profile.setInfo', :title => title, :uid => id, 
         :type => format.to_s == "text" ? 1 : 5, :info_fields => info_fields.to_json)
     end
     
     def get_profile_info
-      session.post('facebook.profile.getInfo', :uid => @id)
+      session.post('facebook.profile.getInfo', :uid => id)
     end
     
     ##
@@ -284,19 +286,19 @@ module Facebooker
     ##
     # Convenience method to send email to the current user
     def send_email(subject, text=nil, fbml=nil)
-      session.send_email([@id], subject, text, fbml)
+      session.send_email([id], subject, text, fbml)
     end
     
     ##
     # Convenience method to set cookie for the current user
     def set_cookie(name, value, expires=nil, path=nil)
-      session.data.set_cookie(@id, name, value, expires, path)
+      session.data.set_cookie(id, name, value, expires, path)
     end
     
     ##
     # Convenience method to get cookies for the current user
     def get_cookies(name=nil)
-      session.data.get_cookies(@id, name)
+      session.data.get_cookies(id, name)
     end
     
     ##
@@ -359,10 +361,6 @@ module Facebooker
       end
     end
     
-    def facebook_id
-      @id
-    end
-    
     def self.user_fields(fields = [])
       valid_fields(fields)
     end
@@ -385,7 +383,7 @@ module Facebooker
     end
     
     def profile_pic_album_id
-      merge_aid(-3, @id)
+      merge_aid(-3, id)
     end
     
     def merge_aid(aid, uid)

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

@@ -94,13 +94,14 @@ module Facebooker
  
           #returning gracefully if the cookies aren't set or have expired
           return unless parsed['session_key'] && parsed['user'] && parsed['expires'] && parsed['ss'] 
-          return unless Time.at(parsed['expires'].to_f) > Time.now
+          return unless Time.at(parsed['expires'].to_f) > Time.now || (parsed['expires'] == "0")
           
           #if we have the unexpired cookies, we'll throw an exception if the sig doesn't verify
           verify_signature(parsed,cookies[Facebooker.api_key])
           
           @facebook_session = new_facebook_session
           @facebook_session.secure_with!(parsed['session_key'],parsed['user'],parsed['expires'],parsed['ss'])
+          session[:facebook_session] = @facebook_session
       end
     
       def secure_with_token!
@@ -277,4 +278,4 @@ module Facebooker
       end
     end
   end
-end
+end

data/lib/facebooker/rails/facebook_session_handling.rb

@@ -31,7 +31,7 @@ class CGI
       def initialize(request, option={})
         @request = request
         @initialization_options = option
-        option['session_id'] = set_session_id
+        option['session_id'] ||= set_session_id
         initialize_aliased_by_facebooker(request, option)
       end
       

data/lib/facebooker/rails/facebook_url_helper.rb

@@ -90,9 +90,9 @@ module ActionView
 	# Altered to throw an error on :popup and sanitize the javascript
 	# for Facebook.
         def convert_options_to_javascript_with_facebooker!(html_options, url ='')
-          if !request_comes_from_facebook?
+          if !respond_to?(:request_comes_from_facebook?) || !request_comes_from_facebook?
             convert_options_to_javascript_without_facebooker!(html_options,url)
-   	  else
+   	      else
             confirm, popup = html_options.delete("confirm"), html_options.delete("popup")
 
             method, href = html_options.delete("method"), html_options['href']
@@ -124,23 +124,24 @@ module ActionView
 	# link_to("Facebooker", "http://rubyforge.org/projects/facebooker", :confirm=>"Go to Facebooker?")
 	# 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?
-            confirm_javascript_function_without_facebooker(confirm)
- 	  else
-  	    if(confirm.is_a?(Hash))
-                confirm_options = confirm.stringify_keys
-		title = confirm_options.delete("title") || "Please Confirm"
-		content = confirm_options.delete("content") || "Are you sure?"
-		style = confirm_options.empty? ? "" : convert_options_to_css(confirm_options)
-  	    else
-	      title,content,style = 'Please Confirm', confirm, ""
+  def confirm_javascript_function_with_facebooker(confirm, fun = nil)
+    if !request_comes_from_facebook?
+      confirm_javascript_function_without_facebooker(confirm)
+    else
+      if(confirm.is_a?(Hash))
+        confirm_options = confirm.stringify_keys
+		    title = confirm_options.delete("title") || "Please Confirm"
+		    content = confirm_options.delete("content") || "Are you sure?"
+		    button_confirm = confirm_options.delete("button_confirm") || "Okay"
+		    button_cancel = confirm_options.delete("button_cancel") || "Cancel"
+		    style = confirm_options.empty? ? "" : convert_options_to_css(confirm_options)
+	    else
+	      title,content,style,button_confirm,button_cancel = 'Please Confirm', confirm, "", "Okay", "Cancel"
 	    end
-
-            "var dlg = new Dialog().showChoice('#{escape_javascript(title.to_s)}','#{escape_javascript(content.to_s)}').setStyle(#{style});"+
+      "var dlg = new Dialog().showChoice('#{escape_javascript(title.to_s)}','#{escape_javascript(content.to_s)}','#{escape_javascript(button_confirm.to_s)}','#{escape_javascript(button_cancel.to_s)}').setStyle(#{style});"+
 	    "var a=this;dlg.onconfirm = function() { #{fun ? fun : 'document.setLocation(a.getHref());'} };"
 	  end
-        end
+  end
 
 	alias_method_chain :confirm_javascript_function, :facebooker
 

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

@@ -4,7 +4,11 @@ module Facebooker
       module FbConnect
         
         def fb_connect_javascript_tag
-          javascript_include_tag "http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php"
+          if request.ssl?
+            javascript_include_tag "https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php"
+          else
+            javascript_include_tag "http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php"
+          end
         end
         
         def init_fb_connect(*required_features)
@@ -31,4 +35,4 @@ module Facebooker
       end
     end
   end
-end
+end

data/lib/facebooker/rails/publisher.rb

@@ -176,8 +176,8 @@ module Facebooker
             publisher = setup_publisher(klass,method)
             # sort the Hash elements (in the short_story and full_story) before generating MD5
             Digest::MD5.hexdigest [publisher.one_line_story_templates,
-               (publisher.short_story_templates and publisher.short_story_templates.collect{|ss| ss.to_a.sort_by{|e| e[0]}}),
-               (publisher.full_story_template and publisher.full_story_template.to_a.sort_by{|e| e[0]})
+               (publisher.short_story_templates and publisher.short_story_templates.collect{|ss| ss.to_a.sort_by{|e| e[0].to_s}}),
+               (publisher.full_story_template and publisher.full_story_template.to_a.sort_by{|e| e[0].to_s})
                ].to_json
           end
           
@@ -396,6 +396,9 @@ module Facebooker
         returning ActionView::Base.new([template_root,controller_root], assigns, self) do |template|
           template.controller=self
           template.extend(self.class.master_helper_module)
+          def template.request_comes_from_facebook?
+            true
+          end
         end
       end
   

data/lib/facebooker/rails/test_helpers.rb

@@ -34,11 +34,6 @@ module Facebooker
         send verb, path, params
       end
       
-      def facebook_post(path, params={}, fb_params=facebook_parameters)
-        params = fb_params.merge(:canvas => true).merge(params)
-        post path, params    
-      end
-      
       def facebook_parameters(overrides=nil)
         overrides ||= {}
         params = default_facebook_parameters.merge(overrides)

data/lib/facebooker/service.rb

@@ -1,8 +1,8 @@
 begin
   require 'curb'
   Facebooker.use_curl = true
-rescue Exception=>e
-  puts e
+rescue LoadError
+  $stderr.puts "Curb not found. Using Net::HTTP."
   require 'net/http'
 end
 require 'facebooker/parser'

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={})
@@ -166,20 +166,23 @@ module Facebooker
     def fql_query(query, format = 'XML')
       post('facebook.fql.query', :query => query, :format => format) do |response|
         type = response.shift
-        return [] if type.nil?
-        response.shift.map do |hash|
-          case type
-          when 'user'
-            user = User.new
-            user.session = self
-            user.populate_from_hash!(hash)
-            user
-          when 'photo'
-            Photo.from_hash(hash)
-          when 'event_member'
-            Event::Attendance.from_hash(hash)
-          else
-            hash
+        if type.nil?
+          []
+        else
+          response.shift.map do |hash|
+            case type
+            when 'user'
+              user = User.new
+              user.session = self
+              user.populate_from_hash!(hash)
+              user
+            when 'photo'
+              Photo.from_hash(hash)
+            when 'event_member'
+              Event::Attendance.from_hash(hash)
+            else
+              hash
+            end
           end
         end
       end
@@ -319,24 +322,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 +540,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/rails_integration_test.rb

@@ -542,6 +542,9 @@ class RailsHelperTest < Test::Unit::TestCase
     def url_for(arg)
       arg
     end
+    def request
+      ActionController::TestRequest.new
+    end
     def fields_for(*args)
       ""
     end
@@ -1097,6 +1100,14 @@ class RailsUrlHelperExtensionsTest < Test::Unit::TestCase
     def protect_against_forgery?
        false
     end
+    
+    def request_comes_from_facebook?
+      @request_comes_from_facebook
+    end
+    
+    def request_comes_from_facebook=(val)
+      @request_comes_from_facebook = val
+    end
 
   end 
   class UrlHelperExtensionsController < NoisyController    
@@ -1117,10 +1128,10 @@ class RailsUrlHelperExtensionsTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
 
     @u = UrlHelperExtensionsClass.new(@controller)
-    @u.stubs(:request_comes_from_facebook?).returns(true)
+    @u.request_comes_from_facebook = true
     
     @non_canvas_u = UrlHelperExtensionsClass.new(@controller)
-    @non_canvas_u.stubs(:request_comes_from_facebook?).returns(false)
+    @non_canvas_u.request_comes_from_facebook = false
     
     @label = "Testing"
     @url = "test.host"
@@ -1129,6 +1140,8 @@ class RailsUrlHelperExtensionsTest < Test::Unit::TestCase
     @title = "Confirm Request"
     @style = {:color => 'black', :background => 'white'}
     @verbose_style = "{background: 'white', color: 'black'}"
+    @default_okay = "Okay"
+    @default_cancel = "Cancel"
     @default_style = "" #"'width','200px'"
   end
 
@@ -1141,19 +1154,19 @@ class RailsUrlHelperExtensionsTest < Test::Unit::TestCase
   end
 
   def test_link_to_with_confirm
-    assert_dom_equal( "<a href=\"#{@url}\" onclick=\"var dlg = new Dialog().showChoice(\'#{@default_title}\',\'#{@prompt}\').setStyle(#{@default_style});"+
+    assert_dom_equal( "<a href=\"#{@url}\" onclick=\"var dlg = new Dialog().showChoice(\'#{@default_title}\',\'#{@prompt}\',\'#{@default_okay}\',\'#{@default_cancel}\').setStyle(#{@default_style});"+
                  "var a=this;dlg.onconfirm = function() { " + 
                  "document.setLocation(a.getHref()); };return false;\">#{@label}</a>",
                   @u.link_to(@label, @url, :confirm => @prompt) )
   end
   def test_link_to_with_confirm_with_title
-    assert_dom_equal( "<a href=\"#{@url}\" onclick=\"var dlg = new Dialog().showChoice(\'#{@title}\',\'#{@prompt}\').setStyle(#{@default_style});"+
+    assert_dom_equal( "<a href=\"#{@url}\" onclick=\"var dlg = new Dialog().showChoice(\'#{@title}\',\'#{@prompt}\',\'#{@default_okay}\',\'#{@default_cancel}\').setStyle(#{@default_style});"+
                  "var a=this;dlg.onconfirm = function() { " + 
                  "document.setLocation(a.getHref()); };return false;\">#{@label}</a>",
                   @u.link_to(@label, @url, :confirm => {:title=>@title,:content=>@prompt}) )
   end
   def test_link_to_with_confirm_with_title_and_style
-    assert_dom_equal( "<a href=\"#{@url}\" onclick=\"var dlg = new Dialog().showChoice(\'#{@title}\',\'#{@prompt}\').setStyle(#{@verbose_style});"+
+    assert_dom_equal( "<a href=\"#{@url}\" onclick=\"var dlg = new Dialog().showChoice(\'#{@title}\',\'#{@prompt}\',\'#{@default_okay}\',\'#{@default_cancel}\').setStyle(#{@verbose_style});"+
                  "var a=this;dlg.onconfirm = function() { " + 
                  "document.setLocation(a.getHref()); };return false;\">#{@label}</a>",
                   @u.link_to(@label, @url, :confirm => {:title=>@title,:content=>@prompt}.merge!(@style)) )
@@ -1168,7 +1181,7 @@ class RailsUrlHelperExtensionsTest < Test::Unit::TestCase
   end
 
   def test_link_to_with_confirm_and_method
-    assert_dom_equal( "<a href=\"#{@url}\" onclick=\"var dlg = new Dialog().showChoice(\'#{@default_title}\',\'#{@prompt}\').setStyle(#{@default_style});"+
+    assert_dom_equal( "<a href=\"#{@url}\" onclick=\"var dlg = new Dialog().showChoice(\'#{@default_title}\',\'#{@prompt}\',\'#{@default_okay}\',\'#{@default_cancel}\').setStyle(#{@default_style});"+
                  "var a=this;dlg.onconfirm = function() { " + 
                  "var f = document.createElement('form'); f.setStyle('display','none'); "+
                  "a.getParentNode().appendChild(f); f.setMethod('POST'); f.setAction(a.getHref());" +
@@ -1191,7 +1204,7 @@ class RailsUrlHelperExtensionsTest < Test::Unit::TestCase
 
   def test_button_to_with_confirm
     assert_equal "<form method=\"post\" action=\"#{@url}\" class=\"button-to\"><div>" +
-                 "<input onclick=\"var dlg = new Dialog().showChoice(\'#{@default_title}\',\'#{@prompt}\').setStyle(#{@default_style});"+
+                 "<input onclick=\"var dlg = new Dialog().showChoice(\'#{@default_title}\',\'#{@prompt}\',\'#{@default_okay}\',\'#{@default_cancel}\').setStyle(#{@default_style});"+
                  "var a=this;dlg.onconfirm = function() { "+
                  "a.getForm().submit(); };return false;\" type=\"submit\" value=\"#{@label}\" /></div></form>", 
                  @u.button_to(@label,@url, :confirm=>@prompt)

data/test/user_test.rb

@@ -27,6 +27,22 @@ class UserTest < Test::Unit::TestCase
   def test_can_ask_user_if_he_or_she_is_friends_with_another_user_by_user_id
     assert(@user.friends_with?(@other_user.id))
   end
+
+  def test_does_not_query_facebook_for_uid
+    @session.expects(:post).never
+    assert_equal 1234, Facebooker::User.new(1234, @session).uid
+  end
+
+  def test_uid_is_always_an_integer
+    assert_equal 1234, Facebooker::User.new(:uid => "1234").uid
+    assert_equal 1234, Facebooker::User.new(:id  => "1234").uid
+    
+    assert_equal 1234, Facebooker::User.new(:uid => "1234").id
+    assert_equal 1234, Facebooker::User.new(:id  => "1234").id
+    
+    assert_equal 1234, Facebooker::User.new(:uid => "1234").facebook_id
+    assert_equal 1234, Facebooker::User.new(:id  => "1234").facebook_id
+  end
   
   def test_cast_to_friend_list_id_with_nil
     assert_nil @user.cast_to_friend_list_id(nil)
@@ -55,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)
@@ -127,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: al-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
+  version: 1.0.12
 platform: ruby
 authors: 
 - Chad Fowler