koala 2.5.0 → 3.0.0.beta1

data/spec/cases/uploadable_io_spec.rb

@@ -8,7 +8,7 @@ module Koala::MIME
   end
 end
 
-describe "Koala::UploadableIO" do
+describe "Koala::HTTPService::UploadableIO" do
   def rails_3_mocks
     tempfile = double('Tempfile', :path => "foo")
     uploaded_file = double('ActionDispatch::Http::UploadedFile',
@@ -39,15 +39,15 @@ describe "Koala::UploadableIO" do
         end
 
         it "returns an UploadIO with the same file path" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@path)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@path)
         end
 
         it "returns an UploadIO with the same content type" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(@stub_type)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(@stub_type)
         end
 
         it "returns an UploadIO with the file's name" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@path))
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@path))
         end
       end
 
@@ -68,16 +68,16 @@ describe "Koala::UploadableIO" do
         end
 
         it "returns an UploadIO with the same io" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@koala_io_params[0])
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@koala_io_params[0])
         end
 
         it "returns an UploadableIO with the same content_type" do
           content_stub = @koala_io_params[1] = double('Content Type')
-          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
         end
 
         it "returns an UploadableIO with the right filename" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@file.path))
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@file.path))
         end
       end
 
@@ -100,16 +100,16 @@ describe "Koala::UploadableIO" do
 
         it "returns an UploadIO with the same io" do
           #Problem comparing Tempfile in Ruby 1.8, REE and Rubinius mode 1.8
-          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path.path).to eq(@koala_io_params[0].path)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).io_or_path.path).to eq(@koala_io_params[0].path)
         end
 
         it "returns an UploadableIO with the same content_type" do
           content_stub = @koala_io_params[1] = double('Content Type')
-          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
         end
 
         it "returns an UploadableIO with the right filename" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@file.path))
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@file.path))
         end
       end
 
@@ -130,18 +130,18 @@ describe "Koala::UploadableIO" do
         end
 
         it "returns an UploadableIO with the same io" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@koala_io_params[0])
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@koala_io_params[0])
         end
 
         it "returns an UploadableIO with the same content_type" do
           content_stub = @koala_io_params[1] = double('Content Type')
-          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
         end
       end
 
       describe "and no content type" do
         it "raises an exception" do
-          expect { Koala::UploadableIO.new(*@koala_io_params) }.to raise_exception(Koala::KoalaError)
+          expect { Koala::HTTPService::UploadableIO.new(*@koala_io_params) }.to raise_exception(Koala::KoalaError)
         end
       end
     end
@@ -154,17 +154,17 @@ describe "Koala::UploadableIO" do
       it "gets the path from the tempfile associated with the UploadedFile" do
         expected_path = double('Tempfile')
         expect(@tempfile).to receive(:path).and_return(expected_path)
-        expect(Koala::UploadableIO.new(@uploaded_file).io_or_path).to eq(expected_path)
+        expect(Koala::HTTPService::UploadableIO.new(@uploaded_file).io_or_path).to eq(expected_path)
       end
 
       it "gets the content type via the content_type method" do
         expected_content_type = double('Content Type')
         expect(@uploaded_file).to receive(:content_type).and_return(expected_content_type)
-        expect(Koala::UploadableIO.new(@uploaded_file).content_type).to eq(expected_content_type)
+        expect(Koala::HTTPService::UploadableIO.new(@uploaded_file).content_type).to eq(expected_content_type)
       end
 
       it "gets the filename from the UploadedFile" do
-        expect(Koala::UploadableIO.new(@uploaded_file).filename).to eq(@uploaded_file.original_filename)
+        expect(Koala::HTTPService::UploadableIO.new(@uploaded_file).filename).to eq(@uploaded_file.original_filename)
       end
     end
 
@@ -177,7 +177,7 @@ describe "Koala::UploadableIO" do
         expected_file = double('File')
         @file_hash[:tempfile] = expected_file
 
-        uploadable = Koala::UploadableIO.new(@file_hash)
+        uploadable = Koala::HTTPService::UploadableIO.new(@file_hash)
         expect(uploadable.io_or_path).to eq(expected_file)
       end
 
