koala 1.2.1 → 1.3.0

data/spec/support/rest_api_shared_examples.rb

@@ -112,145 +112,18 @@ shared_examples_for "Koala RestAPI" do
     end
 
     it "throws an APIError if the result hash has an error key" do
-      Koala.stub(:make_request).and_return(Koala::Response.new(500, {"error_code" => "An error occurred!"}, {}))
-      lambda { @api.rest_call("koppel", {}) }.should raise_exception(Koala::Facebook::APIError)
-    end
-
-    describe "when making a FQL request" do
-      it "calls fql.query method" do
-        @api.should_receive(:rest_call).with(
-          "fql.query", anything, anything
-        ).and_return(Koala::Response.new(200, "2", {}))
-
-        @api.fql_query stub('query string')
-      end
-
-      it "passes a query argument" do
-        query = stub('query string')
-
-        @api.should_receive(:rest_call).with(
-          anything, hash_including(:query => query), anything
-        )
-
-        @api.fql_query(query)
-      end
-
-      it "passes on any other arguments provided" do
-        args = {:a => 2}
-        @api.should_receive(:rest_call).with(anything, hash_including(args), anything)
-        @api.fql_query("a query", args)
-      end
-
-      it "passes on any http options provided" do
-        opts = {:a => 2}
-        @api.should_receive(:rest_call).with(anything, anything, hash_including(opts))
-        @api.fql_query("a query", {}, opts)
-      end
-    end
-
-    describe "when making a FQL-multiquery request" do
-      it "calls fql.multiquery method" do
-        @api.should_receive(:rest_call).with(
-          "fql.multiquery", anything, anything
-        ).and_return({})
-
-        @api.fql_multiquery 'query string'
-      end
-
-      it "passes a queries argument" do
-        queries = stub('query string')
-        queries_json = "some JSON"
-        MultiJson.stub(:encode).with(queries).and_return(queries_json)
-
-        @api.should_receive(:rest_call).with(
-          anything,
-          hash_including(:queries => 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]
-        }
-
-        @api.stub(:rest_call).and_return(raw_results)
-        results = @api.fql_multiquery({:query => true})
-        results.should == expected_results
-      end
-
-      it "passes on any other arguments provided" do
-        args = {:a => 2}
-        @api.should_receive(:rest_call).with(anything, hash_including(args), anything)
-        @api.fql_multiquery("a query", args)
-      end
-
-      it "passes on any http options provided" do
-        opts = {:a => 2}
-        @api.should_receive(:rest_call).with(anything, anything, hash_including(opts))
-        @api.fql_multiquery("a query", {}, opts)
-      end
+      Koala.stub(:make_request).and_return(Koala::HTTPService::Response.new(500, {"error_code" => "An error occurred!"}, {}))
+      lambda { @api.rest_call(KoalaTest.user1, {}) }.should raise_exception(Koala::Facebook::APIError)
     end
   end
 
   it "can use the beta tier" do
-    @api.fql_query("select first_name from user where uid = #{KoalaTest.user2_id}", {}, :beta => true)
+    @api.rest_call("fql.query", {:query => "select first_name from user where uid = #{KoalaTest.user2_id}"}, :beta => true)
   end
 end
 
 shared_examples_for "Koala RestAPI with an access token" do
-  # FQL
-  it "can access public information via FQL" do
-    result = @api.fql_query("select first_name from user where uid = #{KoalaTest.user2_id}")
-    result.size.should == 1
-    result.first['first_name'].should == KoalaTest.user2_name
-  end
-
-  it "can access public information via FQL.multiquery" do
-    result = @api.fql_multiquery(
-      :query1 => "select first_name from user where uid = #{KoalaTest.user2_id}",
-      :query2 => "select first_name from user where uid = #{KoalaTest.user1_id}"
-    )
-    result.size.should == 2
-    result["query1"].first['first_name'].should == KoalaTest.user2_name
-    result["query2"].first['first_name'].should == 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}")
-
-    result.size.should == 1
-    # we've verified that you have read_stream permissions, so we can test against that
-    result.first["read_stream"].should == 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)"
-    )
-    result.size.should == 3
-    result.keys.should include("query1", "query2", "query3")
-  end
-  
-  
-  describe ".set_app_properties" do
+  describe "#set_app_properties" do
     it "sends Facebook the properties JSON-encoded as :properties" do
       props = {:a => 2, :c => [1, 2, "d"]}
       @api.should_receive(:rest_call).with(anything, hash_including(:properties => MultiJson.encode(props)), anything, anything)
@@ -283,46 +156,13 @@ shared_examples_for "Koala RestAPI with an access token" do
       oauth = Koala::Facebook::OAuth.new(KoalaTest.app_id, KoalaTest.secret)
       app_token = oauth.get_app_access_token
       @app_api = Koala::Facebook::API.new(app_token)
-      @app_api.set_app_properties(:desktop => 0).should be_true
+      @app_api.set_app_properties(KoalaTest.app_properties).should be_true
     end
   end
 end
 
 
 shared_examples_for "Koala RestAPI without an access token" do
-  # FQL_QUERY
-  describe "when making a FQL request" do
-    it "can access public information via FQL" do
-      result = @api.fql_query("select first_name from user where uid = #{KoalaTest.user2_id}")
-      result.size.should == 1
-      result.first['first_name'].should == KoalaTest.user2_name
-    end
-
-    it "can access public information via FQL.multiquery" do
-      result = @api.fql_multiquery(
-        :query1 => "select first_name from user where uid = #{KoalaTest.user2_id}",
-        :query2 => "select first_name from user where uid = #{KoalaTest.user1_id}"
-      )
-      result.size.should == 2
-      result["query1"].first['first_name'].should == KoalaTest.user2_name
-      result["query2"].first['first_name'].should == KoalaTest.user1_name
-    end
-
-    it "can't access protected information via FQL" do
-      lambda { @api.fql_query("select read_stream from permissions where uid = #{KoalaTest.user2_id}") }.should raise_error(Koala::Facebook::APIError)
-    end
-
-    it "can't access protected information via FQL.multiquery" do
-      lambda {
-        @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)"
-        )
-      }.should raise_error(Koala::Facebook::APIError)
-    end
-  end
-  
   it "can't use set_app_properties" do
     lambda { @api.set_app_properties(:desktop => 0) }.should raise_error(Koala::Facebook::APIError)
   end

metadata

@@ -1,132 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: koala
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - Alex Koppel, Chris Baclig, Rafi Jacoby, Context Optional
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-04 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+date: 2011-10-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multi_json
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70194747941160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  requirement: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
+  prerelease: false
+  version_requirements: *70194747941160
+- !ruby/object:Gem::Dependency
   name: faraday
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70194747940100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.7.0
-  requirement: *id002
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: *70194747940100
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70194747938880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
-  requirement: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 2.8.0rc1
   type: :development
+  prerelease: false
+  version_requirements: *70194747938880
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70194747937740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.8.7
-  requirement: *id004
+  type: :development
   prerelease: false
-description: Koala is a lightweight, flexible Ruby SDK for Facebook.  It allows read/write access to the social graph via the Graph and REST APIs, as well as support for realtime updates and OAuth and Facebook Connect authentication.  Koala is fully tested and supports Net::HTTP and Typhoeus connections out of the box and can accept custom modules for other services.
+  version_requirements: *70194747937740
+description: Koala is a lightweight, flexible Ruby SDK for Facebook.  It allows read/write
+  access to the social graph via the Graph and REST APIs, as well as support for realtime
+  updates and OAuth and Facebook Connect authentication.  Koala is fully tested and
+  supports Net::HTTP and Typhoeus connections out of the box and can accept custom
+  modules for other services.
 email: alex@alexkoppel.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - readme.md
 - CHANGELOG
-files: 
+files:
 - .autotest
 - .gitignore
+- .rspec
 - .travis.yml
+- .yardopts
 - CHANGELOG
 - Gemfile
+- Guardfile
 - LICENSE
 - Manifest
 - Rakefile
 - autotest/discover.rb
 - koala.gemspec
 - lib/koala.rb
-- lib/koala/batch_operation.rb
-- lib/koala/graph_api.rb
-- lib/koala/graph_batch_api.rb
-- lib/koala/graph_collection.rb
+- lib/koala/api.rb
+- lib/koala/api/batch_operation.rb
+- 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/http_service.rb
-- lib/koala/multipart_request.rb
+- lib/koala/http_service/multipart_request.rb
+- lib/koala/http_service/response.rb
+- lib/koala/http_service/uploadable_io.rb
 - lib/koala/oauth.rb
 - lib/koala/realtime_updates.rb
-- lib/koala/rest_api.rb
 - lib/koala/test_users.rb
-- lib/koala/uploadable_io.rb
 - lib/koala/utils.rb
 - lib/koala/version.rb
 - readme.md
 - spec/cases/api_spec.rb
 - spec/cases/error_spec.rb
-- spec/cases/graph_and_rest_api_spec.rb
 - spec/cases/graph_api_batch_spec.rb
-- spec/cases/graph_api_spec.rb
 - spec/cases/graph_collection_spec.rb
 - spec/cases/http_service_spec.rb
 - spec/cases/koala_spec.rb
+- spec/cases/legacy_spec.rb
 - spec/cases/multipart_request_spec.rb
 - spec/cases/oauth_spec.rb
 - spec/cases/realtime_updates_spec.rb
-- spec/cases/rest_api_spec.rb
 - spec/cases/test_users_spec.rb
 - spec/cases/uploadable_io_spec.rb
 - spec/cases/utils_spec.rb
