fbauth 1.2.T.2 → 1.2.0.0

data/README.mdown

@@ -227,11 +227,6 @@ haven't (that we recall) come across the answers to these questions yet:
 
 # Change Log #
 
-v1.2.0.4
-
-- Added support for Facebook iFrame POST behaviour
-- Fixed bug in Memcache client where we were using keys > 250 chars
-
 v1.1.0.2
 
 - Added memcached caching of Facebook GET data, 60 seconds expiry

data/app/controllers/facebook_auth_functions.rb

@@ -4,15 +4,16 @@ module FacebookAuthFunctions
   OLD_FB_SESSION_PARAMS_KEY = :session
   FB_SIGNED_REQUEST_KEY = :signed_request
 
-  def setup_facebook_auth auth=nil
-    @facebook_auth = auth ||= facebook_auth
+  def setup_facebook_auth
+    @facebook_auth ||= facebook_auth
   end
 
   def require_facebook_auth
     setup_facebook_auth
     if @facebook_auth.nil?
       redirect_to build_auth_url
-    elsif signed_params_present? && request.post?
+    end
+    if signed_params_present? && request.post?
       # If Facebook POST with signed_params, redirect to original URI using GET
       redirect_to request.request_uri
     end

data/app/helpers/fbauth_helper.rb

@@ -8,18 +8,7 @@ module FbauthHelper
   end
 
   def fbauth_init_javascript options={}
-    render :partial => '/fbauth/init.html.haml', :locals => options.merge(:channel_url => fbauth_build_url('/channel.html'))
-  end
-
-  def fbauth_build_url path
-    if request.ssl?
-      u = "https://"
-    else
-      u = "http://"
-    end
-    u += request.host
-    u += ":#{request.port}" if request.port != 80
-    u += path
+    render :partial => '/fbauth/init.html.haml', :locals => options
   end
 
   def fbauth

data/app/views/fbauth/_init.html.haml

@@ -1,23 +1,7 @@
 - if auto_resize
   :javascript
-    window.fbAsyncInit = function() {
-      FB.init({appId: '#{FacebookConfig['app_id']}', status: true, cookie: true, xfbml: true, channelUrl: '#{channel_url}'});
-      FB.Canvas.setAutoResize();
-      if (typeof window.fbAuthInit == 'function') {
-        window.fbAuthInit();
-      }
-    };
+    FB.init({appId: '#{FacebookConfig['app_id']}', status: true, cookie: true, xfbml: true});
+    FB.Canvas.setAutoResize();
 - else
   :javascript
-    window.fbAsyncInit = function() {
-      FB.init({appId: '#{FacebookConfig['app_id']}', status: true, cookie: true, xfbml: true});
-      if (typeof window.fbAuthInit == 'function') {
-        window.fbAuthInit();
-      }
-    };
-:javascript
-  (function() {
-    var e = document.createElement('script'); e.async = true;
-    e.src = document.location.protocol + '//connect.facebook.net/en_US/all.js';
-    document.getElementById('fb-root').appendChild(e);
-  }());
+    FB.init({appId: '#{FacebookConfig['app_id']}', status: true, cookie: true, xfbml: true});

data/app/views/fbauth/_login.html.haml

@@ -1,9 +1,9 @@
 :javascript
