yogi_berra 0.0.1 → 0.0.2

data/Gemfile

@@ -2,5 +2,7 @@ source 'https://rubygems.org'
 
 gem "mongo", "~> 1.8.3"
 gem "rspec", "~> 2.13.0"
+gem "builder", "~> 3.2.1"
+gem "rake", "~> 10.0.4"
 
 gemspec

data/Gemfile.lock

@@ -12,12 +12,26 @@ GEM
     bson (1.8.3)
     bson_ext (1.8.3)
       bson (~> 1.8.3)
+    builder (3.2.1)
+    diff-lcs (1.2.4)
     mongo (1.8.3)
       bson (~> 1.8.3)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  builder (~> 3.2.1)
   mongo (~> 1.8.3)
+  rake (~> 10.0.4)
+  rspec (~> 2.13.0)
   yogi_berra!

data/README.md

@@ -33,6 +33,11 @@ Create a yogi.yml file in rails root config/ folder. Here is a sample:
       database: yogi_berra
       host: localhost
       port: 27017
+      
+View
+----
+To view the exceptions you check them in the database or install this rails app.
+https://github.com/earlonrails/yogi_berra_scoreboard.git
 
 Thanks
 ------

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
 
-spec = eval(File.read('yogi_berra_client.gemspec'))
+spec = eval(File.read('yogi_berra.gemspec'))
 
 Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec

data/lib/facets.rb

