builder 1.2.1 → 1.2.2

data/CHANGES

@@ -1,5 +1,14 @@
 = Change Log
 
+== Version 1.2.2
+
+Another fix for BlankSlate.  The Kernal/Object traps added in 1.2.1
+failed when a method was defined late more than once.  Since the
+method was already marked as removed, another attempt to undefine it
+raised an error.  The fix was to check the list of instance methods
+before attempting the undef operation.  Thanks to Florian Gross and
+David Heinemeier Hansson for the patch.
+
 == Version 1.2.1
 
 BlankSlate now traps method definitions in Kernel and Object to avoid

data/Rakefile

@@ -17,7 +17,7 @@ rescue Exception
   nil
 end
 
-PKG_VERSION = "1.2.1"
+PKG_VERSION = "1.2.2"
 
 SRC_RB = FileList['lib/**/*.rb']
 

data/lib/builder/blankslate.rb

@@ -17,7 +17,9 @@ module Builder
   class BlankSlate
     class << self
       def hide(name)
-	undef_method name unless name =~ /^(__|instance_eval)/
+	undef_method name if
+	  instance_methods.include?(name.to_s) and
+	  name !~ /^(__|instance_eval)/
       end
     end
 

data/lib/builder/xmlbase.rb

@@ -77,7 +77,7 @@ module Builder
     # Append text to the output target.  Escape any markup.  May be
     # used within the markup brakets as:
     #
-    #   builder.p { br; text! "HI" }   #=>  <p><br/>HI</p>
+    #   builder.p { |b| b.br; b.text! "HI" }   #=>  <p><br/>HI</p>
     def text!(text)
       _text(_escape(text))
     end
@@ -93,7 +93,7 @@ module Builder
     #
     # It is also useful for stacking builder objects.  Builders only
     # use <tt><<</tt> to append to the target, so by supporting this
-    # method/operation builders can use oother builders as their
+    # method/operation builders can use other builders as their
     # targets.
     def <<(text)
       _text(text)

data/test/preload.rb

@@ -6,22 +6,24 @@
 
 module Kernel
   class << self
-    attr_reader :k_added_name
+    attr_reader :k_added_names
     alias_method :preload_method_added, :method_added
     def method_added(name)
       preload_method_added(name)
-      @k_added_name = name
+      @k_added_names ||= []
+      @k_added_names << name
     end
   end
 end
 
 class Object
   class << self
-    attr_reader :o_added_name
+    attr_reader :o_added_names
     alias_method :preload_method_added, :method_added
     def method_added(name)
       preload_method_added(name)
-      @o_added_name = name
+      @o_added_names ||= []
+      @o_added_names << name
     end
   end
 end

data/test/testblankslate.rb

@@ -8,8 +8,18 @@ module Kernel
   def late_addition
     1234
   end
+
+  def double_late_addition
+    11
+  end
+
+  def double_late_addition
+    22
+  end
 end
 
+
+
 class Object
   def another_late_addition
     4321
@@ -36,8 +46,12 @@ class TestBlankSlate < Test::Unit::TestCase
   end
 
   def test_preload_method_added
-    assert_equal :late_addition, Kernel.k_added_name
-    assert_equal :another_late_addition, Object.o_added_name
+    assert Kernel.k_added_names.include?(:late_addition)
+    assert Object.o_added_names.include?(:another_late_addition)
+  end
+
+  def test_double_defined_method
+    assert_raise(NoMethodError) { @bs.double.late_addition }
   end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: builder
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2004-10-30
+  version: 1.2.2
+date: 2004-11-23
 summary: Builders for MarkUp.
 require_paths: 
   - lib
@@ -27,20 +27,20 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 files: 
   - lib/builder.rb
-  - lib/builder/xmlmarkup.rb
-  - lib/builder/xmlbase.rb
   - lib/builder/blankslate.rb
+  - lib/builder/xmlbase.rb
   - lib/builder/xmlevents.rb
-  - test/testmarkupbuilder.rb
-  - test/testblankslate.rb
+  - lib/builder/xmlmarkup.rb
   - test/preload.rb
+  - test/testblankslate.rb
+  - test/testmarkupbuilder.rb
   - scripts/publish.rb
+  - CHANGES
   - README
   - Rakefile
-  - CHANGES
 test_files: 
-  - test/testmarkupbuilder.rb
   - test/testblankslate.rb
+  - test/testmarkupbuilder.rb
 rdoc_options: 
   - "--title"
   - "Builder -- Easy XML Building"
@@ -48,9 +48,9 @@ rdoc_options:
   - README
   - "--line-numbers"
 extra_rdoc_files: 
+  - CHANGES
   - README
   - Rakefile
-  - CHANGES
 executables: []
 extensions: []
 requirements: []