mmangino-facebooker 1.0.10 → 1.0.11

data/lib/facebooker/rails/facebook_url_helper.rb

@@ -90,7 +90,7 @@ 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_facebooker?) || !request_comes_from_facebook?
             convert_options_to_javascript_without_facebooker!(html_options,url)
    	  else
             confirm, popup = html_options.delete("confirm"), html_options.delete("popup")

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

@@ -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/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'

metadata

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