quietbacktrace 0.0.9 → 0.1.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.0 / 2007-12-03
+
+* Protected the ActiveSupport snippets with unless defined?(ActiveSupport).
+* That way, alias_method_chain, etc. won't be overridden in Rails apps.
+
 == 0.0.9 / 2007-12-03
 
 * Fixed file path bugs with File.expand_path

data/Manifest.txt

@@ -2,7 +2,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/quietbacktrace
 init.rb
 lib/aliasing.rb
 lib/attribute_accessors.rb

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'hoe'
 require './lib/quietbacktrace.rb'
 
-Hoe.new('quietbacktrace', '0.0.9') do |p|
+Hoe.new('quietbacktrace', '0.1.0') do |p|
   p.rubyforge_name = 'quietbacktrace'
   p.author = 'Dan Croak'
   p.email = 'dcroak@thoughtbot.com'

data/lib/aliasing.rb

@@ -1,4 +1,10 @@
 # :stopdoc:
+#
+# Snipped directly from ActiveSupport from Rails 1.2.3
+# If Quiet Backtrace is run from a Rails app, the actual ActiveSupport
+# methods will be used. That way, alias_method_chain will not be 
+# overridden in your Rails app if Quiet Backtrace is installed.
+#
 # Copyright (c) 2005-2006 David Heinemeier Hansson
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -21,62 +27,63 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # activesupport/lib/activesupport/core_ext/module/aliasing.rb
+unless defined?(ActiveSupport)
+  class Module  # :nodoc:
+    # Encapsulates the common pattern of:
+    #
+    #   alias_method :foo_without_feature, :foo
+    #   alias_method :foo, :foo_with_feature
+    #
+    # With this, you simply do:
+    #
+    #   alias_method_chain :foo, :feature
+    #
+    # And both aliases are set up for you.
+    #
+    # Query and bang methods (foo?, foo!) keep the same punctuation:
+    #
+    #   alias_method_chain :foo?, :feature
+    #
+    # is equivalent to
+    #
+    #   alias_method :foo_without_feature?, :foo?
+    #   alias_method :foo?, :foo_with_feature?
+    #
+    # so you can safely chain foo, foo?, and foo! with the same feature.
+    def alias_method_chain(target, feature)
+      # Strip out punctuation on predicates or bang methods since
+      # e.g. target?_without_feature is not a valid method name.
+      aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
+      yield(aliased_target, punctuation) if block_given?
+      alias_method "#{aliased_target}_without_#{feature}#{punctuation}", target
+      alias_method target, "#{aliased_target}_with_#{feature}#{punctuation}"
+    end
 
-class Module  # :nodoc:
-  # Encapsulates the common pattern of:
-  #
-  #   alias_method :foo_without_feature, :foo
-  #   alias_method :foo, :foo_with_feature
-  #
-  # With this, you simply do:
-  #
-  #   alias_method_chain :foo, :feature
-  #
-  # And both aliases are set up for you.
-  #
-  # Query and bang methods (foo?, foo!) keep the same punctuation:
-  #
-  #   alias_method_chain :foo?, :feature
-  #
-  # is equivalent to
-  #
-  #   alias_method :foo_without_feature?, :foo?
-  #   alias_method :foo?, :foo_with_feature?
-  #
-  # so you can safely chain foo, foo?, and foo! with the same feature.
-  def alias_method_chain(target, feature)
-    # Strip out punctuation on predicates or bang methods since
-    # e.g. target?_without_feature is not a valid method name.
-    aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
-    yield(aliased_target, punctuation) if block_given?
-    alias_method "#{aliased_target}_without_#{feature}#{punctuation}", target
-    alias_method target, "#{aliased_target}_with_#{feature}#{punctuation}"
-  end
-
-  # Allows you to make aliases for attributes, which includes 
-  # getter, setter, and query methods.
-  #
-  # Example:
-  #
-  #   class Content < ActiveRecord::Base
-  #     # has a title attribute
-  #   end
-  #
-  #   class Email < ActiveRecord::Base
-  #     alias_attribute :subject, :title
-  #   end
-  #
-  #   e = Email.find(1)
-  #   e.title    # => "Superstars"
-  #   e.subject  # => "Superstars"
-  #   e.subject? # => true
-  #   e.subject = "Megastars"
-  #   e.title    # => "Megastars"
-  def alias_attribute(new_name, old_name)
-    module_eval <<-STR, __FILE__, __LINE__+1
-      def #{new_name}; #{old_name}; end
-      def #{new_name}?; #{old_name}?; end
-      def #{new_name}=(v); self.#{old_name} = v; end
-    STR
+    # Allows you to make aliases for attributes, which includes 
+    # getter, setter, and query methods.
+    #
+    # Example:
+    #
+    #   class Content < ActiveRecord::Base
+    #     # has a title attribute
+    #   end
+    #
+    #   class Email < ActiveRecord::Base
+    #     alias_attribute :subject, :title
+    #   end
+    #
+    #   e = Email.find(1)
+    #   e.title    # => "Superstars"
+    #   e.subject  # => "Superstars"
+    #   e.subject? # => true
+    #   e.subject = "Megastars"
+    #   e.title    # => "Megastars"
+    def alias_attribute(new_name, old_name)
+      module_eval <<-STR, __FILE__, __LINE__+1
+        def #{new_name}; #{old_name}; end
+        def #{new_name}?; #{old_name}?; end
+        def #{new_name}=(v); self.#{old_name} = v; end
+      STR
+    end
   end
 end

