merb_facebooker 0.0.5 → 0.0.6

data/lib/merb_facebooker.rb

@@ -1,9 +1,9 @@
-# make sure we're running inside Merb
 require 'facebooker'
 require 'yaml'
 require 'merb_facebooker/controller'
 require 'merb_facebooker/helpers'
 
+# make sure we're running inside Merb
 if defined?(Merb::Plugins)
   
   # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
@@ -13,10 +13,9 @@ if defined?(Merb::Plugins)
     ENV['FACEBOOK_API_KEY'] = Merb::Plugins.config[:merb_facebooker]['api_key']
     ENV['FACEBOOK_SECRET_KEY'] = Merb::Plugins.config[:merb_facebooker]['secret_key']
     ENV['FACEBOOKER_RELATIVE_URL_ROOT'] = Merb::Plugins.config[:merb_facebooker]['canvas_page_name']
-    #ActionController::Base.asset_host = FACEBOOKER['callback_url']
   end
   
-  Merb.add_mime_type(:fbml,  :to_fbml,  %w[application/fbml text/fbml], :encoding => "UTF-8")
+  Merb.add_mime_type(:fbml,  :to_fbml,  %w[application/fbml text/fbml], :encoding => 'utf-8')
   Merb::Request.http_method_overrides.push(
     proc { |c| c.params[:fb_sig_request_method].clone if c.params[:fb_sig_request_method]}
   )
@@ -24,12 +23,7 @@ if defined?(Merb::Plugins)
   Merb::BootLoader.before_app_loads do
     Merb::Controller.send(:include, Facebooker::Merb::Controller) 
     Merb::Controller.send(:include, Facebooker::Merb::Helpers)
-    # require code that must be loaded before the application
-  end
-  
-  Merb::BootLoader.after_app_loads do
-    # code that can be required after the application loads
   end
   
-  Merb::Plugins.add_rakefiles "merb_facebooker/merbtasks"
+  Merb::Plugins.add_rakefiles 'merb_facebooker/merbtasks'
 end

data/lib/merb_facebooker/controller.rb

@@ -7,18 +7,22 @@ module Facebooker
         controller.before :set_fbml_format
       end
       
+      # Facebook session
       #
-      # Just returns the @facebook_session instance variable
-      # 
+      # @return Facebook::Session
       def facebook_session
         @facebook_session
       end
       
+      # Sets session
       #
-      # Tries to secure the facebook_session, if it is not secured already, it tries to secure it 
-      # via the request parameter 'auth_token', if that doesn't work, it tries to use the parameters 
-      # from facebook (this could be in the request or via cookies [cookies in case of FBConnect]).
+      # Tries to secure the facebook_session, if it is not secured
+      # already, it tries to secure it via the request parameter 
+      # 'auth_token', if that doesn't work, it tries to use the parameters 
+      # from facebook (this could be in the request or via cookies 
+      # [cookies in case of FBConnect]).
       #
+      # @return [Boolean]
       def set_facebook_session
         session_set = session_already_secured? || secure_with_token! || secure_with_facebook_params!
         if session_set
@@ -28,18 +32,19 @@ module Facebooker
         session_set
       end
       
-      #
-      # initializes the @facebook_params instance using the method verified_facebook_params
-      #
+      # Initializes the @facebook_params instance using the method
+      # verified_facebook_params
+      # 
+      # @return [Mash]
       def facebook_params
         @facebook_params ||= verified_facebook_params
       end      
       
       private
       
-      #
       # Ensures there is an existing facebook session, and if so, it ask if it is secured.
       #
+      # @return [Boolean]
       def session_already_secured?
         (@facebook_session = session[:facebook_session]) && session[:facebook_session].secured?
       end
@@ -102,10 +107,10 @@ module Facebooker
         (value == '0' || value.nil? || value == '')        
       end
 
-      #
       # Get all the parameters from facebook via the request or cookies...
       # (Cookies have more presedence)
       #
+      # @return [Mash]
       def verified_facebook_params
         if !request.cookies[Facebooker::Session.api_key].blank?
           facebook_sig_params = request.cookies.inject({}) do |collection, pair|
@@ -211,7 +216,7 @@ module Facebooker
       end
       
       module ClassMethods
-        #
+
         # Creates a filter which reqires a user to have already authenticated to
         # Facebook before executing actions.  Accepts the same optional options hash which
         # before_filter and after_filter accept.
@@ -225,4 +230,4 @@ module Facebooker
       end
     end
   end
-end
+end

data/lib/merb_facebooker/version.rb

@@ -1,5 +1,5 @@
 module Facebooker
   module Merb
-    VERSION = '0.0.5'.freeze
+    VERSION = '0.0.6'.freeze
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Chris Van Pelt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 +01:00
+date: 2010-04-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,7 @@ dependencies:
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        version: "1.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -46,7 +45,7 @@ dependencies:
         version: 1.0.50
   type: :runtime
   version_requirements: *id002
-description: Merb plugin that makes facebooker work with merb...
+description: Merb plugin that makes facebooker work with Merb.
 email: vanpelt@doloreslabs.com, pavel.kunc@gmail.com
 executables: []
 
@@ -69,7 +68,7 @@ files:
 - LICENSE
 - TODO
 has_rdoc: true
-homepage: http://merb-plugins.rubyforge.org/merb_facebooker/
+homepage: http://github.com/pk/merb_facebooker
 licenses: []
 
 post_install_message: 
@@ -97,6 +96,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Merb plugin that makes facebooker work with merb...
+summary: Merb plugin that makes facebooker work with Merb.
 test_files: []