lib/activehook/hook.rb in activehook-0.1.5 vs lib/activehook/hook.rb in activehook-0.1.6

@@ -1,21 +1,34 @@
 module ActiveHook
   class Hook
-    attr_accessor :token, :uri, :payload, :id, :key, :retry_max, :retry_time, :created_at
+    attr_accessor :token, :uri, :id, :key, :retry_max, :retry_time, :created_at
+    attr_reader :errors, :payload
 
     def initialize(options = {})
       options = defaults.merge(options)
       options.each { |key, value| send("#{key}=", value) }
+      @errors = {}
     end
 
-    def perform
-      validate!
-      ActiveHook.redis.with do |conn|
-        @id = conn.incr('ah:total_queued')
-        conn.lpush('ah:queue', to_json)
-        conn.zadd('ah:validation', @id, @key)
+    def save
+      return false unless valid?
+      save_hook
+    end
+
+    def save!
+      raise Errors::Hook, 'Hook is invalid' unless valid?
+      save_hook
+    end
+
+    def payload=(payload)
+      if payload.is_a?(String)
+        @payload = JSON.parse(payload)
+      else
+        @payload = payload
       end
+    rescue JSON::ParserError
+      @payload = nil
     end
 
     def retry?
       fail_at > Time.now.to_i
     end
@@ -53,24 +66,37 @@
 
     def signature
       OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), @token, final_payload)
     end
 
+    def valid?
+      validate!
+      @errors.empty?
+    end
+
     private
 
+    def save_hook
+      ActiveHook.redis.with do |conn|
+        @id = conn.incr('ah:total_queued')
+        conn.lpush('ah:queue', to_json)
+        conn.zadd('ah:validation', @id, @key)
+      end
+    end
+
     def defaults
       { key: SecureRandom.uuid,
         created_at: Time.now.to_i,
         retry_time: 3600,
         retry_max: 3 }
     end
 
     def validate!
-      raise Errors::Hook, 'Token must be a String.' unless @token.is_a?(String)
-      raise Errors::Hook, 'Payload must be a Hash.' unless @payload.is_a?(Hash)
-      raise Errors::Hook, 'URI is not a valid format.' unless @uri =~ /\A#{URI::regexp}\z/
-      raise Errors::Hook, 'Created at must be an Integer.' unless @created_at.is_a?(Integer)
-      raise Errors::Hook, 'Retry time must be an Integer.' unless @retry_time.is_a?(Integer)
-      raise Errors::Hook, 'Retry max must be an Integer.' unless @retry_max.is_a?(Integer)
+      @errors.merge!(token: ['must be a string.']) unless @token.is_a?(String)
+      @errors.merge!(payload: ['must be a Hash']) unless @payload.is_a?(Hash)
+      @errors.merge!(uri: ['is not a valid format.']) unless @uri =~ /\A#{URI::regexp}\z/
+      @errors.merge!(created_at: ['must be an Integer.']) unless @created_at.is_a?(Integer)
+      @errors.merge!(retry_time: ['must be an Integer.']) unless @retry_time.is_a?(Integer)
+      @errors.merge!(retry_max: ['must be an Integer.']) unless @retry_max.is_a?(Integer)
     end
   end
 end