facebooker 1.0.50 → 1.0.51

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.50"
+  s.version = "1.0.51"
 
   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-09-08}
+  s.date = %q{2009-09-29}
   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/tag.rb

@@ -2,7 +2,7 @@ require 'facebooker/model'
 module Facebooker
   class Tag
     include Model
-    attr_accessor :pid, :subject, :xcoord, :ycoord
+    attr_accessor :pid, :subject, :xcoord, :ycoord, :text, :created
     
     def coordinates
       [xcoord, ycoord]

data/lib/facebooker/models/user.rb

@@ -1,6 +1,7 @@
 require 'facebooker/model'
 require 'facebooker/models/affiliation'
 require 'facebooker/models/work_info'
+require 'facebooker/models/family_relative_info'
 module Facebooker
   # 
   # Holds attributes and behavior for a Facebook User
@@ -10,7 +11,7 @@ module Facebooker
       include Model
       attr_accessor :message, :time, :status_id
     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]
+    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]
     STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url, :proxied_email]
     populating_attr_accessor(*FIELDS)
     attr_reader :affiliations
@@ -20,6 +21,7 @@ module Facebooker
     populating_hash_settable_list_accessor :affiliations, Affiliation
     populating_hash_settable_list_accessor :education_history, EducationInfo
     populating_hash_settable_list_accessor :work_history, WorkInfo
+    populating_hash_settable_list_accessor :family, FamilyRelativeInfo
 
     populating_attr_reader :status
 

data/lib/facebooker/parser.rb

@@ -465,6 +465,18 @@ module Facebooker
        element('events_rsvp_response', data).content.strip
      end
    end
+   
+  class EventsCreate < Parser#:nodoc:
+    def self.process(data)
+      element('events_create_response', data).content.strip
+    end
+  end
+  
+  class EventsCancel < Parser#:nodoc:
+    def self.process(data)
+      element('events_cancel_response', data).content.strip
+    end
+  end
 
   class EventsGet < Parser#:nodoc:
     def self.process(data)
@@ -666,7 +678,9 @@ module Facebooker
       'facebook.photos.addTag' => AddTags,
       'facebook.photos.upload' => UploadPhoto,
       'facebook.stream.publish' => StreamPublish,
-      'facebook.stream.addComment' => StreamAddComment,      
+      'facebook.stream.addComment' => StreamAddComment,
+      'facebook.events.create' => EventsCreate,
+      'facebook.events.cancel' => EventsCancel,
       'facebook.events.get' => EventsGet,
       'facebook.events.rsvp' => EventsRsvp,
       'facebook.groups.get' => GroupsGet,

data/lib/facebooker/rails/controller.rb

@@ -126,7 +126,7 @@ module Facebooker
       end
 
       def fb_cookie_names
-        fb_cookie_names = cookies.keys.select{|k| k.starts_with?(fb_cookie_prefix)}
+        fb_cookie_names = cookies.keys.select{|k| k && k.starts_with?(fb_cookie_prefix)}
       end
 
       def secure_with_cookies!
@@ -189,7 +189,7 @@ module Facebooker
       def create_new_facebook_session_and_redirect!
         session[:facebook_session] = new_facebook_session
         next_url = after_facebook_login_url || default_after_facebook_login_url
-        top_redirect_to session[:facebook_session].login_url({:next => next_url}) unless @installation_required
+        top_redirect_to session[:facebook_session].login_url({:next => next_url, :canvas=>params[:fb_sig_in_canvas]}) unless @installation_required
         false
       end
       

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

@@ -4,7 +4,8 @@ module Facebooker
       module FbConnect
         
         def fb_connect_javascript_tag(options = {})
-          lang = "/#{options[:lang]}" if options[:lang]
+          # accept both Rails and Facebook locale formatting, i.e. "en-US" and "en_US".
+          lang = "/#{options[:lang].to_s.gsub('-', '_')}" if options[:lang]
           # dont use the javascript_include_tag helper since it adds a .js at the end
           if request.ssl?
             "<script src=\"https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php#{lang}\" type=\"text/javascript\"></script>"

data/lib/facebooker/version.rb

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

data/lib/tasks/tunnel.rake

@@ -27,7 +27,7 @@ namespace :facebooker do
     end
 
     task :config => :environment do
-     facebook_config = File.dirname(__FILE__) + '/../../../../../config/facebooker.yml'
+     facebook_config = File.join(RAILS_ROOT, 'config', 'facebooker.yml')
      FACEBOOKER = YAML.load(ERB.new(File.read(facebook_config)).result)[RAILS_ENV]
      @public_host_username = FACEBOOKER['tunnel']['public_host_username'] 
      @public_host = FACEBOOKER['tunnel']['public_host'] 

data/test/facebooker/session_test.rb

@@ -157,6 +157,18 @@ class Facebooker::SessionTest < Test::Unit::TestCase
     assert_equal(["1240077", "222332", "222333", "222335", "222336"], event_attendances.map{|ea| ea.uid}.sort)
     assert_equal 5, event_attendances.size
   end
+  
+  def test_can_create_events
+    mock_http = establish_session
+    mock_http.should_receive(:post_multipart_form).and_return(example_event_create_xml).once
+    event_id = @session.create_event(:name => 'foo', :category => 'bar')
+    assert_equal '34444349712', event_id
+  end
+  
+  def test_can_cancel_events
+    expect_http_posts_with_responses(example_event_cancel_xml)
+    assert @session.cancel_event("12345", :cancel_message => "It's raining")
+  end
 
   def test_can_query_for_events
     expect_http_posts_with_responses(example_events_get_xml)
@@ -431,6 +443,24 @@ XML
     </groups_get_response>
     XML
   end
+  
+  def example_event_create_xml
+    <<-XML
+    <?xml version="1.0" encoding="UTF-8"?>
+    <events_create_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">
+      34444349712
+    </events_create_response> 
+    XML
+  end
+  
+  def example_event_cancel_xml
+    <<-XML
+    <?xml version="1.0" encoding="UTF-8"?>
+    <events_cancel_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_cancel_response> 
+    XML
+  end
 
   def example_events_get_xml
     <<-XML
@@ -690,6 +720,7 @@ XML
     </users_getStandardInfo_response>
     XML
   end
+  
 end
 
 

metadata

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