@@ -185,12 +185,12 @@ describe "Koala::UploadableIO" do
         expected_content_type = double('Content Type')
         @file_hash[:type] = expected_content_type
 
-        uploadable = Koala::UploadableIO.new(@file_hash)
+        uploadable = Koala::HTTPService::UploadableIO.new(@file_hash)
         expect(uploadable.content_type).to eq(expected_content_type)
       end
 
       it "gets the content type from the :type key" do
-        uploadable = Koala::UploadableIO.new(@file_hash)
+        uploadable = Koala::HTTPService::UploadableIO.new(@file_hash)
         expect(uploadable.filename).to eq(@file_hash[:filename])
       end
     end
@@ -199,12 +199,12 @@ describe "Koala::UploadableIO" do
       # what that means is tested below
       it "should accept a file object alone" do
         params = [BEACH_BALL_PATH]
-        expect { Koala::UploadableIO.new(*params) }.not_to raise_exception
+        expect { Koala::HTTPService::UploadableIO.new(*params) }.not_to raise_exception
       end
 
       it "should accept a file path alone" do
         params = [BEACH_BALL_PATH]
-        expect { Koala::UploadableIO.new(*params) }.not_to raise_exception
+        expect { Koala::HTTPService::UploadableIO.new(*params) }.not_to raise_exception
       end
     end
   end
@@ -218,7 +218,7 @@ describe "Koala::UploadableIO" do
     context "if no filename was provided" do
       it "should call the constructor with the content type, file name, and a dummy file name" do
         expect(UploadIO).to receive(:new).with(BEACH_BALL_PATH, "content/type", anything).and_return(@upload_io)
-        expect(Koala::UploadableIO.new(BEACH_BALL_PATH, "content/type").to_upload_io).to eq(@upload_io)
+        expect(Koala::HTTPService::UploadableIO.new(BEACH_BALL_PATH, "content/type").to_upload_io).to eq(@upload_io)
       end
     end
 
@@ -226,7 +226,7 @@ describe "Koala::UploadableIO" do
       it "should call the constructor with the content type, file name, and the filename" do
         filename = "file"
         expect(UploadIO).to receive(:new).with(BEACH_BALL_PATH, "content/type", filename).and_return(@upload_io)
-        Koala::UploadableIO.new(BEACH_BALL_PATH, "content/type", filename).to_upload_io
+        Koala::HTTPService::UploadableIO.new(BEACH_BALL_PATH, "content/type", filename).to_upload_io
       end
     end
   end
@@ -234,33 +234,33 @@ describe "Koala::UploadableIO" do
   describe "getting a file" do
     it "returns the File if initialized with a file" do
       f = File.new(BEACH_BALL_PATH)
-      expect(Koala::UploadableIO.new(f).to_file).to eq(f)
+      expect(Koala::HTTPService::UploadableIO.new(f).to_file).to eq(f)
     end
 
     it "should open up and return a file corresponding to the path if io_or_path is a path" do
       result = double("File")
       expect(File).to receive(:open).with(BEACH_BALL_PATH).and_return(result)
-      expect(Koala::UploadableIO.new(BEACH_BALL_PATH).to_file).to eq(result)
+      expect(Koala::HTTPService::UploadableIO.new(BEACH_BALL_PATH).to_file).to eq(result)
     end
   end
 
   describe ".binary_content?" do
     it "returns true for Rails 3 file uploads" do
-      expect(Koala::UploadableIO.binary_content?(rails_3_mocks.last)).to be_truthy
+      expect(Koala::HTTPService::UploadableIO.binary_content?(rails_3_mocks.last)).to be_truthy
     end
 
     it "returns true for Sinatra file uploads" do
-      expect(Koala::UploadableIO.binary_content?(rails_3_mocks.last)).to be_truthy
+      expect(Koala::HTTPService::UploadableIO.binary_content?(rails_3_mocks.last)).to be_truthy
     end
 
     it "returns true for File objects" do
-      expect(Koala::UploadableIO.binary_content?(File.open(BEACH_BALL_PATH))).to be_truthy
+      expect(Koala::HTTPService::UploadableIO.binary_content?(File.open(BEACH_BALL_PATH))).to be_truthy
     end
 
     it "returns false for everything else" do
-      expect(Koala::UploadableIO.binary_content?(StringIO.new)).to be_falsey
-      expect(Koala::UploadableIO.binary_content?(BEACH_BALL_PATH)).to be_falsey
-      expect(Koala::UploadableIO.binary_content?(nil)).to be_falsey
+      expect(Koala::HTTPService::UploadableIO.binary_content?(StringIO.new)).to be_falsey
+      expect(Koala::HTTPService::UploadableIO.binary_content?(BEACH_BALL_PATH)).to be_falsey
+      expect(Koala::HTTPService::UploadableIO.binary_content?(nil)).to be_falsey
     end
   end
 end  # describe UploadableIO

data/spec/fixtures/mock_facebook_responses.yml

@@ -10,22 +10,6 @@
 #       with_token:
 #       no_token:
 
-# ====== REST API =====
-rest_api:
-
-# -- Stubbed Responses --
-  /method/admin.setAppProperties:
-    'properties={"desktop":0}':
-      post:
-        with_token: 'true'
-  /method/fql.query: # for testing the beta tier
-    query=select first_name from user where uid = 2901279:
-      get:
-        no_token: '[{"first_name":"Luke"}]'
-        with_token: '[{"first_name":"Luke"}]'
-
-
-
 # ====== GRAPH API =====
 graph_api:
 
@@ -95,9 +79,6 @@ graph_api:
     batch=<%= JSON.dump([{"method"=>"post", "relative_url"=>"FEED_ITEM_BATCH/likes"}, {"method"=>"delete", "relative_url"=> "FEED_ITEM_BATCH"}]) %>:
       post:
         with_token: '[{"code": 200, "body": "{\"id\": \"MOCK_LIKE\"}"},{"code": 200, "body":true}]'
-    batch=<%= JSON.dump([{"method" => "post", "relative_url" => "method/fql.query", "body" => "query=select+first_name+from+user+where+uid%3D2905623"}]) %>:
-      post:
-        with_token: '[{"code": 200, "body":"[{\"first_name\":\"Alex\"}]"}]'
 
     # dependencies
     batch=<%= JSON.dump([{"method"=>"get", "relative_url"=>"me", "name" => "getme"}, {"method"=>"get", "relative_url"=>"koppel", "depends_on" => "getme"}]) %>:
@@ -296,24 +277,6 @@ graph_api:
         with_token: '{"data": [{"id": "507731521_100412693339488"}], "paging": {"previous": "https:\/\/graph.facebook.com\/7204941866\/photos?limit=25&until=2008-09-15T18%3A30%3A25%2B0000", "next": "https:\/\/graph.facebook.com\/7204941866\/photos?limit=25&until=2008-09-15T18%3A30%3A25%2B0000"}}'
         no_token: '{"data": [{"id": "507731521_100412693339488"}], "paging": {"previous": "https:\/\/graph.facebook.com\/7204941866\/photos?limit=25&until=2008-09-15T18%3A30%3A25%2B0000", "next": "https:\/\/graph.facebook.com\/7204941866\/photos?limit=25&until=2008-09-15T18%3A30%3A25%2B0000"}}'
 
-  /fql:
-    q=select uid, first_name from user where uid = 2901279:
-      get:
-        no_token: '[{"uid":2901279,"first_name":"Luke"}]'
-        with_token: '[{"uid":2901279,"first_name":"Luke"}]'
-    q=select read_stream from permissions where uid = 2901279:
-      get:
-        <<: *token_required
-        with_token: '[{"read_stream":1}]'
-    'q=<%= JSON.dump({"query1" => "select post_id from stream where source_id = me()", "query2" => "select fromid from comment where post_id in (select post_id from #query1)", "query3" => "select uid, name from user where uid in (select fromid from #query2)"}) %>':
-      get:
-        <<: *token_required
-        with_token: '[{"name":"query1", "fql_result_set":[]},{"name":"query2", "fql_result_set":[]},{"name":"query3", "fql_result_set":[]}]'
-    'q=<%= JSON.dump({"query1" => "select uid, first_name from user where uid = 2901279", "query2" => "select uid, first_name from user where uid = 2905623"}) %>':
-      get:
-        with_token: '[{"name":"query1", "fql_result_set":[{"uid":2901279,"first_name":"Luke"}]},{"name":"query2", "fql_result_set":[{"uid":"2905623","first_name":"Alex"}]}]'
-        no_token: '[{"name":"query1", "fql_result_set":[{"uid":2901279,"first_name":"Luke"}]},{"name":"query2", "fql_result_set":[{"uid":"2905623","first_name":"Alex"}]}]'
-
 
   '/115349521819193_113815981982767':
     no_args:

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # Quantify coverage
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 # load the library
 require 'koala'

