mini_fb 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 396b01082b7673dbdbb00ef7846c28c9054d8b54
-  data.tar.gz: 1cb737e842fbdf953ca170215150675a6eeba7c6
+  metadata.gz: b8e391adab3eb0fcf238f777a85227dd45e654fd
+  data.tar.gz: a2edb60b87d01fd15ac45bbad81ea061d777cdbf
 SHA512:
-  metadata.gz: 0732ea1d42dee9bfa7c32a4e75f2e11f13d9da4cd76148e6e3fb2010d41be0c90184b012d4830a6b158ebf338fb56fa02f6784dd80ebf826d786021f0daebf60
-  data.tar.gz: 75a06e1d0bbe858045f747e80ca4f03c9f934b8b6159b17d1f8697e71d5bb9987e2307d3d74b748b6c8ff297382a6b5e6a74269ef345c8cddf5d2bd460ae744c
+  metadata.gz: 0c44908e88abd8128bff57b620934b1e9bb50be219883aa3b3ebd4285da632f128e68bcd407c8a842454d0365045a55bb701e9c50b643729234d748b611efeac
+  data.tar.gz: 0d96d4738a20e6a09c8c4e7fdeeabc7c7f71423150bd47183c939495ac258ca5c92779df7453f398849537a5bf417e04412d6820c371b6fd3e3a4132afa449d3

data/lib/mini_fb.rb

@@ -512,7 +512,7 @@ module MiniFB
         resp = @@http.get oauth_url
         puts 'resp=' + resp.body.to_s if @@logging
         params = {}
-        params_array = resp.split("&")
+        params_array = resp.body.to_s.split("&")
         params_array.each do |p|
             ps = p.split("=")
             params[ps[0]] = ps[1]
@@ -520,17 +520,29 @@ module MiniFB
         return params
     end
 
+    # Gets long-lived token from the Facebook Graph API
+    # options:
+    #   - app_id: your app ID (string)
+    #   - secret: your app secret (string)
+    #   - access_token: short-lived user token (string)
     # returns a hash with one value being 'access_token', the other being 'expires'
+    #
+    # Throws MiniFB::FaceBookError if response from Facebook Graph API is not successful
     def self.fb_exchange_token(app_id, secret, access_token)
         oauth_url = "#{graph_base}oauth/access_token"
         oauth_url << "?client_id=#{app_id}"
         oauth_url << "&client_secret=#{secret}"
         oauth_url << "&grant_type=fb_exchange_token"
         oauth_url << "&fb_exchange_token=#{CGI.escape(access_token)}"
-        resp = @@http.get oauth_url
-        puts 'resp=' + resp.body.to_s if @@logging
+        response = @@http.get oauth_url
+        body = response.body.to_s
+        puts 'resp=' + body if @@logging
+        unless response.ok?
+          res_hash = JSON.parse(body)
+          raise MiniFB::FaceBookError.new(response.status, "#{res_hash["error"]["type"]}: #{res_hash["error"]["message"]}")
+        end
         params = {}
-        params_array = resp.split("&")
+        params_array = body.split("&")
         params_array.each do |p|
             ps = p.split("=")
             params[ps[0]] = ps[1]
@@ -724,16 +736,10 @@ module MiniFB
         @@log.debug "Response = #{resp}. Status = #{response.status}" if @@logging
         @@log.debug 'API Version =' + response.headers["Facebook-API-Version"].to_s if @@logging
 
-        res_hash = JSON.parse(resp.to_s.size > 2 ? resp.to_s : {response: resp.to_s}.to_json)
-
-        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 = resp.to_s.split("&")
             params_array.each do |p|
                 ps = p.split("=")
                 params[ps[0]] = ps[1]
@@ -741,6 +747,9 @@ module MiniFB
             return params
         else
             res_hash = JSON.parse(resp.to_s.size > 2 ? resp.to_s : {response: resp.to_s}.to_json)
+            unless response.ok?
+                raise MiniFB::FaceBookError.new(response.status, "#{res_hash["error"]["type"]}: #{res_hash["error"]["message"]}")
+            end
         end
 
         if res_hash.is_a? Array # fql  return this

data/lib/version.rb

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

data/spec/mini_fb_spec.rb

@@ -3,65 +3,64 @@ require 'uri'
 require 'yaml'
 require 'active_support/core_ext'
 require_relative '../lib/mini_fb'
+require_relative 'test_helper'
 
 describe MiniFB do
+  before do
+    MiniFB.log_level = :warn
+  end
 
