padrino-helpers 0.16.0.pre4 → 0.16.0
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.
- checksums.yaml +4 -4
- data/README.rdoc +29 -29
- data/Rakefile +1 -1
- data/lib/padrino/rendering/erb_template.rb +7 -7
- data/lib/padrino/rendering/erubi_template.rb +4 -4
- data/lib/padrino/rendering/erubis_template.rb +4 -4
- data/lib/padrino/rendering/haml_template.rb +1 -1
- data/lib/padrino/rendering/hamlit_template.rb +4 -4
- data/lib/padrino/rendering/slim_template.rb +5 -5
- data/lib/padrino/rendering.rb +54 -45
- data/lib/padrino/safe_buffer.rb +31 -36
- data/lib/padrino-helpers/asset_tag_helpers.rb +48 -48
- data/lib/padrino-helpers/form_builder/abstract_form_builder.rb +74 -70
- data/lib/padrino-helpers/form_builder/standard_form_builder.rb +20 -20
- data/lib/padrino-helpers/form_helpers/errors.rb +14 -14
- data/lib/padrino-helpers/form_helpers/options.rb +25 -24
- data/lib/padrino-helpers/form_helpers/security.rb +5 -5
- data/lib/padrino-helpers/form_helpers.rb +133 -133
- data/lib/padrino-helpers/format_helpers.rb +61 -63
- data/lib/padrino-helpers/number_helpers.rb +82 -78
- data/lib/padrino-helpers/output_helpers/abstract_handler.rb +5 -3
- data/lib/padrino-helpers/output_helpers/erb_handler.rb +2 -2
- data/lib/padrino-helpers/output_helpers/haml_handler.rb +1 -1
- data/lib/padrino-helpers/output_helpers.rb +16 -17
- data/lib/padrino-helpers/render_helpers.rb +28 -27
- data/lib/padrino-helpers/tag_helpers.rb +62 -58
- data/lib/padrino-helpers/translation_helpers.rb +2 -2
- data/lib/padrino-helpers.rb +1 -2
- data/padrino-helpers.gemspec +17 -17
- data/test/fixtures/apps/render.rb +2 -2
- data/test/fixtures/markup_app/app.rb +9 -8
- data/test/fixtures/markup_app/views/button_to.erb +3 -3
- data/test/fixtures/markup_app/views/button_to.haml +2 -2
- data/test/fixtures/markup_app/views/button_to.slim +3 -3
- data/test/fixtures/markup_app/views/content_for.erb +4 -4
- data/test/fixtures/markup_app/views/content_for.haml +4 -4
- data/test/fixtures/markup_app/views/content_for.slim +2 -2
- data/test/fixtures/markup_app/views/content_tag.erb +3 -3
- data/test/fixtures/markup_app/views/content_tag.haml +3 -3
- data/test/fixtures/markup_app/views/content_tag.slim +3 -3
- data/test/fixtures/markup_app/views/fields_for.erb +2 -2
- data/test/fixtures/markup_app/views/fields_for.haml +2 -2
- data/test/fixtures/markup_app/views/fields_for.slim +2 -2
- data/test/fixtures/markup_app/views/form_for.erb +41 -41
- data/test/fixtures/markup_app/views/form_for.haml +41 -41
- data/test/fixtures/markup_app/views/form_for.slim +41 -42
- data/test/fixtures/markup_app/views/form_tag.erb +47 -47
- data/test/fixtures/markup_app/views/form_tag.haml +48 -48
- data/test/fixtures/markup_app/views/form_tag.slim +49 -49
- data/test/fixtures/markup_app/views/link_to.erb +2 -2
- data/test/fixtures/markup_app/views/link_to.haml +2 -2
- data/test/fixtures/markup_app/views/link_to.slim +2 -2
- data/test/fixtures/markup_app/views/meta_tag.erb +2 -2
- data/test/fixtures/markup_app/views/meta_tag.haml +2 -2
- data/test/fixtures/markup_app/views/meta_tag.slim +2 -2
- data/test/fixtures/markup_app/views/simple_partial.erb +1 -1
- data/test/fixtures/markup_app/views/simple_partial.haml +1 -1
- data/test/fixtures/markup_app/views/simple_partial.slim +1 -1
- data/test/fixtures/render_app/app.rb +13 -12
- data/test/fixtures/render_app/views/_unsafe.html.builder +1 -1
- data/test/fixtures/render_app/views/_unsafe_object.html.builder +1 -1
- data/test/fixtures/render_app/views/explicit_engine.haml +3 -3
- data/test/helper.rb +19 -19
- data/test/test_asset_tag_helpers.rb +133 -133
- data/test/test_form_builder.rb +629 -628
- data/test/test_form_helpers.rb +610 -610
- data/test/test_format_helpers.rb +66 -63
- data/test/test_helpers.rb +2 -2
- data/test/test_locale.rb +13 -11
- data/test/test_number_helpers.rb +65 -65
- data/test/test_output_helpers.rb +76 -76
- data/test/test_render_helpers.rb +101 -101
- data/test/test_rendering.rb +329 -326
- data/test/test_rendering_extensions.rb +4 -4
- data/test/test_tag_helpers.rb +55 -55
- metadata +6 -6
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
<% form_tag '/simple', :
|
|
2
|
-
<%= hidden_field_tag :session_id, :
|
|
1
|
+
<% form_tag '/simple', class: 'simple-form' do %>
|
|
2
|
+
<%= hidden_field_tag :session_id, value: '__secret__' %>
|
|
3
3
|
<% field_set_tag do %>
|
|
4
4
|
<%= label_tag :username %>
|
|
5
5
|
<%= text_field_tag :username %>
|
|
@@ -18,99 +18,99 @@
|
|
|
18
18
|
<%= check_box_tag :remember_me %>
|
|
19
19
|
<%= label_tag :gender %>
|
|
20
20
|
<%= label_tag :color %>
|
|
21
|
-
<%= select_tag :color, :
|
|
22
|
-
<%= select_tag :type, :
|
|
23
|
-
<%= select_tag :character, :
|
|
24
|
-
<%= radio_button_tag :gender, :
|
|
25
|
-
<%= radio_button_tag :gender, :
|
|
21
|
+
<%= select_tag :color, options: ['green', 'orange', 'purple'] %>
|
|
22
|
+
<%= select_tag :type, grouped_options: { 'foo' => ['foo', 'bar'], 'bar' => ['foo', 'bar'] } %>
|
|
23
|
+
<%= select_tag :character, grouped_options: [['Friends', ['Yoda', ['Obiwan', 1]]], ['Enemies', ['Palpatine', ['Darth Vader', 3]]]] %>
|
|
24
|
+
<%= radio_button_tag :gender, value: 'male' %>
|
|
25
|
+
<%= radio_button_tag :gender, value: 'female' %>
|
|
26
26
|
<%= submit_tag %>
|
|
27
27
|
<% end %>
|
|
28
28
|
<% end %>
|
|
29
29
|
|
|
30
|
-
<% form_tag '/advanced', :
|
|
31
|
-
<%= error_messages_for MarkupUser.new, :
|
|
32
|
-
<%= hidden_field_tag :session_id, :
|
|
33
|
-
<% field_set_tag
|
|
30
|
+
<% form_tag '/advanced', id: 'advanced', class: 'advanced-form', method: 'get' do %>
|
|
31
|
+
<%= error_messages_for MarkupUser.new, header_message: 'There are problems with saving user!' %>
|
|
32
|
+
<%= hidden_field_tag :session_id, value: '__secret__' %>
|
|
33
|
+
<% field_set_tag 'Advanced', class: 'advanced-field-set' do %>
|
|
34
34
|
<p>
|
|
35
|
-
<%= label_tag :username, :
|
|
36
|
-
<%= text_field_tag :username, :
|
|
35
|
+
<%= label_tag :username, class: 'first', caption: "Nickname" %>
|
|
36
|
+
<%= text_field_tag :username, value: params[:username], id: 'the_username' %>
|
|
37
37
|
</p>
|
|
38
38
|
<p>
|
|
39
|
-
<%= label_tag :password, :
|
|
40
|
-
<%= password_field_tag :password, :
|
|
39
|
+
<%= label_tag :password, class: 'first' %>
|
|
40
|
+
<%= password_field_tag :password, value: params[:password] %>
|
|
41
41
|
</p>
|
|
42
42
|
<p>
|
|
43
|
-
<%= label_tag :email, :
|
|
44
|
-
<%= email_field_tag :email, :
|
|
43
|
+
<%= label_tag :email, caption: 'Email Address' %>
|
|
44
|
+
<%= email_field_tag :email, class: 'string' %>
|
|
45
45
|
</p>
|
|
46
46
|
<p>
|
|
47
|
-
<%= label_tag :age, :
|
|
48
|
-
<%= number_field_tag :age, :
|
|
47
|
+
<%= label_tag :age, class: 'age' %>
|
|
48
|
+
<%= number_field_tag :age, class: 'numeric' %>
|
|
49
49
|
</p>
|
|
50
50
|
<p>
|
|
51
|
-
<%= label_tag :telephone, :
|
|
52
|
-
<%= telephone_field_tag :telephone, :
|
|
51
|
+
<%= label_tag :telephone, class: 'telephone' %>
|
|
52
|
+
<%= telephone_field_tag :telephone, class: 'numeric' %>
|
|
53
53
|
</p>
|
|
54
54
|
<p>
|
|
55
|
-
<%= label_tag :webpage, :
|
|
56
|
-
<%= url_field_tag :webpage, :
|
|
55
|
+
<%= label_tag :webpage, caption: 'Your Home Page' %>
|
|
56
|
+
<%= url_field_tag :webpage, class: 'string' %>
|
|
57
57
|
</p>
|
|
58
58
|
<p>
|
|
59
59
|
<%= label_tag :search %>
|
|
60
|
-
<%= search_field_tag :search, :
|
|
60
|
+
<%= search_field_tag :search, class: 'string' %>
|
|
61
61
|
</p>
|
|
62
62
|
<p>
|
|
63
|
-
<%= label_tag :about, :
|
|
64
|
-
<%= text_area_tag :about, :
|
|
63
|
+
<%= label_tag :about, class: 'about', caption: 'About Me' %>
|
|
64
|
+
<%= text_area_tag :about, class: 'large' %>
|
|
65
65
|
</p>
|
|
66
66
|
<p>
|
|
67
|
-
<%= label_tag :photo, :
|
|
68
|
-
<%= file_field_tag :photo, :
|
|
67
|
+
<%= label_tag :photo, class: 'photo' %>
|
|
68
|
+
<%= file_field_tag :photo, class: 'upload' %>
|
|
69
69
|
</p>
|
|
70
70
|
<p>
|
|
71
|
-
<%= label_tag :gender, :
|
|
72
|
-
<%= radio_button_tag :gender, :
|
|
73
|
-
<%= radio_button_tag :remember_me, :
|
|
71
|
+
<%= label_tag :gender, class: 'gender' %>
|
|
72
|
+
<%= radio_button_tag :gender, value: 'male', checked: true %>
|
|
73
|
+
<%= radio_button_tag :remember_me, value: 'female' %>
|
|
74
74
|
<p>
|
|
75
75
|
<p>
|
|
76
76
|
<%= label_tag :fav_color %>
|
|
77
|
-
<%= select_tag :fav_color, :
|
|
77
|
+
<%= select_tag :fav_color, options: [['green', '1'], ['orange', '2'], ['purple', '3']], selected: '2' %>
|
|
78
78
|
</p>
|
|
79
79
|
<p>
|
|
80
|
-
<%= check_box_tag :remember_me, :
|
|
80
|
+
<%= check_box_tag :remember_me, value: '1', checked: true %>
|
|
81
81
|
<p>
|
|
82
82
|
<p>
|
|
83
|
-
<%= range_field_tag('ranger_with_min_max', :
|
|
84
|
-
<%= range_field_tag('ranger_with_range', :
|
|
83
|
+
<%= range_field_tag('ranger_with_min_max', min: 1, max: 50) %>
|
|
84
|
+
<%= range_field_tag('ranger_with_range', range: 1..5) %>
|
|
85
85
|
</p>
|
|
86
86
|
<p>
|
|
87
|
-
<%= datetime_field_tag :datetime, :
|
|
87
|
+
<%= datetime_field_tag :datetime, max: DateTime.new(2000, 4, 1, 12, 0, 0), min: DateTime.new(1993, 2, 24, 12, 30, 45), value: DateTime.new(2000, 4, 1, 12, 0, 0) %>
|
|
88
88
|
</p>
|
|
89
89
|
<p>
|
|
90
|
-
<%= datetime_local_field_tag :datetime_local, :
|
|
90
|
+
<%= datetime_local_field_tag :datetime_local, max: DateTime.new(2000, 4, 1, 12, 0, 0), min: DateTime.new(1993, 2, 24, 12, 30, 45), value: DateTime.new(2000, 4, 1, 12, 0, 0) %>
|
|
91
91
|
</p>
|
|
92
92
|
<p>
|
|
93
|
-
<%= date_field_tag :date, :
|
|
93
|
+
<%= date_field_tag :date, max: DateTime.new(2000, 4, 1), min: DateTime.new(1993, 2, 24), value: DateTime.new(2000, 4, 1) %>
|
|
94
94
|
</p>
|
|
95
95
|
<p>
|
|
96
|
-
<%= month_field_tag :month, :
|
|
96
|
+
<%= month_field_tag :month, max: DateTime.new(2000, 4, 1), min: DateTime.new(1993, 2, 24), value: DateTime.new(2000, 4, 1) %>
|
|
97
97
|
</p>
|
|
98
98
|
<p>
|
|
99
|
-
<%= week_field_tag :week, :
|
|
99
|
+
<%= week_field_tag :week, max: DateTime.new(2000, 4, 1), min: DateTime.new(1993, 2, 24), value: DateTime.new(2000, 4, 1) %>
|
|
100
100
|
</p>
|
|
101
101
|
<p>
|
|
102
|
-
<%= time_field_tag :time, :
|
|
102
|
+
<%= time_field_tag :time, max: Time.new(2008, 6, 21, 13, 30, 0), min: Time.new(1993, 2, 24, 1, 19, 12), value: Time.new(2008, 6, 21, 13, 30, 0) %>
|
|
103
103
|
</p>
|
|
104
104
|
<p>
|
|
105
|
-
<%= color_field_tag :color, :
|
|
105
|
+
<%= color_field_tag :color, value: '#f00' %>
|
|
106
106
|
</p>
|
|
107
107
|
<% end %>
|
|
108
|
-
<% field_set_tag(:
|
|
109
|
-
<%= submit_tag
|
|
110
|
-
<%= button_tag
|
|
111
|
-
<%= image_submit_tag
|
|
108
|
+
<% field_set_tag(class: 'buttons') do %>
|
|
109
|
+
<%= submit_tag 'Login' %>
|
|
110
|
+
<%= button_tag 'Cancel' %>
|
|
111
|
+
<%= image_submit_tag 'buttons/submit.png' %>
|
|
112
112
|
<% end %>
|
|
113
113
|
<% end %>
|
|
114
114
|
|
|
115
|
-
<% form_tag '/dontprotect', :
|
|
115
|
+
<% form_tag '/dontprotect', class: 'no-protection', protect_from_csrf: false do %>
|
|
116
116
|
<% end %>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
= form_tag '/simple', :
|
|
1
|
+
= form_tag '/simple', class: 'simple-form' do
|
|
2
2
|
= error_messages_for nil
|
|
3
3
|
= field_set_tag do
|
|
4
|
-
= hidden_field_tag :session_id, :
|
|
4
|
+
= hidden_field_tag :session_id, value: '__secret__'
|
|
5
5
|
= label_tag :username
|
|
6
6
|
= text_field_tag :username
|
|
7
7
|
= label_tag :password
|
|
@@ -17,76 +17,76 @@
|
|
|
17
17
|
= label_tag :search
|
|
18
18
|
= search_field_tag :search
|
|
19
19
|
= label_tag :color
|
|
20
|
-
= select_tag :color, :
|
|
21
|
-
= select_tag :type, :
|
|
22
|
-
= select_tag :character, :
|
|
20
|
+
= select_tag :color, options: ['green', 'orange', 'purple']
|
|
21
|
+
= select_tag :type, grouped_options: { 'foo' => ['foo', 'bar'], 'bar' => ['foo', 'bar'] }
|
|
22
|
+
= select_tag :character, grouped_options: [['Friends', ['Yoda', ['Obiwan', 1]]], ['Enemies', ['Palpatine', ['Darth Vader', 3]]]]
|
|
23
23
|
= label_tag :gender
|
|
24
|
-
= radio_button_tag :gender, :
|
|
25
|
-
= radio_button_tag :gender, :
|
|
24
|
+
= radio_button_tag :gender, value: 'male'
|
|
25
|
+
= radio_button_tag :gender, value: 'female'
|
|
26
26
|
= check_box_tag :remember_me
|
|
27
27
|
= submit_tag
|
|
28
28
|
|
|
29
|
-
= form_tag '/advanced', :
|
|
30
|
-
= error_messages_for MarkupUser.new, :
|
|
31
|
-
= hidden_field_tag :session_id, :
|
|
32
|
-
= field_set_tag
|
|
29
|
+
= form_tag '/advanced', id: 'advanced', class: 'advanced-form', method: 'get' do
|
|
30
|
+
= error_messages_for MarkupUser.new, header_message: 'There are problems with saving user!'
|
|
31
|
+
= hidden_field_tag :session_id, value: '__secret__'
|
|
32
|
+
= field_set_tag 'Advanced', class: 'advanced-field-set' do
|
|
33
33
|
%p
|
|
34
|
-
= label_tag :username, :
|
|
35
|
-
= text_field_tag :username, :
|
|
34
|
+
= label_tag :username, class: 'first', caption: 'Nickname'
|
|
35
|
+
= text_field_tag :username, value: params[:username], id: 'the_username'
|
|
36
36
|
%p
|
|
37
|
-
= label_tag :password, :
|
|
38
|
-
= password_field_tag :password, :
|
|
37
|
+
= label_tag :password, class: 'first'
|
|
38
|
+
= password_field_tag :password, value: params[:password]
|
|
39
39
|
%p
|
|
40
|
-
= label_tag :email, :
|
|
41
|
-
= email_field_tag :email, :
|
|
40
|
+
= label_tag :email, caption: 'Email Address'
|
|
41
|
+
= email_field_tag :email, class: 'string'
|
|
42
42
|
%p
|
|
43
|
-
= label_tag :age, :
|
|
44
|
-
= number_field_tag :age, :
|
|
43
|
+
= label_tag :age, class: 'age'
|
|
44
|
+
= number_field_tag :age, class: 'numeric'
|
|
45
45
|
%p
|
|
46
|
-
= label_tag :telephone, :
|
|
47
|
-
= telephone_field_tag :telephone, :
|
|
46
|
+
= label_tag :telephone, class: 'telephone'
|
|
47
|
+
= telephone_field_tag :telephone, class: 'numeric'
|
|
48
48
|
%p
|
|
49
|
-
= label_tag :webpage, :
|
|
50
|
-
= url_field_tag :webpage, :
|
|
49
|
+
= label_tag :webpage, caption: 'Your Home Page'
|
|
50
|
+
= url_field_tag :webpage, class: 'string'
|
|
51
51
|
%p
|
|
52
52
|
= label_tag :search
|
|
53
|
-
= search_field_tag :search, :
|
|
53
|
+
= search_field_tag :search, class: 'string'
|
|
54
54
|
%p
|
|
55
|
-
= label_tag :about, :
|
|
56
|
-
= text_area_tag :about, :
|
|
55
|
+
= label_tag :about, class: 'about', caption: 'About Me'
|
|
56
|
+
= text_area_tag :about, class: 'large'
|
|
57
57
|
%p
|
|
58
|
-
= label_tag :gender, :
|
|
59
|
-
= radio_button_tag :gender, :
|
|
60
|
-
= radio_button_tag :gender, :
|
|
58
|
+
= label_tag :gender, class: 'gender'
|
|
59
|
+
= radio_button_tag :gender, value: 'male', checked: true
|
|
60
|
+
= radio_button_tag :gender, value: 'female'
|
|
61
61
|
%p
|
|
62
|
-
= label_tag :photo, :
|
|
63
|
-
= file_field_tag :photo, :
|
|
62
|
+
= label_tag :photo, class: 'photo'
|
|
63
|
+
= file_field_tag :photo, class: 'upload'
|
|
64
64
|
%p
|
|
65
65
|
= label_tag :fav_color
|
|
66
|
-
= select_tag :fav_color, :
|
|
66
|
+
= select_tag :fav_color, options: [['green', '1'], ['orange', '2'], ['purple', '3']], selected: '2'
|
|
67
67
|
%p
|
|
68
|
-
= check_box_tag :remember_me, :
|
|
68
|
+
= check_box_tag :remember_me, value: '1', checked: true
|
|
69
69
|
%p
|
|
70
|
-
= range_field_tag('ranger_with_min_max', :
|
|
71
|
-
= range_field_tag('ranger_with_range', :
|
|
70
|
+
= range_field_tag('ranger_with_min_max', min: 1, max: 50)
|
|
71
|
+
= range_field_tag('ranger_with_range', range: 1..5)
|
|
72
72
|
%p
|
|
73
|
-
= datetime_field_tag :datetime, :
|
|
73
|
+
= datetime_field_tag :datetime, max: DateTime.new(2000, 4, 1, 12, 0, 0), min: DateTime.new(1993, 2, 24, 12, 30, 45), value: DateTime.new(2000, 4, 1, 12, 0, 0)
|
|
74
74
|
%p
|
|
75
|
-
= datetime_local_field_tag :datetime_local, :
|
|
75
|
+
= datetime_local_field_tag :datetime_local, max: DateTime.new(2000, 4, 1, 12, 0, 0), min: DateTime.new(1993, 2, 24, 12, 30, 45), value: DateTime.new(2000, 4, 1, 12, 0, 0)
|
|
76
76
|
%p
|
|
77
|
-
= date_field_tag :date, :
|
|
77
|
+
= date_field_tag :date, max: DateTime.new(2000, 4, 1), min: DateTime.new(1993, 2, 24), value: DateTime.new(2000, 4, 1)
|
|
78
78
|
%p
|
|
79
|
-
= month_field_tag :month, :
|
|
79
|
+
= month_field_tag :month, max: DateTime.new(2000, 4, 1), min: DateTime.new(1993, 2, 24), value: DateTime.new(2000, 4, 1)
|
|
80
80
|
%p
|
|
81
|
-
= week_field_tag :week, :
|
|
81
|
+
= week_field_tag :week, max: DateTime.new(2000, 4, 1), min: DateTime.new(1993, 2, 24), value: DateTime.new(2000, 4, 1)
|
|
82
82
|
%p
|
|
83
|
-
= time_field_tag :time, :
|
|
83
|
+
= time_field_tag :time, max: Time.new(2008, 6, 21, 13, 30, 0), min: Time.new(1993, 2, 24, 1, 19, 12), value: Time.new(2008, 6, 21, 13, 30, 0)
|
|
84
84
|
%p
|
|
85
|
-
= color_field_tag :color, :
|
|
86
|
-
= field_set_tag(:
|
|
87
|
-
= submit_tag
|
|
88
|
-
= button_tag
|
|
89
|
-
= image_submit_tag
|
|
85
|
+
= color_field_tag :color, value: '#f00'
|
|
86
|
+
= field_set_tag(class: 'buttons') do
|
|
87
|
+
= submit_tag 'Login'
|
|
88
|
+
= button_tag 'Cancel'
|
|
89
|
+
= image_submit_tag 'buttons/submit.png'
|
|
90
90
|
|
|
91
|
-
= form_tag '/dontprotect', :
|
|
92
|
-
= submit_tag
|
|
91
|
+
= form_tag '/dontprotect', class: 'no-protection', protect_from_csrf: false do
|
|
92
|
+
= submit_tag 'Login'
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
= form_tag '/simple', :
|
|
1
|
+
= form_tag '/simple', class: 'simple-form' do
|
|
2
2
|
= error_messages_for nil
|
|
3
3
|
= field_set_tag do
|
|
4
|
-
= hidden_field_tag :session_id, :
|
|
4
|
+
= hidden_field_tag :session_id, value: '__secret__'
|
|
5
5
|
= label_tag :username
|
|
6
6
|
= text_field_tag :username
|
|
7
7
|
= label_tag :password
|
|
@@ -17,77 +17,77 @@
|
|
|
17
17
|
= label_tag :search
|
|
18
18
|
= search_field_tag :search
|
|
19
19
|
= label_tag :color
|
|
20
|
-
= select_tag :color, :
|
|
21
|
-
= select_tag :type, :
|
|
22
|
-
= select_tag :character, :
|
|
20
|
+
= select_tag :color, options: ['green', 'orange', 'purple']
|
|
21
|
+
= select_tag :type, grouped_options: { 'foo' => ['foo', 'bar'], 'bar' => ['foo', 'bar'] }
|
|
22
|
+
= select_tag :character, grouped_options: [['Friends', ['Yoda', ['Obiwan', 1]]], ['Enemies', ['Palpatine', ['Darth Vader', 3]]]]
|
|
23
23
|
= label_tag :gender
|
|
24
|
-
= radio_button_tag :gender, :
|
|
25
|
-
= radio_button_tag :gender, :
|
|
24
|
+
= radio_button_tag :gender, value: 'male'
|
|
25
|
+
= radio_button_tag :gender, value: 'female'
|
|
26
26
|
= check_box_tag :remember_me
|
|
27
27
|
= submit_tag
|
|
28
28
|
|
|
29
|
-
= form_tag '/advanced', :
|
|
30
|
-
= error_messages_for MarkupUser.new, :
|
|
31
|
-
= hidden_field_tag :session_id, :
|
|
32
|
-
= field_set_tag
|
|
29
|
+
= form_tag '/advanced', id: 'advanced', class: 'advanced-form', method: 'get' do
|
|
30
|
+
= error_messages_for MarkupUser.new, header_message: 'There are problems with saving user!'
|
|
31
|
+
= hidden_field_tag :session_id, value: '__secret__'
|
|
32
|
+
= field_set_tag 'Advanced', class: 'advanced-field-set' do
|
|
33
33
|
p
|
|
34
|
-
= label_tag :username, :
|
|
35
|
-
= text_field_tag :username, :
|
|
34
|
+
= label_tag :username, class: 'first', caption: 'Nickname'
|
|
35
|
+
= text_field_tag :username, value: params[:username], id: 'the_username'
|
|
36
36
|
p
|
|
37
|
-
= label_tag :password, :
|
|
38
|
-
= password_field_tag :password, :
|
|
37
|
+
= label_tag :password, class: 'first'
|
|
38
|
+
= password_field_tag :password, value: params[:password]
|
|
39
39
|
p
|
|
40
|
-
= label_tag :email, :
|
|
41
|
-
= email_field_tag :email, :
|
|
40
|
+
= label_tag :email, caption: 'Email Address'
|
|
41
|
+
= email_field_tag :email, class: 'string'
|
|
42
42
|
p
|
|
43
|
-
= label_tag :age, :
|
|
44
|
-
= number_field_tag :age, :
|
|
43
|
+
= label_tag :age, class: 'age'
|
|
44
|
+
= number_field_tag :age, class: 'numeric'
|
|
45
45
|
p
|
|
46
|
-
= label_tag :telephone, :
|
|
47
|
-
= telephone_field_tag :telephone, :
|
|
46
|
+
= label_tag :telephone, class: 'telephone'
|
|
47
|
+
= telephone_field_tag :telephone, class: 'numeric'
|
|
48
48
|
p
|
|
49
|
-
= label_tag :webpage, :
|
|
50
|
-
= url_field_tag :webpage, :
|
|
49
|
+
= label_tag :webpage, caption: 'Your Home Page'
|
|
50
|
+
= url_field_tag :webpage, class: 'string'
|
|
51
51
|
p
|
|
52
52
|
= label_tag :search
|
|
53
|
-
= search_field_tag :search, :
|
|
53
|
+
= search_field_tag :search, class: 'string'
|
|
54
54
|
p
|
|
55
|
-
= label_tag :about, :
|
|
56
|
-
= text_area_tag :about, :
|
|
55
|
+
= label_tag :about, class: 'about', caption: "About Me"
|
|
56
|
+
= text_area_tag :about, class: 'large'
|
|
57
57
|
p
|
|
58
|
-
= label_tag :gender, :
|
|
59
|
-
= radio_button_tag :gender, :
|
|
60
|
-
= radio_button_tag :gender, :
|
|
58
|
+
= label_tag :gender, class: 'gender'
|
|
59
|
+
= radio_button_tag :gender, value: 'male', checked: true
|
|
60
|
+
= radio_button_tag :gender, value: 'female'
|
|
61
61
|
p
|
|
62
|
-
= label_tag :photo, :
|
|
63
|
-
= file_field_tag :photo, :
|
|
62
|
+
= label_tag :photo, class: 'photo'
|
|
63
|
+
= file_field_tag :photo, class: 'upload'
|
|
64
64
|
p
|
|
65
65
|
= label_tag :fav_color
|
|
66
|
-
= select_tag :fav_color, :
|
|
66
|
+
= select_tag :fav_color, options: [['green', '1'], ['orange', '2'], ['purple', '3']], selected: '2'
|
|
67
67
|
p
|
|
68
|
-
= check_box_tag :remember_me, :
|
|
68
|
+
= check_box_tag :remember_me, value: '1', checked: true
|
|
69
69
|
p
|
|
70
|
-
= range_field_tag('ranger_with_min_max', :
|
|
71
|
-
= range_field_tag('ranger_with_range', :
|
|
70
|
+
= range_field_tag('ranger_with_min_max', min: 1, max: 50)
|
|
71
|
+
= range_field_tag('ranger_with_range', range: 1..5)
|
|
72
72
|
p
|
|
73
|
-
= datetime_field_tag :datetime, :
|
|
73
|
+
= datetime_field_tag :datetime, max: DateTime.new(2000, 4, 1, 12, 0, 0), min: DateTime.new(1993, 2, 24, 12, 30, 45), value: DateTime.new(2000, 4, 1, 12, 0, 0)
|
|
74
74
|
p
|
|
75
|
-
= datetime_local_field_tag :datetime_local, :
|
|
75
|
+
= datetime_local_field_tag :datetime_local, max: DateTime.new(2000, 4, 1, 12, 0, 0), min: DateTime.new(1993, 2, 24, 12, 30, 45), value: DateTime.new(2000, 4, 1, 12, 0, 0)
|
|
76
76
|
p
|
|
77
|
-
= date_field_tag :date, :
|
|
77
|
+
= date_field_tag :date, max: DateTime.new(2000, 4, 1), min: DateTime.new(1993, 2, 24), value: DateTime.new(2000, 4, 1)
|
|
78
78
|
p
|
|
79
|
-
= month_field_tag :month, :
|
|
79
|
+
= month_field_tag :month, max: DateTime.new(2000, 4, 1), min: DateTime.new(1993, 2, 24), value: DateTime.new(2000, 4, 1)
|
|
80
80
|
p
|
|
81
|
-
= week_field_tag :week, :
|
|
81
|
+
= week_field_tag :week, max: DateTime.new(2000, 4, 1), min: DateTime.new(1993, 2, 24), value: DateTime.new(2000, 4, 1)
|
|
82
82
|
p
|
|
83
|
-
= time_field_tag :time, :
|
|
83
|
+
= time_field_tag :time, max: Time.new(2008, 6, 21, 13, 30, 0), min: Time.new(1993, 2, 24, 1, 19, 12), value: Time.new(2008, 6, 21, 13, 30, 0)
|
|
84
84
|
p
|
|
85
|
-
= color_field_tag :color, :
|
|
85
|
+
= color_field_tag :color, value: '#f00'
|
|
86
86
|
|
|
87
|
-
= field_set_tag(:
|
|
88
|
-
= submit_tag
|
|
89
|
-
= button_tag
|
|
90
|
-
= image_submit_tag
|
|
91
|
-
|
|
92
|
-
= form_tag '/dontprotect', :
|
|
93
|
-
= submit_tag
|
|
87
|
+
= field_set_tag(class: 'buttons') do
|
|
88
|
+
= submit_tag 'Login'
|
|
89
|
+
= button_tag 'Cancel'
|
|
90
|
+
= image_submit_tag 'buttons/submit.png'
|
|
91
|
+
|
|
92
|
+
= form_tag '/dontprotect', class: 'no-protection', protect_from_csrf: false do
|
|
93
|
+
= submit_tag 'Login'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
<%= link_to
|
|
1
|
+
<%= link_to 'Test 1 No Block', '/test1', class: 'test', id: 'test1' %>
|
|
2
2
|
|
|
3
|
-
<% link_to(
|
|
3
|
+
<% link_to('/test2', class: 'test', id: 'test2') do %>
|
|
4
4
|
<span>Test 2 With Block</span>
|
|
5
5
|
<% end %>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
= link_to
|
|
1
|
+
= link_to 'Test 1 No Block', '/test1', class: 'test', id: 'test1'
|
|
2
2
|
|
|
3
|
-
= link_to(
|
|
3
|
+
= link_to('/test2', class: 'test', id: 'test2') do
|
|
4
4
|
%span Test 2 With Block
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
= link_to
|
|
1
|
+
= link_to 'Test 1 No Block', '/test1', class: 'test', id: 'test1'
|
|
2
2
|
|
|
3
|
-
= link_to(
|
|
3
|
+
= link_to('/test2', class: 'test', id: 'test2') do
|
|
4
4
|
span Test 2 With Block
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
<%= meta_tag
|
|
1
|
+
<%= meta_tag 'weblog,news', name: 'keywords' %>
|
|
2
2
|
|
|
3
|
-
<%= meta_tag
|
|
3
|
+
<%= meta_tag 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' %>
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
= meta_tag
|
|
1
|
+
= meta_tag 'weblog,news', name: 'keywords'
|
|
2
2
|
|
|
3
|
-
= meta_tag
|
|
3
|
+
= meta_tag 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
= meta_tag
|
|
1
|
+
= meta_tag 'weblog,news', name: 'keywords'
|
|
2
2
|
|
|
3
|
-
= meta_tag
|
|
3
|
+
= meta_tag 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
<p class="erb"><%= partial 'partials/erb', :
|
|
1
|
+
<p class="erb"><%= partial 'partials/erb', engine: 'erb' %></p>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
%p.haml= partial 'partials/haml', :
|
|
1
|
+
%p.haml= partial 'partials/haml', engine: 'haml'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
p.slim= partial 'partials/slim', :
|
|
1
|
+
p.slim= partial 'partials/slim', engine: 'slim'
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
PADRINO_ROOT =
|
|
1
|
+
PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
|
|
2
2
|
RACK_ENV = 'test' unless defined? RACK_ENV
|
|
3
3
|
|
|
4
4
|
require 'padrino-core'
|
|
5
5
|
|
|
6
6
|
class RenderUser
|
|
7
7
|
attr_accessor :name
|
|
8
|
+
|
|
8
9
|
def initialize(name); @name = name; end
|
|
9
10
|
end
|
|
10
11
|
|
|
@@ -41,43 +42,43 @@ class RenderDemo < Padrino::Application
|
|
|
41
42
|
|
|
42
43
|
# partial with object
|
|
43
44
|
get '/partial/object' do
|
|
44
|
-
partial 'template/user', :
|
|
45
|
+
partial 'template/user', object: RenderUser.new('John'), locals: { extra: 'bar' }
|
|
45
46
|
end
|
|
46
47
|
|
|
47
48
|
# partial with collection
|
|
48
49
|
get '/partial/collection' do
|
|
49
|
-
partial 'template/user', :
|
|
50
|
+
partial 'template/user', collection: [RenderUser.new('John'), RenderUser.new('Billy')], locals: { extra: 'bar' }
|
|
50
51
|
end
|
|
51
52
|
|
|
52
53
|
# partial with collection and ext
|
|
53
54
|
get '/partial/collection.ext' do
|
|
54
|
-
partial 'template/user.haml', :
|
|
55
|
+
partial 'template/user.haml', collection: [RenderUser.new('John'), RenderUser.new('Billy')], locals: { extra: 'bar' }
|
|
55
56
|
end
|
|
56
57
|
|
|
57
58
|
# partial with locals
|
|
58
59
|
get '/partial/locals' do
|
|
59
|
-
partial 'template/user', :
|
|
60
|
+
partial 'template/user', locals: { user: RenderUser.new('John'), extra: 'bar' }
|
|
60
61
|
end
|
|
61
62
|
|
|
62
63
|
# partial starting with forward slash
|
|
63
64
|
get '/partial/foward_slash' do
|
|
64
|
-
partial '/template/user', :
|
|
65
|
+
partial '/template/user', object: RenderUser.new('John'), locals: { extra: 'bar' }
|
|
65
66
|
end
|
|
66
67
|
|
|
67
68
|
# partial with unsafe engine
|
|
68
69
|
get '/partial/unsafe' do
|
|
69
|
-
block = params[:block] ? proc{ params[:block] } : nil
|
|
70
|
+
block = params[:block] ? proc { params[:block] } : nil
|
|
70
71
|
partial 'unsafe.html.builder', &block
|
|
71
72
|
end
|
|
72
73
|
|
|
73
74
|
get '/partial/unsafe_one' do
|
|
74
|
-
block = params[:block] ? proc{ params[:block] } : nil
|
|
75
|
-
partial 'unsafe_object', :
|
|
75
|
+
block = params[:block] ? proc { params[:block] } : nil
|
|
76
|
+
partial 'unsafe_object', object: 'Mary', &block
|
|
76
77
|
end
|
|
77
78
|
|
|
78
79
|
get '/partial/unsafe_many' do
|
|
79
|
-
block = params[:block] ? proc{ params[:block] } : nil
|
|
80
|
-
partial 'unsafe_object', :
|
|
80
|
+
block = params[:block] ? proc { params[:block] } : nil
|
|
81
|
+
partial 'unsafe_object', collection: %w[John Mary], &block
|
|
81
82
|
end
|
|
82
83
|
|
|
83
84
|
get '/render_block_:ext' do
|
|
@@ -99,7 +100,7 @@ class RenderDemo < Padrino::Application
|
|
|
99
100
|
render "dive_inner_#{ext}"
|
|
100
101
|
end
|
|
101
102
|
# @current_engine = save
|
|
102
|
-
content_tag('div', form_result, :
|
|
103
|
+
content_tag('div', form_result, class: 'wrapper')
|
|
103
104
|
end
|
|
104
105
|
end
|
|
105
106
|
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
xml.h1 'User name is John'
|
|
2
|
-
xml.div{ |x| x << yield } if block_given?
|
|
2
|
+
xml.div { |x| x << yield } if block_given?
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
xml.h1 "User name is #{unsafe_object}"
|
|
2
|
-
xml.div{ |x| x << yield } if block_given?
|
|
2
|
+
xml.div { |x| x << yield } if block_given?
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
%p.start= current_engine
|
|
2
|
-
%p.haml= partial "current_engines/haml", :
|
|
3
|
-
%p.erb= partial 'current_engines/erb', :
|
|
4
|
-
%p.slim= partial 'current_engines/slim', :
|
|
2
|
+
%p.haml= partial "current_engines/haml", engine: :haml
|
|
3
|
+
%p.erb= partial 'current_engines/erb', engine: :erb
|
|
4
|
+
%p.slim= partial 'current_engines/slim', engine: :slim
|
|
5
5
|
%p.end= current_engine
|