facebooker2 0.0.5 → 0.0.6

data/lib/facebooker2.rb

@@ -25,7 +25,7 @@ module Facebooker2
   end
   
   def self.load_facebooker_yaml
-    config = YAML.load(File.read(File.join(::Rails.root,"config","facebooker.yml")))[::Rails.env]
+    config = YAML.load(ERB.new(File.read(File.join(::Rails.root,"config","facebooker.yml"))).result)[::Rails.env]
     raise NotConfigured.new("Unable to load configuration for #{::Rails.env} from facebooker.yml. Is it set up?") if config.nil?
     self.configuration = config.with_indifferent_access
   end

data/lib/facebooker2/rails/helpers/facebook_connect.rb

@@ -23,13 +23,14 @@ module Facebooker2
 
           text = options.delete(:text)
           
-          content_tag("fb:login-button",text,options.merge(:onlogin=>js))
+          #rails 3 only escapes non-html_safe strings, so get the raw string instead of the SafeBuffer
+          content_tag("fb:login-button",text,options.merge(:onlogin=>js.to_str))
         end
         
         def fb_login(options = {},&proc)
            js = capture(&proc)
            text = options.delete(:text)
-           concat(content_tag("fb:login-button",text,options.merge(:onlogin=>js)))
+           concat(content_tag("fb:login-button",text,options.merge(:onlogin=>js.to_str)))
         end
         
         #
@@ -37,7 +38,7 @@ module Facebooker2
         #  args are passed to the call to link_to_function
         def fb_logout_link(text,url,*args)
           function= "FB.logout(function() {window.location.href = '#{url}';})"
-          link_to_function text, function, *args
+          link_to_function text, function.to_str, *args
         end
         
         def fb_server_fbml(style=nil,&proc)

data/lib/facebooker2/rails/helpers/javascript.rb

@@ -40,7 +40,14 @@ module Facebooker2
             }());
           </script>
         JAVASCRIPT
-        block_given? ? concat(js) : js
+        escaped_js = fb_html_safe(js)
+        if block_given? 
+           concat(escaped_js)
+           #return the empty string, since concat returns the buffer and we don't want double output
+           # from klochner
+           "" 
+        else
+           escaped_js
         end
       end
     end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker2
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Mike Mangino
@@ -9,29 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 -04:00
+date: 2011-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mogli
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 0
+        - 12
         version: 0.0.12
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby-hmac
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Facebook Connect integration library for ruby and rails
 email: mmangino@elevatedrails.com
 executables: []
@@ -59,21 +75,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Facebook Connect integration library for ruby and rails