mini_fb 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be505723cf0db6d36400587903da97d34d916c95
-  data.tar.gz: dc822865779c05341d3316547d57d9fbb0f48370
+  metadata.gz: 396b01082b7673dbdbb00ef7846c28c9054d8b54
+  data.tar.gz: 1cb737e842fbdf953ca170215150675a6eeba7c6
 SHA512:
-  metadata.gz: a0e2e566abcaedf70de9c9b2b0c97c2dbbc6a05894174fc960ecfdd30dc06ab67f814942d107fb16dfff61562eabc7456fe18c4e086ee545efc16dd8c3b32b84
-  data.tar.gz: b32d26ce35a3ecb08744530a5739d0637ccc7192652c5126471f3367b285144e4cde24d11cd9eb45912052b594807589d738fd7b616090f671065b494c16ab85
+  metadata.gz: 0732ea1d42dee9bfa7c32a4e75f2e11f13d9da4cd76148e6e3fb2010d41be0c90184b012d4830a6b158ebf338fb56fa02f6784dd80ebf826d786021f0daebf60
+  data.tar.gz: 75a06e1d0bbe858045f747e80ca4f03c9f934b8b6159b17d1f8697e71d5bb9987e2307d3d74b748b6c8ff297382a6b5e6a74269ef345c8cddf5d2bd460ae744c

data/README.markdown

@@ -47,14 +47,21 @@ Facebook now uses Oauth 2 for authentication, but don't worry, this part is easy
 That's it. You now need to hold onto this access_token. We've put it in a cookie for now, but you probably
 want to store it in your database or something.
 
-Getting Data from Facebook
+General Use
 --------------------------
 
+    @response_hash = MiniFB.get(@access_token, @id, @options = {})
+
+
 It's very simple:
 
     @id = {some ID of something in facebook} || "me"
-    @type = {some facebook type like feed, friends, or photos} # (optional) nil will just return the object data directly
-    @response_hash = MiniFB.get(@access_token, @id, :type=>@type)
+    @options:
+      type = {some facebook type like feed, friends, or photos}
+      version = {version of the graph api}. Example: "2.5"
+      fields = {array of fields to explicit fetch}
+      params = {optional params}
+
     # @response_hash is a hash, but also allows object like syntax for instance, the following is true:
     @response_hash["user"] == @response_hash.user
 
@@ -112,7 +119,7 @@ eg:
       :uid => @user_id, :target_id => @target_user_id,
       :message => "Hello other user!"
     })
-    
+
 all responses will be json. In the instance of 'bad json' methods, the response will formatted {'response': '#{bad_response_string}'}
 
 
@@ -194,7 +201,7 @@ Define an fb_connect method in your login/sessions controller like so:
         @fb_info = MiniFB.parse_cookie_information(FB_APP_ID, cookies) # some users may have to use their API rather than the app. ID.
         puts "uid=#{@fb_info['uid']}"
         puts "session=#{@fb_info['session_key']}"
-        
+
         if MiniFB.verify_cookie_signature(FB_APP_ID, FB_SECRET, cookies)
           # And here you would create the user if it doesn't already exist, then redirect them to wherever you want.
         else

data/VERSION.yml

@@ -0,0 +1,5 @@
+---
+:major: 2
+:minor: 1
+:patch: 2
+:build:

data/lib/mini_fb.rb

@@ -573,7 +573,9 @@ module MiniFB
     #   - metadata: to include metadata in response. true/false
     #   - params: Any additional parameters you would like to submit
     def self.get(access_token, id, options={})
-        url = "#{graph_base}#{id}"
+        url = graph_base
+        url << "v#{options[:version]}/" if options[:version]
+        url << id
         url << "/#{options[:type]}" if options[:type]
         params = options[:params] || {}
         params["access_token"] = "#{(access_token)}"
@@ -594,7 +596,8 @@ module MiniFB
     #
     # Can throw a connection Timeout if there is too many items
     def self.multiget(access_token, ids, options={})
-        url = "#{graph_base}"
+        url = graph_base
+        url << "v#{options[:version]}/" if options[:version]
         url << "#{options[:type]}" if options[:type]
         params = options[:params] || {}
         params["ids"] = ids.join(',')
@@ -611,7 +614,9 @@ module MiniFB
     #   - metadata: to include metadata in response. true/false
     #   - params: Any additional parameters you would like to submit
     def self.post(access_token, id, options={})
-        url = "#{graph_base}#{id}"
+        url = graph_base
+        url << "v#{options[:version]}/" if options[:version]
+        url << id
         url << "/#{options[:type]}" if options[:type]
         options.delete(:type)
         params = options[:params] || {}
@@ -636,7 +641,8 @@ module MiniFB
     #   - metadata: to include metadata in response. true/false
     #   - params: Any additional parameters you would like to submit
     def self.delete(access_token, ids, options={})
-        url = "#{graph_base}"
+        url = graph_base
+        url << "v#{options[:version]}/" if options[:version]
         params = options[:params] || {}
         if ids.is_a?(Array)
           params["ids"] = ids.join(',')
