eukaliptus 0.7.1 → 0.8.1

data/README.rdoc

@@ -14,7 +14,7 @@ We provide integration with two authentication methods out of the box, Koala Fac
 
 Require it in your Gemfile
 
-    gem 'eukaliptus', :git => 'git://github.com/seasonlabs/eukaliptus.git'
+    gem 'eukaliptus'
 
 Update your bundle
 

data/lib/eukaliptus/request.rb

@@ -2,12 +2,42 @@ require 'rack/request'
 
 # Extend Rack::Request to add some helpers for FB
 class Request < ::Rack::Request
+  URL_ENCODED = %r{^application/x-www-form-urlencoded}
+  JSON_ENCODED = %r{^application/json}
+
   def params
-    rack_input = env["rack.input"].read
-    @params ||= Rack::Utils.parse_query(rack_input, "&")
+    @params ||= retrieve_params(env)
   end
 
   def facebook?
-    params["signed_request"].present?
+    params[:signed_request].present?
   end
+
+  private
+    # Stolen from Goliath
+    def retrieve_params(env)
+      params = {}
+      params.merge!(::Rack::Utils.parse_nested_query(env['QUERY_STRING']))
+
+      if env['rack.input']
+        post_params = ::Rack::Utils::Multipart.parse_multipart(env)
+        unless post_params
+          body = env['rack.input'].read
+          env['rack.input'].rewind
+
+          post_params = case(env['CONTENT_TYPE'])
+          when URL_ENCODED then
+            ::Rack::Utils.parse_nested_query(body)
+          when JSON_ENCODED then
+            MultiJson.decode(body)
+          else
+            {}
+          end
+        end
+
+        params.merge!(post_params)
+      end
+
+      params
+    end
 end

data/lib/eukaliptus/version.rb

@@ -1,3 +1,3 @@
 module Eukaliptus
-  VERSION = "0.7.1"
+  VERSION = "0.8.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: eukaliptus
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors: 
 - season
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-11 00:00:00 +02:00
+date: 2011-06-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency