errbit_cloudfuji 0.1.0 → 0.1.1

data/Gemfile

@@ -1,5 +1,7 @@
 source :rubygems
 
+gem 'rake'
+
 gem 'bundler_local_development', :group => :development, :require => false
 begin
   require 'bundler_local_development'
@@ -13,14 +15,3 @@ gem 'cloudfuji', :git => 'git://github.com/cloudfuji/cloudfuji_client.git'
 group :test, :development do
   gem 'pg'  # Default database for testing
 end
-
-group :test do
-  gem 'rspec'
-  gem 'combustion'
-  gem 'factory_girl'
-  unless ENV["CI"]
-    gem 'ruby-debug',   :platform => :mri_18
-    gem (RUBY_VERSION == "1.9.2" ? 'ruby-debug19' : 'debugger'), :platform => :mri_19
-  end
-end
-

data/Rakefile

@@ -1,27 +1,4 @@
 #!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-Bundler.require :default, :development
-
-task :environment do
-  Combustion.initialize!
-end
-Combustion::Application.load_tasks
-
-class Combustion::Application
-  # Add migrations from all engines
-  Railties.engines.each do |engine|
-    config.paths['db/migrate'] += engine.paths['db/migrate'].existent
-  end
-end
-
-desc 'Default: run spec tests.'
-task :default => :spec
-
-# Let Combustion handle database preparation
-Rake::Task["spec"].prerequisites.clear
+require 'rake'
 
 Bundler::GemHelper.install_tasks

data/app/{models/notice_observer.rb → observers/cloudfuji_notice_observer.rb}

@@ -1,27 +1,41 @@
-class NoticeObserver < Mongoid::Observer
+class CloudfujiNoticeObserver < Mongoid::Observer
+  observe :notice
+
   def after_create(notice)
     if ::Cloudfuji::Platform.on_cloudfuji?
       @notice = notice
       @err    = notice.err
       @app    = notice.problem.app
 
+      err_url = Rails.application.routes.url_helpers.app_err_url(@app, @err, :host => ENV['CLOUDFUJI_DOMAIN'])
+
       human_message = notice_title(notice.err.problem)
-      human_message += " see more at #{Rails.application.routes.url_helpers.app_err_url(@app, @notice.problem, :host => ENV['CLOUDFUJI_DOMAIN'])}"
+      human_message += " - see more at #{err_url}"
       event = {
-        :category => :app,
-        :name     => :errored,
+        :category => :error,
+        :name     => :caught,
         :data     => {
-          :human  => human_message,
+          :human            => human_message,
+          :error_ido_id     => @err.ido_id,
+          :app_name         => @app.name,
           :environment_name => @notice.environment_name,
           :occurrences      => @notice.problem.notices_count,
           :message          => @notice.message,
           :app_backtrace    => @notice.app_backtrace,
           :request          => @notice.request,
           :source           => "Errbit",
-          :url              => Rails.application.routes.url_helpers.app_err_url(@app, @err, :host => ENV['CLOUDFUJI_DOMAIN'])
+          :url              => err_url
         }
       }
 
+      if @notice.respond_to?(:user_attributes) && @notice.user_attributes.present?
+        event[:data].merge! :user_attributes => {
+                              :ido_id => @notice.user_attributes[:ido_id],
+                              :email  => @notice.user_attributes[:email]}
+      end
+
+      puts "Publishing Cloudfuji Event: #{event.inspect}"
+
       ::Cloudfuji::Event.publish(event)
 
       puts "Notifying: #{@app.watchers.inspect}"
@@ -32,7 +46,10 @@ class NoticeObserver < Mongoid::Observer
     end
   end
 
+  private
+
   def notice_title(notice)
     "[#{@app.name}][#{@notice.environment_name}] #{@notice.message}"
   end
 end
+

data/config/initializers/cloudfuji.rb

@@ -2,7 +2,7 @@ require 'errbit/cloudfuji'
 
 Errbit::Application.configure do
   # Register observers to fire Cloudfuji events
-  config.mongoid.observers = :err_observer, :notice_observer
+  config.mongoid.observers = :cloudfuji_notice_observer
 
   # Set default host for ActionMailer
   default_host = ENV['ERRBIT_HOST'] || ENV['BUSHIDO_DOMAIN']

data/errbit_cloudfuji.gemspec

@@ -12,11 +12,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.version = Errbit::Cloudfuji::VERSION
 
-  s.add_development_dependency 'rspec-rails', '~> 2.6'
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'combustion'
-
   s.add_dependency 'cloudfuji',           '>= 0.0.42'
   s.add_dependency 'devise_cloudfuji_authenticatable'
+  s.add_dependency 'uuid'
 
 end