-    before :all do
-        @is_setup = true
-        file_path = File.expand_path("../mini_fb_tests.yml", File.dirname(__FILE__))
-        @config   = File.open(file_path) { |yf| YAML::load(yf) }
-        MiniFB.log_level = :warn
-
-        @oauth_url       = MiniFB.oauth_url(@config['fb_app_id'],
-                                            "http://localhost:3000", # redirect url
-                                            :scope=>MiniFB.scopes.join(","))
-    end
-
+  let(:app_id){TestHelper.config['app_id']}
+  let(:app_secret){TestHelper.config['app_secret']}
+  let(:access_token){TestHelper.config['access_token']}
 
+  describe '#authenticate_as_app' do
 
-    before :each do
-        # this code runs once per-test
+    it 'authenticates with valid params' do
+      res = MiniFB.authenticate_as_app(app_id, app_secret)
+      expect(res).to include('access_token')
+      expect(res['access_token']).to match(/^#{app_id}/)
     end
+  end
 
-    it 'test_uri_escape' do
-        URI.escape("x=y").should eq("x=y")
-    end
+  describe '#signed_request_params' do
+    let (:req) { 'vlXgu64BQGFSQrY0ZcJBZASMvYvTHu9GQ0YM9rjPSso.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsIjAiOiJwYXlsb2FkIn0' }
+    let (:secret) { 'secret' }
 
-    it 'test_authenticate_as_app' do
-        res = MiniFB.authenticate_as_app(@config["fb_api_key"], @config["fb_secret"])
-        res.should include("access_token")
-        res["access_token"].should match(/^#{@config['fb_app_id']}/)#starts_with?(@config["fb_app_id"].to_s)
+    it 'decodes params' do
+      expect(MiniFB.signed_request_params(secret, req)).to eq({"0" => "payload"})
     end
+  end
 
+  describe '#exchange_token' do
+    let(:invalid_app_id) { '12345' }
+    let(:invalid_secret) { 'secret' }
+    let(:invalid_access_token) { 'token' }
 
-    it 'test_signed_request_params' do
-        # Example request and secret taken from http://developers.facebook.com/docs/authentication/canvas
-        secret = 'secret'
-        req = 'vlXgu64BQGFSQrY0ZcJBZASMvYvTHu9GQ0YM9rjPSso.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsIjAiOiJwYXlsb2FkIn0'
-        expect(MiniFB.signed_request_params(secret, req)).to eq({"0" => "payload"})
-    end
-
-end
+    it 'returns valid long-lived token' do
+      res = MiniFB.fb_exchange_token(app_id, app_secret, access_token)
 
+      expect(res).to include('access_token')
+      expect(res).to include('expires')
+    end
 
-def access_token
-    @config['access_token']
-end
+    it 'raises error on request with invalid params' do
+      error_message = 'Facebook error 400: OAuthException: '\
+        'Error validating application. '\
+        'Cannot get application info due to a system error.'
 
+      expect do
+        MiniFB.fb_exchange_token(invalid_app_id, invalid_secret, invalid_access_token)
+      end.to raise_error(MiniFB::FaceBookError, error_message)
+    end
 
-def test_me_with_fields
-    fields = {
-            'interests' => [:name],
-            'activities'=> [:name],
-            'music'     => [:name],
-            'videos'    => [:name],
-            'television'=> [:name],
-            'movies'    => [:name],
-            'likes'     => [:name],
-            'work'      => [:name],
-            'education' => [:name],
-            'books'     => [:name]
-    }
+    it 'raise error on request with invalid token' do
+      error_message = 'Facebook error 400: OAuthException: '\
+        'Invalid OAuth access token.'
 
-    snap   = MiniFB.get(access_token, 'me', :fields =>fields.keys)
+      expect do
+        MiniFB.fb_exchange_token(app_id, app_secret, invalid_access_token)
+      end.to raise_error(MiniFB::FaceBookError, error_message)
+    end
+  end
 end

data/spec/test_helper.rb

@@ -0,0 +1,14 @@
+module TestHelper
+  class << self
+    
+    def config
+      @config  ||= File.open(config_path) { |yf| YAML::load(yf) }
+    end
+
+    private
+
+      def config_path
+        File.expand_path("../mini_fb_tests.yml", File.dirname(__FILE__))
+      end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_fb
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -50,13 +50,13 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.markdown
+- README.md
 - Rakefile
-- VERSION.yml
 - lib/mini_fb.rb
 - lib/version.rb
 - mini_fb.gemspec
 - spec/mini_fb_spec.rb
+- spec/test_helper.rb
 homepage: http://github.com/appoxy/mini_fb/
 licenses: []
 metadata: {}
@@ -76,9 +76,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Tiny facebook library. By http://www.appoxy.com
 test_files:
 - spec/mini_fb_spec.rb
+- spec/test_helper.rb

data/VERSION.yml

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