data/spec/support/graph_api_shared_examples.rb

@@ -32,14 +32,14 @@ shared_examples_for "Koala GraphAPI" do
     it "passes the results through GraphCollection.evaluate" do
       result = {}
       allow(@api).to receive(:api).and_return(result)
-      expect(Koala::Facebook::GraphCollection).to receive(:evaluate).with(result, @api)
+      expect(Koala::Facebook::API::GraphCollection).to receive(:evaluate).with(result, @api)
       @api.graph_call("/me")
     end
 
     it "returns the results of GraphCollection.evaluate" do
       expected = {}
       allow(@api).to receive(:api).and_return([])
-      expect(Koala::Facebook::GraphCollection).to receive(:evaluate).and_return(expected)
+      expect(Koala::Facebook::API::GraphCollection).to receive(:evaluate).and_return(expected)
       expect(@api.graph_call("/me")).to eq(expected)
     end
 
@@ -158,63 +158,6 @@ shared_examples_for "Koala GraphAPI" do
     # the results should have an ID and a name, among other things
     expect(result["id"] && result["name"]).to be_truthy
   end
-
-  # FQL
-  describe "#fql_query" do
-    it "makes a request to /fql" do
-      expect(@api).to receive(:get_object).with("fql", anything, anything)
-      @api.fql_query double('query string')
-    end
-
-    it "passes a query argument" do
-      query = double('query string')
-      expect(@api).to receive(:get_object).with(anything, hash_including(:q => query), anything)
-      @api.fql_query(query)
-    end
-
-    it "passes on any other arguments provided" do
-      args = {:a => 2}
-      expect(@api).to receive(:get_object).with(anything, hash_including(args), anything)
-      @api.fql_query("a query", args)
-    end
-  end
-
-  describe "#fql_multiquery" do
-    it "makes a request to /fql" do
-      expect(@api).to receive(:get_object).with("fql", anything, anything)
-      @api.fql_multiquery 'query string'
-    end
-
-    it "passes a queries argument" do
-      queries = double('query string')
-      queries_json = "some JSON"
-      allow(JSON).to receive(:dump).with(queries).and_return(queries_json)
-
-      expect(@api).to receive(:get_object).with(anything, hash_including(:q => queries_json), anything)
-      @api.fql_multiquery(queries)
-    end
-
-    it "simplifies the response format" do
-      raw_results = [
-        {"name" => "query1", "fql_result_set" => [1, 2, 3]},
-        {"name" => "query2", "fql_result_set" => [:a, :b, :c]}
-      ]
-      expected_results = {
-        "query1" => [1, 2, 3],
-        "query2" => [:a, :b, :c]
-      }
-
-      allow(@api).to receive(:get_object).and_return(raw_results)
-      results = @api.fql_multiquery({:query => true})
-      expect(results).to eq(expected_results)
-    end
-
-    it "passes on any other arguments provided" do
-      args = {:a => 2}
-      expect(@api).to receive(:get_object).with(anything, hash_including(args), anything)
-      @api.fql_multiquery("a query", args)
-    end
-  end
 end
 
 
@@ -370,7 +313,7 @@ shared_examples_for "Koala GraphAPI with an access token" do
 
     it "sets options[:video] to true" do
       source = double("UploadIO")
-      allow(Koala::UploadableIO).to receive(:new).and_return(source)
+      allow(Koala::HTTPService::UploadableIO).to receive(:new).and_return(source)
       allow(source).to receive(:requires_base_http_service).and_return(false)
       expect(Koala).to receive(:make_request).with(anything, anything, anything, hash_including(:video => true)).and_return(Koala::HTTPService::Response.new(200, "[]", {}))
       @api.put_video("foo")
@@ -508,51 +451,6 @@ shared_examples_for "Koala GraphAPI with an access token" do
     end
   end
 
-  it "can access public information via FQL" do
-    result = @api.fql_query("select uid, first_name from user where uid = #{KoalaTest.user2_id}")
-    expect(result.size).to eq(1)
-    expect(result.first['first_name']).to eq(KoalaTest.user2_name)
-    expect(result.first['uid']).to eq(KoalaTest.user2_id.to_i)
-  end
-
-  it "can access public information via FQL.multiquery" do
-    result = @api.fql_multiquery(
-      :query1 => "select uid, first_name from user where uid = #{KoalaTest.user2_id}",
-      :query2 => "select uid, first_name from user where uid = #{KoalaTest.user1_id}"
-    )
-    expect(result.size).to eq(2)
-    # this should check for first_name, but there's an FB bug currently
-    expect(result["query1"].first['uid']).to eq(KoalaTest.user2_id.to_i)
-    # result["query1"].first['first_name'].should == KoalaTest.user2_name
-    expect(result["query2"].first['first_name']).to eq(KoalaTest.user1_name)
-  end
-
-  it "can access protected information via FQL" do
-    # Tests agains the permissions fql table
-
-    # get the current user's ID
-    # we're sneakily using the Graph API, which should be okay since it has its own tests
-    g = Koala::Facebook::API.new(@token)
-    id = g.get_object("me", :fields => "id")["id"]
-
-    # now send a query about your permissions
-    result = @api.fql_query("select read_stream from permissions where uid = #{id}")
-
-    expect(result.size).to eq(1)
-    # we've verified that you have read_stream permissions, so we can test against that
-    expect(result.first["read_stream"]).to eq(1)
-  end
-
-  it "can access protected information via FQL.multiquery" do
-    result = @api.fql_multiquery(
-      :query1 => "select post_id from stream where source_id = me()",
-      :query2 => "select fromid from comment where post_id in (select post_id from #query1)",
-      :query3 => "select uid, name from user where uid in (select fromid from #query2)"
-    )
-    expect(result.size).to eq(3)
-    expect(result.keys).to include("query1", "query2", "query3")
-  end
-
   # test all methods to make sure they pass data through to the API
   # we run the tests here (rather than in the common shared example group)
   # since some require access tokens
@@ -572,7 +470,6 @@ shared_examples_for "Koala GraphAPI with an access token" do
       :search => 3,
       :set_app_restrictions => 4,
       :get_page_access_token => 3,
-      :fql_query => 3, :fql_multiquery => 3,
       # methods that have special arguments
       :get_comments_for_urls => [["url1", "url2"], {}],
       :put_picture => ["x.jpg", "image/jpg", {}, "me"],
@@ -609,7 +506,7 @@ shared_examples_for "Koala GraphAPI with GraphCollection" do
     # GraphCollection methods
     it "gets a GraphCollection when getting connections" do
       @result = @api.get_connections(KoalaTest.page, "photos")
-      expect(@result).to be_a(Koala::Facebook::GraphCollection)
+      expect(@result).to be_a(Koala::Facebook::API::GraphCollection)
     end
 
     it "returns nil if the get_collections call fails with nil" do
@@ -620,7 +517,7 @@ shared_examples_for "Koala GraphAPI with GraphCollection" do
 
     it "gets a GraphCollection when searching" do
       result = @api.search("facebook")
-      expect(result).to be_a(Koala::Facebook::GraphCollection)
+      expect(result).to be_a(Koala::Facebook::API::GraphCollection)
     end
 
     it "returns nil if the search call fails with nil" do
@@ -631,7 +528,7 @@ shared_examples_for "Koala GraphAPI with GraphCollection" do
 
     it "gets a GraphCollection when paging through results" do
       @results = @api.get_page(["search", {"q"=>"facebook", "limit"=>"25", "until"=> KoalaTest.search_time}])
-      expect(@results).to be_a(Koala::Facebook::GraphCollection)
+      expect(@results).to be_a(Koala::Facebook::API::GraphCollection)
     end
 
     it "returns nil if the page call fails with nil" do
