activehook-server 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 201412c43f9227345cee75c377792a9fc8f8d961
-  data.tar.gz: c5c69be1f47a5f1ddd5892f0d68eb4762d4e5a72
+  metadata.gz: 1219a4526cb89c42d1458f392368e300921856d3
+  data.tar.gz: fef1df8b61a5bff797a1f677dc63c107e39bb5b4
 SHA512:
-  metadata.gz: 61643d860e6d5f1c4a029a7735fe456bb40e4c765d9e3cc86baf3b62013ce514cf2c5304b9db37f1cff1ee727c8df616825fa523f7c728644ae9ad399103e080
-  data.tar.gz: edb11abbb40d1caf937a8a3207117378086ee7c299c0a713bd85aa8d6695b39264bb49f6d89d9f153ed2e91bf2d2a36662c23779a466083bd7380adeeb344732
+  metadata.gz: a52a21c85a679d5cd622848f821d9d8e47e98313f4b6e205e4b5c54db902f1bfce37ec4a9ad089151a16732134cc476c78cf5cc96e1685cb09335bac8e721242
+  data.tar.gz: 54bce1a19600d8f6be8031bcc162589ad31e067b6abe19e25d298eaa3b1e0326369c137137bebc2dba8abca779bf36f0e4a8a056c50214da16c5d2bf6d046e27

data/bin/activehook-server

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'activehook/server/version'
 require 'activehook/server'
 
 server = ActiveHook::Server::Launcher.new(ARGV)

data/lib/activehook/server.rb

@@ -5,7 +5,8 @@ require 'uri'
 require 'net/http'
 require 'openssl'
 require 'connection_pool'
-require 'activehook/server/hook'
+require 'activehook/server/version'
+require 'activehook/server/message'
 require 'activehook/server/config'
 require 'activehook/server/redis'
 require 'activehook/server/errors'

data/lib/activehook/server/errors.rb

@@ -2,7 +2,7 @@ module ActiveHook
   module Server
     module Errors
       class Config < StandardError; end
-      class Hook < StandardError; end
+      class Message < StandardError; end
       class HTTP < StandardError; end
       class Send < StandardError; end
       class Server < StandardError; end

data/lib/activehook/server/{hook.rb → message.rb}

@@ -1,6 +1,6 @@
 module ActiveHook
   module Server
-    class Hook
+    class Message
       attr_accessor :token, :uri, :id, :key, :retry_max, :retry_time, :created_at
       attr_reader :errors, :payload
 
@@ -16,7 +16,7 @@ module ActiveHook
       end
 
       def save!
-        raise Errors::Hook, 'Hook is invalid' unless valid?
+        raise Errors::Message, 'Message is invalid' unless valid?
         save_hook
       end
 
@@ -58,10 +58,9 @@ module ActiveHook
       end
 
       def final_payload
-        { hook_id: @id,
-          hook_key: @key,
-          hook_time: @created_at,
-          hook_signature: ActiveHook.config.signature_header,
+        { id: @id,
+          key: @key,
+          created_at: @created_at,
           payload: @payload }.to_json
       end
 
@@ -76,7 +75,7 @@ module ActiveHook
 
       private
 
-      def save_hook
+      def save_message
         ActiveHook::Server.redis.with do |conn|
           @id = conn.incr('ah:total_queued')
           conn.lpush('ah:queue', to_json)

data/lib/activehook/server/queue.rb

@@ -1,7 +1,7 @@
 module ActiveHook
   module Server
-    # The Queue object processes any hooks that are queued into our Redis server.
-    # It will perform a 'blocking pop' on our hook list until one is added.
+    # The Queue object processes any messages that are queued into our Redis server.
+    # It will perform a 'blocking pop' on our message list until one is added.
     #
     class Queue
       def initialize
@@ -12,8 +12,8 @@ module ActiveHook
       #
       def start
         until @done
-          json = retrieve_hook
-          HookRunner.new(json) if json
+          json = retrieve_message
+          MessageRunner.new(json) if json
         end
       end
 
@@ -27,35 +27,36 @@ module ActiveHook
 
       # Performs a 'blocking pop' on our redis queue list.
       #
-      def retrieve_hook
+      def retrieve_message
         json = ActiveHook::Server.redis.with { |c| c.brpop('ah:queue') }
         json.last if json
       end
     end
 
-    class HookRunner
+    class MessageRunner
       def initialize(json)
-        @hook = Hook.new(JSON.parse(json))
-        @post = Send.new(hook: @hook)
+        @message = Message.new(JSON.parse(json))
+        @post = Send.new(message: @message)
         start
       end
 
       def start
         @post.start
         ActiveHook::Server.redis.with do |conn|
-          @post.success? ? hook_success(conn) : hook_failed(conn)
+          @post.success? ? message_success(conn) : message_failed(conn)
         end
       end
 
       private
 
-      def hook_success(conn)
+      def message_success(conn)
         conn.incr('ah:total_success')
       end
 
-      def hook_failed(conn)
-        conn.zadd('ah:retry', @hook.retry_at, @hook.to_json) if @hook.retry?
+      def message_failed(conn)
         conn.incr('ah:total_failed')
+        return unless @message.retry?
+        conn.zadd('ah:retry', @message.retry_at, @message.to_json)
       end
     end
   end

data/lib/activehook/server/send.rb

@@ -7,7 +7,7 @@ module ActiveHook
         "User-Agent"   => "ActiveHook/#{ActiveHook::Server::VERSION}"
       }.freeze
 
-      attr_accessor :hook
+      attr_accessor :message
       attr_reader :response_time, :status, :response
 
       def initialize(options = {})
@@ -15,12 +15,12 @@ module ActiveHook
       end
 
       def start
-        @status = post_hook
+        @status = post_message
         log_status
       end
 
       def uri
-        @uri ||= URI.parse(@hook.uri)
+        @uri ||= URI.parse(@message.uri)
       end
 
       def success?
@@ -29,10 +29,10 @@ module ActiveHook
 
       private
 
-      def post_hook
+      def post_message
         http = Net::HTTP.new(uri.host, uri.port)
         measure_response_time do
-          @response = http.post(uri.path, @hook.final_payload, final_headers)
+          @response = http.post(uri.path, @message.final_payload, final_headers)
         end
         response_status(@response)
       rescue
@@ -67,7 +67,7 @@ module ActiveHook
       end
 
       def final_headers
-        { "X-Hook-Signature" => @hook.signature }.merge(REQUEST_HEADERS)
+        { "X-Hook-Signature" => @message.signature }.merge(REQUEST_HEADERS)
       end
     end
   end

data/lib/activehook/server/version.rb

@@ -1,6 +1,6 @@
 module ActiveHook
   module Server
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
     CODENAME = 'Fat Sparrow'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activehook-server
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nicholas Sweeting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -159,10 +159,10 @@ files:
 - lib/activehook/server.rb
 - lib/activehook/server/config.rb
 - lib/activehook/server/errors.rb
-- lib/activehook/server/hook.rb
 - lib/activehook/server/launcher.rb
 - lib/activehook/server/log.rb
 - lib/activehook/server/manager.rb
+- lib/activehook/server/message.rb
 - lib/activehook/server/queue.rb
 - lib/activehook/server/redis.rb
 - lib/activehook/server/retry.rb