mmangino-facebooker 1.0.15 → 1.0.16

data/Manifest.txt

@@ -41,7 +41,6 @@ generators/xd_receiver/xd_receiver_generator.rb
 generators/xd_receiver/templates/xd_receiver.html
 init.rb
 install.rb
-lib/facebooker.rb
 lib/facebooker/adapters/adapter_base.rb
 lib/facebooker/adapters/bebo_adapter.rb
 lib/facebooker/adapters/facebook_adapter.rb
@@ -50,10 +49,13 @@ lib/facebooker/batch_request.rb
 lib/facebooker/data.rb
 lib/facebooker/feed.rb
 lib/facebooker/logging.rb
+lib/facebooker/mock/service.rb
+lib/facebooker/mock/session.rb
 lib/facebooker/model.rb
 lib/facebooker/models/affiliation.rb
 lib/facebooker/models/album.rb
 lib/facebooker/models/applicationproperties.rb
+lib/facebooker/models/applicationrestrictions.rb
 lib/facebooker/models/cookie.rb
 lib/facebooker/models/education_info.rb
 lib/facebooker/models/event.rb
@@ -67,18 +69,23 @@ lib/facebooker/models/page.rb
 lib/facebooker/models/photo.rb
 lib/facebooker/models/tag.rb
 lib/facebooker/models/user.rb
+lib/facebooker/models/user.rb.orig
+lib/facebooker/models/user.rb.rej
+lib/facebooker/models/video.rb
 lib/facebooker/models/work_info.rb
 lib/facebooker/parser.rb
 lib/facebooker/rails/controller.rb
-lib/facebooker/rails/facebook_asset_path.rb
+lib/facebooker/rails/cucumber/world.rb
+lib/facebooker/rails/cucumber.rb
 lib/facebooker/rails/facebook_form_builder.rb
 lib/facebooker/rails/facebook_pretty_errors.rb
 lib/facebooker/rails/facebook_request_fix.rb
 lib/facebooker/rails/facebook_session_handling.rb
 lib/facebooker/rails/facebook_url_helper.rb
 lib/facebooker/rails/facebook_url_rewriting.rb
-lib/facebooker/rails/helpers.rb
 lib/facebooker/rails/helpers/fb_connect.rb
+lib/facebooker/rails/helpers.rb
+lib/facebooker/rails/integration_session.rb
 lib/facebooker/rails/profile_publisher_extensions.rb
 lib/facebooker/rails/publisher.rb
 lib/facebooker/rails/routing.rb
@@ -87,28 +94,32 @@ lib/facebooker/rails/utilities.rb
 lib/facebooker/server_cache.rb
 lib/facebooker/service.rb
 lib/facebooker/session.rb
+lib/facebooker/session.rb.orig
+lib/facebooker/session.rb.rej
 lib/facebooker/version.rb
+lib/facebooker.rb
 lib/net/http_multipart_post.rb
 lib/tasks/facebooker.rake
 lib/tasks/tunnel.rake
 rails/init.rb
 setup.rb
 templates/layout.erb
-test/adapters_test.rb
-test/batch_request_test.rb
-test/event_test.rb
-test/facebook_admin_test.rb
-test/facebook_cache_test.rb
-test/facebook_data_test.rb
+test/facebooker/adapters_test.rb
+test/facebooker/admin_test.rb
+test/facebooker/batch_request_test.rb
+test/facebooker/data_test.rb
+test/facebooker/logging_test.rb
+test/facebooker/model_test.rb
+test/facebooker/models/event_test.rb
+test/facebooker/models/user_test.rb
+test/facebooker/rails/publisher_test.rb
+test/facebooker/rails_integration_test.rb
+test/facebooker/server_cache_test.rb
+test/facebooker/session_test.rb
 test/facebooker_test.rb
 test/fixtures/multipart_post_body_with_only_parameters.txt
 test/fixtures/multipart_post_body_with_single_file.txt
 test/fixtures/multipart_post_body_with_single_file_that_has_nil_key.txt
-test/http_multipart_post_test.rb
-test/logging_test.rb
-test/model_test.rb
-test/publisher_test.rb
-test/rails_integration_test.rb
-test/session_test.rb
+test/net/http_multipart_post_test.rb
+test/rails_test_helper.rb
 test/test_helper.rb
-test/user_test.rb

data/Rakefile