@@ -691,37 +588,4 @@ shared_examples_for "Koala GraphAPI without an access token" do
   it "can't delete a like" do
     expect { @api.delete_like("7204941866_119776748033392") }.to raise_error(Koala::Facebook::AuthenticationError)
   end
-
-  # FQL_QUERY
-  describe "when making a FQL request" do
-    it "can access public information via FQL" do
-      result = @api.fql_query("select uid, first_name from user where uid = #{KoalaTest.user2_id}")
-      expect(result.size).to eq(1)
-      expect(result.first['first_name']).to eq(KoalaTest.user2_name)
-    end
-
-    it "can access public information via FQL.multiquery" do
-      result = @api.fql_multiquery(
-        :query1 => "select uid, first_name from user where uid = #{KoalaTest.user2_id}",
-        :query2 => "select uid, first_name from user where uid = #{KoalaTest.user1_id}"
-      )
-      expect(result.size).to eq(2)
-      expect(result["query1"].first['first_name']).to eq(KoalaTest.user2_name)
-      expect(result["query2"].first['first_name']).to eq(KoalaTest.user1_name)
-    end
-
-    it "can't access protected information via FQL" do
-      expect { @api.fql_query("select read_stream from permissions where uid = #{KoalaTest.user2_id}") }.to raise_error(Koala::Facebook::APIError)
-    end
-
-    it "can't access protected information via FQL.multiquery" do
-      expect {
-        @api.fql_multiquery(
-          :query1 => "select post_id from stream where source_id = me()",
-          :query2 => "select fromid from comment where post_id in (select post_id from #query1)",
-          :query3 => "select uid, name from user where uid in (select fromid from #query2)"
-        )
-      }.to raise_error(Koala::Facebook::APIError)
-    end
-  end
 end

data/spec/support/koala_test.rb

@@ -157,12 +157,12 @@ module KoalaTest
     print "Validating permissions for live testing..."
     # make sure we have the necessary permissions
     api = Koala::Facebook::API.new(token)
-    perms = api.fql_query("select #{testing_permissions} from permissions where uid = me()")[0]
-    perms.each_pair do |perm, value|
-      if value == (perm == "read_insights" ? 1 : 0) # live testing depends on insights calls failing
-        puts "failed!\n" # put a new line after the print above
-        raise ArgumentError, "Your access token must have #{testing_permissions.join(", ")}, and lack read_insights.  You have: #{perms.inspect}"
-      end
+    perms = api.get_connect("me", "permissions")["data"]
+
+    # live testing depends on insights calls failing
+    if perms.keys.include?("read_insights") || (perms.keys & testing_permissions) != testing_permissions
+      puts "failed!\n" # put a new line after the print above
+      raise ArgumentError, "Your access token must have #{testing_permissions.join(", ")}, and lack read_insights.  You have: #{perms.inspect}"
     end
     puts "done!"
   end

data/spec/support/mock_http_service.rb

@@ -32,8 +32,8 @@ module Koala
     mock_response_file_path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'mock_facebook_responses.yml')
     RESPONSES = YAML.load(ERB.new(IO.read(mock_response_file_path)).result(binding))
 
-    def self.make_request(path, args, verb, options = {})
-      if response = match_response(path, args, verb, options)
+    def self.make_request(request)
+      if response = match_response(request.raw_path, request.raw_args, request.raw_verb, request.raw_options)
         # create response class object
         response_object = if response.is_a? String
           Koala::HTTPService::Response.new(200, response, {})
@@ -65,7 +65,7 @@ module Koala
 
     # For a given query, see if our mock responses YAML has a resopnse for it.
     def self.match_response(path, args, verb, options = {})
-      server = options[:rest_api] ? 'rest_api' : 'graph_api'
+      server = 'graph_api'
       path = 'root' if path == '' || path == '/'
       verb = (verb || 'get').to_s
       token = args.delete('access_token')
@@ -88,8 +88,8 @@ module Koala
       args = arguments.inject({}) do |hash, (k, v)|
         # ensure our args are all stringified
         value = if v.is_a?(String)
