exception-ketchup 0.1.0 → 0.2.0

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem 'rails'
-gem 'mongoid'
+gem "mongoid"
 gem 'bson_ext'
 
 # Add dependencies to develop your gem here.
@@ -12,7 +12,7 @@ gem 'bson_ext'
 group :development do
   gem "rspec", "~> 2.8.0"
   gem 'rspec-rails'
-  gem 'mongoid-rspec'
+  #gem 'mongoid-rspec'
   gem 'database_cleaner'
   gem "rdoc", "~> 3.12"
   gem "bundler"

data/Gemfile.lock

@@ -1,45 +1,45 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionmailer (3.2.10)
+      actionpack (= 3.2.10)
+      mail (~> 2.4.4)
+    actionpack (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+    activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    bson (1.7.1)
-    bson_ext (1.7.1)
-      bson (~> 1.7.1)
+    bson (1.8.1)
+    bson_ext (1.8.1)
+      bson (~> 1.8.1)
     builder (3.0.4)
-    database_cleaner (0.7.2)
+    database_cleaner (0.9.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    fuubar (1.0.0)
+    fuubar (1.1.0)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
-      ruby-progressbar (~> 0.0.10)
+      ruby-progressbar (~> 1.0.0)
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.1)
@@ -48,46 +48,44 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    journey (1.0.3)
+    journey (1.0.4)
     json (1.7.6)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    mongo (1.7.1)
-      bson (~> 1.7.1)
-    mongoid (2.5.0)
+    mime-types (1.19)
+    mongoid (3.0.16)
       activemodel (~> 3.1)
-      mongo (~> 1.7)
+      moped (~> 1.1)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    mongoid-rspec (1.4.4)
-      mongoid (~> 2.0)
-      rspec (~> 2)
-    multi_json (1.3.7)
+    moped (1.3.2)
+    multi_json (1.5.0)
+    origin (1.0.11)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.2)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.10)
+      actionmailer (= 3.2.10)
+      actionpack (= 3.2.10)
+      activerecord (= 3.2.10)
+      activeresource (= 3.2.10)
+      activesupport (= 3.2.10)
       bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+      railties (= 3.2.10)
+    railties (3.2.10)
+      actionpack (= 3.2.10)
+      activesupport (= 3.2.10)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
@@ -105,14 +103,15 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    ruby-progressbar (0.0.10)
-    sprockets (2.1.2)
+    ruby-progressbar (1.0.2)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
@@ -127,7 +126,6 @@ DEPENDENCIES
   fuubar
   jeweler (~> 1.8.4)
   mongoid
-  mongoid-rspec
   rails
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/README.md

@@ -1,6 +1,8 @@
 ## Ketchup exception handling
 
-Rails exception handling happens with ActionController extension and Mongoid support.
+Rails exception handling happens with ActionController extension and Mongoid support. 
+
+With version 0.2 comes Mongoid 3 support.
 
 ## Install & Configuration
 
@@ -95,7 +97,7 @@ If <code>config.persist</code> is set to false, <code>:remember</code> will be i
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+## Copyright
 
 Copyright (c) 2012 Daniel Schmidt. See LICENSE.txt for
 further details.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/exception-ketchup.gemspec

@@ -5,17 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = "exception-ketchup"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Daniel Schmidt"]
-  s.date = "2013-01-04"
-  s.description = "TODO: longer description of your gem"
+  s.authors = ["Daniel Schmidt", "Lars M\u{fc}ller"]
+  s.date = "2013-01-07"
+  s.description = "Rails exception handling happens with ActionController extension and Mongoid support."
   s.email = "dsci@code79.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.md",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -24,14 +23,15 @@ Gem::Specification.new do |s|
     "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
-    "README.rdoc",
     "Rakefile",
     "VERSION",
+    "exception-ketchup.gemspec",
     "lib/exception-ketchup.rb",
     "lib/rails/controller.rb",
     "lib/rails/error.rb",
     "lib/rails/mailer.rb",
     "lib/util/handler.rb",