@@ -135,6 +116,7 @@ files:
 - spec/fixtures/facebook_data.yml
 - spec/fixtures/mock_facebook_responses.yml
 - spec/spec_helper.rb
+- spec/support/custom_matchers.rb
 - spec/support/graph_api_shared_examples.rb
 - spec/support/json_testing_fix.rb
 - spec/support/koala_test.rb
@@ -142,57 +124,49 @@ files:
 - spec/support/ordered_hash.rb
 - spec/support/rest_api_shared_examples.rb
 - spec/support/uploadable_io_shared_examples.rb
-has_rdoc: true
 homepage: http://github.com/arsduo/koala
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Koala
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3741350754426721879
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A lightweight, flexible library for Facebook with support for the Graph API, the REST API, realtime updates, and OAuth authentication.
-test_files: 
+summary: A lightweight, flexible library for Facebook with support for the Graph API,
+  the REST API, realtime updates, and OAuth authentication.
+test_files:
 - spec/cases/api_spec.rb
 - spec/cases/error_spec.rb
-- spec/cases/graph_and_rest_api_spec.rb
 - spec/cases/graph_api_batch_spec.rb
-- spec/cases/graph_api_spec.rb
 - spec/cases/graph_collection_spec.rb
 - spec/cases/http_service_spec.rb
 - spec/cases/koala_spec.rb
+- spec/cases/legacy_spec.rb
 - spec/cases/multipart_request_spec.rb
 - spec/cases/oauth_spec.rb
 - spec/cases/realtime_updates_spec.rb
-- spec/cases/rest_api_spec.rb
 - spec/cases/test_users_spec.rb
 - spec/cases/uploadable_io_spec.rb
 - spec/cases/utils_spec.rb
@@ -201,6 +175,7 @@ test_files:
 - spec/fixtures/facebook_data.yml
 - spec/fixtures/mock_facebook_responses.yml
 - spec/spec_helper.rb
+- spec/support/custom_matchers.rb
 - spec/support/graph_api_shared_examples.rb
 - spec/support/json_testing_fix.rb
 - spec/support/koala_test.rb
@@ -208,3 +183,4 @@ test_files:
 - spec/support/ordered_hash.rb
 - spec/support/rest_api_shared_examples.rb
 - spec/support/uploadable_io_shared_examples.rb
+has_rdoc: 

data/lib/koala/batch_operation.rb

@@ -1,74 +0,0 @@
-module Koala
-  module Facebook
-    class BatchOperation
-      attr_reader :access_token, :http_options, :post_processing, :files, :batch_api, :identifier
-
-      @identifier = 0
-
-      def self.next_identifier
-        @identifier += 1
-      end
-
-      def initialize(options = {})
-        @identifier = self.class.next_identifier
-        @args = (options[:args] || {}).dup # because we modify it below
-        @access_token = options[:access_token]
-        @http_options = (options[:http_options] || {}).dup # dup because we modify it below
-        @batch_args = @http_options.delete(:batch_args) || {}
-        @url = options[:url]
-        @method = options[:method].to_sym
-        @post_processing = options[:post_processing]
-
-        process_binary_args
-
-        raise Koala::KoalaError, "Batch operations require an access token, none provided." unless @access_token
-      end
-
-      def to_batch_params(main_access_token)
-        # set up the arguments
-        args_string = Koala.http_service.encode_params(@access_token == main_access_token ? @args : @args.merge(:access_token => @access_token))
-
-        response = {
-          :method => @method.to_s,
-          :relative_url => @url,
-        }
-
-        # handle batch-level arguments, such as name, depends_on, and attached_files
-        @batch_args[:attached_files] = @files.keys.join(",") if @files
-        response.merge!(@batch_args) if @batch_args
-
-        # for get and delete, we append args to the URL string
-        # otherwise, they go in the body
-        if args_string.length > 0
-          if args_in_url?
-            response[:relative_url] += (@url =~ /\?/ ? "&" : "?") + args_string if args_string.length > 0
-          else
-            response[:body] = args_string if args_string.length > 0
-          end
-        end
-
-        response
-      end
-
-      protected
-
-      def process_binary_args
-        # collect binary files
-        @args.each_pair do |key, value|
-          if UploadableIO.binary_content?(value)
-            @files ||= {}
-            # we use a class-level counter to ensure unique file identifiers across multiple batch operations
-            # (this is thread safe, since we just care about uniqueness)
-            # so remove the file from the original hash and add it to the file store
-            id = "op#{identifier}_file#{@files.keys.length}"
-            @files[id] = @args.delete(key).is_a?(UploadableIO) ? value : UploadableIO.new(value)
-          end
-        end
-      end
-
-      def args_in_url?
-        @method == :get || @method == :delete
-      end
-    end
-  end
-end