mjfreshyfresh-mini_fb 0.1.17 → 0.1.18

data/lib/mini_fb.rb

@@ -1,5 +1,6 @@
 require 'digest/md5'
 require 'erb'
+require 'hashie'
 require 'json' unless defined? JSON
 require 'net/http'
 require 'cgi' unless defined? Rack
@@ -138,6 +139,8 @@ module MiniFB
   # to hide value from simple introspection.
   def MiniFB.call( api_key, secret, method, kwargs )
 
+      kwargs = Hashie::Mash.new kwargs
+
       puts 'kwargs=' + kwargs.inspect if @@logging
 
       if secret.is_a? String
@@ -160,7 +163,6 @@ module MiniFB
 
       # Hash with secret
       arg_string = String.new
-      kwargs.each { |k,v| (kwargs[k.to_s] = v ; kwargs.delete(k)) if k.is_a? Symbol }
       kwargs.sort.each { |kv| arg_string << kv[0] << "=" << kv[1].to_s }
       kwargs["sig"] = Digest::MD5.hexdigest( arg_string + secret.value.call )
 
@@ -179,23 +181,33 @@ module MiniFB
       rescue
         raise
       end
-
+      
       # Handle response
-      return response.body if custom_format
+      
+      body = response.body
+      return body if custom_format
+      unescaped_attempt = false
 
       begin
-          data = JSON.parse( response.body )
-          puts 'response=' + data.inspect if @@logging
-          if data.include?( "error_msg" ) then
-              raise FaceBookError.new( data["error_code"] || 1, data["error_msg"] )
-          end
-
+        data = JSON.parse body
+        puts 'response=' + data.inspect if @@logging
+        if data.include?( "error_msg" ) then
+            raise FaceBookError.new( data["error_code"] || 1, data["error_msg"] )
+        end
       rescue JSON::ParserError => ex
-        return response.body if BAD_JSON_METHODS.include? kwargs["method"]
-        return (response.body == 'true') if %w{true false}.include?(response.body) # Hack for Facebook boolean API calls with BAD JSON.
-        raise BadJSONDataError, "#{kwargs["method"]} returned \"#{response.body}\""
+        return body if BAD_JSON_METHODS.include? kwargs["method"]
+        return (body == 'true') if %w{true false}.include?(body) # Hack for Facebook boolean API calls with BAD JSON.
+        
+        unless unescaped_attempt
+          unescaped_attempt = true
+          body = body[/\A"(.*)"\z/m,1].gsub('\\', '')
+          retry
+        end
+        
+        raise BadJSONDataError, "#{kwargs["method"]} returned \"#{body}\""
       end
-      return data
+      
+      data.is_a?(Hash) ? Hashie::Mash.new(data) : data
   end
 
   # Returns true is signature is valid, false otherwise.

data/test/test_mini_fb.rb

@@ -41,9 +41,27 @@ class MiniFBTests < Test::Unit::TestCase
     test 'should return raw JSON if JSON format is directly specified' do
       results = @facebook_session.call 'Friends.get'
       results_raw = @facebook_session.call 'Friends.get', 'format' => 'JSON'
+      assert results_raw.is_a?(String)
       assert results == JSON.parse(results_raw)
     end
     
+    test 'should not create Hashie object if return is array' do
+      results = @facebook_session.call 'Friends.get'
+      assert results.is_a?(Array)
+    end
+    
+    test 'should not create Hashie object if return is string' do
+      results = @facebook_session.call 'users.getLoggedInUser'
+      assert results.is_a?(String)
+    end
+    
+    test 'should create Hashie object if return is Hash' do
+      results = @facebook_session.call 'Admin.getAppProperties', :properties => ['app_id', 'application_name'].to_json
+      assert results.is_a?(Hashie::Mash)
+      assert results.app_id.is_a?(Fixnum)
+      assert results.application_name.is_a?(String)
+    end
+    
     test 'should return XML if format is XML' do
       results = @facebook_session.call 'Friends.get', 'format' => 'xml'
       returned_at_least_one_response_element = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mjfreshyfresh-mini_fb
 version: !ruby/object:Gem::Version 
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors: 
 - Travis Reeder