doesfacebook 0.5.0.pre3 → 0.5.0

data/README.rdoc

@@ -38,7 +38,7 @@ or ssl_callback_url fields of your app. A sample configuration looks like this:
   my_sweet_facebook_app:
     app_id: 1234567890
     secret_key: a1b2c3d4e5f6g7h8i9j0k1l
-    canvas_name: my_sweet_canvas_name
+    namespace: my_sweet_canvas_name
     callback_url: http://your.server.com/and/path
     ssl_callback_url: https://your.secure.server.com/and/path
 
@@ -53,7 +53,7 @@ The typical configuration options are as follows:
 
 * app_id: Facebook ID of your application
 * secret_key: Facebook secret key of your application (used to parse and validate Facebook requests)
-* canvas_name: The "myapp" from "http://apps.facebook.com/myapp" used frequently for link generation and redirection
+* namespace: The "myapp" from "http://apps.facebook.com/myapp" used frequently for link generation and redirection (previously, this configuration field was known as "canvas_name", but Facebook has deprecated that name in favor of "namespace")
 * callback_url: The server callback URL for your app. Used to identify the proper configuration which should be loaded for each request.
 * ssl_callback_url: The server callback for secure, HTTPS requests. Required for production apps. Can be different from your non-secure callback_url
 
@@ -86,7 +86,7 @@ against the Facebook platform easier:
 
 * app_id: The current application's id, parsed from doesfacebook.yml
 * app_callback_url: The current application's callback URL, parsed from doesfacebook.yml
-* app_canvas_name: The current application's canvas shortname, parsed from doesfacebook.yml
+* app_namespace: The current application's canvas shortname, parsed from doesfacebook.yml (aliased as "app_canvas_name" for backwards compatibility)
 * app_canvas_url: The full URL to the application canvas (e.g., http://apps.facebook.com/myapp)
 * url_for_canvas(url_opts={}): Like the standard url_for, but ensures the endpoint is in the Facebook canvas
 * link_to_canvas(text, url_opts={}, html_opts={}): Use as you would the regular link_to helper; generates links to the canvas and properly targets the link to "_top" frame to keep app within canvas and not break into your iframe

data/app/helpers/does_facebook_helper.rb

@@ -19,20 +19,20 @@ module DoesFacebookHelper
     end
   end
   
-  # Return the current app canvas name:
-  def app_canvas_name
-    controller.send(:facebook_config)[:canvas_name]
+  # Return the current app namespace:
+  def app_namespace
+    controller.send(:facebook_config)[:namespace]
   end
+  alias_method :app_canvas_name, :app_namespace     # <= Deprecation of "canvas_name", but still aliased
   
   # Return the full canvas URL:
   def app_canvas_url
-    request.ssl? ? "https://apps.facebook.com/#{app_canvas_name}" : "http://apps.facebook.com/#{app_canvas_name}"
+    "#{request.ssl? ? "https://" : "http://"}apps.facebook.com/#{app_namespace}"
   end
   
   # Generate a URL that points within the Facebook canvas
   def url_for_canvas(url_opts={})
-    apps_root = request.ssl? ? "https://apps.facebook.com/" : "http://apps.facebook.com/"
-    canvas_root = File.join(apps_root, app_canvas_name)
+    canvas_root = app_canvas_url
     if url_opts.is_a?(Hash)
       return File.join(canvas_root, url_for(url_opts))
     elsif url_opts.include?("://")

data/lib/doesfacebook/config.rb

@@ -9,26 +9,25 @@ module DoesFacebook
     # Load app configuration by Facebook callback path with a fallback to config
     # defined with name matching our current environment:
     def facebook_config
-      app_settings = all_facebook_config.find do |app_name, settings|
-        (settings["ssl_callback_url"] || settings["callback_url"]).match(/https?:\/\/#{request.host}/)
+      @facebook_config ||= nil
+      return @facebook_config unless @facebook_config.nil?
+      app_name, app_config = all_facebook_config.find do |name, config|
+        test_callback = request.ssl? ? config["ssl_callback_url"] : config["callback_url"]
+        request.url.match(/^#{test_callback}.*/)
       end
-      if app_settings
-        app_name, app_config = app_settings
-        if app_config
-          Rails.logger.debug("  Facebook configuration for app \"#{app_name}\" loaded via request to host #{request.host}")
-          return @@facebook_config = HashWithIndifferentAccess.new(app_config)
+      if app_config
+        app_config = HashWithIndifferentAccess.new(app_config)
+        if app_config[:canvas_name]
+          app_config[:namespace] ||= app_config.delete(:canvas_name)
+          Rails.logger.warn("  DoesFacebook Deprecation Warning: \"canvas_name\" field in doesfacebook.yml should be renamed \"namespace\" as per Facebook Roadmap")
         end
-      end
-      
-      @@facebook_config = HashWithIndifferentAccess.new(all_facebook_config[Rails.env])
-      unless @@facebook_config.blank?
-        Rails.logger.debug("  Facebook configuration loaded for app based on environment \"#{Rails.env}\"")
+        Rails.logger.info("  Facebook configuration for app \"#{app_name}\" loaded for request URL #{request.url}")
+        @facebook_config = app_config
       else
         Rails.logger.warn("  Facebook configuration could not be found. doesfacebook.yml has no app for host #{request.host}")
         Rails.logger.warn("  Facebook configuration can be generated by running \"rails generate does_facebook:config\"")
       end
-      
-      return @@facebook_config
+      return @facebook_config
     end
     
       

data/lib/doesfacebook/controls.rb

@@ -15,7 +15,7 @@ module DoesFacebook
     # Mechanism for redirecting within the Facebook canvas:
     def redirect_to_canvas_old(opts={})
       raise MalformedUrlOptions.new("Options passed to `redirect_to_canvas` must be a URL options Hash") unless opts.is_a?(Hash)
-      dest = File.join("http://apps.facebook.com/", facebook_config[:canvas_name], url_for(opts.merge(:only_path=>true))) 
+      dest = File.join("http://apps.facebook.com/", facebook_config[:namespace], url_for(opts.merge(:only_path=>true))) 
       logger.warn "DoesFacebook: redirect_to_canvas_old method is deprecated and does not support HTTPS."
       logger.warn "DoesFacebook: Use redirect_to_canvas for HTTPS-support and JavaScript-based redirection."
       logger.info "Canvas Redirect to #{opts.inspect}=>#{dest}"
@@ -26,7 +26,7 @@ module DoesFacebook
     def redirect_to_canvas(opts={})
       raise MalformedUrlOptions.new("Options passed to `redirect_to_canvas` must be a URL options Hash") unless opts.is_a?(Hash)
       apps_root = request.ssl? ? "https://apps.facebook.com/" : "http://apps.facebook.com/"
-      dest = File.join(apps_root, facebook_config[:canvas_name], url_for(opts.merge(:only_path=>true))) 
+      dest = File.join(apps_root, facebook_config[:namespace], url_for(opts.merge(:only_path=>true))) 
       @facebook_redirect_url = dest
       logger.info "Canvas Redirect to #{opts.inspect}=>#{dest}"
       begin

data/lib/generators/doesfacebook/config/templates/doesfacebook.yml

@@ -15,18 +15,18 @@
 name_of_app:
   app_id: 1234567890
   secret_key: 1234567890abcdefghijklmnopqrsttuv
-  canvas_name: your_canvas_name
+  namespace: your_canvas_name
   callback_url: http://your.dev.server.com/and/path
   
 name_of_another_app:
   app_id: 1234567890
   secret_key: 1234567890abcdefghijklmnopqrsttuv
-  canvas_name: your_canvas_name
+  namespace: your_canvas_name
   callback_url: http://your.dev.server.com/and/path
   
 name_of_production_app:
   app_id: 1234567890
   secret_key: 1234567890abcdefghijklmnopqrsttuv
-  canvas_name: your_canvas_name
+  namespace: your_canvas_name
   callback_url: http://your.server.com/and/path
   ssl_callback_url: https://your.secure.server.com/and/path

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: doesfacebook
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre3
-  prerelease: 6
+  version: 0.5.0
+  prerelease: 
 platform: ruby
 authors:
 - mccolin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000Z
+date: 2012-03-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156557920 !ruby/object:Gem::Requirement
+  requirement: &2162612200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156557920
+  version_requirements: *2162612200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156557320 !ruby/object:Gem::Requirement
+  requirement: &2162611700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *2156557320
+  version_requirements: *2162611700
 description: Paper-thin Facebook validation and signed request parsing Rails plugin
 email: info@awexomelabs.com
 executables: []
@@ -67,9 +67,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17