apphunkd 0.12.2 → 0.13.0

data/Rakefile

@@ -21,6 +21,7 @@ begin
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
     gem.add_dependency "eventmachine", ">= 0"
+    gem.add_dependency "httparty", ">= 0.5.2"
     gem.add_dependency "sinatra", ">= 0.9.4"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.12.2
+0.13.0

data/apphunkd.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apphunkd}
-  s.version = "0.12.2"
+  s.version = "0.13.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Wolff"]
@@ -248,17 +248,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0.5.2"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0"])
+      s.add_dependency(%q<httparty>, [">= 0.5.2"])
       s.add_dependency(%q<sinatra>, [">= 0.9.4"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<eventmachine>, [">= 0"])
+    s.add_dependency(%q<httparty>, [">= 0.5.2"])
     s.add_dependency(%q<sinatra>, [">= 0.9.4"])
   end
 end

data/lib/apphunkd/queue.rb

@@ -38,9 +38,9 @@ module Apphunkd
                 result = push_item_to_remote_service(item)
                 if result.status == :ok
                   case result.response.code
-                  when '201'
+                  when 201
                     debug "Message successfully stored."
-                  when '400', '403'
+                  when 400, 403
                     log_error "Remote Service refused to store item: #{result.response.code} / #{result.response.body}. Dropped."
                   else
                     put_item_to_stack(item)
@@ -48,7 +48,7 @@ module Apphunkd
                   end
                 else
                   put_item_to_stack(item)
-                  log_error "Could not push to Remote Service: Connection Error. Put item back in queue."
+                  log_error "Could not push to Remote Service: Connection Error. Put item back in queue: #{result.status} / #{result.response}"
                 end
               end
             end
@@ -78,8 +78,8 @@ module Apphunkd
       end
 
       def push_item_to_remote_service(item)
-        url = generate_api_messages_url(item.delete('token'))
-        result = Apphunkd::Remote.post(url, item, 300)
+        url = generate_api_messages_url(item[:token])
+        result = Apphunkd::Remote.post_message(url, item.dup, 300)
       end
 
       def generate_api_messages_url(token)

data/lib/apphunkd/remote.rb

@@ -1,26 +1,28 @@
-require 'net/http'
+require 'httparty'
 require 'timeout'
-require 'uri'
 
 module Apphunkd
   module Remote
+    include HTTParty
     
     autoload :Result, 'apphunkd/remote/result'
     
     class << self
       
-      def post(url, payload = {}, post_timeout = 30)
+      def post_message(url, payload = {}, post_timeout = 60)
         begin
+          payload.delete(:token)
           Timeout.timeout(post_timeout) do
-            uri = URI.parse(url)
-            result = Remote::Result.new(:response => Net::HTTP.post_form(uri, payload))
+            result = Remote::Result.new(self.post(url, :body => payload))
             result.status = :ok
             return result
           end
-        rescue SocketError, Errno::ECONNREFUSED
-          Remote::Result.new(:status => :connection_error)
-        rescue Timeout::Error
-          Remote::Result.new(:status => :timeout)
+        rescue SocketError => e
+          return Remote::Result.new(:status => :connection_error, :response => "SocketError: #{e.inspect}")
+        rescue Errno::ECONNREFUSED => e
+          return Remote::Result.new(:status => :connection_error, :response => "ConnRefused: #{e.inspect}")
+        rescue Timeout::Error => e
+          return Remote::Result.new(:status => :timeout, :response => "Timeout: #{e.inspect}")
         end
       end
       

data/lib/apphunkd/remote/result.rb

@@ -5,9 +5,8 @@ module Apphunkd
       attr_accessor :status
       attr_accessor :response
       
-      def initialize(opts = {})
-        self.status = opts.delete(:status)
-        self.response = opts.delete(:response)
+      def initialize(new_response)
+        self.response = new_response
       end
       
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: apphunkd
 version: !ruby/object:Gem::Version 
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors: 
 - Andreas Wolff
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   type: :runtime