koala 1.11.1 → 2.0.0rc1

data/spec/cases/realtime_updates_spec.rb

@@ -61,18 +61,6 @@ describe "Koala::Facebook::RealtimeUpdates" do
       expect(Koala::Facebook::RealtimeUpdates.instance_methods.map(&:to_sym)).not_to include(:api=)
     end
 
-    # old graph_api accessor
-    it "returns the api object when graph_api is called" do
-      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :secret => @secret)
-      expect(updates.graph_api).to eq(updates.api)
-    end
-
-    it "fire a deprecation warning when graph_api is called" do
-      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :secret => @secret)
-      expect(Koala::Utils).to receive(:deprecate)
-      updates.graph_api
-    end
-
     # init with secret / fetching the token
     it "initializes properly with an app_id and a secret" do
       updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :secret => @secret)

data/spec/cases/test_users_spec.rb

@@ -72,18 +72,6 @@ describe "Koala::Facebook::TestUsers" do
       expect(Koala::Facebook::TestUsers.instance_methods.map(&:to_sym)).to include(:api)
       expect(Koala::Facebook::TestUsers.instance_methods.map(&:to_sym)).not_to include(:api=)
     end
-
-    # old graph_api accessor
-    it "returns the api object when graph_api is called" do
-      test_users = Koala::Facebook::TestUsers.new(:app_id => @app_id, :secret => @secret)
-      expect(test_users.graph_api).to eq(test_users.api)
-    end
-
-    it "fire a deprecation warning when graph_api is called" do
-      test_users = Koala::Facebook::TestUsers.new(:app_id => @app_id, :secret => @secret)
-      expect(Koala::Utils).to receive(:deprecate)
-      test_users.graph_api
-    end
   end
 
   describe "when used without network" do
@@ -105,12 +93,12 @@ describe "Koala::Facebook::TestUsers" do
       end
 
       it "accepts permissions as a string" do
-        expect(@test_users.graph_api).to receive(:graph_call).with(anything, hash_including("permissions" => "read_stream,publish_stream"), anything, anything)
+        expect(@test_users.api).to receive(:graph_call).with(anything, hash_including("permissions" => "read_stream,publish_stream"), anything, anything)
         result = @test_users.create(true, "read_stream,publish_stream")
       end
 
       it "accepts permissions as an array" do
-        expect(@test_users.graph_api).to receive(:graph_call).with(anything, hash_including("permissions" => "read_stream,publish_stream"), anything, anything)
+        expect(@test_users.api).to receive(:graph_call).with(anything, hash_including("permissions" => "read_stream,publish_stream"), anything, anything)
         result = @test_users.create(true, ["read_stream", "publish_stream"])
       end
 
@@ -123,13 +111,13 @@ describe "Koala::Facebook::TestUsers" do
 
       it "lets you specify other graph arguments, like uid and access token" do
         args = {:uid => "some test user ID", :owner_access_token => "some owner access token"}
-        expect(@test_users.graph_api).to receive(:graph_call).with(anything, hash_including(args), anything, anything)
+        expect(@test_users.api).to receive(:graph_call).with(anything, hash_including(args), anything, anything)
         @test_users.create(true, nil, args)
       end
 
       it "lets you specify http options that get passed through to the graph call" do
         options = {:some_http_option => true}
-        expect(@test_users.graph_api).to receive(:graph_call).with(anything, anything, anything, options)
+        expect(@test_users.api).to receive(:graph_call).with(anything, anything, anything, options)
         @test_users.create(true, nil, {}, options)
       end
     end
@@ -180,7 +168,7 @@ describe "Koala::Facebook::TestUsers" do
         options = {:some_http_option => true}
         # technically this goes through delete_object, but this makes it less brittle
         @stubbed = true
-        expect(@test_users.graph_api).to receive(:graph_call).with(anything, anything, anything, options)
+        expect(@test_users.api).to receive(:graph_call).with(anything, anything, anything, options)
         @test_users.delete("user", options)
       end
     end
@@ -227,20 +215,20 @@ describe "Koala::Facebook::TestUsers" do
 
       it "makes a POST with the test user Graph API " do
         @user1 = @test_users2.create(true)
-        expect(@test_users2.graph_api).to receive(:graph_call).with(anything, anything, "post", anything)
+        expect(@test_users2.api).to receive(:graph_call).with(anything, anything, "post", anything)
         @test_users2.update(@user1, @updates)
       end
 
       it "makes a request to the test user with the update params " do
         @user1 = @test_users2.create(true)
-        expect(@test_users2.graph_api).to receive(:graph_call).with(@user1["id"], @updates, anything, anything)
+        expect(@test_users2.api).to receive(:graph_call).with(@user1["id"], @updates, anything, anything)
         @test_users2.update(@user1, @updates)
       end
 
       it "accepts an options hash" do
         options = {:some_http_option => true}
         @stubbed = true
-        expect(@test_users2.graph_api).to receive(:graph_call).with(anything, anything, anything, options)
+        expect(@test_users2.api).to receive(:graph_call).with(anything, anything, anything, options)
         @test_users2.update("foo", @updates, options)
       end
 

data/spec/fixtures/mock_facebook_responses.yml

@@ -259,16 +259,6 @@ graph_api:
         code: 500
         body: '{"error": {"type": "Exception","message": "No node specified"}}'
 
-  /search:
-    q=facebook:
-      get:
-        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"}}'
-    "limit=25&q=facebook&until=<%= TEST_DATA['search_time'] %>":
-      get:
-        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:

data/spec/support/graph_api_shared_examples.rb

@@ -51,12 +51,6 @@ shared_examples_for "Koala GraphAPI" do
     end
   end
 
-  # SEARCH
-  it "can search" do
-    result = @api.search("facebook")
-    expect(result.length).to be_an(Integer)
-  end
-
   # DATA
   # access public info
 
@@ -118,12 +112,6 @@ shared_examples_for "Koala GraphAPI" do
     expect(result["http://developers.facebook.com/blog/post/490"] && result["http://developers.facebook.com/blog/post/472"]).to be_truthy
   end
 
-  # SEARCH
-  it "can search" do
-    result = @api.search("facebook")
-    expect(result.length).to be_an(Integer)
-  end
-
   # PAGING THROUGH COLLECTIONS
   # see also graph_collection_tests
   it "makes a request for a page when provided a specific set of page params" do
@@ -522,7 +510,6 @@ shared_examples_for "Koala GraphAPI with an access token" do
       :put_wall_post => 4,
       :put_comment => 3,
       :put_like => 2, :delete_like => 2,
-      :search => 3,
       :set_app_restrictions => 4,
       :get_page_access_token => 3,
       :fql_query => 3, :fql_multiquery => 3,
@@ -571,26 +558,10 @@ shared_examples_for "Koala GraphAPI with GraphCollection" do
       expect(@api.get_connections(KoalaTest.page, "photos")).to be_nil
     end
 
-    it "gets a GraphCollection when searching" do
-      result = @api.search("facebook")
-      expect(result).to be_a(Koala::Facebook::GraphCollection)
-    end
-
-    it "returns nil if the search call fails with nil" do
-      # this happens sometimes
-      expect(@api).to receive(:graph_call).and_return(nil)
-      expect(@api.search("facebook")).to be_nil
-    end
-
-    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)
-    end
-
     it "returns nil if the page call fails with nil" do
       # this happens sometimes
       expect(@api).to receive(:graph_call).and_return(nil)
-      expect(@api.get_page(["search", {"q"=>"facebook", "limit"=>"25", "until"=> KoalaTest.search_time}])).to be_nil
+      expect(@api.get_connections(KoalaTest.page, "photos")).to be_nil
     end
   end
 end

data/spec/support/koala_test.rb