@@ -696,67 +702,59 @@ module MiniFB
     end
 
     def self.fetch(url, options={})
-
-        begin
-            case options[:method]
-            when :post
-                @@log.debug 'url_post=' + url if @@logging
-                response = @@http.post url, options[:params]
-            when :delete
-                if options[:params] && options[:params].size > 0
-                    url += '?' + options[:params].map { |k, v|  CGI.escape(k.to_s) + '=' + CGI.escape(v.to_s) }.join('&')
-                end
-                @@log.debug 'url_delete=' + url if @@logging
-                response = @@http.delete url
-            else
-                if options[:params] && options[:params].size > 0
-                    url += '?' + options[:params].map { |k, v|  CGI.escape(k.to_s) + '=' + CGI.escape(v.to_s) }.join('&')
-                end
-                @@log.debug 'url_get=' + url if @@logging
-                response = @@http.get url
+        case options[:method]
+        when :post
+            @@log.debug 'url_post=' + url if @@logging
+            response = @@http.post url, options[:params]
+        when :delete
+            if options[:params] && options[:params].size > 0
+                url += '?' + options[:params].map { |k, v|  CGI.escape(k.to_s) + '=' + CGI.escape(v.to_s) }.join('&')
             end
-
-            resp = response.body
-            @@log.debug 'Response = ' + resp if @@logging
-            @@log.debug 'API Version =' + resp.headers["Facebook-API-Version"].to_s if @@logging
-
-            if options[:response_type] == :params
-                # Some methods return a param like string, for example: access_token=11935261234123|rW9JMxbN65v_pFWQl5LmHHABC
-                params = {}
-                params_array = resp.split("&")
-                params_array.each do |p|
-                    ps = p.split("=")
-                    params[ps[0]] = ps[1]
-                end
-                return params
-            else
-                begin
-                    res_hash = JSON.parse(resp.to_s)
-                rescue
-                    # quick fix for things like stream.publish that don't return json
-                    res_hash = JSON.parse("{\"response\": #{resp.to_s}}")
-                end
+            @@log.debug 'url_delete=' + url if @@logging
+            response = @@http.delete url
+        else
+            if options[:params] && options[:params].size > 0
+                url += '?' + options[:params].map { |k, v|  CGI.escape(k.to_s) + '=' + CGI.escape(v.to_s) }.join('&')
             end
+            @@log.debug 'url_get=' + url if @@logging
+            response = @@http.get url
+        end
 
-            if res_hash.is_a? Array # fql  return this
-                res_hash.collect! { |x| x.is_a?(Hash) ? Hashie::Mash.new(x) : x }
-            else
-                res_hash = { response: res_hash } unless res_hash.is_a? Hash
-                res_hash = Hashie::Mash.new(res_hash)
-            end
+        resp = response.body
+        @@log.debug "Response = #{resp}. Status = #{response.status}" if @@logging
+        @@log.debug 'API Version =' + response.headers["Facebook-API-Version"].to_s if @@logging
 
-            if res_hash.include?("error_msg")
-                raise FaceBookError.new(res_hash["error_code"] || 1, res_hash["error_msg"])
-            end
+        res_hash = JSON.parse(resp.to_s.size > 2 ? resp.to_s : {response: resp.to_s}.to_json)
 
-            return res_hash
-        rescue Exception => ex
-            puts "ex.http_code=" + response.status if @@logging
-            puts 'ex.http_body=' + resp if @@logging
-            res_hash = JSON.parse(resp) # probably should ensure it has a good response
+        unless response.ok?
             raise MiniFB::FaceBookError.new(response.status, "#{res_hash["error"]["type"]}: #{res_hash["error"]["message"]}")
         end
 
+        if options[:response_type] == :params
+            # Some methods return a param like string, for example: access_token=11935261234123|rW9JMxbN65v_pFWQl5LmHHABC
+            params = {}
+            params_array = resp.split("&")
+            params_array.each do |p|
+                ps = p.split("=")
+                params[ps[0]] = ps[1]
+            end
+            return params
+        else
+            res_hash = JSON.parse(resp.to_s.size > 2 ? resp.to_s : {response: resp.to_s}.to_json)
+        end
+
+        if res_hash.is_a? Array # fql  return this
+            res_hash.collect! { |x| x.is_a?(Hash) ? Hashie::Mash.new(x) : x }
+        else
+            res_hash = { response: res_hash } unless res_hash.is_a? Hash
+            res_hash = Hashie::Mash.new(res_hash)
+        end
+
+        if res_hash.include?("error_msg")
+            raise FaceBookError.new(res_hash["error_code"] || 1, res_hash["error_msg"])
+        end
+
+        res_hash
     end
 
     # Returns all available scopes.

data/lib/version.rb

@@ -1,3 +1,3 @@
 module MiniFB
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_fb
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -52,6 +52,7 @@ files:
 - LICENSE.txt
 - README.markdown
 - Rakefile
+- VERSION.yml
 - lib/mini_fb.rb
 - lib/version.rb
 - mini_fb.gemspec