-          should_json_decode?(v) ? JSON.load(v) : v
-        elsif v.is_a?(Koala::UploadableIO)
+          should_json_decode?(v) ? JSON.parse(v) : v
+        elsif v.is_a?(Koala::HTTPService::UploadableIO)
           # obviously there are no files in the yaml
           "[FILE]"
         else
@@ -119,7 +119,7 @@ module Koala
         # will remove +'s in restriction strings
         string.split("&").reduce({}) do |hash, component|
           k, v = component.split("=", 2) # we only care about the first =
-          value = should_json_decode?(v) ? JSON.load(v) : v.to_s rescue v.to_s
+          value = should_json_decode?(v) ? JSON.parse(v) : v.to_s rescue v.to_s
           # some special-casing, unfortunate but acceptable in this testing
           # environment
           value = nil if value.empty?

data/spec/support/uploadable_io_shared_examples.rb

@@ -12,7 +12,7 @@ shared_examples_for "MIME::Types can't return results" do
       else
         @koala_io_params[0] = path
       end
-      expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(mime_type)
+      expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(mime_type)
     end
 
     it "should get content types for #{extension} using basic analysis with file names with more than one dot" do
@@ -22,7 +22,7 @@ shared_examples_for "MIME::Types can't return results" do
       else
         @koala_io_params[0] = path
       end
-      expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(mime_type)
+      expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(mime_type)
     end
   end
 
@@ -37,7 +37,7 @@ shared_examples_for "MIME::Types can't return results" do
     end
 
     it "should throw an exception" do
-      expect { Koala::UploadableIO.new(*@koala_io_params) }.to raise_exception(Koala::KoalaError)
+      expect { Koala::HTTPService::UploadableIO.new(*@koala_io_params) }.to raise_exception(Koala::KoalaError)
     end
   end
 end
@@ -47,7 +47,7 @@ shared_examples_for "determining a mime type" do
     it "should return an UploadIO with MIME::Types-determined type if the type exists" do
       type_result = ["type"]
       allow(Koala::MIME::Types).to receive(:type_for).and_return(type_result)
-      expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(type_result.first)
+      expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(type_result.first)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koala
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Alex Koppel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -71,10 +71,10 @@ files:
 - lib/koala/api/graph_batch_api.rb
 - lib/koala/api/graph_collection.rb
 - lib/koala/api/graph_error_checker.rb
-- lib/koala/api/rest_api.rb
 - lib/koala/errors.rb
 - lib/koala/http_service.rb
 - lib/koala/http_service/multipart_request.rb
+- lib/koala/http_service/request.rb
 - lib/koala/http_service/response.rb
 - lib/koala/http_service/uploadable_io.rb
 - lib/koala/oauth.rb
@@ -89,6 +89,7 @@ files:
 - spec/cases/graph_api_spec.rb
 - spec/cases/graph_collection_spec.rb
 - spec/cases/graph_error_checker_spec.rb
+- spec/cases/http_service/request_spec.rb
 - spec/cases/http_service_spec.rb
 - spec/cases/koala_spec.rb
 - spec/cases/koala_test_spec.rb
@@ -109,7 +110,6 @@ files:
 - spec/support/graph_api_shared_examples.rb
 - spec/support/koala_test.rb
 - spec/support/mock_http_service.rb
-- spec/support/rest_api_shared_examples.rb
 - spec/support/uploadable_io_shared_examples.rb
 homepage: http://github.com/arsduo/koala
 licenses:
@@ -130,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.3
@@ -147,6 +147,7 @@ test_files:
 - spec/cases/graph_api_spec.rb
 - spec/cases/graph_collection_spec.rb
 - spec/cases/graph_error_checker_spec.rb
+- spec/cases/http_service/request_spec.rb
 - spec/cases/http_service_spec.rb
 - spec/cases/koala_spec.rb
 - spec/cases/koala_test_spec.rb
@@ -167,6 +168,5 @@ test_files:
 - spec/support/graph_api_shared_examples.rb
 - spec/support/koala_test.rb
 - spec/support/mock_http_service.rb
-- spec/support/rest_api_shared_examples.rb
 - spec/support/uploadable_io_shared_examples.rb
 has_rdoc: