apphunk 0.4.1 → 0.5.0

data/Rakefile

@@ -6,13 +6,14 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "apphunk"
     gem.summary = %Q{A library that send's messages to Apphunk.com}
-    gem.description = %Q{Apphunk is a library that allows your applications (currently only Ruby AND Rails) to send messages to Apphunk.com}
+    gem.description = %Q{Apphunk is a library that allows your applications to send messages to Apphunk.com}
     gem.email = "andreas@apphunk.com"
     gem.homepage = "http://apphunk.com"
     gem.authors = ["Andreas Wolff"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
     gem.add_dependency "json"
+    gem.add_dependency "postbox", ">= 0.2.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/apphunk.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apphunk}
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Wolff"]
-  s.date = %q{2010-04-06}
-  s.description = %q{Apphunk is a library that allows your applications (currently only Ruby AND Rails) to send messages to Apphunk.com}
+  s.date = %q{2010-06-30}
+  s.description = %q{Apphunk is a library that allows your applications to send messages to Apphunk.com}
   s.email = %q{andreas@apphunk.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -31,8 +31,6 @@ Gem::Specification.new do |s|
      "lib/apphunk/config.rb",
      "lib/apphunk/logger.rb",
      "lib/apphunk/proxy.rb",
-     "lib/apphunk/remote.rb",
-     "lib/apphunk/remote/result.rb",
      "rails/init.rb",
      "spec/apphunk/proxy_spec.rb",
      "spec/apphunk_spec.rb",
@@ -42,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://apphunk.com}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A library that send's messages to Apphunk.com}
   s.test_files = [
     "spec/apphunk/proxy_spec.rb",
@@ -54,19 +52,22 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<postbox>, [">= 0.2.0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<postbox>, [">= 0.2.0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<postbox>, [">= 0.2.0"])
   end
 end
 

data/lib/apphunk.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
+require 'postbox'
 
 module Apphunk
   
   autoload :Config, 'apphunk/config'
   autoload :Logger, 'apphunk/logger'
   autoload :Proxy,  'apphunk/proxy'
-  autoload :Remote, 'apphunk/remote'
   
   class << self
 
@@ -108,4 +108,4 @@ module Apphunk
   
 end
 
-Apphunk.init_defaults
+Apphunk.init_defaults

data/lib/apphunk/proxy.rb

@@ -1,20 +1,19 @@
 require 'json'
-require 'ostruct'
 
 module Apphunk
   module Proxy
     class << self
       
-      PROXY_API_URL = "http://127.0.0.1:8212/api/messages"
-      
       def send_message_to_apphunkd(message, options)
         if options[:environments] && options[:environment] && !options[:environments].include?(options[:environment])
           return false
         end
         
         payload = prepare_payload(message, options)
-        result = Apphunk::Remote.post(PROXY_API_URL, payload, 3)
-        return process_response(result)
+        url = generate_api_messages_url(payload[:token])
+        return Postbox.post(url, payload) do |result|
+          process_response(result)
+        end
       end
 
       def prepare_payload(message, options)
@@ -28,19 +27,22 @@ module Apphunk
       end
       
       def process_response(result)
-        if result.status == :ok
-          if result.response.code == '201'
-            return true
-          else
-            Apphunk::Logger.error "The Apphunkd-Proxy couldn't store the message: #{result.response.code} / #{result.response.body}"
-            return false
-          end
+        if result.success == true
+          return true
         else
-          Apphunk::Logger.error "Connection Error: Could not get a response from local Apphunkd-Proxy in time"
+          Apphunk::Logger.error "Could not store message: #{result.response}"
           return false
         end
       end
       
+      
+      protected
+
+      def generate_api_messages_url(token)
+        path = "v1/#{token}/messages"
+        "http://api.apphunk.com/#{path}"
+      end
+ 
     end
   end
-end
+end

data/spec/apphunk/proxy_spec.rb

@@ -4,12 +4,13 @@ describe Apphunk::Proxy do
   describe 'send_message_to_apphunkd_proxy' do
     before(:each) do
       @opts = { :tags => 'test', :token => 'secret' }
-      Apphunk::Remote.stub!(:post)
+      @payload = { :token => 'secret' }
       Apphunk::Proxy.stub!(:process_response).and_return(true)
+      Postbox.stub!(:post)
     end
     
     it 'should prepare the payload' do
-      Apphunk::Proxy.should_receive(:prepare_payload).with("My Message", @opts)
+      Apphunk::Proxy.should_receive(:prepare_payload).with("My Message", @opts).and_return(@payload)
       Apphunk::Proxy.send_message_to_apphunkd("My Message", @opts)
     end
     
@@ -21,17 +22,12 @@ describe Apphunk::Proxy do
     
     context 'posting' do
       before(:each) do
-        @payload = { "prepared" => "payload" }
+        @payload = { :prepared => "payload", :token => "secret" }
         Apphunk::Proxy.stub!(:prepare_payload).and_return(@payload)
       end
       
-      it 'should post the payload to the local Apphunkd api' do
-        Apphunk::Remote.should_receive(:post).with('http://127.0.0.1:8212/api/messages', @payload, anything)
-        Apphunk::Proxy.send_message_to_apphunkd("My Message", @opts)
-      end
-    
-      it 'should allow the post to only take 3 seconds to finish' do
-        Apphunk::Remote.should_receive(:post).with(anything, anything, 3)
+      it 'should post the payload' do
+        Postbox.should_receive(:post).with('http://api.apphunk.com/v1/secret/messages', @payload)
         Apphunk::Proxy.send_message_to_apphunkd("My Message", @opts)
       end
     end
@@ -39,28 +35,17 @@ describe Apphunk::Proxy do
     
   describe 'process_response' do
     before(:each) do
-      @result = Apphunk::Remote::Result.new
-      @result.response = mock('Response')
-      Apphunk::Remote.stub!(:post).and_return(@result)
+      @result = OpenStruct.new
     end
     
     it 'should return true if the Proxy return 201, created' do
-      @result.status = :ok
-      @result.response.stub!(:code).and_return("201")
-      Apphunk::Proxy.process_response(@result)
+      @result.success = true
+      Apphunk::Proxy.process_response(@result).should be_true
     end
     
     it 'should output the failure and return false if the Proxy doesn not return 201' do
-      @result.status = :ok
-      @result.response.stub!(:code).and_return("404")
-      @result.response.stub!(:body).and_return("Not found.")
-      Apphunk::Logger.should_receive(:error).with(/Not found/)
-      Apphunk::Proxy.process_response(@result)
-    end
-    
-    it 'should output the failure and return false if the connection to the proxy failed' do
-      @result.status = :connection_error
-      Apphunk::Logger.should_receive(:error).with(/Connection Error/)
+      @result.success = false
+      Apphunk::Logger.should_receive(:error).with(/not store/)
       Apphunk::Proxy.process_response(@result)
     end
   end
@@ -70,7 +55,7 @@ describe Apphunk::Proxy do
       @opts = { :token => 'secret', :environment => 'development', :tags => 'test', :trails => { :user => '5' } }
     end
     
-    it 'should create an OpenStruct, containing the message and extracted options' do
+    it 'should create a Hash, containing the message and extracted options' do
       payload = Apphunk::Proxy.prepare_payload("My Message", @opts)
       payload[:message].should == "My Message"
       payload[:token].should == "secret"

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apphunk
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Andreas Wolff
@@ -9,40 +15,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 +02:00
+date: 2010-06-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: Apphunk is a library that allows your applications (currently only Ruby AND Rails) to send messages to Apphunk.com
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: postbox
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id004
+description: Apphunk is a library that allows your applications to send messages to Apphunk.com
 email: andreas@apphunk.com
 executables: []
 
@@ -66,8 +102,6 @@ files:
 - lib/apphunk/config.rb
 - lib/apphunk/logger.rb
 - lib/apphunk/proxy.rb
-- lib/apphunk/remote.rb
-- lib/apphunk/remote/result.rb
 - rails/init.rb
 - spec/apphunk/proxy_spec.rb
 - spec/apphunk_spec.rb
@@ -83,21 +117,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A library that send's messages to Apphunk.com

data/lib/apphunk/remote.rb

@@ -1,29 +0,0 @@
-require 'net/http'
-require 'timeout'
-require 'uri'
-
-module Apphunk
-  module Remote
-    
-    autoload :Result, 'apphunk/remote/result'
-    
-    class << self
-      
-      def post(url, payload = {}, post_timeout = 30)
-        begin
-          Timeout.timeout(post_timeout) do
-            uri = URI.parse(url)
-            result = Remote::Result.new(:response => Net::HTTP.post_form(uri, 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)
-        end
-      end
-      
-    end
-  end
-end

data/lib/apphunk/remote/result.rb

@@ -1,15 +0,0 @@
-module Apphunk
-  module Remote
-    class Result
-      
-      attr_accessor :status
-      attr_accessor :response
-      
-      def initialize(opts = {})
-        self.status = opts.delete(:status)
-        self.response = opts.delete(:response)
-      end
-      
-    end
-  end
-end