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,29 +1,32 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
-- Pivotal Labs
+- Alex Chaffee
+- Brian Takita
+- Jeff Dean
+- Jim Kingdon
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -07:00
-default_executable: 
+date: 2009-06-17 00:00:00 -07:00
+default_executable: erector
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: treetop
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.2.3
     version: 
 description: Html Builder library.
-email: erector@googlegroups.compivotallabsopensource@googlegroups.com
+email: erector@googlegroups.com
 executables: 
 - erector
 extensions: []
@@ -31,30 +34,30 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 files: 
+- README.txt
+- VERSION.yml
+- bin/erector
+- lib/erector.rb
 - lib/erector/erect.rb
 - lib/erector/erected.rb
 - lib/erector/extensions/object.rb
 - lib/erector/indenting.rb
 - lib/erector/mixin.rb
+- lib/erector/rails.rb
 - lib/erector/rails/extensions/action_controller.rb
 - lib/erector/rails/extensions/action_view.rb
-- lib/erector/rails/extensions/rails_widget/helpers.rb
 - lib/erector/rails/extensions/rails_widget.rb
+- lib/erector/rails/extensions/rails_widget/helpers.rb
 - lib/erector/rails/rails_version.rb
 - lib/erector/rails/template_handlers/action_view_template_handler.rb
-- lib/erector/rails.rb
 - lib/erector/raw_string.rb
 - lib/erector/rhtml.treetop
 - lib/erector/unicode.rb
 - lib/erector/unicode_builder.rb
 - lib/erector/version.rb
 - lib/erector/widget.rb
-- lib/erector/widgets/table.rb
 - lib/erector/widgets.rb
-- lib/erector.rb
-- README.txt
-- VERSION.yml
-- bin/erector
+- lib/erector/widgets/table.rb
 - spec/core_spec_suite.rb
 - spec/erect/erect_rails_spec.rb
 - spec/erect/erect_spec.rb
@@ -70,13 +73,10 @@ files:
 - spec/spec_helper.rb
 - spec/spec_suite.rb
 has_rdoc: true
-homepage: http://erector.rubyforge.org
-licenses: []
-
+homepage: http://erector.rubyforge.org/
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -94,9 +94,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: erector
-rubygems_version: 1.3.3
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Html Builder library.
-test_files: []
-
+test_files: 
+- spec/rails_spec_suite.rb
+- spec/spec_suite.rb
+- spec/erector
+- spec/erector/indentation_spec.rb
+- spec/erector/unicode_builder_spec.rb
+- spec/erector/widgets
+- spec/erector/widgets/table_spec.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/core_spec_suite.rb