rnotifier 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67a2b60f6bf080a8814c12e59719bab1e080fe39
-  data.tar.gz: 96aeb8786e52e6fd723cb9528e6bfd78ffb0cd6f
+  metadata.gz: 7fdda4804509a222da3da5cb876ec831a829659c
+  data.tar.gz: 1b6b2be167646512fd9078ecbd2c711a933d572f
 SHA512:
-  metadata.gz: 8f65adfbbd5788e39ea264a5d3b84b2f0759f916ffcb002b04ac2c4ef975295b7511ca85fd126d5d2a93b30ea4d68985aaa5eea73fa765c1656b6472124e551b
-  data.tar.gz: 9d0f025c02c33b4558271c27838575320b48052e7e31284c561c56e7b2e5d77bc3d0395012b44f6052d02e7b09e291841f99613fcf103087d99f1fa9d2927025
+  metadata.gz: 98a2cde857b4e00ef0a5fbd0a8a710c5c5563c07a81f5f8c081f634514ce9e684938df5a9915aa3f8ad2c8afb30008169dd36457294f4626c0dfa192e96133bf
+  data.tar.gz: e76ebcfd6889c2d0ac0a3ae2f8da50e986f85286f742b2caffe79ea000f8702d7e0957b782ec63b01624862bfec2fd9eebc87c9ec70203379ff0e4d96a6e0ebc

data/.travis.yml

@@ -0,0 +1,11 @@
+branches:
+  only:
+    - 'master'
+
+language: ruby
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+
+script: bundle exec rspec spec

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'coveralls', require: false
 # Specify your gem's dependencies in rnotifier.gemspec
 gemspec

data/README.md

@@ -2,6 +2,9 @@
 
 Exception catcher for rack base applications.
 
