koala 1.1.0 → 1.2.0

data/lib/koala/http_services/net_http_service.rb

@@ -1,92 +0,0 @@
-require "net/http" unless defined?(Net::HTTP)
-require "net/https"
-require "net/http/post/multipart"
-
-module Koala
-  module NetHTTPService
-    # this service uses Net::HTTP to send requests to the graph
-    include Koala::HTTPService
-
-    # Net::HTTP-specific values
-    class << self
-      attr_accessor :ca_file, :ca_path, :verify_mode
-    end
-    
-    def self.make_request(path, args, verb, options = {})
-      # We translate args to a valid query string. If post is specified,
-      # we send a POST request to the given path with the given arguments.
-
-      # by default, we use SSL only for private requests
-      # this makes public requests faster
-      private_request = args["access_token"] || @always_use_ssl || options[:use_ssl]
-
-      # if the verb isn't get or post, send it as a post argument
-      args.merge!({:method => verb}) && verb = "post" if verb != "get" && verb != "post"
-
-      http = create_http(server(options), private_request, options)
-
-      response = http.start do |http|
-        if verb == "post"
-          if params_require_multipart? args
-            http.request Net::HTTP::Post::Multipart.new path, encode_multipart_params(args)
-          else
-            http.post(path, encode_params(args))
-          end
-        else
-          http.get("#{path}?#{encode_params(args)}")
-        end
-      end
-
-      Koala::Response.new(response.code.to_i, response.body, response)
-    end
-
-    protected
-    def self.encode_params(param_hash)
-      # unfortunately, we can't use to_query because that's Rails, not Ruby
-      # if no hash (e.g. no auth token) return empty string
-      ((param_hash || {}).collect do |key_and_value|
-        key_and_value[1] = MultiJson.encode(key_and_value[1]) if key_and_value[1].class != String
-        "#{key_and_value[0].to_s}=#{CGI.escape key_and_value[1]}"
-      end).join("&")
-    end
-
-    def self.encode_multipart_params(param_hash)
-      Hash[*param_hash.collect do |key, value|
-        [key, value.kind_of?(Koala::UploadableIO) ? value.to_upload_io : value]
-      end.flatten]
-    end
-
-    def self.create_http(server, private_request, options)
-      if proxy_server = options[:proxy] || proxy
-        proxy = URI.parse(proxy_server)
-        http  = Net::HTTP.new(server, private_request ? 443 : nil,
-                              proxy.host, proxy.port, proxy.user, proxy.password)
-      else
-        http  = Net::HTTP.new(server, private_request ? 443 : nil)
-      end
-
-      if timeout_value = options[:timeout] || timeout
-        http.open_timeout = timeout_value
-        http.read_timeout = timeout_value
-      end
-
-      # For HTTPS requests, set the proper CA certificates
-      if private_request
-        http.use_ssl = true  
-        http.verify_mode = options[:verify_mode] || verify_mode || OpenSSL::SSL::VERIFY_PEER
-        
-        if cert_file = options[:ca_file] || ca_file
-          raise Errno::ENOENT, "Certificate file #{cert_file.inspect} does not exist!" unless File.exists?(cert_file)
-          http.ca_file = cert_file 
-        end
-        
-        if cert_path = options[:ca_path] || ca_path
-          raise Errno::ENOENT, "Certificate path #{cert_path.inspect} does not exist!" unless File.directory?(cert_path)
-          http.ca_path = cert_path
-        end
-      end
-
-      http
-    end
-  end
-end

data/lib/koala/http_services/typhoeus_service.rb

@@ -1,37 +0,0 @@
-require "typhoeus" unless defined?(Typhoeus)
-
-module Koala
-  module TyphoeusService
-    # this service uses Typhoeus to send requests to the graph
-    include Typhoeus
-    include Koala::HTTPService
-
-    def self.make_request(path, args, verb, options = {})
-      # if the verb isn't get or post, send it as a post argument
-      args.merge!({:method => verb}) && verb = "post" if verb != "get" && verb != "post"
-
-      # switch any UploadableIOs to the files Typhoeus expects
-      args.each_pair {|key, value| args[key] = value.to_file if value.is_a?(UploadableIO)}
-
-      # you can pass arguments directly to Typhoeus using the :typhoeus_options key
-      typhoeus_options = {:params => args}.merge(options[:typhoeus_options] || {})
-
-      # if proxy/timeout options aren't passed, check if defaults are set
-      typhoeus_options[:proxy] ||= proxy
-      typhoeus_options[:timeout] ||= timeout
-
-      # by default, we use SSL only for private requests (e.g. with access token)
-      # this makes public requests faster
-      prefix = (args["access_token"] || @always_use_ssl || options[:use_ssl]) ? "https" : "http"
-
-      response = Typhoeus::Request.send(verb, "#{prefix}://#{server(options)}#{path}", typhoeus_options)
-      Koala::Response.new(response.code, response.body, response.headers_hash)
-    end
-
-    protected
-
-    def self.multipart_requires_content_type?
-      false # Typhoeus handles multipart file types, we don't have to require it
-    end
-  end
-end

data/lib/koala/http_services.rb

@@ -1,46 +0,0 @@
-module Koala
-  class Response
-    attr_reader :status, :body, :headers
-    def initialize(status, body, headers)
-      @status = status
-      @body = body
-      @headers = headers
-    end
-  end
-
-  module HTTPService
-    # common functionality for all HTTP services
-    def self.included(base)
-      base.class_eval do
-        class << self
-          attr_accessor :always_use_ssl, :proxy, :timeout
-        end
-
-        def self.server(options = {})
-          server = "#{options[:rest_api] ? Facebook::REST_SERVER : Facebook::GRAPH_SERVER}"
-          server.gsub!(/\.facebook/, "-video.facebook") if options[:video]
-          "#{options[:beta] ? "beta." : ""}#{server}"
-        end
-        
-        def self.encode_params(param_hash)
-          # unfortunately, we can't use to_query because that's Rails, not Ruby
-          # if no hash (e.g. no auth token) return empty string
-          ((param_hash || {}).collect do |key_and_value|
-            key_and_value[1] = MultiJson.encode(key_and_value[1]) unless key_and_value[1].is_a? String
-            "#{key_and_value[0].to_s}=#{CGI.escape key_and_value[1]}"
-          end).join("&")
-        end
-                                      
-        protected
-        
-        def self.params_require_multipart?(param_hash)
-          param_hash.any? { |key, value| value.kind_of?(Koala::UploadableIO) }
-        end
-    
-        def self.multipart_requires_content_type?
-          true
-        end
-      end
-    end
-  end
-end

data/spec/cases/http_services/http_service_spec.rb

@@ -1,129 +0,0 @@
-require 'spec_helper'
-
-
-class Bear
-  include Koala::HTTPService
-end
-
-describe "Koala::HTTPService" do
-
-  describe "common methods" do
-    describe "always_use_ssl accessor" do
-      it "should be added" do
-        # in Ruby 1.8, .methods returns strings
-        # in Ruby 1.9, .method returns symbols 
-        Bear.methods.collect {|m| m.to_sym}.should include(:always_use_ssl)
-        Bear.methods.collect {|m| m.to_sym}.should include(:always_use_ssl=)
-      end
-    end
-    
-    describe "proxy accessor" do
-      it "should be added" do
-        # in Ruby 1.8, .methods returns strings
-        # in Ruby 1.9, .method returns symbols 
-        Bear.methods.collect {|m| m.to_sym}.should include(:proxy)
-        Bear.methods.collect {|m| m.to_sym}.should include(:proxy=)
-      end
-    end
-    
-    describe "timeout accessor" do
-      it "should be added" do
-        # in Ruby 1.8, .methods returns strings
-        # in Ruby 1.9, .method returns symbols 
-        Bear.methods.collect {|m| m.to_sym}.should include(:timeout)
-        Bear.methods.collect {|m| m.to_sym}.should include(:timeout=)
-      end
-    end
-    
-    describe "server" do
-      describe "with no options" do
-        it "returns the REST server if options[:rest_api]" do
-          Bear.server(:rest_api => true).should == Koala::Facebook::REST_SERVER
-        end
-
-        it "returns the graph server if !options[:rest_api]" do
-          Bear.server(:rest_api => false).should == Koala::Facebook::GRAPH_SERVER
-          Bear.server({}).should == Koala::Facebook::GRAPH_SERVER
-        end
-      end
-
-      describe "with options[:beta]" do
-        before :each do
-          @options = {:beta => true}
-        end
-        
-        it "returns the beta REST server if options[:rest_api]" do
-          server = Bear.server(@options.merge(:rest_api => true))
-          server.should =~ Regexp.new("beta.#{Koala::Facebook::REST_SERVER}")
-        end
-
-        it "returns the beta rest server if !options[:rest_api]" do
-          server = Bear.server(@options)
-          server.should =~ Regexp.new("beta.#{Koala::Facebook::GRAPH_SERVER}")
-        end
-      end
-      
-      describe "with options[:video]" do
-        before :each do
-          @options = {:video => true}
-        end
-        
-        it "should return the REST video server if options[:rest_api]" do
-          server = Bear.server(@options.merge(:rest_api => true))
-          server.should =~ Regexp.new(Koala::Facebook::REST_SERVER.gsub(/\.facebook/, "-video.facebook"))
-        end
-
-        it "should return the graph video server if !options[:rest_api]" do
-          server = Bear.server(@options)
-          server.should =~ Regexp.new(Koala::Facebook::GRAPH_SERVER.gsub(/\.facebook/, "-video.facebook"))
-        end
-      end
-    end
-
-    describe "#encode_params" do
-      it "should return an empty string if param_hash evaluates to false" do
-        Bear.encode_params(nil).should == ''
-      end
-
-      it "should convert values to JSON if the value is not a String" do
-        val = 'json_value'
-        not_a_string = 'not_a_string'
-        not_a_string.stub(:is_a?).and_return(false)
-        MultiJson.should_receive(:encode).with(not_a_string).and_return(val)
-
-        string = "hi"
-
-        args = {
-          not_a_string => not_a_string,
-          string => string
-        }
-
-        result = Bear.encode_params(args)
-        result.split('&').find do |key_and_val|
-          key_and_val.match("#{not_a_string}=#{val}")
-        end.should be_true
-      end
-
-      it "should escape all values" do
-        args = Hash[*(1..4).map {|i| [i.to_s, "Value #{i}($"]}.flatten]
-
-        result = Bear.encode_params(args)
-        result.split('&').each do |key_val|
-          key, val = key_val.split('=')
-          val.should == CGI.escape(args[key])
-        end
-      end
-
-      it "should convert all keys to Strings" do
-        args = Hash[*(1..4).map {|i| [i, "val#{i}"]}.flatten]
-
-        result = Bear.encode_params(args)
-        result.split('&').each do |key_val|
-          key, val = key_val.split('=')
-          key.should == args.find{|key_val_arr| key_val_arr.last == val}.first.to_s
-        end
-      end
-    end
-  end
-
-end