headquarters 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49835f5ea6c9c1d08010c6c6de69126d68fefd36
-  data.tar.gz: aca257c780d85bb4efa0f57fc5e2dd87d00b93da
+  metadata.gz: b918932a9bf5a0d18d6b9a2d5e2e85bb4eab2b0d
+  data.tar.gz: f68c7ce2029733e9c2b8d3085d564b946433ea9c
 SHA512:
-  metadata.gz: 072a81b8ec0db58856d4b88d181a2e23af5c3f90c3c1ad6b1459492e446439ba4b5145df8af9af58a026250f67aca6f0cad55b2cc8b36cfa39b1623e3b2f90b9
-  data.tar.gz: 1c4b58be9bced8e5c845ebfd37bd1928c9a266537bf8f91d4caa68696f524f6d097d8473e701c2c6834a86bf9b58ce7d53accf5ea64a8644f5e3aefdd9371928
+  metadata.gz: fad10448257f1c394466d9ec23e05e3c8ec509d6c943c673b3f427f8e651438bd8365d6e4e63fdc56180f55bc0a1dab32252c07bed295030e5f09ad0a6ffdf6e
+  data.tar.gz: 66e149d00d1f07e555742decf3fccb247fd94eb6a83123b1854c1fa1af3aac3f1934a3475a72d809094059ef8484c30e181a234a540b792df4c937fd21b8bd74

data/README.md

@@ -47,66 +47,64 @@ Headquarters.logger = Logger.new(STDERR)
 
 ## Usage
 
-These are all the available method to interact with the headquarters.
+You must first instantiate a client:
 
-### Members
+```ruby
+client = Headquarters.new
+```
+
+You most likely want to authenticate to use protected endpoints (such as sending emails). You can do so by passing the credentials to the constructor:
 
-To retrieve a collection of all members of the team you might use the `all`
-operation:
 
 ```ruby
-Headquarters::Member.all
+client = Headquarters.new(client_id: 'your_client_id', client_secret: 'your_client_secret')
 ```
 
-Or you can search for a specific email
+The main client contains namespaces that give you access to different features of Headquarters. For example, the email API can be accessed via `client.email`. If your applications needs only to send emails, and doesn't use any other features, you can instantiate an email client directly instead:
 
 ```ruby
-Headquarters::Member.search('mpalhas@groupbuddies.com')
+email_client = Headquarters::Client::Email.new(client_id: 'your_client_id', client_secret: 'your_client_secret')
 ```
 
-### Pull Requests
+### Members
 
-To get all (paginated) pull requests for groupbuddies, use the
-`pull_requests` operation:
+To retrieve a collection of all members of the team you might use the `all`
+operation:
 
 ```ruby
-Headquarters::Github.pull_requests
+client.members.all
 ```
 
-You can filter these results using anything that github takes in the `q`
-parameters of its [search API](https://developer.github.com/v3/search/). For
-instance, if you want to get only the open pull requests, you might do:
+Or you can search for a specific email
 
 ```ruby
-Headquarters::Github.pull_requests(query: 'is:open')
+client.members.search('mpalhas@groupbuddies.com')
 ```
 
-### Internal
+### Github
 
-There is some extra info protected with basic authentication. In order to get it
-you must first add the credentials to you `.env` file:
+Within the `github` namespace, you can use the `pull_requests` method to get a list of all open Pull Requests in the Group Buddies organization:
 
-```
-BASIC_AUTH_USER=some-username
-BASIC_AUTH_PASS=some-password
+```ruby
+client.github.pull_requests
 ```
 
-#### Members
-
-Now you may use the `all_internal` operation:
+You can filter these results using anything that github takes in the `q`
+parameters of its [search API](https://developer.github.com/v3/search/). For
+instance, if you want to get only the open pull requests, you might do:
 
 ```ruby
-Headquarters::Member.all_internal
+client.github.pull_requests(query: 'is:open')
 ```
 
-#### Emails
+### Emails
 
 You can send emails for Group Buddies addresses (Any non-GB addresses will be filtered out).
 
 `app_name` can be set to be appended to the sender. i.e. `from: hq@groupbuddies.com, app_name: test` will become `hq+test@groupbuddies.com`. This is useful for filtering and labeling.
 
 ```ruby
-Headquarters::Email.send(to: 'mpalhas@groupbuddies.com,zamith@groupbuddies.com', subject: 'custom subject', body: '<b>HTML body</b>', app_name: 'hq')
+client.email.deliver(to: 'mpalhas@groupbuddies.com,zamith@groupbuddies.com', subject: 'custom subject', body: '<b>HTML body</b>', app_name: 'hq')
 ```
 
   When using rails you can use headquarters as the delivery method, and transparently send emails using ActiveMailer as usual:
@@ -114,6 +112,11 @@ Headquarters::Email.send(to: 'mpalhas@groupbuddies.com,zamith@groupbuddies.com',
 ```ruby
 # config/initializers/mailer.rb
 ActionMailer::Base.delivery_method = :headquarters
+
+Headquarters::RailsDeliveryMethod.credentials = {
+  client_id: 'your_client_id',
+  client_secret: 'your_client_secret'
+}
 ```
 
 Using this method, `app_name` is also available as a header or parameter to the `mail` function

data/Rakefile

@@ -5,3 +5,10 @@ RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:spec)
 
 task default: [:rubocop, :spec]
+
+task :console do
+  require 'pry'
+  require 'headquarters'
+  ARGV.clear
+  Pry.start
+end

data/headquarters.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'dotenv'
   spec.add_dependency 'httparty', '>= 0.13.3'
 
   spec.add_development_dependency 'climate_control'

data/lib/headquarters.rb

@@ -1,16 +1,15 @@
 require 'net/https'
 require 'logger'
-require 'dotenv'
 
 require 'headquarters/version'
-require 'headquarters/endpoints'
+require 'headquarters/client'
 
 if defined? ::Rails::Railtie
   require 'headquarters/railtie'
 end
 
 module Headquarters
-  API_BASE = 'hq.groupbuddies.com'
+  API_BASE = 'https://hq.groupbuddies.com'
   ROOT_PATH = File.dirname(__FILE__)
 
   @api_base = API_BASE
@@ -19,12 +18,11 @@ module Headquarters
 
   class << self
     attr_accessor :api_base, :api_port, :logger
+
+    def new(*options)
+      Client.new(*options)
+    end
   end
 end
 
 require 'headquarters/request'
-require 'headquarters/member'
-require 'headquarters/github'
-require 'headquarters/email'
-
-Dotenv.load

data/lib/headquarters/api.rb

@@ -0,0 +1,51 @@
+require 'headquarters/api/factory'
+require 'headquarters/api/oauth_authenticator'
+
+module Headquarters
+  class API
+    def initialize(**options)
+      @authenticator = options[:authenticator] || OAuthAuthenticator.new(options)
+    end
+
+    def headers
+      authenticator.headers.merge(
+        'Accept' => 'v2'
+      )
+    end
+
+    attr_reader :authenticator
+
+    def get(endpoint, **params)
+      perform_request(:get, endpoint, params)
+    end
+
+    def post(endpoint, **params)
+      perform_request(:post, endpoint, params)
+    end
+
+    private
+
+    def perform_request(method, endpoint, params = {})
+      Request.perform(method, endpoint, params_with_headers(params))
+    end
+
+    def params_with_headers(original_params)
+      params = original_params.dup
+      params[:headers] ||= {}
+      params[:headers].merge!(headers)
+      params
+    end
+
+    def self.namespace(name)
+      class_name = namespace_to_class_name(name)
+      define_method(name) do
+        @namespaces ||= {}
+        @namespaces[name] ||= API::Factory.new(class_name, authenticator: authenticator)
+      end
+    end
+
+    def self.namespace_to_class_name(name)
+      "#{self.name}::#{name.to_s.split('_').map(&:capitalize).join}"
+    end
+  end
+end

data/lib/headquarters/api/endpoints.rb

@@ -0,0 +1,13 @@
+module Headquarters
+  class API
+    module Endpoints
+      MEMBERS = '/members'
+      EMAIL = '/emails'
+      OAUTH_TOKEN = '/oauth/token'
+
+      module Github
+        PULL_REQUESTS = '/github/pull_requests'
+      end
+    end
+  end
+end

data/lib/headquarters/api/factory.rb

@@ -0,0 +1,17 @@
+module Headquarters
+  class API
+    module Factory
+      def self.new(klass, **args)
+        classify(klass).new(**args)
+      end
+
+      private
+
+      def self.classify(klass)
+        klass.to_s.split('::').inject(Headquarters) do |constant, child_klass|
+          constant.const_get child_klass
+        end
+      end
+    end
+  end
+end

data/lib/headquarters/api/oauth_authenticator.rb

@@ -0,0 +1,37 @@
+module Headquarters
+  class API
+    class OAuthAuthenticator
+      def initialize(client_id: nil, client_secret: nil)
+        @client_id = client_id
+        @client_secret = client_secret
+        authenticate!
+      end
+
+      attr_reader :access_token, :client_id, :client_secret
+
+      def headers
+        if access_token
+          { 'Authorization' => "Bearer #{access_token}" }
+        else
+          {}
+        end
+      end
+
+      def authenticate!
+        return if client_id.nil? || client_secret.nil?
+
+        response = Request.perform(:post, Endpoints::OAUTH_TOKEN, body: authentication_body)
+
+        @access_token = Hash(response).fetch('access_token', nil)
+      end
+
+      def authentication_body
+        {
+          grant_type: 'client_credentials',
+          client_id: client_id,
+          client_secret: client_secret
+        }
+      end
+    end
+  end
+end

data/lib/headquarters/client.rb

@@ -0,0 +1,13 @@
+require 'headquarters/api'
+
+module Headquarters
+  class Client < API
+    namespace :members
+    namespace :email
+    namespace :github
+  end
+end
+
+require 'headquarters/client/members'
+require 'headquarters/client/email'
+require 'headquarters/client/github'

data/lib/headquarters/{email.rb → client/email.rb}

@@ -1,23 +1,23 @@
 module Headquarters
-  class Email
+  class Client::Email < API
     FIELDS = %i(to from subject app_name body)
 
-    def self.send(**raw_params)
+    def deliver(**raw_params)
       prepare_params(raw_params)
-      Request.perform_with_auth(:post, Endpoints::Internal::EMAIL, params)
+      post Endpoints::EMAIL, body: params
     end
 
-    class << self
-      attr_accessor(*FIELDS)
-    end
+    attr_accessor(*FIELDS)
+
+    private
 
-    def self.params
+    def params
       Hash[FIELDS.map do |field|
         [field, public_send(field)]
       end.compact]
     end
 
-    def self.prepare_params(raw_params)
+    def prepare_params(raw_params)
       @to = raw_params[:to]
       if @to.is_a? Array
         @to = @to.join(',')

data/lib/headquarters/client/github.rb

@@ -0,0 +1,7 @@
+module Headquarters
+  class Client::Github < API
+    def pull_requests(query: nil)
+      get Endpoints::Github::PULL_REQUESTS, query: { q: query }
+    end
+  end
+end

data/lib/headquarters/client/members.rb

@@ -0,0 +1,13 @@
+require 'headquarters/api/endpoints'
+
+module Headquarters
+  class Client::Members < API
+    def all
+      get Endpoints::MEMBERS
+    end
+
+    def search(query)
+      get Endpoints::MEMBERS, query: { q: query }
+    end
+  end
+end

data/lib/headquarters/rails_delivery_method.rb

@@ -0,0 +1,35 @@
+require 'headquarters/client/email'
+
+module Headquarters
+  class RailsDeliveryMethod
+    def initialize(**_)
+    end
+
+    class << self
+      attr_accessor :credentials
+    end
+
+    def deliver(mail)
+      params = {
+        from:     mail.from,
+        to:       mail.to,
+        subject:  mail.subject,
+        body:     mail.body.to_s,
+        app_name: mail.header['app_name'].to_s
+      }
+      client.deliver(params)
+    end
+
+    alias_method :deliver!,       :deliver
+    alias_method :deliver_now,    :deliver
+    alias_method :deliver_now!,   :deliver
+    alias_method :deliver_later,  :deliver
+    alias_method :deliver_later!, :deliver
+
+    private
+
+    def client
+      @client ||= Headquarters::Client::Email.new(self.class.credentials)
+    end
+  end
+end

data/lib/headquarters/railtie.rb

@@ -1,11 +1,10 @@
-require 'headquarters/email'
-require 'headquarters/email/rails_delivery_method'
+require 'headquarters/rails_delivery_method'
 
 module Headquarters
-  class Railtie < Rails::Railtie
+  class Railtie < ::Rails::Railtie
     initializer 'headquaters.add_delivery_method' do
       ActiveSupport.on_load :action_mailer do
-        ActionMailer::Base.add_delivery_method :headquarters, Headquarters::Email::RailsDeliveryMethod
+        ActionMailer::Base.add_delivery_method :headquarters, Headquarters::RailsDeliveryMethod
       end
     end
   end

data/lib/headquarters/request.rb

@@ -5,69 +5,37 @@ module Headquarters
     include ::HTTParty
     base_uri Headquarters.api_base
 
-    def self.perform_with_auth(http_method, path, params = {}, options = {})
-      options_with_auth = options.merge(basic_auth_info)
-      perform(http_method, path, params, options_with_auth)
+    def self.perform(http_method, path, params = {})
+      new(path, params).public_send(http_method)
     end
 
-    def self.perform(http_method, path, params = {}, options = {})
-      new(path, params, options).public_send(http_method)
-    end
-
-    def initialize(path, params, options)
+    def initialize(path, params)
       @path = path
-      @options = options
       @params = params
     end
 
     def get
-      @options.merge!(query: params) if params && params.any?
-      response = Request.get(path, options)
+      response = Request.get(path, params)
       log_request_info(:get, response)
       response.parsed_response
     end
 
     def post
-      @options.merge!(body: params) if params && params.any?
-      response = Request.post(path, options)
+      response = Request.post(path, params)
       log_request_info(:post, response)
       response.parsed_response
     end
 
     private
 
-    attr_reader :path, :options, :params
+    attr_reader :path, :params
 
     def log_request_info(http_method, response)
-      Headquarters.logger.info "[HQ] [#{current_time}] #{http_method.to_s.upcase} #{path} #{options} #{response.code}"
+      Headquarters.logger.info "[HQ] [#{current_time}] #{http_method.to_s.upcase} #{path} #{params} #{response.code}"
     end
 
     def current_time
       Time.now.utc.strftime('%d/%b/%Y %H:%M:%S %Z')
     end
-
-    def self.basic_auth_info
-      hq_basic_auth_info || deprecated_basic_auth_info
-    end
-
-    def self.hq_basic_auth_info
-      return unless ENV['HQ_BASIC_AUTH_USER']
-      {
-        basic_auth: {
-          username: ENV['HQ_BASIC_AUTH_USER'],
-          password: ENV['HQ_BASIC_AUTH_PASS']
-        }
-      }
-    end
-
-    def self.deprecated_basic_auth_info
-      warn '[DEPRECATED] Using ENV["BASIC_AUTH_USER"] is deprecated. Please use ENV["HQ_BASIC_AUTH_USER"]'
-      {
-        basic_auth: {
-          username: ENV['BASIC_AUTH_USER'],
-          password: ENV['BASIC_AUTH_PASS']
-        }
-      }
-    end
   end
 end

data/lib/headquarters/version.rb

@@ -1,3 +1,3 @@
 module Headquarters
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/headquarters/api/factory_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module Headquarters
+  class API
+    describe Factory do
+      class ::Headquarters::FakeClass < API
+        namespace :fake_nested_class
+      end
+
+      context '.new' do
+        it 'creates an instance of the given class' do
+          instance = Factory.new(:FakeClass)
+
+          expect(instance.class).to eq(::Headquarters::FakeClass)
+        end
+      end
+    end
+  end
+end

data/spec/headquarters/api/oauth_authenticator_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+module Headquarters
+  class API
+    describe OAuthAuthenticator do
+      context '#authenticate!' do
+        context 'client_id or client_secret are missing' do
+          it 'does nothing' do
+            allow(Request).to receive(:perform)
+
+            OAuthAuthenticator.new
+            OAuthAuthenticator.new client_id: 'id'
+            OAuthAuthenticator.new client_secret: 'secret'
+
+            expect(Request).not_to have_received(:perform)
+          end
+        end
+
+        context 'client_id and client_secret exist' do
+          it 'makes a new POST request with the correct parameters' do
+            allow(Request).to receive(:perform).and_return({})
+
+            credentials = { client_id: 'id', client_secret: 'secret' }
+            OAuthAuthenticator.new(**credentials)
+
+            expect(Request).to have_received(:perform).with(:post, Endpoints::OAUTH_TOKEN, hash_including(body: hash_including(credentials)))
+          end
+        end
+      end
+    end
+  end
+end

data/spec/headquarters/api_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+require 'shared_examples/an_http_requester'
+
+module Headquarters
+  describe API do
+    it_behaves_like 'an HTTP requester'
+
+    context '#headers' do
+      context 'no authentication' do
+        it 'includes only the API version' do
+          api = API.new
+
+          expect(api.headers).to eq('Accept' => 'v2')
+        end
+      end
+
+      context 'with authentication' do
+        let(:credentials) { { client_id: 'id', client_secret: 'secret' } }
+
+        it 'includes the API version' do
+          allow(Request).to receive(:perform)
+
+          api = API.new(credentials)
+
+          expect(api.headers).to match hash_including('Accept' => 'v2')
+        end
+
+        it 'includes authentication headers' do
+          expected_headers = { header: :value }
+          fake_authenticator = double('OAuthAuthenticator', headers: expected_headers)
+          allow(API::OAuthAuthenticator).to receive(:new).and_return(fake_authenticator)
+
+          api = API.new(credentials)
+
+          expect(api.headers).to match hash_including(expected_headers)
+        end
+      end
+    end
+
+    context '.namespace' do
+      class API::FakeNamespace
+        def initialize(**_)
+        end
+      end
+
+      it 'creates a new method' do
+        API.namespace(:fake_namespace)
+
+        expect(API.new.methods).to include(:fake_namespace)
+      end
+
+      it 'sets the return value to an instance of the expected class' do
+        API.namespace(:fake_namespace)
+
+        expect(API.new.fake_namespace).to be_a(API::FakeNamespace)
+      end
+    end
+  end
+end

data/spec/headquarters/client/email_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'shared_examples/an_http_requester'
+
+module Headquarters
+  class Client
+    describe Email do
+      it_behaves_like 'an HTTP requester'
+
+      subject(:client) { described_class.new }
+
+      context '#deliver' do
+        it 'posts an email to be sent' do
+          allow(client).to receive(:post)
+          params = { subject: 'fake subject' }
+
+          client.deliver(params)
+
+          expect(client).to have_received(:post).with(Endpoints::EMAIL, body: hash_including(params))
+        end
+
+        context 'with multiple destinations' do
+          it 'comma-separates the list of emails' do
+            allow(client).to receive(:post)
+            params = { to: %w(1@email.com 2@email.com') }
+
+            client.deliver(params)
+
+            expect(client).to have_received(:post).with(Endpoints::EMAIL, body: hash_including(to: params[:to].join(',')))
+          end
+        end
+      end
+    end
+  end
+end

data/spec/headquarters/client/github_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'shared_examples/an_http_requester'
+
+module Headquarters
+  class Client
+    describe Github do
+      it_behaves_like 'an HTTP requester'
+
+      subject(:client) { described_class.new }
+
+      context '#pull_requests' do
+        it 'asks for all the pull requests' do
+          allow(client).to receive(:get)
+
+          client.pull_requests
+
+          expect(client).to have_received(:get).with(Endpoints::Github::PULL_REQUESTS, query: { q: nil })
+        end
+
+        it 'asks for the open pull requests' do
+          allow(client).to receive(:get)
+
+          client.pull_requests(query: 'is:open')
+
+          expect(client).to have_received(:get).with(Endpoints::Github::PULL_REQUESTS, query: { q: 'is:open' })
+        end
+      end
+    end
+  end
+end

data/spec/headquarters/client/members_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'shared_examples/an_http_requester'
+
+module Headquarters
+  class Client
+    describe Members do
+      it_behaves_like 'an HTTP requester'
+
+      subject(:client) { described_class.new }
+
+      context '#all' do
+        it 'asks for all the members' do
+          allow(client).to receive(:get)
+
+          client.all
+
+          expect(client).to have_received(:get).with(Endpoints::MEMBERS)
+        end
+      end
+
+      context '#search' do
+        it 'asks for the members using an extra query param' do
+          allow(client).to receive(:get)
+
+          client.search('a_query')
+
+          expect(client).to have_received(:get).with(Endpoints::MEMBERS, query: { q: 'a_query' })
+        end
+      end
+    end
+  end
+end

data/spec/headquarters/client_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'shared_examples/an_http_requester'
+
+module Headquarters
+  describe Client do
+    it_behaves_like 'an HTTP requester'
+
+    subject(:client) { described_class.new }
+
+    it { expect(client.members).to be_a Client::Members }
+    it { expect(client.email).to be_a Client::Email }
+    it { expect(client.github).to be_a Client::Github }
+  end
+end

data/spec/{request_spec.rb → headquarters/request_spec.rb}

@@ -33,24 +33,5 @@ module Headquarters
         expect(Request).to have_received(:get).with(url, {})
       end
     end
-
-    context '.perform_with_auth' do
-      it 'makes the actual call with basic auth' do
-        url = '/some-url'
-        credentials = { basic_auth: { username: 'user', password: 'pass' } }
-        new_env = {
-          BASIC_AUTH_PASS: credentials[:basic_auth][:password],
-          BASIC_AUTH_USER: credentials[:basic_auth][:username]
-        }
-        stub_request(:get, 'user:pass@' + Headquarters.api_base + url)
-        allow(Request).to receive(:get).and_call_original
-
-        with_modified_env new_env do
-          Request.perform_with_auth(:get, url)
-
-          expect(Request).to have_received(:get).with(url, credentials)
-        end
-      end
-    end
   end
 end

data/spec/headquarters_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Headquarters do
+  context '.new' do
+    it 'instantiates a new client' do
+      expect(Headquarters::Client).to receive(:new)
+
+      Headquarters.new
+    end
+  end
+end

data/spec/shared_examples/an_http_requester.rb

@@ -0,0 +1,39 @@
+RSpec.shared_examples 'an HTTP requester' do
+  let(:client) { described_class.new }
+
+  context '#get' do
+    it 'makes a GET request to the correct endpoint' do
+      allow(client).to receive(:perform_request)
+
+      client.get :fake_endpoint
+
+      expect(client).to have_received(:perform_request).with(:get, :fake_endpoint, {})
+    end
+
+    it 'accepts optional arguments' do
+      allow(client).to receive(:perform_request)
+
+      client.get :fake_endpoint, arg: :value
+
+      expect(client).to have_received(:perform_request).with(:get, :fake_endpoint, arg: :value)
+    end
+  end
+
+  context '#post' do
+    it 'makes a POST request' do
+      allow(client).to receive(:perform_request)
+
+      client.post :fake_endpoint
+
+      expect(client).to have_received(:perform_request).with(:post, :fake_endpoint, {})
+    end
+
+    it 'accepts optional arguments' do
+      allow(client).to receive(:perform_request)
+
+      client.post :fake_endpoint, arg: :value
+
+      expect(client).to have_received(:perform_request).with(:post, :fake_endpoint, arg: :value)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'headquarters'
 require 'climate_control'
 
 Dir[File.join(Headquarters::ROOT_PATH, 'spec/support/**/*.rb')].each { |f| require f }
+Dir[File.join(Headquarters::ROOT_PATH, 'spec/shared_examples/**/*.rb')].each { |f| require f }
 
 class DummyLogger
   def self.info(_message); end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: headquarters
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Miguel Palhas
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -125,18 +111,28 @@ files:
 - Rakefile
 - headquarters.gemspec
 - lib/headquarters.rb
-- lib/headquarters/email.rb
-- lib/headquarters/email/rails_delivery_method.rb
-- lib/headquarters/endpoints.rb
-- lib/headquarters/github.rb
-- lib/headquarters/member.rb
+- lib/headquarters/api.rb
+- lib/headquarters/api/endpoints.rb
+- lib/headquarters/api/factory.rb
+- lib/headquarters/api/oauth_authenticator.rb
+- lib/headquarters/client.rb
+- lib/headquarters/client/email.rb
+- lib/headquarters/client/github.rb
+- lib/headquarters/client/members.rb
+- lib/headquarters/rails_delivery_method.rb
 - lib/headquarters/railtie.rb
 - lib/headquarters/request.rb
 - lib/headquarters/version.rb
-- spec/email_spec.rb
-- spec/github_spec.rb
-- spec/member_spec.rb
-- spec/request_spec.rb
+- spec/headquarters/api/factory_spec.rb
+- spec/headquarters/api/oauth_authenticator_spec.rb
+- spec/headquarters/api_spec.rb
+- spec/headquarters/client/email_spec.rb
+- spec/headquarters/client/github_spec.rb
+- spec/headquarters/client/members_spec.rb
+- spec/headquarters/client_spec.rb
+- spec/headquarters/request_spec.rb
+- spec/headquarters_spec.rb
+- spec/shared_examples/an_http_requester.rb
 - spec/spec_helper.rb
 homepage: https://github.com/groupbuddies/headquarters-ruby
 licenses:
@@ -163,8 +159,14 @@ signing_key:
 specification_version: 4
 summary: Ruby wrapper for the headquarters API for Group Buddies
 test_files:
-- spec/email_spec.rb
-- spec/github_spec.rb
-- spec/member_spec.rb
-- spec/request_spec.rb
+- spec/headquarters/api/factory_spec.rb
+- spec/headquarters/api/oauth_authenticator_spec.rb
+- spec/headquarters/api_spec.rb
+- spec/headquarters/client/email_spec.rb
+- spec/headquarters/client/github_spec.rb
+- spec/headquarters/client/members_spec.rb
+- spec/headquarters/client_spec.rb
+- spec/headquarters/request_spec.rb
+- spec/headquarters_spec.rb
+- spec/shared_examples/an_http_requester.rb
 - spec/spec_helper.rb

data/lib/headquarters/email/rails_delivery_method.rb

@@ -1,30 +0,0 @@
-require 'headquarters/email'
-
-module Headquarters
-  class Email
-    class RailsDeliveryMethod
-      attr_accessor :options
-
-      def initialize(options = {})
-        self.options = options
-      end
-
-      def deliver(mail)
-        params = {
-          from:     mail.from,
-          to:       mail.to,
-          subject:  mail.subject,
-          body:     mail.body.to_s,
-          app_name: mail.header['app_name'].to_s
-        }
-        Headquarters::Email.send(params)
-      end
-
-      alias_method :deliver!,       :deliver
-      alias_method :deliver_now,    :deliver
-      alias_method :deliver_now!,   :deliver
-      alias_method :deliver_later,  :deliver
-      alias_method :deliver_later!, :deliver
-    end
-  end
-end

data/lib/headquarters/endpoints.rb

@@ -1,14 +0,0 @@
-module Headquarters
-  module Endpoints
-    MEMBERS = '/members'
-
-    module Github
-      PULL_REQUESTS = '/github/pull_requests'
-    end
-
-    module Internal
-      MEMBERS = '/internal/members'
-      EMAIL = '/internal/emails'
-    end
-  end
-end

data/lib/headquarters/github.rb

@@ -1,7 +0,0 @@
-module Headquarters
-  class Github
-    def self.pull_requests(query: nil)
-      Request.perform(:get, Endpoints::Github::PULL_REQUESTS, query: { q: query })
-    end
-  end
-end

data/lib/headquarters/member.rb

@@ -1,15 +0,0 @@
-module Headquarters
-  class Member
-    def self.all
-      Request.perform(:get, Endpoints::MEMBERS)
-    end
-
-    def self.search(query)
-      Request.perform(:get, Endpoints::MEMBERS, q: query)
-    end
-
-    def self.all_internal
-      Request.perform_with_auth(:get, Endpoints::Internal::MEMBERS)
-    end
-  end
-end

data/spec/email_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-module Headquarters
-  describe Email do
-    context '.send' do
-      it 'makes a new POST request using the correct API endpoint' do
-        allow(Request).to receive(:perform_with_auth)
-        params = { subject: 'fake subject' }
-
-        Email.send(params)
-
-        expect(Request).to have_received(:perform_with_auth).with(:post, Endpoints::Internal::EMAIL, hash_including(params))
-      end
-    end
-  end
-end

data/spec/github_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-module Headquarters
-  describe Github do
-    context '.pull_requests' do
-      it 'asks for all the pull requests' do
-        allow(Request).to receive(:perform)
-
-        Github.pull_requests
-
-        expect(Request).to have_received(:perform).
-          with(:get, Endpoints::Github::PULL_REQUESTS, query: { q: nil })
-      end
-
-      it 'asks for the open pull requests' do
-        allow(Request).to receive(:perform)
-
-        Github.pull_requests(query: 'is:open')
-
-        expect(Request).to have_received(:perform).
-          with(:get, Endpoints::Github::PULL_REQUESTS, query: { q: 'is:open' })
-      end
-    end
-  end
-end

data/spec/member_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-module Headquarters
-  describe Member do
-    context '.all' do
-      it 'makes a new GET request using the correct API endpoint' do
-        allow(Request).to receive(:perform)
-
-        Member.all
-
-        expect(Request).to have_received(:perform).with(:get, Endpoints::MEMBERS)
-      end
-    end
-
-    context '.all_internal' do
-      it 'makes a new GET request using the correct API endpoint' do
-        allow(Request).to receive(:perform_with_auth)
-
-        Member.all_internal
-
-        expect(Request).to have_received(:perform_with_auth).with(:get, Endpoints::Internal::MEMBERS)
-      end
-    end
-  end
-end