-  window.fbAuthInit = function() {
+  $(document).ready(function() {
     fbauth_hide_panels();
-    FB.getLoginStatus(function(response) { fbauth_update_page(response); });
-    FB.Event.subscribe('auth.statusChange', function(response) { fbauth_update_page(response); });
-  };
+  });
+  FB.getLoginStatus(function(response) { fbauth_update_page(response); });
+  FB.Event.subscribe('auth.statusChange', function(response) { fbauth_update_page(response); });
   function fbauth_hide_panels() {
     $('#{login_el}').hide();
     $('#{add_el}').hide();

data/lib/facebook_decoder.rb

@@ -0,0 +1,30 @@
+require 'active_support'
+require 'digest/sha2'
+
+class FacebookDecoder
+
+  def self.decode data
+    unless data.nil?
+      sig, b64udata = data.split('.')
+      unless b64udata.nil?
+        json = b64udata.tr('-_', '+/').unpack('m')[0]
+        begin
+          parms = JSON.parse(json)
+        rescue => e
+          begin
+            parms = JSON.parse(json + '"}')
+          rescue => e2
+            begin
+              parms = JSON.parse(json + '}')
+            rescue => e3
+              raise "Unable to parse json structure - '#{json}'"
+              parms = {}
+            end
+          end
+        end
+      end
+    end
+    parms
+  end
+
+end

data/lib/{fbauth/http.rb → facebook_http.rb}

@@ -23,7 +23,7 @@ module FacebookHttp
     json = nil
     uri = URI.parse(build_get_url(url, params))
 
-    json = Rails.cache.read(uri.to_s) if caching_enabled? && uri.to_s.size < 250
+    json = Rails.cache.read(uri.to_s) if caching_enabled?
     if json.nil?
       bench = Benchmark.measure do
         http = Net::HTTP.new uri.host, uri.port
@@ -42,7 +42,7 @@ module FacebookHttp
         end
       end
       logger.warn("Facebook GET call to #{uri.to_s} completed in #{bench.real} seconds")
-      Rails.cache.write(uri.to_s, json, :expires_in => 60) if caching_enabled? && json && uri.to_s.size < 250
+      Rails.cache.write(uri.to_s, json, :expires_in => 60) if json && caching_enabled?
     end
     json
   end

data/lib/fbauth.rb

@@ -9,9 +9,9 @@
   end
 end
 
-require 'fbauth/decoder.rb'
-require 'fbauth/auth.rb'
-require 'fbauth/config.rb'
-require 'fbauth/http.rb'
-require 'fbauth/graph.rb'
-require 'fbauth/query.rb'
+require 'facebook_decoder.rb'
+require 'facebook_auth.rb'
+require 'facebook_config.rb'
+require 'facebook_http.rb'
+require 'facebook_graph.rb'
+require 'facebook_query.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: fbauth
 version: !ruby/object:Gem::Version 
-  hash: 229
-  prerelease: 4
+  hash: 79
+  prerelease: false
   segments: 
   - 1
   - 2
-  - T
-  - 2
-  version: 1.2.T.2
+  - 0
+  - 0
+  version: 1.2.0.0
 platform: ruby
 authors: 
 - Three Wise Men Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -04:00
+date: 2011-03-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -29,19 +29,18 @@ extensions: []
 extra_rdoc_files: 
 - README.mdown
 files: 
+- lib/facebook_auth.rb
+- lib/facebook_config.rb
+- lib/facebook_decoder.rb
+- lib/facebook_graph.rb
+- lib/facebook_http.rb
+- lib/facebook_query.rb
 - lib/fbauth.rb
-- lib/fbauth/auth.rb
-- lib/fbauth/config.rb
-- lib/fbauth/decoder.rb
-- lib/fbauth/graph.rb
-- lib/fbauth/http.rb
-- lib/fbauth/query.rb
 - app/controllers/facebook_auth_functions.rb
 - app/helpers/fbauth_helper.rb
 - app/views/fbauth/_init.html.haml
 - app/views/fbauth/_login.html.haml
 - rails/init.rb
-- public/channel.html
 - README.mdown
 has_rdoc: true
 homepage: http://github.com/ThreeWiseMen/fbauth
@@ -64,18 +63,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Authentication framework for Rails Facebook apps

data/lib/fbauth/decoder.rb

@@ -1,25 +0,0 @@
-require 'active_support'
-require 'digest/sha2'
-
-class FacebookDecoder
-
-  def self.decode data
-    unless data.nil?
-      sig, b64udata = data.split('.')
-      unless b64udata.nil?
-        json = b64udata.tr('-_', '+/').unpack('m')[0]
-        begin
-          parms = JSON.parse(balance(json))
-        rescue => e
-          raise "Unable to parse json structure - '#{json}'"
-        end
-      end
-    end
-    parms
-  end
-
-  def self.balance input
-    input += '"' * (input.count('"') % 2)
-    input += "}" * (input.count('{') - input.count('}'))
-  end
-end

data/public/channel.html

@@ -1 +0,0 @@
-<script src="http://connect.facebook.net/en_US/all.js"></script>