data/lib/errbit/cloudfuji.rb

@@ -4,18 +4,17 @@ module Errbit
       def enable_cloudfuji!
         load_hooks!
         extend_user!
-        extend_notice!
+        extend_err!
         disable_devise_for_cloudfuji_controllers!
       end
 
       def extend_user!
         puts "Extending the user model"
-        User.instance_eval do
+        User.class_eval do
+          field                   :ido_id
           validates_presence_of   :ido_id
           validates_uniqueness_of :ido_id
-        end
 
-        User.class_eval do
           def cloudfuji_extra_attributes(extra_attributes)
             self.name  = "#{extra_attributes['first_name'].to_s} #{extra_attributes['last_name'].to_s}"
             self.email = extra_attributes["email"]
@@ -24,20 +23,13 @@ module Errbit
         end
       end
 
-      def extend_notice!
-        Notice.class_eval do
-          def publish_cloudfuji_event
-            human_message = "App at #{server_environment['hostname']} error"
-            ::Cloudfuji::Event.publish({
-                :category => :app,
-                :name     => :error,
-                :data     => {
-                  :human  => human_message,
-                  :source => "Errbit",
-                  :url    => "#{ENV['PUBLIC_URL']}/#tickets/#{self.to_param}"
-                }
-              })
-          end
+      def extend_err!
+        Err.class_eval do
+          field                   :ido_id
+          validates_presence_of   :ido_id
+          validates_uniqueness_of :ido_id
+
+          before_validation Proc.new { |e| e.ido_id ||= UUID.new.generate  }
         end
       end
 

data/lib/errbit_cloudfuji/version.rb

@@ -1,5 +1,5 @@
 module Errbit
   module Cloudfuji
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/errbit_cloudfuji.rb

@@ -1,6 +1,7 @@
 # Gem Dependencies
 require 'cloudfuji'
 require 'devise_cloudfuji_authenticatable'
+require 'uuid'
 
 # Rails Engine
 require 'errbit_cloudfuji/engine'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errbit_cloudfuji
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,64 +10,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: capybara
+  name: cloudfuji
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.0.42
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.42
 - !ruby/object:Gem::Dependency
-  name: combustion
+  name: devise_cloudfuji_authenticatable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cloudfuji
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,9 +43,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.42
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise_cloudfuji_authenticatable
+  name: uuid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -104,8 +72,7 @@ files:
 - MIT-LICENSE
 - README
 - Rakefile
-- app/models/err_observer.rb
-- app/models/notice_observer.rb
+- app/observers/cloudfuji_notice_observer.rb
 - app/views/users/_fields.html.haml
 - app/views/users/index.html.haml
 - config.ru
@@ -121,7 +88,6 @@ files:
 - lib/errbit_cloudfuji/engine.rb
 - lib/errbit_cloudfuji/version.rb
 - lib/tasks/cloudfuji.rake
-- spec/spec_helper.rb
 homepage: http://cloudfuji.com
 licenses: []
 post_install_message: 
@@ -134,12 +100,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3638422326911840529
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3638422326911840529
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/app/models/err_observer.rb

@@ -1,22 +0,0 @@
-class ErrObserver < Mongoid::Observer
-  def after_create(err)
-    if ::Cloudfuji::Platform.on_cloudfuji?
-      human_message = issue_title(err.problem)
-      human_message += " see more at #{Rails.application.routes.url_helpers.app_err_url(err.problem.app, err, :host => ENV['CLOUDFUJI_DOMAIN'])}"
-      event = {
-        :category => :app,
-        :name     => :errored,
-        :data     => {
-          :human  => human_message,
-          :source => "Errbit",
-          :url    => Rails.application.routes.url_helpers.app_err_url(err.problem.app, err, :host => ENV['CLOUDFUJI_DOMAIN'])
-        }
-      }
-      ::Cloudfuji::Event.publish(event)
-    end
-  end
-
-  def issue_title(problem)
-    "[#{ problem.environment }][#{ problem.where }] #{problem.message.to_s.truncate(100)}"
-  end
-end

data/spec/spec_helper.rb

@@ -1,22 +0,0 @@
-require 'rubygems'
-require 'bundler'
-require 'rails/all'
-
-Bundler.require :default, :development
-
-require 'rspec/rails'
-require 'factory_girl'
-require 'ffaker'
-
-# Load factories from spec/factories
-Dir[File.expand_path("../factories/*.rb", __FILE__)].each {|factory| require factory }
-
-Combustion.initialize!
-
-RSpec.configure do |config|
-  config.use_transactional_fixtures = true
-end
-
-# Cloudfuji::Platform.on_cloudfuji? is false,
-# so we need to enable it manually
-Errbit::Cloudfuji.enable_cloudfuji!