@@ -3,7 +3,7 @@ module KoalaTest
 
   class << self
     attr_accessor :oauth_token, :app_id, :secret, :app_access_token, :code, :session_key
-    attr_accessor :oauth_test_data, :subscription_test_data, :search_time
+    attr_accessor :oauth_test_data, :subscription_test_data
     attr_accessor :test_user_api
     attr_accessor :vcr_oauth_token
   end
@@ -107,9 +107,6 @@ module KoalaTest
     self.session_key = data["oauth_test_data"]["session_key"]
 
     self.vcr_oauth_token = data["vcr_data"]["oauth_token"]
-
-    # fix the search time so it can be used in the mock responses
-    self.search_time = data["search_time"] || (Time.now - 3600).to_s
   end
 
   def self.testing_permissions

data/spec/support/rest_api_shared_examples.rb

@@ -25,7 +25,7 @@ shared_examples_for "Koala RestAPI" do
     end
 
     it "sets the read_only option to true if the method is listed in the read-only list" do
-      method = Koala::Facebook::RestAPI::READ_ONLY_METHODS.first
+      method = Koala::Facebook::API::READ_ONLY_METHODS.first
 
       expect(@api).to receive(:api).with(
         anything,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: koala
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 2.0.0rc1
 platform: ruby
 authors:
 - Alex Koppel
@@ -83,7 +83,6 @@ files:
 - lib/koala/api/graph_api.rb
 - lib/koala/api/graph_batch_api.rb
 - lib/koala/api/graph_collection.rb
-- lib/koala/api/legacy.rb
 - lib/koala/api/rest_api.rb
 - lib/koala/errors.rb
 - lib/koala/http_service.rb
@@ -104,7 +103,6 @@ files:
 - spec/cases/http_service_spec.rb
 - spec/cases/koala_spec.rb
 - spec/cases/koala_test_spec.rb
-- spec/cases/legacy_spec.rb
 - spec/cases/multipart_request_spec.rb
 - spec/cases/oauth_spec.rb
 - spec/cases/realtime_updates_spec.rb
@@ -143,9 +141,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.2.1
@@ -162,7 +160,6 @@ test_files:
 - spec/cases/http_service_spec.rb
 - spec/cases/koala_spec.rb
 - spec/cases/koala_test_spec.rb
-- spec/cases/legacy_spec.rb
 - spec/cases/multipart_request_spec.rb
 - spec/cases/oauth_spec.rb
 - spec/cases/realtime_updates_spec.rb

data/lib/koala/api/legacy.rb

@@ -1,26 +0,0 @@
-require 'koala/api'
-module Koala
-  module Facebook
-    # Legacy support for old pre-1.2 APIs
-    
-    # A wrapper for the old APIs deprecated in 1.2.0, which triggers a deprecation warning when used.
-    # Otherwise, this class functions identically to API.
-    # @see API 
-    # @private
-    class OldAPI < API
-      def initialize(*args)
-        Koala::Utils.deprecate("#{self.class.name} is deprecated and will be removed in a future version; please use the API class instead.")
-        super
-      end
-    end
-    
-    # @private
-    class GraphAPI < OldAPI; end
-    
-    # @private
-    class RestAPI < OldAPI; end
-    
-    # @private
-    class GraphAndRestAPI < OldAPI; end
-  end
-end

data/spec/cases/legacy_spec.rb

@@ -1,115 +0,0 @@
-require 'spec_helper'
-
-# Support for legacy / deprecated interfaces
-describe "legacy APIs" do
-
-  it "deprecates the REST API" do
-    api = Koala::Facebook::API.new
-    allow(api).to receive(:api)
-    expect(Koala::Utils).to receive(:deprecate)
-    api.rest_call("stuff")
-  end
-
-  describe Koala::Facebook::GraphAPI do
-    describe "class consolidation" do
-      before :each do
-        allow(Koala::Utils).to receive(:deprecate) # avoid actual messages to stderr
-      end
-
-      it "still allows you to instantiate a GraphAndRestAPI object" do
-        api = expect(Koala::Facebook::GraphAPI.new("token")).to be_a(Koala::Facebook::GraphAPI)
-      end
-
-      it "ultimately creates an API object" do
-        api = expect(Koala::Facebook::GraphAPI.new("token")).to be_a(Koala::Facebook::API)
-      end
-
-      it "fires a depreciation warning" do
-        expect(Koala::Utils).to receive(:deprecate)
-        api = Koala::Facebook::GraphAPI.new("token")
-      end
-    end
-  end
-
-  describe Koala::Facebook::RestAPI do
-    describe "class consolidation" do
-      before :each do
-        allow(Koala::Utils).to receive(:deprecate) # avoid actual messages to stderr
-      end
-
-      it "still allows you to instantiate a GraphAndRestAPI object" do
-        api = expect(Koala::Facebook::RestAPI.new("token")).to be_a(Koala::Facebook::RestAPI)
-      end
-
-      it "ultimately creates an API object" do
-        api = expect(Koala::Facebook::RestAPI.new("token")).to be_a(Koala::Facebook::API)
-      end
-
-      it "fires a depreciation warning" do
-        expect(Koala::Utils).to receive(:deprecate)
-        api = Koala::Facebook::RestAPI.new("token")
-      end
-    end
-  end
-
-  describe Koala::Facebook::GraphAndRestAPI do
-    describe "class consolidation" do
-      before :each do
-        allow(Koala::Utils).to receive(:deprecate) # avoid actual messages to stderr
-      end
-
-      it "still allows you to instantiate a GraphAndRestAPI object" do
-        api = expect(Koala::Facebook::GraphAndRestAPI.new("token")).to be_a(Koala::Facebook::GraphAndRestAPI)
-      end
-
-      it "ultimately creates an API object" do
-        api = expect(Koala::Facebook::GraphAndRestAPI.new("token")).to be_a(Koala::Facebook::API)
-      end
-
-      it "fires a depreciation warning" do
-        expect(Koala::Utils).to receive(:deprecate)
-        api = Koala::Facebook::GraphAndRestAPI.new("token")
-      end
-    end
-  end
-
-  {:typhoeus => Koala::TyphoeusService, :net_http => Koala::NetHTTPService}.each_pair do |adapter, module_class|
-    describe module_class.to_s do
-      it "responds to deprecated_interface" do
-        expect(module_class).to respond_to(:deprecated_interface)
-      end
-
-      it "issues a deprecation warning" do
-        expect(Koala::Utils).to receive(:deprecate)
-        module_class.deprecated_interface
-      end
-
-      it "sets the default adapter to #{adapter}" do
-        module_class.deprecated_interface
-        expect(Faraday.default_adapter).to eq(adapter)
-      end
-    end
-  end
-
-  describe "moved classes" do
-    it "allows you to access Koala::HTTPService::MultipartRequest through the Koala module" do
-      expect(Koala::MultipartRequest).to eq(Koala::HTTPService::MultipartRequest)
-    end
-    
-    it "allows you to access Koala::Response through the Koala module" do
-      expect(Koala::Response).to eq(Koala::HTTPService::Response)
-    end
-    
-    it "allows you to access Koala::Response through the Koala module" do
-      expect(Koala::UploadableIO).to eq(Koala::HTTPService::UploadableIO)
-    end
-    
-    it "allows you to access Koala::Facebook::GraphBatchAPI::BatchOperation through the Koala::Facebook module" do
-      expect(Koala::Facebook::BatchOperation).to eq(Koala::Facebook::GraphBatchAPI::BatchOperation)
-    end 
-    
-    it "allows you to access Koala::Facebook::API::GraphCollection through the Koala::Facebook module" do
-      expect(Koala::Facebook::GraphCollection).to eq(Koala::Facebook::API::GraphCollection)
-    end   
-  end
-end