koala 1.1.0 → 1.2.0beta1

data/spec/support/mock_http_service.rb

@@ -38,7 +38,7 @@ module Koala
       path = 'root' if path == '' || path == '/'
       verb ||= 'get'
       server = options[:rest_api] ? 'rest_api' : 'graph_api'
-      token = args.delete('access_token') 
+      token = args.delete('access_token')
       with_token = (token == ACCESS_TOKEN || token == APP_ACCESS_TOKEN) ? 'with_token' : 'no_token'
 
       # Assume format is always JSON
@@ -77,11 +77,13 @@ module Koala
       response_object
     end
 
-    def self.mock?
-      true
+    def self.encode_params(*args)
+      # use HTTPService's encode_params
+      HTTPService.encode_params(*args)
     end
 
     protected
+
     def self.create_params_key(params_hash)
       if params_hash.empty?
         'no_args'
@@ -93,4 +95,4 @@ module Koala
       end
     end
   end
-end
+end

data/spec/support/ordered_hash.rb

@@ -0,0 +1,205 @@
+module KoalaTest
+  # directly taken from Rails 3.1's OrderedHash
+  # see https://github.com/rails/rails/blob/master/activesupport/lib/active_support/ordered_hash.rb
+  
+  # The order of iteration over hashes in Ruby 1.8 is undefined. For example, you do not know the
+  # order in which +keys+ will return keys, or +each+ yield pairs. <tt>ActiveSupport::OrderedHash</tt>
+  # implements a hash that preserves insertion order, as in Ruby 1.9:
+  #
+  #   oh = ActiveSupport::OrderedHash.new
+  #   oh[:a] = 1
+  #   oh[:b] = 2
+  #   oh.keys # => [:a, :b], this order is guaranteed
+  #
+  # <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts with other implementations.
+  class OrderedHash < ::Hash #:nodoc:
+    def to_yaml_type
+      "!tag:yaml.org,2002:omap"
+    end
+
+    def encode_with(coder)
+      coder.represent_seq '!omap', map { |k,v| { k => v } }
+    end
+
+    def to_yaml(opts = {})
+      if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
+        return super
+      end
+
+      YAML.quick_emit(self, opts) do |out|
+        out.seq(taguri) do |seq|
+          each do |k, v|
+            seq.add(k => v)
+          end
+        end
+      end
+    end
+
+    def nested_under_indifferent_access
+      self
+    end
+
+    # Hash is ordered in Ruby 1.9!
+    if RUBY_VERSION < '1.9'
+
+      # In MRI the Hash class is core and written in C. In particular, methods are
+      # programmed with explicit C function calls and polymorphism is not honored.
+      #
+      # For example, []= is crucial in this implementation to maintain the @keys
+      # array but hash.c invokes rb_hash_aset() originally. This prevents method
+      # reuse through inheritance and forces us to reimplement stuff.
+      #
+      # For instance, we cannot use the inherited #merge! because albeit the algorithm
+      # itself would work, our []= is not being called at all by the C code.
+
+      def initialize(*args, &block)
+        super
+        @keys = []
+      end
+
+      def self.[](*args)
+        ordered_hash = new
+
+        if (args.length == 1 && args.first.is_a?(Array))
+          args.first.each do |key_value_pair|
+            next unless (key_value_pair.is_a?(Array))
+            ordered_hash[key_value_pair[0]] = key_value_pair[1]
+          end
+
+          return ordered_hash
+        end
+
+        unless (args.size % 2 == 0)
+          raise ArgumentError.new("odd number of arguments for Hash")
+        end
+
+        args.each_with_index do |val, ind|
+          next if (ind % 2 != 0)
+          ordered_hash[val] = args[ind + 1]
+        end
+
+        ordered_hash
+      end
+
+      def initialize_copy(other)
+        super
+        # make a deep copy of keys
+        @keys = other.keys
+      end
+
+      def []=(key, value)
+        @keys << key unless has_key?(key)
+        super
+      end
+
+      def delete(key)
+        if has_key? key
+          index = @keys.index(key)
+          @keys.delete_at index
+        end
+        super
+      end
+
+      def delete_if
+        super
+        sync_keys!
+        self
+      end
+
+      def reject!
+        super
+        sync_keys!
+        self
+      end
+
+      def reject(&block)
+        dup.reject!(&block)
+      end
+
+      def keys
+        @keys.dup
+      end
+
+      def values
+        @keys.collect { |key| self[key] }
+      end
+
+      def to_hash
+        self
+      end
+
+      def to_a
+        @keys.map { |key| [ key, self[key] ] }
+      end
+
+      def each_key
+        return to_enum(:each_key) unless block_given?
+        @keys.each { |key| yield key }
+        self
+      end
+
+      def each_value
+        return to_enum(:each_value) unless block_given?
+        @keys.each { |key| yield self[key]}
+        self
+      end
+
+      def each
+        return to_enum(:each) unless block_given?
+        @keys.each {|key| yield [key, self[key]]}
+        self
+      end
+
+      alias_method :each_pair, :each
+
+      alias_method :select, :find_all
+
+      def clear
+        super
+        @keys.clear
+        self
+      end
+
+      def shift
+        k = @keys.first
+        v = delete(k)
+        [k, v]
+      end
+
+      def merge!(other_hash)
+        if block_given?
+          other_hash.each { |k, v| self[k] = key?(k) ? yield(k, self[k], v) : v }
+        else
+          other_hash.each { |k, v| self[k] = v }
+        end
+        self
+      end
+
+      alias_method :update, :merge!
+
+      def merge(other_hash, &block)
+        dup.merge!(other_hash, &block)
+      end
+
+      # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
+      def replace(other)
+        super
+        @keys = other.keys
+        self
+      end
+
+      def invert
+        OrderedHash[self.to_a.map!{|key_value_pair| key_value_pair.reverse}]
+      end
+
+      def inspect
+        "#<OrderedHash #{super}>"
+      end
+
+      private
+        def sync_keys!
+          @keys.delete_if {|k| !has_key?(k)}
+        end
+    end
+  end
+end