data/lib/attribute_accessors.rb

@@ -1,4 +1,10 @@
 # :stopdoc:
+#
+# Snipped directly from ActiveSupport from Rails 1.2.3
+# If Quiet Backtrace is run from a Rails app, the actual ActiveSupport
+# methods will be used. That way, mattr_accessor and cattr_accessor will 
+# not be overridden in your Rails app if Quiet Backtrace is installed.
+#
 # Copyright (c) 2005-2006 David Heinemeier Hansson
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -24,100 +30,102 @@
 #
 # Extends the module object with module and instance accessors for class attributes, 
 # just like the native attr* accessors for instance attributes.
-class Module # :nodoc:
-  def mattr_reader(*syms)
-    syms.each do |sym|
-      next if sym.is_a?(Hash)
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
+unless defined?(ActiveSupport)
+  class Module # :nodoc:
+    def mattr_reader(*syms)
+      syms.each do |sym|
+        next if sym.is_a?(Hash)
+        class_eval(<<-EOS, __FILE__, __LINE__)
+          unless defined? @@#{sym}
+            @@#{sym} = nil
+          end
         
-        def self.#{sym}
-          @@#{sym}
-        end
+          def self.#{sym}
+            @@#{sym}
+          end
 
-        def #{sym}
-          @@#{sym}
-        end
-      EOS
+          def #{sym}
+            @@#{sym}
+          end
+        EOS
+      end
     end
-  end
   
-  def mattr_writer(*syms)
-    options = syms.last.is_a?(Hash) ? syms.pop : {}
-    syms.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
+    def mattr_writer(*syms)
+      options = syms.last.is_a?(Hash) ? syms.pop : {}
+      syms.each do |sym|
+        class_eval(<<-EOS, __FILE__, __LINE__)
+          unless defined? @@#{sym}
+            @@#{sym} = nil
+          end
         
-        def self.#{sym}=(obj)
-          @@#{sym} = obj
-        end
+          def self.#{sym}=(obj)
+            @@#{sym} = obj
+          end
         
-        #{"
-        def #{sym}=(obj)
-          @@#{sym} = obj
-        end
-        " unless options[:instance_writer] == false }
-      EOS
+          #{"
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
+          " unless options[:instance_writer] == false }
+        EOS
+      end
     end
-  end
   
-  def mattr_accessor(*syms)
-    mattr_reader(*syms)
-    mattr_writer(*syms)
+    def mattr_accessor(*syms)
+      mattr_reader(*syms)
+      mattr_writer(*syms)
+    end
   end
-end
 
-# activesupport/lib/activesupport/core_ext/class/attribute_accessors.rb
+  # activesupport/lib/activesupport/core_ext/class/attribute_accessors.rb
 
-# Extends the class object with class and instance accessors for class attributes,
-# just like the native attr* accessors for instance attributes.
-class Class # :nodoc:
-  def cattr_reader(*syms)
-    syms.flatten.each do |sym|
-      next if sym.is_a?(Hash)
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
+  # Extends the class object with class and instance accessors for class attributes,
+  # just like the native attr* accessors for instance attributes.
+  class Class # :nodoc:
+    def cattr_reader(*syms)
+      syms.flatten.each do |sym|
+        next if sym.is_a?(Hash)
+        class_eval(<<-EOS, __FILE__, __LINE__)
+          unless defined? @@#{sym}
+            @@#{sym} = nil
+          end
 
-        def self.#{sym}
-          @@#{sym}
-        end
+          def self.#{sym}
+            @@#{sym}
+          end
 
-        def #{sym}
-          @@#{sym}
-        end
-      EOS
+          def #{sym}
+            @@#{sym}
+          end
+        EOS
+      end
     end
-  end
 
-  def cattr_writer(*syms)
-    options = syms.last.is_a?(Hash) ? syms.pop : {}
-    syms.flatten.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
+    def cattr_writer(*syms)
+      options = syms.last.is_a?(Hash) ? syms.pop : {}
+      syms.flatten.each do |sym|
+        class_eval(<<-EOS, __FILE__, __LINE__)
+          unless defined? @@#{sym}
+            @@#{sym} = nil
+          end
 
-        def self.#{sym}=(obj)
-          @@#{sym} = obj
-        end
+          def self.#{sym}=(obj)
+            @@#{sym} = obj
+          end
 
-        #{"
-        def #{sym}=(obj)
-          @@#{sym} = obj
-        end
-        " unless options[:instance_writer] == false }
-      EOS
+          #{"
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
+          " unless options[:instance_writer] == false }
+        EOS
+      end
     end
-  end
 
-  def cattr_accessor(*syms)
-    cattr_reader(*syms)
-    cattr_writer(*syms)
+    def cattr_accessor(*syms)
+      cattr_reader(*syms)
+      cattr_writer(*syms)
+    end
   end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: quietbacktrace
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.1.0
 date: 2007-12-03 00:00:00 -05:00
 summary: quiet_backtrace suppresses the noise in your Test::Unit backtrace. It also provides hooks for you to add additional filters.
 require_paths: 
@@ -33,7 +33,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- bin/quietbacktrace
 - init.rb
 - lib/aliasing.rb
 - lib/attribute_accessors.rb
@@ -48,8 +47,8 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-executables: 
-- quietbacktrace
+executables: []
+
 extensions: []
 
 requirements: []