mini_fb 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47673e1ef51af1dfe27fdefc65c2923c2ee65300
-  data.tar.gz: 20c9ea4d481521de3a8cbc41796dcbb66ade9f29
+  metadata.gz: be505723cf0db6d36400587903da97d34d916c95
+  data.tar.gz: dc822865779c05341d3316547d57d9fbb0f48370
 SHA512:
-  metadata.gz: 8846e74c083cd3ab2513d7efae29fcbe68f8a292f84efc9464d8bb8c8b88e9f879f096b8f83cba4f4e7a1c70d5bd24a6e393467768ba7452ad2b293704cfcdcf
-  data.tar.gz: 0c1b39eebfa8e53877725bf6798d48bf727270b585ccae3fd9cdaccc1a7af6ea20339ee860a12f793a5ff32618b5faff1bcb6cf7e0afea051ccbd381da8d34ae
+  metadata.gz: a0e2e566abcaedf70de9c9b2b0c97c2dbbc6a05894174fc960ecfdd30dc06ab67f814942d107fb16dfff61562eabc7456fe18c4e086ee545efc16dd8c3b32b84
+  data.tar.gz: b32d26ce35a3ecb08744530a5739d0637ccc7192652c5126471f3367b285144e4cde24d11cd9eb45912052b594807589d738fd7b616090f671065b494c16ab85

data/.gitignore

@@ -1,3 +1,4 @@
 pkg
 .idea
 mini_fb_tests.yml
+*.gem

data/Gemfile

@@ -2,4 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rspec'
+gem 'jeweler2'
+gem 'rspec', '~> 2.11.0'
+gem 'rake'
+gem 'activesupport'

data/Gemfile.lock

@@ -1,30 +1,44 @@
 PATH
   remote: .
   specs:
-    mini_fb (2.1.0)
+    mini_fb (2.0.0)
       hashie
-      rest_client
+      hashie
+      rest-client
+      rest-client
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.5)
-    hashie (2.0.5)
-    netrc (0.7.7)
-    rest_client (1.7.3)
-      netrc (~> 0.7.7)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    hashie (2.0.2)
+    i18n (0.6.4)
+    jeweler2 (2.0.9)
+      git (>= 1.2.5)
+    mime-types (1.21)
+    multi_json (1.6.1)
+    rake (10.0.3)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
+  jeweler2
   mini_fb!
-  rspec
+  rake
+  rspec (~> 2.11.0)

data/lib/mini_fb.rb

@@ -14,12 +14,11 @@
 require 'digest/md5'
 require 'erb'
 require 'json' unless defined? JSON
-require 'rest_client'
+require 'httpclient'
 require 'hashie'
 require 'base64'
 require 'openssl'
 require 'logger'
-require_relative 'version'
 
 module MiniFB
 
@@ -29,6 +28,8 @@ module MiniFB
 
     @@logging = false
     @@log = Logger.new(STDOUT)
+    @@http = HTTPClient.new
+
 
     def self.log_level=(level)
         if level.is_a? Numeric
@@ -318,7 +319,7 @@ module MiniFB
     def self.verify_signed_request(secret, req)
         s, p = req.split(".")
         sig = base64_url_decode(s)
-        expected_sig = OpenSSL::HMAC.digest('SHA256', secret, p.tr("-_", "+/"))
+        expected_sig = OpenSSL::HMAC.digest('SHA256', secret, p)
         return sig == expected_sig
     end
 
@@ -508,7 +509,7 @@ module MiniFB
         oauth_url << "&redirect_uri=#{CGI.escape(redirect_uri)}"
         oauth_url << "&client_secret=#{secret}"
         oauth_url << "&code=#{CGI.escape(code)}"
-        resp = RestClient.get oauth_url
+        resp = @@http.get oauth_url
         puts 'resp=' + resp.body.to_s if @@logging
         params = {}
         params_array = resp.split("&")
@@ -526,7 +527,7 @@ module MiniFB
         oauth_url << "&client_secret=#{secret}"
         oauth_url << "&grant_type=fb_exchange_token"
         oauth_url << "&fb_exchange_token=#{CGI.escape(access_token)}"
-        resp = RestClient.get oauth_url
+        resp = @@http.get oauth_url
         puts 'resp=' + resp.body.to_s if @@logging
         params = {}
         params_array = resp.split("&")
@@ -557,13 +558,12 @@ module MiniFB
         params["type"] = "client_cred"
         params["client_id"] = "#{app_id}"
         params["client_secret"] = "#{secret}"
-#      resp = RestClient.get url
         options = {}
         options[:params] = params
         options[:method] = :get
         options[:response_type] = :params
         resp = fetch(url, options)
-        puts 'resp=' + resp if @@logging
+        puts 'resp=' + resp.to_s if @@logging
         resp
     end
 
@@ -583,6 +583,28 @@ module MiniFB
         return fetch(url, options)
     end
 
+    # Gets multiple data from the Facebook Graph API
+    # options:
+    #   - type: eg: feed, home, etc
+    #   - metadata: to include metadata in response. true/false
+    #   - params: Any additional parameters you would like to submit
+    # Example:
+    #
+    # MiniFB.multiget(access_token, [123, 234])
+    #
+    # Can throw a connection Timeout if there is too many items
+    def self.multiget(access_token, ids, options={})
+        url = "#{graph_base}"
+        url << "#{options[:type]}" if options[:type]
+        params = options[:params] || {}
+        params["ids"] = ids.join(',')
+        params["access_token"] = "#{(access_token)}"
+        params["metadata"] = "1" if options[:metadata]
+        params["fields"] = options[:fields].join(",") if options[:fields]
+        options[:params] = params
+        return fetch(url, options)
+    end
+
     # Posts data to the Facebook Graph API
     # options:
     #   - type: eg: feed, home, etc
@@ -608,6 +630,31 @@ module MiniFB
 
     end
 
+    # Sends a DELETE request to the Facebook Graph API
+    # options:
+    #   - type: eg: feed, home, etc
+    #   - 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}"
+        params = options[:params] || {}
+        if ids.is_a?(Array)
+          params["ids"] = ids.join(',')
+        else
+          url << "#{ids}"
+        end
+        url << "/#{options[:type]}" if options[:type]
+        options.delete(:type)
+        options.each do |key, value|
+            params[key] = "#{value}"
+        end
+        params["access_token"] = "#{(access_token)}"
+        options[:params] = params
+        options[:method] = :delete
+        return fetch(url, options)
+
+    end
+
     # Executes an FQL query
     def self.fql(access_token, fql_query, options={})
         url = "https://api.facebook.com/method/fql.query"
@@ -651,18 +698,27 @@ module MiniFB
     def self.fetch(url, options={})
 
         begin
-            if options[:method] == :post
+            case options[:method]
+            when :post
                 @@log.debug 'url_post=' + url if @@logging
-                resp = RestClient.post url, options[:params]
+                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
-                resp = RestClient.get url
+                response = @@http.get url
             end
 
-            @@log.debug 'resp=' + resp.to_s if @@log.debug?
+            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
@@ -694,11 +750,11 @@ module MiniFB
             end
 
             return res_hash
-        rescue RestClient::Exception => ex
-            puts "ex.http_code=" + ex.http_code.to_s if @@logging
-            puts 'ex.http_body=' + ex.http_body if @@logging
-            res_hash = JSON.parse(ex.http_body) # probably should ensure it has a good response
-            raise MiniFB::FaceBookError.new(ex.http_code, "#{res_hash["error"]["type"]}: #{res_hash["error"]["message"]}")
+        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
+            raise MiniFB::FaceBookError.new(response.status, "#{res_hash["error"]["type"]}: #{res_hash["error"]["message"]}")
         end
 
     end

data/lib/version.rb

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

data/mini_fb.gemspec

@@ -3,8 +3,8 @@ require File.expand_path('../lib/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Travis Reeder"]
   gem.email         = ["travis@appoxy.com"]
-  gem.description   = "Tiny facebook library by Appoxy.com"
-  gem.summary       = "Tiny facebook library by Appoxy.com"
+  gem.description   = "Tiny facebook library. By http://www.appoxy.com"
+  gem.summary       = "Tiny facebook library. By http://www.appoxy.com"
   gem.homepage      = "http://github.com/appoxy/mini_fb/"
 
   gem.files         = `git ls-files`.split($\)
@@ -15,8 +15,7 @@ Gem::Specification.new do |gem|
   gem.version       = MiniFB::VERSION
 
   gem.required_rubygems_version = ">= 1.3.6"
-  gem.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  gem.add_runtime_dependency "rest_client", ">= 0"
+  gem.required_ruby_version = Gem::Requirement.new(">= 1.8")
+  gem.add_runtime_dependency "httpclient", ">= 0"
   gem.add_runtime_dependency "hashie", ">= 0"
-
 end

metadata

@@ -1,52 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: mini_fb
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest_client
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Tiny facebook library by Appoxy.com
+description: Tiny facebook library. By http://www.appoxy.com
 email:
 - travis@appoxy.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
+- ".gitignore"
+- ".rvmrc"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -65,19 +65,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Tiny facebook library by Appoxy.com
+summary: Tiny facebook library. By http://www.appoxy.com
 test_files:
 - spec/mini_fb_spec.rb