data/spec/support/rest_api_shared_examples.rb

@@ -87,7 +87,7 @@ shared_examples_for "Koala RestAPI" do
 
       @api.rest_call('anything', {}, options)
     end
-    
+
     it "uses get by default" do
       @api.should_receive(:api).with(
         anything,
@@ -98,7 +98,7 @@ shared_examples_for "Koala RestAPI" do
 
       @api.rest_call('anything')
     end
-    
+
     it "allows you to specify other http methods as the last argument" do
       method = 'bar'
       @api.should_receive(:api).with(
@@ -134,20 +134,20 @@ shared_examples_for "Koala RestAPI" do
 
         @api.fql_query(query)
       end
-      
+
       it "should pass 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 "should pass 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 "should call fql.multiquery method" do
         @api.should_receive(:rest_call).with(
@@ -161,7 +161,7 @@ shared_examples_for "Koala RestAPI" 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),
@@ -170,7 +170,7 @@ shared_examples_for "Koala RestAPI" do
 
         @api.fql_multiquery(queries)
       end
-      
+
       it "simplifies the response format" do
         raw_results = [
           {"name" => "query1", "fql_result_set" => [1, 2, 3]},
@@ -180,18 +180,18 @@ shared_examples_for "Koala RestAPI" do
           "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 "should pass 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 "should pass on any http options provided" do
         opts = {:a => 2}
         @api.should_receive(:rest_call).with(anything, anything, hash_including(opts))
@@ -204,19 +204,19 @@ end
 shared_examples_for "Koala RestAPI with an access token" do
   # FQL
   it "should be able to access public information via FQL" do
-    result = @api.fql_query('select first_name from user where uid = 216743')
+    result = @api.fql_query("select first_name from user where uid = #{KoalaTest.user2_id}")
     result.size.should == 1
-    result.first['first_name'].should == 'Chris'
+    result.first['first_name'].should == KoalaTest.user2_name
   end
 
   it "should be able to access public information via FQL.multiquery" do
     result = @api.fql_multiquery(
-      :query1 => 'select first_name from user where uid = 216743',
-      :query2 => 'select first_name from user where uid = 2905623'
+      :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 == 'Chris'
-    result["query2"].first['first_name'].should == 'Alex'
+    result["query1"].first['first_name'].should == KoalaTest.user2_name
+    result["query2"].first['first_name'].should == KoalaTest.user1_name
   end
 
   it "should be able to access protected information via FQL" do
@@ -224,7 +224,7 @@ shared_examples_for "Koala RestAPI with an access token" do
 
     # 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::GraphAPI.new(@token)
+    g = Koala::Facebook::API.new(@token)
     id = g.get_object("me", :fields => "id")["id"]
 
     # now send a query about your permissions
@@ -234,15 +234,15 @@ shared_examples_for "Koala RestAPI with an access token" do
     # we've verified that you have read_stream permissions, so we can test against that
     result.first["read_stream"].should == 1
   end
-  
-  
+
+
   it "should be able to 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)", 
+      :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.size.should == 3
     result.keys.should include("query1", "query2", "query3")
   end
 
@@ -253,33 +253,33 @@ shared_examples_for "Koala RestAPI without an access token" do
   # FQL_QUERY
   describe "when making a FQL request" do
     it "should be able to access public information via FQL" do
-      @result = @api.fql_query("select first_name from user where uid = 216743")
-      @result.size.should == 1
-      @result.first["first_name"].should == "Chris"
+      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 "should be able to access public information via FQL.multiquery" do
       result = @api.fql_multiquery(
-        :query1 => 'select first_name from user where uid = 216743',
-        :query2 => 'select first_name from user where uid = 2905623'
+        :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 == 'Chris'
-      result["query2"].first['first_name'].should == 'Alex'
+      result["query1"].first['first_name'].should == KoalaTest.user2_name
+      result["query2"].first['first_name'].should == KoalaTest.user1_name
     end
 
     it "should not be able to access protected information via FQL" do
-      lambda { @api.fql_query("select read_stream from permissions where uid = 216743") }.should raise_error(Koala::Facebook::APIError)
+      lambda { @api.fql_query("select read_stream from permissions where uid = #{KoalaTest.user2_id}") }.should raise_error(Koala::Facebook::APIError)
     end
-    
+
     it "should not be able to access protected information via FQL.multiquery" do
-      lambda { 
+      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)", 
+          :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
-end
+end

data/spec/support/uploadable_io_shared_examples.rb

@@ -36,15 +36,9 @@ shared_examples_for "MIME::Types can't return results" do
       end
     end
 
-    it "should throw an exception if the MIME type can't be determined and the HTTP service requires content type" do
-      Koala.stub!(:multipart_requires_content_type?).and_return(true)
+    it "should throw an exception" do
       lambda { Koala::UploadableIO.new(*@koala_io_params) }.should raise_exception(Koala::KoalaError)
     end
-
-    it "should just have @content_type == nil if the HTTP service doesn't require content type" do
-      Koala.stub!(:multipart_requires_content_type?).and_return(false)
-      Koala::UploadableIO.new(*@koala_io_params).content_type.should be_nil
-    end
   end
 end
 
@@ -73,4 +67,4 @@ shared_examples_for "determining a mime type" do
 
     it_should_behave_like "MIME::Types can't return results"
   end
-end
+end

metadata

@@ -1,83 +1,84 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: koala
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0beta1
+  prerelease: 5
 platform: ruby
-authors: 
+authors:
 - Alex Koppel, Chris Baclig, Rafi Jacoby, Context Optional
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-18 00:00:00 +02:00
+date: 2011-08-17 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70190931210420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multipart-post
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70190931210420
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &70190931209740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70190931209740
+- !ruby/object:Gem::Dependency
+  name: faraday-stack
+  requirement: &70190931200940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.5"
-  type: :development
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70190931200940
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70190931200100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.7
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: typhoeus
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70190931200100
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70190931198560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.2.4
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *id005
-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: *70190931198560
+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
 - .travis.yml
@@ -93,28 +94,27 @@ files:
 - lib/koala/graph_api.rb
 - lib/koala/graph_batch_api.rb
 - lib/koala/graph_collection.rb
-- lib/koala/http_services.rb
-- lib/koala/http_services/net_http_service.rb
-- lib/koala/http_services/typhoeus_service.rb
+- lib/koala/http_service.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
 - readme.md
 - spec/cases/api_base_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/http_services/http_service_spec.rb
-- spec/cases/http_services/net_http_service_spec.rb
-- spec/cases/http_services/typhoeus_service_spec.rb
+- spec/cases/http_service_spec.rb
 - spec/cases/koala_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
 - spec/fixtures/beach.jpg
 - spec/fixtures/cat.m4v
 - spec/fixtures/facebook_data.yml
@@ -122,59 +122,58 @@ files:
 - spec/spec_helper.rb
 - spec/support/graph_api_shared_examples.rb
 - spec/support/json_testing_fix.rb
-- spec/support/live_testing_data_helper.rb
+- spec/support/koala_test.rb
 - spec/support/mock_http_service.rb
+- spec/support/ordered_hash.rb
 - spec/support/rest_api_shared_examples.rb
-- spec/support/setup_mocks_or_live.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: -702788258280667645
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4017352999765369439
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 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_base_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/http_services/http_service_spec.rb
-- spec/cases/http_services/net_http_service_spec.rb
-- spec/cases/http_services/typhoeus_service_spec.rb
+- spec/cases/http_service_spec.rb
 - spec/cases/koala_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
 - spec/fixtures/beach.jpg
 - spec/fixtures/cat.m4v
 - spec/fixtures/facebook_data.yml
@@ -182,8 +181,8 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/graph_api_shared_examples.rb
 - spec/support/json_testing_fix.rb
-- spec/support/live_testing_data_helper.rb
+- spec/support/koala_test.rb
 - spec/support/mock_http_service.rb
+- spec/support/ordered_hash.rb
 - spec/support/rest_api_shared_examples.rb
-- spec/support/setup_mocks_or_live.rb
 - spec/support/uploadable_io_shared_examples.rb