exceptioner 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,6 +1,6 @@
 = Exceptioner 
 
-Be notified about exceptions by various transports Email, Jabber, IRC, etc. Choose the option you want.
+Stay notified about exceptions by various transports Email, Jabber, IRC, etc. Choose the option you want.
 
 The most common use is to use Exceptioner as rack middleware and send notifications when an exception occur in you web application. It may be used with Rails, Sinatra or any other rack citizen. 
 Exceptioner may be also used with any ruby code you want. Just configure delivery methods and don't miss any exception.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/exceptioner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exceptioner}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micha\305\202 \305\201omnicki"]
@@ -28,8 +28,10 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/exceptioner.rb",
      "lib/exceptioner/action_controller.rb",
-     "lib/exceptioner/core_ext/class/attribute_accessors.rb",
+     "lib/exceptioner/core_ext/class/attribute.rb",
+     "lib/exceptioner/core_ext/kernel/singleton_class.rb",
      "lib/exceptioner/core_ext/module/attribute_accessors.rb",
+     "lib/exceptioner/core_ext/module/remove_method.rb",
      "lib/exceptioner/middleware.rb",
      "lib/exceptioner/notifier.rb",
      "lib/exceptioner/railtie.rb",

data/lib/exceptioner/core_ext/class/attribute.rb