@@ -15,7 +15,7 @@ Hoe.new('facebooker', Facebooker::VERSION::STRING) do |p|
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.remote_rdoc_dir = '' # Release to root
-  p.test_globs = 'test/*.rb'
+  p.test_globs = 'test/**/*_test.rb'
   p.extra_deps << ['json', '>= 1.0.0'] 
 end
 

data/generators/facebook/templates/public/javascripts/facebooker.js

@@ -48,14 +48,7 @@ function encodeURIComponent(str) {
 
 var Form = {};
 Form.serialize = function(form_element) {
-  elements=$(form_element).serialize();
-  param_string="";
-  for (var name in elements) {
-    if (param_string) 
-      param_string += "&";
-    param_string += encodeURIComponent(name)+"="+encodeURIComponent(elements[name]);
-  }
-  return param_string;
+  return $(form_element).serialize();
 };
 
 Ajax.Updater = function (container,url,options) {

data/init.rb

@@ -12,7 +12,6 @@ require 'net/http_multipart_post'
 require 'facebooker/rails/controller'
 require 'facebooker/rails/facebook_url_rewriting'
 require 'facebooker/rails/facebook_session_handling'
-require 'facebooker/rails/facebook_asset_path'
 require 'facebooker/rails/facebook_request_fix'
 require 'facebooker/rails/routing'
 require 'facebooker/rails/facebook_pretty_errors' rescue nil
@@ -68,3 +67,6 @@ end
 # pull :canvas=> into env in routing to allow for conditions
 ActionController::Routing::RouteSet.send :include,  Facebooker::Rails::Routing::RouteSetExtensions
 ActionController::Routing::RouteSet::Mapper.send :include, Facebooker::Rails::Routing::MapperExtensions
+
+Mime::Type.register_alias "text/html", :fbml
+Mime::Type.register_alias "text/javascript", :fbjs

data/lib/facebooker.rb

@@ -100,7 +100,7 @@ module Facebooker
       @timeout
     end
    
-    [:api_key,:secret_key, :www_server_base_url,:login_url_base,:install_url_base,:api_rest_path,:api_server_base,:api_server_base_url,:canvas_server_base].each do |delegated_method|
+    [:api_key,:secret_key, :www_server_base_url,:login_url_base,:install_url_base,:api_rest_path,:api_server_base,:api_server_base_url,:canvas_server_base, :video_server_base].each do |delegated_method|
       define_method(delegated_method){ return current_adapter.send(delegated_method)}
     end
     
@@ -170,3 +170,4 @@ require 'facebooker/adapters/adapter_base'
 require 'facebooker/adapters/facebook_adapter'
 require 'facebooker/adapters/bebo_adapter'
 require 'facebooker/models/friend_list'
+require 'facebooker/models/video'

data/lib/facebooker/adapters/facebook_adapter.rb

@@ -11,6 +11,10 @@ module Facebooker
        "api.facebook.com"
     end
     
+    def video_server_base
+      "api-video.facebook.com"
+    end
+    
     def www_server_base_url
       "www.facebook.com"
     end

data/lib/facebooker/mock/service.rb

@@ -0,0 +1,50 @@
+require 'digest/md5'
+require 'facebooker/service'
+
+module Facebooker
+  # A mock service that reads the Facebook response from fixtures
+  # Adapted from http://gist.github.com/44344
+  #
+  #   Facebooker::MockService.fixture_path = 'path/to/dir'
+  #   Facebooker::Session.current = Facebooker::MockSession.create
+  #
+  class MockService < Service
+    class << self
+      attr_accessor :fixture_path
+    end
+
+    def read_fixture(method, filename, original = nil)
+      path = fixture_path(method, filename)
+      File.read path
+    rescue Errno::ENAMETOOLONG
+      read_fixture(method, hash_fixture_name(filename), filename)
+    rescue Errno::ENOENT => e
+      if File.exists?(fixture_path(method, 'default'))
+        File.read fixture_path(method, 'default')
+      else
+        e.message << "\n(Non-hashed path is #{original})" if original
+        e.message << "\nFacebook API Reference: http://wiki.developers.facebook.com/index.php/#{method.sub(/^facebook\./, '')}#Example_Return_XML"
+        raise e
+      end
+    end
+
+    def post(params)
+      method = params.delete(:method)
+      params.delete_if {|k,_| [:v, :api_key, :call_id, :sig].include?(k) }
+      Parser.parse(method, read_fixture(method, fixture_name(params)))
+    end
+
+  private
+    def fixture_path(method, filename)
+      File.join(self.class.fixture_path, method, "#{filename}.xml")
+    end
+
+    def hash_fixture_name(filename)
+      Digest::MD5.hexdigest(filename)
+    end
+
+    def fixture_name(params)
+      params.map {|*args| args.join('=') }.sort.join('&')
+    end
+  end
+end

data/lib/facebooker/mock/session.rb

@@ -0,0 +1,18 @@
+require 'facebooker/session'
+
+module Facebooker
+  class MockSession < Session
+    def secured?
+      true
+    end
+
+    def secure!
+      @uid = 1
+      true
+    end
+ 
+    def service
+      @service ||= MockService.new(Facebooker.api_server_base, Facebooker.api_rest_path, @api_key)
+    end
+  end
+end

data/lib/facebooker/model.rb

@@ -122,7 +122,7 @@ module Facebooker
       unless hash.nil? || hash.empty?
         hash.each do |key, value|
           set_attr_method = "#{key}="
-          if !value.nil? and respond_to?(set_attr_method)
+          if !value.nil? && respond_to?(set_attr_method)
             self.__send__(set_attr_method, value) 
           else
             Facebooker::Logging.log_info("**Warning**, Attempt to set non-attribute: #{key}",hash)
@@ -132,4 +132,4 @@ module Facebooker
       end      
     end    
   end
-end
+end

data/lib/facebooker/models/applicationrestrictions.rb

@@ -0,0 +1,10 @@
+module Facebooker
+
+  class ApplicationRestrictions
+    include Model
+    FIELDS = [ :age, :location, :age_distribution, :type ]
+    
+    attr_accessor *FIELDS
+         
+  end
+end

data/lib/facebooker/models/user.rb

@@ -204,6 +204,38 @@ module Facebooker
         options.merge(nil => multipart_post_file)))
     end
     
