erector 0.6.4 → 0.6.6

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 6
-:patch: 4
+:patch: 6
 

data/lib/erector/widget.rb

@@ -153,8 +153,10 @@ module Erector
 
     SPACES_PER_INDENT = 2
 
-    attr_reader :helpers, :assigns, :block, :parent, :output, :prettyprint, :indentation
+    RESERVED_INSTANCE_VARS = [:helpers, :assigns, :block, :parent, :output, :prettyprint, :indentation, :at_start_of_line]
 
+    attr_reader *RESERVED_INSTANCE_VARS
+    
     def initialize(assigns={}, &block)
       unless assigns.is_a? Hash
         raise "Erector's API has changed. Now you should pass only an options hash into Widget.new; the rest come in via to_s, or by using #widget."
@@ -223,8 +225,10 @@ module Erector
     end
     
     def assign_local(name, value)
+      raise ArgumentError, "Sorry, #{name} is a reserved variable name for Erector. Please choose a different name." if RESERVED_INSTANCE_VARS.include?(name)
       instance_variable_set("@#{name}", value)
       if any_are_needed?
+        raise ArgumentError, "Sorry, #{name} is a reserved method name for Erector. Please choose a different name." if respond_to?(name)
         metaclass.module_eval do
           attr_reader name
         end
@@ -268,7 +272,7 @@ module Erector
     #
     # # Options: see #to_s
     def to_a(options = {}, &blk)
-      _render(options, &blk).to_a
+      _render({:output => []}.merge(options), &blk).to_a
     end
     
     def _render(options = {}, &blk)

data/spec/erector/widget_spec.rb

@@ -80,7 +80,7 @@ module WidgetSpec
     # 
     #     (time_for_to_a <= time_for_string).should be_true
     #   end
-    # end
+    end
 
     describe "#instruct" do
       it "when passed no arguments; returns an XML declaration with version 1 and utf-8" do
@@ -702,6 +702,15 @@ module WidgetSpec
 
     end
     
+    describe "assigning local variables" do
+      it "attempting to overwrite a reserved instance variable raises error" do
+        lambda {
+          Erector::Widget.new(:output => "foo")
+        }.should raise_error(ArgumentError)
+      end
+    end
+      
+    
     describe "when declaring parameters with the 'needs' macro" do
       it "doesn't complain if there aren't any needs declared" do
         class Thing1 < Erector::Widget
@@ -815,6 +824,13 @@ module WidgetSpec
         thing = NeedlessThing.new(:love => "all we need")
         lambda {thing.love}.should raise_error
       end
+
+      it "complains if you attempt to 'need' a variable whose name overlaps with an existing method" do
+        class ThingWithOverlap < Erector::Widget
+          needs :text
+        end
+        lambda { ThingWithOverlap.new(:text => "alas") }.should raise_error(ArgumentError)
+      end
       
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.6
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-24 00:00:00 -07:00
+date: 2009-05-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency