right_hook 0.2.5 → 0.3.0

data/lib/right_hook/app.rb

@@ -3,27 +3,22 @@ require 'json'
 
 module RightHook
   class App < Sinatra::Base
-    KNOWN_EVENT_TYPES = %w(
-      pull_request
-      issue
-    )
-
     post '/hook/:owner/:repo_name/:event_type' do
       owner = params[:owner]
       repo_name = params[:repo_name]
       event_type = params[:event_type]
       content = request.body.read
 
-      halt 404 unless KNOWN_EVENT_TYPES.include?(event_type)
+      halt 404 unless Event::KNOWN_TYPES.include?(event_type)
       halt 501 unless respond_to?("on_#{event_type}")
 
       require_valid_signature(content, owner, repo_name, event_type)
 
       json = JSON.parse(content)
       case event_type
-      when 'pull_request'
+      when Event::PULL_REQUEST
         on_pull_request(owner, repo_name, json['number'], json['action'], json['pull_request'])
-      when 'issue'
+      when Event::ISSUE
         on_issue(owner, repo_name, json['action'], json['issue'])
       else
         halt 500

data/lib/right_hook/event.rb

@@ -0,0 +1,24 @@
+module RightHook
+  module Event
+    class << self
+      def github_name(event_type)
+        case event_type
+        when ISSUE
+          'issues'
+        when PULL_REQUEST
+          'pull_request'
+        else
+          raise ArgumentError, "Unrecognized event_type: #{event_type}"
+        end
+      end
+    end
+
+    ISSUE = 'issue'.freeze
+    PULL_REQUEST = 'pull_request'.freeze
+
+    KNOWN_TYPES = [
+      ISSUE,
+      PULL_REQUEST
+    ].freeze
+  end
+end

data/lib/right_hook/logger.rb

@@ -0,0 +1,13 @@
+require 'logger'
+
+module RightHook
+  class << self
+    def logger
+      @logger || Logger.new(File::NULL)
+    end
+
+    def logger=(logger)
+      @logger = logger
+    end
+  end
+end

data/lib/right_hook/subscriber.rb

@@ -1,4 +1,6 @@
 require 'httparty'
+require 'right_hook/event'
+require 'right_hook/logger'
 
 module RightHook
   # Subscriber can subscribe and unsubscribe GitHub hooks to a hosted instance of a specified {RightHook::App}.
@@ -49,19 +51,24 @@ module RightHook
       oauth_token = opts.fetch(:oauth_token) { self.oauth_token }
       owner = opts.fetch(:owner) { self.owner }
       base_url = opts.fetch(:base_url) { self.base_url }
+      event_type = opts.fetch(:event_type) { self.event_type }
 
-      HTTParty.post('https://api.github.com/hub',
+      response = HTTParty.post('https://api.github.com/hub',
         headers: {
           # http://developer.github.com/v3/#authentication
           'Authorization' => "token #{oauth_token}"
         },
         body: {
           'hub.mode' => mode,
-          'hub.topic' => "https://github.com/#{owner}/#{repo_name}/events/#{event_type}",
+          'hub.topic' => "https://github.com/#{owner}/#{repo_name}/events/#{Event.github_name(event_type)}",
           'hub.callback' => "#{base_url}/hook/#{owner}/#{repo_name}/#{event_type}",
           'hub.secret' => secret
         }
-      ).success?
+      )
+
+      RightHook.logger.warn("Failure modifying subscription: #{response.inspect}") unless response.success?
+
+      response.success?
     end
   end
 end

data/lib/right_hook/version.rb

@@ -1,3 +1,3 @@
 module RightHook
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/spec/event_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe RightHook::Event do
+  describe '.github_name' do
+    it 'maps all known types' do
+      described_class::KNOWN_TYPES.each do |type|
+        expect {
+          described_class.github_name(type)
+        }.not_to raise_error
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'right_hook/app'
 require 'right_hook/authenticated_client'
 require 'right_hook/authenticator'
 require 'right_hook/commenter'
+require 'right_hook/event'
 require 'right_hook/subscriber'
 
 require_relative './support/spec_helpers.rb'

data/spec/subscriber_spec.rb

@@ -13,7 +13,7 @@ describe RightHook::Subscriber do
   describe '.subscribe' do
     let!(:stubbed_request) do
       stub_request(:post, 'https://api.github.com/hub').
-        with(:body => 'hub.mode=subscribe&hub.topic=https%3A%2F%2Fgithub.com%2Fmark-rushakoff%2Fright_hook%2Fevents%2Fissue&hub.callback=http%3A%2F%2Fexample.com%2Fhook%2Fmark-rushakoff%2Fright_hook%2Fissue&hub.secret=the-secret',
+        with(:body => 'hub.mode=subscribe&hub.topic=https%3A%2F%2Fgithub.com%2Fmark-rushakoff%2Fright_hook%2Fevents%2Fissues&hub.callback=http%3A%2F%2Fexample.com%2Fhook%2Fmark-rushakoff%2Fright_hook%2Fissue&hub.secret=the-secret',
              :headers => {'Authorization' => 'token my_token'}
             ).to_return(:status => status_code, :body => '', :headers => {})
     end
@@ -37,12 +37,30 @@ describe RightHook::Subscriber do
         expect(stubbed_request).to have_been_requested
       end
     end
+
+    context 'When everything is overridden' do
+      let(:status_code) { 200 }
+      it 'works' do
+        s = described_class.new
+        result = s.subscribe(
+          repo_name: 'right_hook',
+          secret: 'the-secret',
+          oauth_token: 'my_token',
+          owner: 'mark-rushakoff',
+          base_url: 'http://example.com',
+          event_type: 'issue'
+        )
+        expect(result).to eq(true)
+
+        expect(stubbed_request).to have_been_requested
+      end
+    end
   end
 
   describe '.unsubscribe' do
     let!(:stubbed_request) do
       stub_request(:post, 'https://api.github.com/hub').
-        with(:body => 'hub.mode=unsubscribe&hub.topic=https%3A%2F%2Fgithub.com%2Fmark-rushakoff%2Fright_hook%2Fevents%2Fissue&hub.callback=http%3A%2F%2Fexample.com%2Fhook%2Fmark-rushakoff%2Fright_hook%2Fissue&hub.secret=the-secret',
+        with(:body => 'hub.mode=unsubscribe&hub.topic=https%3A%2F%2Fgithub.com%2Fmark-rushakoff%2Fright_hook%2Fevents%2Fissues&hub.callback=http%3A%2F%2Fexample.com%2Fhook%2Fmark-rushakoff%2Fright_hook%2Fissue&hub.secret=the-secret',
              :headers => {'Authorization' => 'token my_token'}
             ).to_return(:status => status_code, :body => '', :headers => {})
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_hook
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -174,6 +174,8 @@ files:
 - lib/right_hook/authenticated_client.rb
 - lib/right_hook/authenticator.rb
 - lib/right_hook/commenter.rb
+- lib/right_hook/event.rb
+- lib/right_hook/logger.rb
 - lib/right_hook/subscriber.rb
 - lib/right_hook/version.rb
 - right_hook.gemspec
@@ -184,6 +186,7 @@ files:
 - spec/authenticator_spec.rb
 - spec/captain_hook_spec.rb
 - spec/commenter_spec.rb
+- spec/event_spec.rb
 - spec/spec_helper.rb
 - spec/subscriber_spec.rb
 - spec/support/spec_helpers.rb
@@ -221,6 +224,7 @@ test_files:
 - spec/authenticator_spec.rb
 - spec/captain_hook_spec.rb
 - spec/commenter_spec.rb
+- spec/event_spec.rb
 - spec/spec_helper.rb
 - spec/subscriber_spec.rb
 - spec/support/spec_helpers.rb