+    # Upload a video to the user's profile.
+    #
+    # In your view, create a multipart form that posts directly to your application (not through canvas):
+    #
+    #   <% form_tag videos_url(:canvas => false), :html => {:multipart => true, :promptpermission => 'video_upload'} do %>
+    #     Video: <%= file_field_tag 'video' %>
+    #     Title: <%= text_area_tag 'title' %>
+    #     Description: <%= text_area_tag 'description' %>
+    #     <%= submit_tag 'Upload Video', :class => 'inputsubmit' %>
+    #   <% end %>
+    # 
+    # And in your controller: 
+    #
+    #   class VideosController < ApplicationController
+    #     def create
+    #       file = Net::HTTP::MultipartPostFile.new(
+    #         params[:photo].original_filename,
+    #         params[:photo].content_type,
+    #         params[:photo].read
+    #       )
+    #     
+    #       @video = facebook_session.user.upload_video(file, :description => params[:description])
+    #       redirect_to videos_url(:canvas => true)
+    #     end
+    #   end
+    #
+    # Options correspond to http://wiki.developers.facebook.com/index.php/Video.upload
+    def upload_video(multipart_post_file, options = {})
+      Video.from_hash(session.post_file('facebook.video.upload',
+        options.merge(nil => multipart_post_file, :base => Facebooker.video_server_base)))
+    end
+    
     def profile_fbml
       session.post('facebook.profile.getFBML', :uid => id)  
     end    
@@ -314,7 +346,7 @@ module Facebooker
     ##
     # Two Facebooker::User objects should be considered equal if their Facebook ids are equal
     def ==(other_user)
-      id == other_user.id
+      other_user.is_a?(User) && id == other_user.id
     end
     
     

data/lib/facebooker/models/video.rb

@@ -0,0 +1,9 @@
+require 'facebooker/model'
+module Facebooker
+  class Video
+    include Model
+    attr_accessor :vid, :owner, :title,
+                  :link, :description, :created,
+                  :story_fbid
+  end
+end

data/lib/facebooker/parser.rb

@@ -305,6 +305,12 @@ module Facebooker
       hashinate(element('photos_upload_response', data))
     end
   end
+
+  class UploadVideo < Parser#:nodoc:
+    def self.process(data)
+      hashinate(element('video_upload_response', data))
+    end
+  end
   
   class SendRequest < Parser#:nodoc:
     def self.process(data)
