ramon 0.4.0 → 0.4.1

data/Gemfile

@@ -4,3 +4,6 @@ source "http://rubygems.org"
 gemspec
 
 gem 'rails', :group => :test 
+
+
+gem 'ramon', :path => '~/ramon'

data/lib/ramon/configuration.rb

@@ -1,7 +1,7 @@
 module Ramon
     class Configuration
         class ConfigurationException < StandardError; end
-        OPTIONS = [:app_key, :host, :port, :secret,
+        OPTIONS = [:app_key, :address, :secret, :protocol,
             :environment_name, :framework, :project_root].freeze
 
         # The Aplication key. Only in Amon Plus.
@@ -11,7 +11,7 @@ module Ramon
         attr_accessor :secret
 
         # The host to connect to (defaults to 127.0.0.1).
-        attr_accessor :host
+        attr_accessor :address
 
         # The port on which your Amon instance runs. Defaults to 2464
         attr_accessor :port
@@ -28,12 +28,15 @@ module Ramon
         # The logger used by Amon
         attr_accessor :logger
 
+        # The name of the procotol used to log data - (http/zeromq)
+        attr_accessor :protocol
+        
         def initialize
-            @host                     = 'http://127.0.0.1'
-            @port                     = 2464
+            @address                    = 'http://127.0.0.1:2464'
             @app_key                  = ''
             @secret                   = ''
             @framework                = 'Standalone'
+            @protocol                 = 'http'
         end
 
 

data/lib/ramon/sender.rb

@@ -1,12 +1,16 @@
 require 'net/http'
 require 'json'
 require 'zlib'
+begin
+  require 'zmq'
+rescue LoadError
+end
 
 module Ramon
     class Sender
         def initialize(options = {})
-            [ :host, 
-                :port, 
+            [ :address, 
+                :protocol,
                 :app_key,
                 :secret
             ].each do |option|
@@ -14,9 +18,8 @@ module Ramon
             end
         end
 
-
-        attr_reader :host,
-            :port,
+        attr_reader :address, 
+            :protocol,
             :app_key,
             :secret
 
@@ -31,11 +34,11 @@ module Ramon
 
 
         def url
-            URI.parse("#{host}:#{port}/api/")
+            URI.parse("#{address}/api/")
         end
 
-        def post(type, data)
-
+        def post_http(type, data = {})
+            
             if type == 'log'
                 @url = "#{url}log/#{app_key}"
             else
@@ -49,7 +52,7 @@ module Ramon
                 response = Net::HTTP.new(url.host, url.port).start {|http| http.request(request) }
                 case response
                 when Net::HTTPSuccess
-                    log :error, "#{@url} - #{response.message}"
+                    log :info, "#{@url} - #{response.message}"
                     return response
                 else
                     log :error, "#{@url} - #{response.code} - #{response.message}"
@@ -58,7 +61,33 @@ module Ramon
                 log :error, "[Ramon::Sender#post] Cannot send data to #{@url} Error: #{e.class} - #{e.message}"
                 nil 
             end
+        end
+
+        def post_zeromq(type, data = {})
+            if defined?(ZMQ)
+                context = ZMQ::Context.new()
+                socket = context.socket(ZMQ::DEALER) 
+                socket.connect("tcp://#{address}")
+                json_data = {:type => type,
+                            :content =>  data}
+                if app_key
+                    json_data['app_key'] = app_key
+                end
+
+                json_data = json_data.to_json
+
+                socket.send(json_data, ZMQ::NOBLOCK)
+                socket.close()
+                true
+            end
+        end
 
+        def post(type, data)
+            if protocol == 'zeromq'
+                post_zeromq(type, data)
+            elsif protocol == 'http'
+                post_http(type, data)
+            end
         end
 
     end # Class end 

data/lib/ramon/version.rb

@@ -1,3 +1,3 @@
 module Ramon
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/config_spec.rb

@@ -5,8 +5,8 @@ describe Configuration do
 
  it "should provide default values" do
     config = Ramon::Configuration.new
-    config.port.should == 2464
-    config.host.should == 'http://127.0.0.1'
+    config.address.should == 'http://127.0.0.1:2464'
+    config.protocol.should == 'http'
   end
 
 end

data/spec/web_spec.rb

@@ -1,14 +1,15 @@
 require 'spec_helper'
+require "logger"
 
 module Ramon
     # Works only when the Amon application is started
-    describe 'Web app test' do
+    describe 'Web app http test' do
 
         it 'Test logging' do
 
             Ramon.configure do |config|
-                config.host  = 'http://127.0.0.1'
-                config.port  = 2464
+                config.address  = 'http://127.0.0.1:2465'
+                config.logger = Logger.new(STDOUT)
             end
             
             Ramon.log([1,2,3,4]).response.code.should == "200"

data/spec/zeromq_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require "logger"
+
+module Ramon
+    # Works only when the AmonMQ server is started
+    describe 'Web app zeromq test' do
+
+        it 'Test ZeroMQ logging' do
+
+            Ramon.configure do |config|
+                config.address  = '127.0.0.1:5464'
+                config.protocol = 'zeromq'
+                config.logger = Logger.new(STDOUT)
+            end
+            
+            Ramon.log([1,2,3,4]).should == true
+            Ramon.log({:test => 'zeromq data', :more_test => 'more zeromq data'}).should == true
+        end	
+
+        it 'Test logging with multiple tags' do
+            Ramon.log("test zeromq", ['debug', 'benchmark']).should == true
+            Ramon.log({:test => 'data', :more_test => 'more_data'}, ['info','warning','user']).should == true
+        end
+
+
+        it 'Test Exceptions' do
+            Ramon.post('exception', {:url => 'test', :exception_class => 'test_me zeromq'}).should == true
+        end
+
+    end
+end 
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ramon
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - martinrusev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-23 00:00:00 +00:00
+date: 2012-04-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ files:
 - spec/rails_integration_spec.rb
 - spec/spec_helper.rb
 - spec/web_spec.rb
+- spec/zeromq_spec.rb
 has_rdoc: true
 homepage: http://amon.cx
 licenses: []