@@ -0,0 +1,29 @@
+# This code is stolen from ActiveSupport gem. 
+# We don't need to instance accessors so they're removed
+# for cattr_ methods so responsible part of code was removed.
+#
+# Note we don't overwrite class_attribute method if it exists already.
+class Class
+  unless method_defined?(:class_attribute)
+    require 'exceptioner/core_ext/kernel/singleton_class'
+    require 'exceptioner/core_ext/module/remove_method'
+
+    def class_attribute(*attrs)
+      attrs.each do |name|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def self.#{name}() nil end
+          def self.#{name}?() !!#{name} end
+
+          def self.#{name}=(val)
+            singleton_class.class_eval do
+              remove_possible_method(:#{name})
+              define_method(:#{name}) { val }
+            end
+            val
+          end
+        RUBY
+
+      end
+    end
+  end
+end

data/lib/exceptioner/core_ext/kernel/singleton_class.rb

@@ -0,0 +1,13 @@
+module Kernel
+  # Returns the object's singleton class.
+  def singleton_class
+    class << self
+      self
+    end
+  end unless respond_to?(:singleton_class) # exists in 1.9.2
+
+  # class_eval on an object acts like singleton_class.class_eval.
+  def class_eval(*args, &block)
+    singleton_class.class_eval(*args, &block)
+  end
+end

data/lib/exceptioner/core_ext/module/remove_method.rb

@@ -0,0 +1,11 @@
+class Module
+  def remove_possible_method(method)
+    remove_method(method)
+  rescue NameError
+  end
+
+  def redefine_method(method, &block)
+    remove_possible_method(method)
+    define_method(method, &block)
+  end
+end

data/lib/exceptioner/transport/base.rb

@@ -2,13 +2,13 @@ module Exceptioner::Transport
 
   class Base
     
-    cattr_accessor :sender
+    class_attribute :sender
 
-    cattr_accessor :recipients
+    class_attribute :recipients
 
-    cattr_accessor :prefix
+    class_attribute :prefix
 
-    cattr_accessor :subject
+    class_attribute :subject
 
 
     def self.deliver(exception, options = {})

data/lib/exceptioner/transport/jabber/jabber.rb

@@ -7,9 +7,9 @@ module Exceptioner::Transport
 
   class Jabber < Base
     
-    cattr_accessor :jabber_id
+    class_attribute :jabber_id
 
-    cattr_accessor :password
+    class_attribute :password
 
     def self.deliver(exception, options = {})
       connect

data/lib/exceptioner/transport/mail/mail.rb

@@ -8,9 +8,9 @@ module Exceptioner::Transport
   class Mail < Base
     DEFAULT_SENDER_ADDRESS = 'exceptioner@exceptioner.net'
 
-    cattr_accessor :delivery_method
+    class_attribute :delivery_method
 
-    cattr_accessor :delivery_options
+    class_attribute :delivery_options
 
     def self.deliver(exception, options = {})
       mail = prepare_mail(exception, options)
@@ -28,11 +28,11 @@ module Exceptioner::Transport
 
     protected
     def self.default_options
-      super.merge(
+      {
         :delivery_method => delivery_method,
         :delivery_options => delivery_options,
         :sender => DEFAULT_SENDER_ADDRESS
-      )
+      }.merge!(super)
     end
 
     def self.prepare_mail(exception, mail_options)
@@ -47,7 +47,7 @@ module Exceptioner::Transport
         :subject          => options[:subject],
         :body             => options[:body]
       )
-      mail.delivery_method(options[:delivery_method], options[:delivery_options]) if options[:delivery_method]
+      mail.delivery_method(options[:delivery_method], options[:delivery_options] || {}) if options[:delivery_method]
       mail
     end
 

data/lib/exceptioner.rb

@@ -1,4 +1,4 @@
-require 'exceptioner/core_ext/class/attribute_accessors'
+require 'exceptioner/core_ext/class/attribute'
 require 'exceptioner/core_ext/module/attribute_accessors'
 require 'exceptioner/railtie' if defined?(Rails::Railtie)
 

data/lib/generators/exceptioner/templates/exceptioner.rb

@@ -2,7 +2,7 @@
 Exceptioner.setup do |config|
 
   # Define how to deliver information about exception
-  # Available options are: email
+  # Available options are: mail, :jabber
   # config.transports = [:mail]
 
   # ### The section below regards mail transport only ###
@@ -26,7 +26,6 @@ Exceptioner.setup do |config|
 
   # Prefix prepended to email subject
   # config.mail.prefix = '[ERROR] '
-  
 
   # ### The section below regards jabber/xmpp transport only ###
 
@@ -40,6 +39,6 @@ Exceptioner.setup do |config|
   # config.jabber.jabber_id = 'server@jabber.org'
   
   # Sender's password
-  # conifg.jabber.password = 'SECRETXXX'
+  # config.jabber.password = 'SECRETXXX'
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - "Micha\xC5\x82 \xC5\x81omnicki"
@@ -79,8 +79,10 @@ files:
 - init.rb
 - lib/exceptioner.rb
 - lib/exceptioner/action_controller.rb
-- lib/exceptioner/core_ext/class/attribute_accessors.rb
+- lib/exceptioner/core_ext/class/attribute.rb
+- lib/exceptioner/core_ext/kernel/singleton_class.rb
 - lib/exceptioner/core_ext/module/attribute_accessors.rb
+- lib/exceptioner/core_ext/module/remove_method.rb
 - lib/exceptioner/middleware.rb
 - lib/exceptioner/notifier.rb
 - lib/exceptioner/railtie.rb

data/lib/exceptioner/core_ext/class/attribute_accessors.rb

@@ -1,42 +0,0 @@
-# This code is stolen from ActiveSupport gem. 
-# We don't need to pass options like :instance_writer
-# for cattr_ methods so responsible part of code was removed.
-#
-# Note we don't overwrite cattr_ methods if they exist already.
-
-class Class
-  def cattr_reader(*syms)
-    syms.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-
-        def self.#{sym}
-          @@#{sym}
-        end
-      EOS
-    end
-  end unless method_defined?(:cattr_reader)
-
-  def cattr_writer(*syms)
-    syms.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-
-        def self.#{sym}=(obj)
-          @@#{sym} = obj
-        end
-      EOS
-
-      self.send("#{sym}=", yield) if block_given?
-    end
-  end unless method_defined?(:cattr_writer)
-
-  def cattr_accessor(*syms, &blk)
-    cattr_reader(*syms)
-    cattr_writer(*syms, &blk)
-  end unless method_defined?(:cattr_accessor)
-end