pivotal-erector 0.6.6 → 0.6.7

data/VERSION.yml

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

data/lib/erector/widget.rb

@@ -128,11 +128,10 @@ module Erector
     protected
     def self.get_needs
       @needs ||= []
-      parent = self.ancestors[1]
-      if parent.respond_to? :get_needs
-        parent.get_needs + @needs
-      else
-        @needs
+
+      ancestors[1..-1].inject(@needs.dup) do |needs, ancestor|
+        needs.push(*ancestor.get_needs) if ancestor.respond_to?(:get_needs)
+        needs
       end
     end
 

data/spec/erector/widget_spec.rb

@@ -711,7 +711,7 @@ module WidgetSpec
     end
       
     
-    describe "when declaring parameters with the 'needs' macro" do
+    context "when declaring parameters with the 'needs' macro" do
       it "doesn't complain if there aren't any needs declared" do
         class Thing1 < Erector::Widget
         end
@@ -796,12 +796,16 @@ module WidgetSpec
         }.should_not raise_error
       end
       
-      it "accumulates needs across the inheritance chain" do
+      it "accumulates needs across the inheritance chain even with modules mixed in" do
+        module Something
+        end
+
         class Vehicle < Erector::Widget
           needs :wheels
         end
         
         class Car < Vehicle
+          include Something
           needs :engine
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-erector
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Alex Chaffee
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -07:00
+date: 2009-06-17 00:00:00 -07:00
 default_executable: erector
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,7 +72,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spec_suite.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://erector.rubyforge.org/
 post_install_message: 
 rdoc_options: 
@@ -96,23 +96,23 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Html Builder library.
 test_files: 
-- spec/core_spec_suite.rb
-- spec/erect
-- spec/erect/erect_rails_spec.rb
-- spec/erect/erect_spec.rb
-- spec/erect/erected_spec.rb
-- spec/erect/rhtml_parser_spec.rb
+- spec/rails_spec_suite.rb
+- spec/spec_suite.rb
 - spec/erector
 - spec/erector/indentation_spec.rb
-- spec/erector/mixin_spec.rb
 - spec/erector/unicode_builder_spec.rb
-- spec/erector/widget_spec.rb
 - spec/erector/widgets
 - spec/erector/widgets/table_spec.rb
-- spec/rails_spec_suite.rb
+- spec/erector/mixin_spec.rb
+- spec/erector/widget_spec.rb
+- spec/erect
+- spec/erect/erected_spec.rb
+- spec/erect/erect_rails_spec.rb
+- spec/erect/rhtml_parser_spec.rb
+- spec/erect/erect_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/spec_suite.rb
+- spec/core_spec_suite.rb