Merge branch 'master' of github.com:jnunemaker/twitter

lib/twitter.rb

@@ -1,5 +1,6 @@
 require File.expand_path('../twitter/error', __FILE__)
 require File.expand_path('../twitter/configuration', __FILE__)
+require File.expand_path('../twitter/api', __FILE__)
 require File.expand_path('../twitter/client', __FILE__)
 require File.expand_path('../twitter/search', __FILE__)
 require File.expand_path('../twitter/base', __FILE__)

lib/twitter/api.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../connection', __FILE__)
+require File.expand_path('../request', __FILE__)
+require File.expand_path('../authentication', __FILE__)
+
+module Twitter
+  class API
+    attr_accessor *Configuration::VALID_OPTIONS_KEYS
+
+    def initialize(options={})
+      options = Twitter.options.merge(options)
+      Configuration::VALID_OPTIONS_KEYS.each do |key|
+        send("#{key}=", options[key])
+      end
+    end
+
+    include Connection
+    include Request
+    include Authentication
+  end
+end

lib/twitter/authentication.rb

@@ -0,0 +1,18 @@
+module Twitter
+  module Authentication
+    private
+
+    def authentication
+      {
+        :consumer_key => consumer_key,
+        :consumer_secret => consumer_secret,
+        :token => oauth_token,
+        :token_secret => oauth_token_secret
+      }
+    end
+
+    def authenticated?
+      authentication.values.all?
+    end
+  end
+end

lib/twitter/client.rb

@@ -1,19 +1,12 @@
-Dir[File.expand_path('../client/*.rb', __FILE__)].each{|f| require f}
-
 module Twitter
-  class Client
-    attr_accessor *Configuration::VALID_OPTIONS_KEYS
+  class Client < API
+    # Require client method modules after initializing the Client class in
+    # order to avoid a superclass mismatch error, allowing those modules to be
+    # Client-namespaced.
+    Dir[File.expand_path('../client/*.rb', __FILE__)].each{|f| require f}
 
-    def initialize(options={})
-      options = Twitter.options.merge(options)
-      Configuration::VALID_OPTIONS_KEYS.each do |key|
-        send("#{key}=", options[key])
-      end
-    end
+    alias :api_endpoint :endpoint
 
-    include Connection
-    include Request
-    include Authentication
     include Utils
 
     include Timeline

lib/twitter/configuration.rb

@@ -3,12 +3,14 @@
 
 module Twitter
   module Configuration
-    VALID_OPTIONS_KEYS = [:consumer_key, :consumer_secret, :oauth_token, :oauth_token_secret, :adapter, :endpoint, :format, :user_agent].freeze
-    VALID_FORMATS = [:json, :xml].freeze
-    DEFAULT_ADAPTER = Faraday.default_adapter.freeze
-    DEFAULT_ENDPOINT = 'https://api.twitter.com/1/'.freeze
-    DEFAULT_FORMAT = :json.freeze
-    DEFAULT_USER_AGENT = "Twitter Ruby Gem #{Twitter::VERSION}".freeze
+    VALID_OPTIONS_KEYS      = [:consumer_key, :consumer_secret, :oauth_token, :oauth_token_secret, :adapter, :endpoint, :search_endpoint, :format, :user_agent].freeze
+    VALID_FORMATS           = [:json, :xml].freeze
+
+    DEFAULT_ADAPTER         = Faraday.default_adapter.freeze
+    DEFAULT_ENDPOINT        = 'https://api.twitter.com/1/'.freeze
+    DEFAULT_SEARCH_ENDPOINT = 'https://search.twitter.com/'.freeze
+    DEFAULT_FORMAT          = :json.freeze
+    DEFAULT_USER_AGENT      = "Twitter Ruby Gem #{Twitter::VERSION}".freeze
 
     attr_accessor *VALID_OPTIONS_KEYS
 
@@ -25,10 +27,11 @@ def options
     end
 
     def reset
-      self.adapter    = DEFAULT_ADAPTER
-      self.endpoint   = DEFAULT_ENDPOINT
-      self.format     = DEFAULT_FORMAT
-      self.user_agent = DEFAULT_USER_AGENT
+      self.adapter         = DEFAULT_ADAPTER
+      self.endpoint        = DEFAULT_ENDPOINT
+      self.search_endpoint = DEFAULT_SEARCH_ENDPOINT
+      self.format          = DEFAULT_FORMAT
+      self.user_agent      = DEFAULT_USER_AGENT
     end
   end
 end

lib/twitter/connection.rb

@@ -0,0 +1,26 @@
+require 'faraday_middleware'
+Dir[File.expand_path('../../faraday/*.rb', __FILE__)].each{|f| require f}
+
+module Twitter
+  module Connection
+    private
+
+    def connection(raw=false)
+      options = {
+        :headers => {:user_agent => user_agent},
+        :ssl => {:verify => false},
+        :url => api_endpoint
+      }
+
+      Faraday::Connection.new(options) do |builder|
+        builder.use Faraday::Request::Multipart
+        builder.use Faraday::Request::OAuth, authentication if authenticated?
+        builder.adapter(adapter)
+        builder.use Faraday::Response::RaiseHttp5xx
+        builder.use Faraday::Response::Parse unless raw
+        builder.use Faraday::Response::RaiseHttp4xx
+        builder.use Faraday::Response::Mashify unless raw
+      end
+    end
+  end
+end

lib/twitter/request.rb

@@ -0,0 +1,38 @@
+module Twitter
+  module Request
+    def get(path, options={}, raw=false)
+      request(:get, path, options, raw)
+    end
+
+    def post(path, options={}, raw=false)
+      request(:post, path, options, raw)
+    end
+
+    def put(path, options={}, raw=false)
+      request(:put, path, options, raw)
+    end
+
+    def delete(path, options={}, raw=false)
+      request(:delete, path, options, raw)
+    end
+
+    private
+
+    def request(method, path, options, raw)
+      response = connection(raw).send(method) do |request|
+        case method
+          when :get, :delete
+            request.url(formatted_path(path), options)
+          when :post, :put
+            request.path = formatted_path(path)
+            request.body = options
+        end
+      end
+      raw ? response : response.body
+    end
+
+    def formatted_path(path)
+      [path, format].compact.join('.')
+    end
+  end
+end

lib/twitter/search.rb

@@ -1,30 +1,22 @@
 require 'cgi'
-require File.expand_path('../search/request', __FILE__)
-Dir[File.expand_path('../search/*.rb', __FILE__)].each{|f| require f}
 
 module Twitter
 
   # Handles the Twitter Search API
   #
   # @see http://dev.twitter.com/doc/get/search Twitter Search API docs
-  class Search
-    attr_accessor *Configuration::VALID_OPTIONS_KEYS
+  class Search < API
     attr_reader :fetch, :query
 
     # Creates a new instance of a search
     #
     # @param [String] query the optional keyword to search
-    def initialize(options={})
-      options = Twitter.options.merge(options)
+    def initialize(*)
       clear
-      Configuration::VALID_OPTIONS_KEYS.each do |key|
-        send("#{key}=", options[key])
-      end
+      super
     end
 
-    include Connection
-    include Request
-    include Authentication
+    alias :api_endpoint :search_endpoint
 
     # Clears all the query filters to make a new search
     def clear