@@ -0,0 +1,280 @@
+# Taken from https://github.com/rubyworks/facets/blob/master/lib/core/facets/module/mattr.rb
+module Facets
+
+  # Creates a class-variable attribute that can
+  # be accessed both on an instance and class level.
+  #
+  #   class CARExample
+  #     @@a = 10
+  #     cattr :a
+  #   end
+  #
+  #   CARExample.a           #=> 10
+  #   CARExample.new.a       #=> 10
+  #
+  # NOTE: This method is not a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  #
+  # @uncommon
+  #   require 'facets/module/cattr'
+  #
+  def cattr(*syms)
+    writers, readers = syms.flatten.partition{ |a| a.to_s =~ /=$/ }
+    writers = writers.map{ |e| e.to_s.chomp('=').to_sym }
+    ##readers.concat( writers ) # writers also get readers
+
+    cattr_reader(*readers)
+    cattr_writer(*writers)
+
+    return readers + writers
+  end
+
+  # Creates a class-variable attr_reader that can
+  # be accessed both on an instance and class level.
+  #
+  #   class CARExample
+  #     @@a = 10
+  #     cattr_reader :a
+  #   end
+  #
+  #   CARExample.a           #=> 10
+  #   CARExample.new.a       #=> 10
+  #
+  # NOTE: This method is not a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  #
+  # @uncommon
+  #   require 'facets/module/cattr'
+  #
+  def cattr_reader(*syms)
+    syms.flatten.each do |sym|
+      module_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}
+          @@#{sym}
+        end
+
+        def #{sym}
+          @@#{sym}
+        end
+      EOS
+    end
+    return syms
+  end
+
+  # Creates a class-variable attr_writer that can
+  # be accessed both on an instance and class level.
+  #
+  #   class CAWExample
+  #     cattr_writer :a
+  #     def self.a
+  #       @@a
+  #     end
+  #   end
+  #
+  #   CAWExample.a = 10
+  #   CAWExample.a            #=> 10
+  #   CAWExample.new.a = 29
+  #   CAWExample.a            #=> 29
+  #
+  # NOTE: This method is not a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  #
+  # @uncommon
+  #   require 'facets/module/cattr'
+  #
+  def cattr_writer(*syms)
+    syms.flatten.each do |sym|
+      module_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
+
+        def #{sym}=(obj)
+          @@#{sym}=(obj)
+        end
+      EOS
+    end
+    return syms
+  end
+
+  # Creates a class-variable attr_accessor that can
+  # be accessed both on an instance and class level.
+  #
+  #   class CAAExample
+  #     cattr_accessor :a
+  #   end
+  #
+  #   CAAExample.a = 10
+  #   CAAExample.a           #=> 10
+  #   mc = CAAExample.new
+  #   mc.a                   #=> 10
+  #
+  # NOTE: This method is not a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  #
+  # @uncommon
+  #   require 'facets/module/cattr'
+  #
+  def cattr_accessor(*syms)
+    cattr_reader(*syms) + cattr_writer(*syms)
+  end
+
+  # Creates a class-variable attribute that can
+  # be accessed both on an instance and class level.
+  #
+  #   c = Class.new do
+  #     mattr :a
+  #     def initialize
+  #       @@a = 10
+  #     end
+  #   end
+  #
+  #   c.new.a       #=> 10
+  #   c.a           #=> 10
+  #
+  # NOTE: The #mattr methods may not be as useful for modules as the #cattr
+  # methods are for classes, becuase class-level methods are not "inherited"
+  # across the metaclass for included modules.
+  #
+  # NOTE: This methiod is not a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  #
+  # @uncommon
+  #   require 'facets/module/mattr'
+  #
+  def mattr(*syms)
+    writers, readers = syms.flatten.partition{ |a| a.to_s =~ /=$/ }
+    writers = writers.collect{ |e| e.to_s.chomp('=').to_sym }
+    ##readers.concat( writers ) # writers also get readers
+
+    mattr_writer( *writers )
+    mattr_reader( *readers )
+
+    return readers + writers
+  end
+
+  # Creates a class-variable attr_reader that can
+  # be accessed both on an instance and class level.
+  #
+  #   c = Class.new do
+  #     @@a = 10
+  #     mattr_reader :a
+  #   end
+  #
+  #   c.a           #=> 10
+  #   c.new.a       #=> 10
+  #
+  # NOTE: This methiod is not a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  #
+  # @uncommon
+  #   require 'facets/module/mattr'
+  #
+  def mattr_reader( *syms )
+    syms.flatten.each do |sym|
+      module_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}
+          @@#{sym}
+        end
+
+        def #{sym}
+          @@#{sym}
+        end
+      EOS
+    end
+    return syms
+  end
+
+  # Creates a class-variable attr_writer that can
+  # be accessed both on an instance and class level.
+  #
+  #   c = Class.new do
+  #     mattr_writer :a
+  #     def self.a
+  #       @@a
+  #     end
+  #   end
+  #
+  #   c.a = 10
+  #   c.a            #=> 10
+  #
+  #   c.new.a = 29
+  #   c.a            #=> 29
+  #
+  # NOTE: This methiod is not a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  #
+  # @uncommon
+  #   require 'facets/module/mattr'
+  #
+  def mattr_writer(*syms)
+    syms.flatten.each do |sym|
+      module_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
+
+        def #{sym}=(obj)
+          @@#{sym}=(obj)
+        end
+      EOS
+    end
+    return syms
+  end
+
+  # Creates a class-variable attr_accessor that can
+  # be accessed both on an instance and class level.
+  #
+  #   c = Class.new do
+  #     mattr_accessor :a
+  #   end
+  #
+  #   c.a = 10
+  #   c.a           #=> 10
+  #
+  #   x = c.new
+  #   x.a           #=> 10
+  #
+  # NOTE: This methiod is not a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  #
+  # @uncommon
+  #   require 'facets/module/mattr'
+  #
+  def mattr_accessor(*syms)
+    mattr_reader(*syms) + mattr_writer(*syms)
+  end
+
+end

data/lib/yogi_berra/catcher.rb

@@ -1,18 +1,31 @@
 require 'mongo'
+require 'facets'
 
 module YogiBerra
   class Catcher
+    extend Facets
     cattr_accessor :settings, :mongo_client, :connection
 
     class << self
-      def load_db_settings
-        begin
-          File.open("#{Rails.root}/config/yogi.yml", 'r') do |f|
-            yaml_file = YAML.load(f)
-            @@settings = yaml_file["#{Rails.env}"] if yaml_file
+      def load_db_settings(config_file = nil)
+        if config_file
+          database_config = config_file
+        elsif defined?(Rails)
+          database_config = "#{Rails.root}/config/yogi.yml"
+        else
+          YogiBerra::Logger.log("No config file specified!", :error)
+        end
+        if database_config
+          begin
+            File.open(database_config, 'r') do |f|
+              yaml_file = YAML.load(f)
+              environment = ENV["RAILS_ENV"] ? ENV["RAILS_ENV"] : ENV["YOGI_ENV"]
+              YogiBerra::Logger.log("I get here! #{environment.inspect}", :info)
+              @@settings = yaml_file["#{environment}"] if yaml_file
+            end
+          rescue
+            YogiBerra::Logger.log("No such file: #{database_config}", :error)
           end
-        rescue
-          $stderr.puts "[YogiBerra Error] No such file: #{Rails.root}/config/yogi.yml"
         end
       end
 
@@ -21,12 +34,14 @@ module YogiBerra
         # by not waiting for a response from mongodb
         @@mongo_client = Mongo::MongoClient.new(host, port, :w => 0)
       rescue
-        Rails.logger.error "[YogiBerra Error] Couldn't connect to the mongo database on host: #{host} port: #{port}."
+        YogiBerra::Logger.log("Couldn't connect to the mongo database on host: #{host} port: #{port}.", :error)
         nil
       end
 
       def quick_connection
+        YogiBerra::Logger.log("settings::::::::::: #{settings.inspect}", :info)
         settings = @@settings || load_db_settings
+
         if settings
           host = settings["host"]
           port = settings["port"]
@@ -34,10 +49,10 @@ module YogiBerra
           if client
             @@connection = client[settings["database"]]
           else
-            Rails.logger.error "[YogiBerra Error] Couldn't connect to the mongo database on host: #{host} port: #{port}."
+            YogiBerra::Logger.log("Couldn't connect to the mongo database on host: #{host} port: #{port}.", :error)
           end
         else
-          Rails.logger.error "[YogiBerra Error] Couldn't load the yogi.yml file."
+          YogiBerra::Logger.log("Couldn't load the yogi.yml file.", :error)
         end
       end
     end

data/lib/yogi_berra/data.rb

@@ -13,8 +13,10 @@ module YogiBerra
     end
 
     def self.parse_exception(notice)
+      puts YogiBerra::Catcher.settings["project"].inspect
       data_hash = {
         :error_class => notice.error_class,
+        :project => YogiBerra::Catcher.settings["project"],
         :error_message => notice.error_message
       }
       if notice.backtrace.lines.any?

data/lib/yogi_berra/exception_middleware.rb

@@ -7,10 +7,12 @@ module YogiBerra
 
     def call(env)
       begin