@@ -562,7 +568,8 @@ module Facebooker
       'facebook.groups.getMembers' => GroupGetMembers,
       'facebook.notifications.sendEmail' => NotificationsSendEmail,
       'facebook.data.getUserPreference' => GetPreference,
-      'facebook.data.setUserPreference' => SetPreference
+      'facebook.data.setUserPreference' => SetPreference,
+      'facebook.video.upload' => UploadVideo
     }
   end
 end

data/lib/facebooker/rails/controller.rb

@@ -7,7 +7,7 @@ module Facebooker
       def self.included(controller)
         controller.extend(ClassMethods)
         #controller.before_filter :set_adapter <-- security hole noted by vchu
-        controller.before_filter :set_fbml_format
+        controller.before_filter :set_facebook_request_format
         controller.helper_attr :facebook_session_parameters
         controller.helper_method :request_comes_from_facebook?
       end
@@ -238,6 +238,9 @@ module Facebooker
       def ensure_has_photo_upload
         has_extended_permission?("photo_upload") || application_needs_permission("photo_upload")
       end
+      def ensure_has_video_upload
+        has_extended_permission?("video_upload") || application_needs_permission("video_upload")
+      end
       def ensure_has_create_listing
         has_extended_permission?("create_listing") || application_needs_permission("create_listing")
       end
@@ -266,9 +269,14 @@ module Facebooker
         redirect_to session[:facebook_session].install_url(url_params)
       end
       
-      def set_fbml_format
-        params[:format]="fbml" if request_comes_from_facebook?
+      def set_facebook_request_format
+        if request_is_facebook_ajax?
+          params[:format] = 'fbjs'
+        elsif request_comes_from_facebook?
+          params[:format] = 'fbml'
+        end
       end
+      
       def set_adapter
         Facebooker.load_adapter(params) if(params[:fb_sig_api_key])
       end
@@ -286,6 +294,10 @@ module Facebooker
         def ensure_application_is_installed_by_facebook_user(options = {})
           before_filter :ensure_application_is_installed_by_facebook_user, options
         end
+        
+        def request_comes_from_facebook?
+          request_is_for_a_facebook_canvas? || request_is_facebook_ajax?
+        end
       end
     end
   end

data/lib/facebooker/rails/cucumber.rb

@@ -0,0 +1,30 @@
+require 'facebooker/rails/cucumber/world'
+require 'facebooker/mock/session'
+require 'facebooker/mock/service'
+
+Facebooker::MockService.fixture_path = File.join(RAILS_ROOT, 'features', 'support', 'facebook')
+
+Facebooker::Session.current = Facebooker::MockSession.create
+class ApplicationController
+  def facebook_session
+    Facebooker::Session.current
+  end
+end
+
+module Facebooker
+  class << self
+    # prevent Facebooker from adding canvas name as prefix to URLs
+    def request_for_canvas(arg)
+      yield
+    end
+  end
+  
+  module Rails
+    module Controller
+      # prevent Facebooker from rendering fb:redirect
+      def redirect_to(*args)
+        super
+      end
+    end
+  end
+end

data/lib/facebooker/rails/cucumber/world.rb

@@ -0,0 +1,46 @@
+require 'cucumber/rails/world'
+require 'facebooker/rails/integration_session'
+
+module Facebooker
+  module Rails
+    module Cucumber
+      class World < ::Cucumber::Rails::World
+        def open_session
+          session = Facebooker::Rails::IntegrationSession.new
+
+          # delegate the fixture accessors back to the test instance
+          extras = Module.new { attr_accessor :delegate, :test_result }
+          if self.class.respond_to?(:fixture_table_names)
+            self.class.fixture_table_names.each do |table_name|
+              name = table_name.tr(".", "_")
+              next unless respond_to?(name)
+              extras.__send__(:define_method, name) { |*args| delegate.send(name, *args) }
+            end
+          end
+
+          # delegate add_assertion to the test case
+          extras.__send__(:define_method, :add_assertion) { test_result.add_assertion }
+          session.extend(extras)
+          session.delegate = self
+          session.test_result = @_result
+
+          yield session if block_given?
+          session
+        end
+        
+        def without_canvas
+          in_canvas = @integration_session.canvas
+          @integration_session.canvas = false
+          yield
+          @integration_session.canvas = in_canvas
+        end
+      end
+    end
+  end
+end
+
+World do
+  w = Facebooker::Rails::Cucumber::World.new
+  w.reset!
+  w
+end