erector 0.6.6 → 0.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,4 @@
1
1
  ---
2
2
  :major: 0
3
3
  :minor: 6
4
- :patch: 6
5
-
4
+ :patch: 7
@@ -128,11 +128,10 @@ module Erector
128
128
  protected
129
129
  def self.get_needs
130
130
  @needs ||= []
131
- parent = self.ancestors[1]
132
- if parent.respond_to? :get_needs
133
- parent.get_needs + @needs
134
- else
135
- @needs
131
+
132
+ ancestors[1..-1].inject(@needs.dup) do |needs, ancestor|
133
+ needs.push(*ancestor.get_needs) if ancestor.respond_to?(:get_needs)
134
+ needs
136
135
  end
137
136
  end
138
137
 
@@ -711,7 +711,7 @@ module WidgetSpec
711
711
  end
712
712
 
713
713
 
714
- describe "when declaring parameters with the 'needs' macro" do
714
+ context "when declaring parameters with the 'needs' macro" do
715
715
  it "doesn't complain if there aren't any needs declared" do
716
716
  class Thing1 < Erector::Widget
717
717
  end
@@ -796,12 +796,16 @@ module WidgetSpec
796
796
  }.should_not raise_error
797
797
  end
798
798
 
799
- it "accumulates needs across the inheritance chain" do
799
+ it "accumulates needs across the inheritance chain even with modules mixed in" do
800
+ module Something
801
+ end
802
+
800
803
  class Vehicle < Erector::Widget
801
804
  needs :wheels
802
805
  end
803
806
 
804
807
  class Car < Vehicle
808
+ include Something
805
809
  needs :engine
806
810
  end
807
811
 
metadata CHANGED
@@ -1,29 +1,32 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: erector
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.6
4
+ version: 0.6.7
5
5
  platform: ruby
6
6
  authors:
7
- - Pivotal Labs
7
+ - Alex Chaffee
8
+ - Brian Takita
9
+ - Jeff Dean
10
+ - Jim Kingdon
8
11
  autorequire:
9
12
  bindir: bin
10
13
  cert_chain: []
11
14
 
12
- date: 2009-05-25 00:00:00 -07:00
13
- default_executable:
15
+ date: 2009-06-17 00:00:00 -07:00
16
+ default_executable: erector
14
17
  dependencies:
15
18
  - !ruby/object:Gem::Dependency
16
- name: hoe
19
+ name: treetop
17
20
  type: :runtime
18
21
  version_requirement:
19
22
  version_requirements: !ruby/object:Gem::Requirement
20
23
  requirements:
21
24
  - - ">="
22
25
  - !ruby/object:Gem::Version
23
- version: 1.5.0
26
+ version: 1.2.3
24
27
  version:
25
28
  description: Html Builder library.
26
- email: erector@googlegroups.compivotallabsopensource@googlegroups.com
29
+ email: erector@googlegroups.com
27
30
  executables:
28
31
  - erector
29
32
  extensions: []
@@ -31,30 +34,30 @@ extensions: []
31
34
  extra_rdoc_files:
32
35
  - README.txt
33
36
  files:
37
+ - README.txt
38
+ - VERSION.yml
39
+ - bin/erector
40
+ - lib/erector.rb
34
41
  - lib/erector/erect.rb
35
42
  - lib/erector/erected.rb
36
43
  - lib/erector/extensions/object.rb
37
44
  - lib/erector/indenting.rb
38
45
  - lib/erector/mixin.rb
46
+ - lib/erector/rails.rb
39
47
  - lib/erector/rails/extensions/action_controller.rb
40
48
  - lib/erector/rails/extensions/action_view.rb
41
- - lib/erector/rails/extensions/rails_widget/helpers.rb
42
49
  - lib/erector/rails/extensions/rails_widget.rb
50
+ - lib/erector/rails/extensions/rails_widget/helpers.rb
43
51
  - lib/erector/rails/rails_version.rb
44
52
  - lib/erector/rails/template_handlers/action_view_template_handler.rb
45
- - lib/erector/rails.rb
46
53
  - lib/erector/raw_string.rb
47
54
  - lib/erector/rhtml.treetop
48
55
  - lib/erector/unicode.rb
49
56
  - lib/erector/unicode_builder.rb
50
57
  - lib/erector/version.rb
51
58
  - lib/erector/widget.rb
52
- - lib/erector/widgets/table.rb
53
59
  - lib/erector/widgets.rb
54
- - lib/erector.rb
55
- - README.txt
56
- - VERSION.yml
57
- - bin/erector
60
+ - lib/erector/widgets/table.rb
58
61
  - spec/core_spec_suite.rb
59
62
  - spec/erect/erect_rails_spec.rb
60
63
  - spec/erect/erect_spec.rb
@@ -70,13 +73,10 @@ files:
70
73
  - spec/spec_helper.rb
71
74
  - spec/spec_suite.rb
72
75
  has_rdoc: true
73
- homepage: http://erector.rubyforge.org
74
- licenses: []
75
-
76
+ homepage: http://erector.rubyforge.org/
76
77
  post_install_message:
77
78
  rdoc_options:
78
- - --main
79
- - README.txt
79
+ - --charset=UTF-8
80
80
  require_paths:
81
81
  - lib
82
82
  required_ruby_version: !ruby/object:Gem::Requirement
@@ -94,9 +94,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
94
94
  requirements: []
95
95
 
96
96
  rubyforge_project: erector
97
- rubygems_version: 1.3.3
97
+ rubygems_version: 1.3.1
98
98
  signing_key:
99
- specification_version: 3
99
+ specification_version: 2
100
100
  summary: Html Builder library.
101
- test_files: []
102
-
101
+ test_files:
102
+ - spec/rails_spec_suite.rb
103
+ - spec/spec_suite.rb
104
+ - spec/erector
105
+ - spec/erector/indentation_spec.rb
106
+ - spec/erector/unicode_builder_spec.rb
107
+ - spec/erector/widgets
108
+ - spec/erector/widgets/table_spec.rb
109
+ - spec/erector/mixin_spec.rb
110
+ - spec/erector/widget_spec.rb
111
+ - spec/erect
112
+ - spec/erect/erected_spec.rb
113
+ - spec/erect/erect_rails_spec.rb
114
+ - spec/erect/rhtml_parser_spec.rb
115
+ - spec/erect/erect_spec.rb
116
+ - spec/spec.opts
117
+ - spec/spec_helper.rb
118
+ - spec/core_spec_suite.rb