+        path_parameters = env['action_controller.request.path_parameters'] || {}
+        query_hash      = env['rack.request.query_hash'] || {}
         response = dup._call(env)
         environment = {
           :session => env['rack.session'],
-          :params => env['action_controller.request.path_parameters'].merge(env['rack.request.query_hash']),
+          :params => path_parameters.merge(query_hash),
           :user_agent => env['HTTP_USER_AGENT'],
           :server_name => env['SERVER_NAME'],
           :server_port => env['SERVER_PORT'],

data/lib/yogi_berra/logger.rb

@@ -0,0 +1,12 @@
+module YogiBerra
+  class Logger
+    def self.log(log_string, level = :info)
+      message = "[YogiBerra #{level.to_s.capitalize}] #{log_string}"
+      if defined?(Rails)
+        Rails.logger.send(level, message)
+      else
+        $stderr.puts(message)
+      end
+    end
+  end
+end

data/lib/yogi_berra/rails.rb

@@ -18,8 +18,7 @@ module YogiBerra
                    end
 
     if defined?(::Rails.configuration) && ::Rails.configuration.respond_to?(:middleware)
-      ::Rails.configuration.middleware.insert_after 'ActionController::Failsafe',
-                                                    YogiBerra::ExceptionMiddleware
+      ::Rails.configuration.middleware.insert_after('ActionController::Failsafe', YogiBerra::ExceptionMiddleware)
       # ::Rails.configuration.middleware.insert_after 'Rack::Lock',
       #                                               YogiBerra::UserInformer
     end

data/lib/yogi_berra/version.rb

@@ -1,3 +1,3 @@
 module YogiBerra
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/yogi_berra.rb

@@ -1,13 +1,14 @@
-require "yogi_berra/catcher"
-require "yogi_berra/backtrace"
-require "yogi_berra/notice"
-require "yogi_berra/exception_middleware"
-require "yogi_berra/data"
+require 'yogi_berra/catcher'
+require 'yogi_berra/backtrace'
+require 'yogi_berra/notice'
+require 'yogi_berra/exception_middleware'
+require 'yogi_berra/data'
+require 'yogi_berra/logger'
 
 if defined?(::Rails.version) && ::Rails.version.to_f >= 3.0
-  require "yogi_berra/engine"
+  require 'yogi_berra/engine'
 else
-  require "yogi_berra/rails"
+  require 'yogi_berra/rails'
 end
 
 module YogiBerra
@@ -22,7 +23,7 @@ module YogiBerra
       if database
         YogiBerra::Data.store!(notice, environment, database)
       else
-        Rails.logger.error "[YogiBerra Error] No database connection!"
+        YogiBerra::Logger.log("No database connection!", :error)
       end
     end
 

data/spec/spec_helper.rb

@@ -1,28 +1,17 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-
-ActionMailer::Base.delivery_method = :test
-ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = "test.com"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-
 # Load support files
+$:.unshift("../lib/yogi_berra/*")
+require 'yogi_berra'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Helper methods
-class ActiveSupport::TestCase
-  setup { YogiBerra::Data.delete_all }
 
-  # Creates RunTimeError
-  def build_exception
-      raise
-    rescue => caught_exception
-      caught_exception
-  end
+# Creates RunTimeError
+def build_exception
+  raise
+rescue => caught_exception
+  caught_exception
 end
+

data/spec/yogi_berra_spec.rb

@@ -2,51 +2,49 @@ require 'spec_helper'
 
 describe YogiBerra do
 
-  it "should call the upstream app with the environment" #do
-    # environment = { 'key' => 'value' }
-    # app = lambda { |env| ['response', {}, env] }
-    # stack = YogiBerra::ExceptionMiddleware.new(app)
-
-    # response = stack.call(environment)
-
-    # assert_equal ['response', {}, environment], response
-  #end
-
-  it "deliver an exception raised while calling an upstream app" #do
-
-    # exception = build_exception
-    # environment = { 'key' => 'value' }
-    # app = lambda do |env|
-    #   raise exception
-    # end
-
-    # begin
-    #   stack = YogiBerra::ExceptionMiddleware.new(app)
-    #   stack.call(environment)
-    # rescue Exception => raised
-    #   assert_equal exception, raised
-    # else
-    #   flunk "Didn't raise an exception"
-    # end
-
-  #end
-
-  it "should deliver an exception in rack.exception" #do
-
-    # exception = build_exception
-    # environment = { 'key' => 'value' }
-
-    # response = [200, {}, ['okay']]
-    # app = lambda do |env|
-    #   env['rack.exception'] = exception
-    #   response
-    # end
-    # stack = YogiBerra::ExceptionMiddleware.new(app)
-
-    # actual_response = stack.call(environment)
-
-    # assert_equal response, actual_response
-
-  #end
+  it "should call the upstream app with the environment" do
+    environment = { 'key' => 'value' }
+    app = lambda { |env| ['response', {}, env] }
+    stack = YogiBerra::ExceptionMiddleware.new(app)
+
+    response = stack.call(environment)
+
+    response[0].should == 'response'
+    response[1].should == {}
+    response[2].instance_variable_get("@response").should == { 'key' => 'value' }
+  end
+
+  it "deliver an exception raised while calling an upstream app" do
+    exception = build_exception
+    environment = { 'key' => 'value' }
+    app = lambda do |env|
+      raise exception
+    end
+
+    begin
+      stack = YogiBerra::ExceptionMiddleware.new(app)
+      stack.call(environment)
+    rescue Exception => raised
+      raised.should == exception
+    end
+  end
+
+  it "should deliver an exception in rack.exception" do
+    exception = build_exception
+    environment = { 'key' => 'value' }
+
+    response = [200, {}, ['okay']]
+    app = lambda do |env|
+      env['rack.exception'] = exception
+      response
+    end
+    stack = YogiBerra::ExceptionMiddleware.new(app)
+
+    actual_response = stack.call(environment)
+
+    actual_response[0].should == 200
+    actual_response[1].should == {}
+    actual_response[2].instance_variable_get("@response").should == ["okay"]
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yogi_berra
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 10.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 10.0.4
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
@@ -66,12 +98,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/facets.rb
 - lib/yogi_berra/action_controller_catcher.rb
 - lib/yogi_berra/backtrace.rb
 - lib/yogi_berra/catcher.rb
 - lib/yogi_berra/data.rb
 - lib/yogi_berra/engine.rb
 - lib/yogi_berra/exception_middleware.rb
+- lib/yogi_berra/logger.rb
 - lib/yogi_berra/notice.rb
 - lib/yogi_berra/rails.rb
 - lib/yogi_berra/version.rb