+[![Build Status](https://travis-ci.org/jiren/rnotifier.png?branch=master)](https://travis-ci.org/jiren/rnotifier) 
+ [![Coverage Status](https://coveralls.io/repos/jiren/rnotifier/badge.png?branch=master)](https://coveralls.io/r/jiren/rnotifier?branch=master)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,13 +25,13 @@ rnotifier install 'API-KEY'  # This will create 'config/rnotifier.yaml' file.
 
 ### Config file options
 
-- environments: development  #Default is production
-- capture_code: true         #Default false
-- api_host: 'http://yourapp.com' #Default http://rnotifier.com
+    environments: development,test #default is production
+    capture_code: true             #default false
+    api_host: 'http://yourapp.com' #default http://rnotifier.com
 
 ### To test config
 
-rnotifier test  #This will send test exception to rnotifier.
+    rnotifier test                 #this will send test exception to rnotifier.
 
 ## Contributing
 

data/lib/rnotifier/config.rb

@@ -4,15 +4,16 @@ module Rnotifier
       :api_host     => 'http://api.rnotifier.com',
       :api_version  => 'v1', 
       :notify_path  => 'exception',
+      :event_path   => 'event',
       :ignore_env   => ['development', 'test'],
       :http_open_timeout => 2,
       :http_read_timeout => 4
     }
 
-    CLIENT = "RN-RUBY-GEM:#{Rnotifier::VERSION}"
+    CLIENT = "RRG:#{Rnotifier::VERSION}"
 
     class << self
-      attr_accessor :api_key, :notification_path, :environments, :current_env, 
+      attr_accessor :api_key, :notification_path, :event_path, :environments, :current_env, 
         :valid, :app_env, :api_host, :ignore_exceptions, :capture_code
 
       def [](val)
@@ -49,6 +50,8 @@ module Rnotifier
         self.app_env = get_app_env
         self.ignore_exceptions = self.ignore_exceptions.split(',') if self.ignore_exceptions.is_a?(String)
 
+        self.event_path = '/' + [DEFAULT[:api_version], DEFAULT[:event_path], self.api_key].join('/')
+
         self.valid = true 
       end
 
@@ -80,6 +83,16 @@ module Rnotifier
         (defined?(Rails) && Rails.respond_to?(:root)) ? Rails.root.to_s : Dir.pwd
       end
 
+      def event_app_env
+        {
+          :env => self.current_env,
+          :pid => $$,
+          :host => (Socket.gethostname rescue ''),
+          :language => 'ruby',
+          :platform => (RUBY_PLATFORM rescue '')
+        }
+      end
+
     end
   end
 end

data/lib/rnotifier/event_data.rb

@@ -0,0 +1,31 @@
+module Rnotifier
+  class EventData
+    attr_reader :data
+
+    def initialize(name, data = {})
+      @data = {
+        :name => name, 
+        :data => data,
+        :app_env => EventData.app_env,
+        :occurred_at => Time.now.utc.to_s,
+        :data_from => :event,
+        :rnotifier_client => Config::CLIENT,
+      }
+      @data[:context_data] = Thread.current[:rnotifier_context] if Thread.current[:rnotifier_context]
+    end
+
+    def notify
+      begin
+        Notifier.send(data, Rnotifier::Config.event_path)
+      rescue Exception => e
+        Rlogger.error("[EVENT NOTIFY] #{e.message}")
+        Rlogger.error("[EVENT NOTIFY] #{e.backtrace}")
+      end
+    end
+
+    def self.app_env
+      @env ||= Rnotifier::Config.event_app_env 
+    end
+
+  end
+end

data/lib/rnotifier/exception_code.rb

@@ -4,7 +4,10 @@ module Rnotifier
 
       def get(backtrace)
         return unless backtrace
-        filename, line, method = (backtrace.find{|l| l =~ /^#{Config.app_env[:app_root]}/} || backtrace[0]).split(':')
+        bline = backtrace.find do |l| 
+          l.index(Config.app_env[:app_root]) == 0 && !Gem.path.any?{|path| l.index(path) == 0}
+        end
+        filename, line, method = (bline|| backtrace[0]).split(':')
         self.find(filename, line.to_i, 3)
       end
 

data/lib/rnotifier/exception_data.rb

@@ -18,9 +18,8 @@ module Rnotifier
 
       begin
         data = options[:type] == :rack ? self.rack_exception_data : {:extra => self.env }
-
         data[:app_env] = Rnotifier::Config.app_env
-        data[:occurred_at] = Time.now.to_s
+        data[:occurred_at] = Time.now.utc.to_s
         data[:exception] = self.exception_data
         data[:context_data] = Thread.current[:rnotifier_context] if Thread.current[:rnotifier_context]
         data[:data_from] = options[:type]
@@ -30,10 +29,8 @@ module Rnotifier
       rescue Exception => e
         Rlogger.error("[NOTIFY] #{e.message}")
         Rlogger.error("[NOTIFY] #{e.backtrace}")
-      ensure
-        Rnotifier.clear_context
+        false
       end
-      false
     end
 
     def rack_exception_data

data/lib/rnotifier/notifier.rb

@@ -3,23 +3,26 @@ module Rnotifier
     class << self
 
       def connection
-        @connection ||= Faraday.new(:url => Rnotifier::Config.api_host) do |faraday|
+        @connection ||= Faraday.new(:url => Config.api_host) do |faraday|
           faraday.adapter Faraday.default_adapter  
         end
       end
 
-      def send(data)
+      def send(data, url = nil)
         response = self.connection.post do |req|
-          req.url Rnotifier::Config.notification_path
+          req.url(url || Config.notification_path)
           req.headers['Content-Type'] = 'application/json'
-          req.options[:timeout] =  Rnotifier::Config[:http_open_timeout]
-          req.options[:open_timeout] = Rnotifier::Config[:http_read_timeout]
+          req.headers['Api-Key'] = Config.api_key
+          req.options[:timeout] =  Config[:http_open_timeout]
+          req.options[:open_timeout] = Config[:http_read_timeout]
           req.body =  MultiJson.dump(data)
         end
 
         return true if response.status == 200
         Rlogger.error("[RNOTIFIER SERVER] Response Status:#{response.status}")
         false
+      ensure
+        Rnotifier.clear_context
       end
     end
   end

data/lib/rnotifier/version.rb

@@ -1,3 +1,3 @@
 module Rnotifier
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/rnotifier.rb

@@ -9,6 +9,7 @@ require 'rnotifier/config'
 require 'rnotifier/rlogger'
 require 'rnotifier/notifier'
 require 'rnotifier/exception_data' 
+require 'rnotifier/event_data' 
 require 'rnotifier/rack_middleware'
 require 'rnotifier/parameter_filter'
 require 'rnotifier/exception_code'
@@ -45,8 +46,12 @@ module Rnotifier
       Thread.current[:rnotifier_context] = nil
     end
 
-    def send_exception(exception, opts = {})
-      Rnotifier::ExceptionData.new(exception, opts, {:type => :rescue}).notify
+    def exception(exception, params = {})
+      Rnotifier::ExceptionData.new(exception, params, {:type => :rescue}).notify
+    end
+
+    def event(name, params = {})
+      Rnotifier::EventData.new(name, params).notify if Rnotifier::Config.valid?
     end
 
   end

data/spec/event_data_spec.rb

@@ -0,0 +1,29 @@
+$:.unshift(File.dirname(__FILE__))
+require 'spec_helper'
+
+describe Rnotifier::EventData do
+
+  before(:all) do
+    rnotifier_init
+    @name = 'product'
+    @data = {:id => 1, :name => 'ProductX'}
+  end
+
+  it 'is initialize exception_data object' do
+    e_data = Rnotifier::EventData.new(@name, @data)
+
+    expect(e_data.data[:name]).to eq @name
+    expect(e_data.data[:data]).to eq @data
+    expect(e_data.data[:data_from]).to eq :event
+  end
+
+  it 'sends event data to server' do
+    path = '/' + [ Rnotifier::Config::DEFAULT[:api_version], Rnotifier::Config::DEFAULT[:event_path], 'API-KEY'].join('/')
+    stubs = stub_faraday_request({:path => path})
+
+    Rnotifier::EventData.new(@name, @data).notify
+
+    expect { stubs.verify_stubbed_calls }.to_not raise_error
+  end
+
+end

data/spec/fixtures/fake_app.rb

@@ -4,6 +4,7 @@ require 'sinatra/base'
 module RnotifierTest
 
   class FakeApp < Sinatra::Base
+    set :environment, :production
     use Rnotifier::RackMiddleware, 'spec/fixtures/rnotifier_test.yaml'
 
     get '/' do

data/spec/rack_middleware_spec.rb

@@ -12,11 +12,11 @@ describe Rnotifier::RackMiddleware do
   end
 
   it 'sends get request and catch exception' do
-     get "/exception/1"
+    get "/exception/1" 
 
-     expect(last_response.errors.split(/:\n/).first).to eq @type_error 
-     expect(last_response.status).to eq 500
-     expect { @stubs.verify_stubbed_calls }.to_not raise_error
+    expect(last_response.errors.split(/:\n/).first).to eq @type_error 
+    expect(last_response.status).to eq 500
+    expect { @stubs.verify_stubbed_calls }.to_not raise_error
   end
 
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] = 'test'
+
 require 'rubygems'
 require 'bundler/setup'
 require 'open-uri'
@@ -5,10 +7,14 @@ require 'rack'
 require 'rack/request'
 require 'rack/mock'
 require 'rack/test'
-require 'rnotifier'
+require 'coveralls'
 
+$:.unshift(File.dirname(__FILE__) + '/../lib/')
+require 'rnotifier'
 require File.dirname(__FILE__) + "/fixtures/fake_app"
 
+Coveralls.wear!
+
 RSpec.configure do |config|
   config.color_enabled = true
   #config.tty = true
@@ -20,24 +26,15 @@ RSpec.configure do |config|
   end
 end
 
-$:.unshift(File.dirname(__FILE__) + '/../lib/')
-
-ENV['RACK_ENV'] = 'test'
-
-require 'rnotifier'
-
 def rnotifier_init
   ENV['RACK_ENV'] = 'test'
   Rnotifier.load_config("#{Dir.pwd}/spec/fixtures/rnotifier.yaml")
 end
 
-def set_test_adapter
-end
-
 def stub_faraday_request(opts = {})
   opts[:status] ||= 200
   opts[:message] ||= 'ok'
-  opts[:path] = '/' + [ Rnotifier::Config::DEFAULT[:api_version], Rnotifier::Config::DEFAULT[:notify_path], 'API-KEY'].join('/')
+  opts[:path] ||= '/' + [ Rnotifier::Config::DEFAULT[:api_version], Rnotifier::Config::DEFAULT[:notify_path], 'API-KEY'].join('/')
 
   stubs = Faraday::Adapter::Test::Stubs.new
   conn  = Faraday.new do |builder|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rnotifier
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Jiren Patel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,6 +128,7 @@ files:
 - lib/rnotifier.rb
 - lib/rnotifier/config.rb
 - lib/rnotifier/config_test.rb
+- lib/rnotifier/event_data.rb
 - lib/rnotifier/exception_code.rb
 - lib/rnotifier/exception_data.rb
 - lib/rnotifier/notifier.rb
@@ -138,6 +140,7 @@ files:
 - rnotifier.gemspec
 - spec/code.text
 - spec/config_spec.rb
+- spec/event_data_spec.rb
 - spec/exception_code_spec.rb
 - spec/exception_data_spec.rb
 - spec/fixtures/fake_app.rb
@@ -172,6 +175,7 @@ summary: Exception catcher for Rails and other Rack apps
 test_files:
 - spec/code.text
 - spec/config_spec.rb
+- spec/event_data_spec.rb
 - spec/exception_code_spec.rb
 - spec/exception_data_spec.rb
 - spec/fixtures/fake_app.rb