+    "lib/util/support.rb",
     "spec/dummy/README.rdoc",
     "spec/dummy/Rakefile",
     "spec/dummy/app/assets/javascripts/application.js",
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
-  s.summary = "TODO: one-line summary of your gem"
+  s.summary = "Rails exception handling happens with ActionController extension and Mongoid support."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -86,7 +86,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
-      s.add_development_dependency(%q<mongoid-rspec>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -98,7 +97,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
-      s.add_dependency(%q<mongoid-rspec>, [">= 0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -111,7 +109,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
-    s.add_dependency(%q<mongoid-rspec>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/lib/exception-ketchup.rb

@@ -109,6 +109,7 @@ module Ketchup
 end
 
 # require extensions.
+require_relative "util/support"
 require_relative "rails/error"
 require_relative "rails/controller"
 require_relative "rails/mailer.rb"

data/lib/rails/error.rb

@@ -4,8 +4,7 @@ module Ketchup
 
     class Error
       include Mongoid::Document
-
-      store_in :errors
+      include Ketchup::Exception::SupportedMongos
 
       field :kind,        :type => String
       field :message,     :type => String

data/lib/util/support.rb

@@ -0,0 +1,20 @@
+module Ketchup
+  module Exception
+    module SupportedMongos
+      extend ActiveSupport::Concern
+
+      # Checks which Mongoid is used and adjusts the store in a collection
+      # method.
+      included do
+        major,minor,path = Mongoid::VERSION.split(".")
+        if major.match(/3/)
+          store_in collection: Ketchup::Exception.exception_collection
+        elsif major.match(/2/)
+          store_in Ketchup::Exception.exception_collection
+        end
+
+      end
+
+    end
+  end
+end

data/spec/lib/controller_spec.rb

@@ -30,6 +30,11 @@ FakeTestController = Class.new(ApplicationController) do
 
 end
 
+Rails.application.routes.draw do
+  match '/show_author/:id' => "fake_test#show"
+end
+
+
 describe "exception handling within controller", :type => :controller do
   let(:recipients){ %W(ds@test.com da@test.com) }
 
@@ -42,10 +47,17 @@ describe "exception handling within controller", :type => :controller do
       config.environment = :test
     end
 
-    Author = Class.new do
-      include Mongoid::Document
+    mongo_major = Mongoid::VERSION.split(".").first
 
-      store_in :authors
+    unless defined?(Author)
+      Author = Class.new do
+        include Mongoid::Document
+        if mongo_major.eql?("3")
+          store_in :collection => :authors
+        else
+          store_in :authors
+        end
+      end
     end
 
   end

data/spec/lib/error_spec.rb

@@ -24,6 +24,10 @@ describe Ketchup::Exception::Error do
 
     its(:kind){should eq "StandardError"}
 
+    it "collection name matches configuration" do
+      subject.collection.name.to_sym.should eq Ketchup::Exception.exception_collection
+    end
+
   end
 
 end

data/spec/lib/exception-ketchup_spec.rb

@@ -18,7 +18,7 @@ describe Ketchup::Exception do
     context "for environment" do
 
       it "is production" do
-        subject.environment.should eq :production
+        subject.environment.should eq [:production]
       end
 
     end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 
 require 'rspec/rails'
-require 'mongoid-rspec'
 require 'database_cleaner'
 
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exception-ketchup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,22 +92,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid-rspec
-  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: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -196,16 +180,13 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
-- README.rdoc
 files:
 - .document
 - .rspec
-- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
-- README.rdoc
 - Rakefile
 - VERSION
 - exception-ketchup.gemspec
@@ -214,6 +195,7 @@ files:
 - lib/rails/error.rb
 - lib/rails/mailer.rb
 - lib/util/handler.rb
+- lib/util/support.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -267,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 987405559075421703
+      hash: 4275328440188607377
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@ovula

data/README.rdoc

@@ -1,102 +0,0 @@
-## Ketchup exception handling
-
-Rails exception handling happens with ActionController extension and Mongoid support.
-
-## Install & Configuration
-
-Add 
-
-```ruby
-gem "exception-ketchup" 
-```
-
-to your Gemfile.
-
-Add a file to <code>Rails.root/initializers/</code>.
-
-Configure <code>Ketchup::Exception</code>:
-
-```ruby
-
-# Config Exception handling here. 
-Ketchup::Exception.setup do |config|
-  # A list  email of addresses to which the exception notification should be mailed. 
-  config.recipients    = %W(daniel.schmidt@datenspiel.com lars.mueller@datenspiel.com)
-  # Subject to use for email.
-  config.subject       = "Error happens at myovulasens"
-  # The path to the mail template
-  config.template_path = "notifications" 
-  # The following are optional configurations
-  # Disables or enables delivering of exception messages. Defaults to true.
-  # config.deliver_mail = false
-  # Disables or enables persisting of exception messages. Defaults to true
-  # config.persist = false
-  # Define the collection name hwere to exception messages should be stored.
-  # Defaults to :errors
-  # config.exception_collection = :errors
-  # Define a Proc here that is responsible for logging messages. 
-  # See exception-ketchup.rb for details about.
-  # config.log_error = lambda do |error|
-  #   # do something with err. 
-  # end
-  # The Rails env(s) to use. Optional for configuration, defaults to :production
-  # config.environment = [:production]
-end
-```
-
-## Make it available
-
-Add to your controller class:
-
-```ruby
-
-class ApplicationController
-
-  ketchup_exceptions do |c|
-    c.rescue_errors   = [
-      {:error => RestClient::ServerBrokeConnection, :with => :server_not_responding},
-      {:error => CanCan::AccessDenied, :with    => :unauthorized,
-                                       :notify  => false,
-                                       :remember => false,
-                                       :log     => true}
-    ]
-  end
-
-end
-
-```
-
-<code>rescue_errors</code>  -  Configure which exceptions you want to treat in a special way by using the following options
-   *   <code>error</code>:    Class, mandatory.
-                              Error-Class to handle
-   *   <code>with</code>:     Symbol|Proc.
-                              Method to execute for individual error handling. This method should take
-                              one argument which is the error that was raised.
-                              If this is omitted, be sure to implement a <code>:respond_with_error</code> method.
-   *   <code>remember</code>: Boolean, default: <code>true</code>
-                              Wether or not write the error to the database
-   *   <code>notify</code>:   Boolean, default: <code>true</code>
-                              Wether or not to send an email to the configured recipients
-   *   <code>log</code>:      Boolean, default: <code>true</code>
-                              Wether or not to log the exception
-
-**Note:** 
-
-If <code>config.deliver_mail</code> is set to false, <code>:notify</code> will be ignored.
-If <code>config.persist</code> is set to false, <code>:remember</code> will be ignored.
-
-## Contributing to exception-ketchup
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-## Copyright
-
-Copyright (c) 2012 Datenspiel GmbH. Contributors Daniel Schmidt (@dsci), Lars Müller (@lmue) 
-See LICENSE.txt forfurther details.
-