formtastic 3.1.1 → 4.0.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.gitattributes +1 -0
- data/.gitignore +3 -2
- data/.travis.yml +29 -24
- data/CHANGELOG.md +49 -0
- data/DEPRECATIONS +4 -1
- data/Gemfile.lock +104 -0
- data/{README.textile → README.md} +178 -166
- data/Rakefile +20 -1
- data/app/assets/stylesheets/formtastic.css +1 -1
- data/bin/appraisal +8 -0
- data/formtastic.gemspec +9 -15
- data/gemfiles/rails_5.2/Gemfile +5 -0
- data/gemfiles/rails_6.0/Gemfile +5 -0
- data/gemfiles/rails_edge/Gemfile +13 -0
- data/lib/formtastic.rb +9 -11
- data/lib/formtastic/actions.rb +6 -3
- data/lib/formtastic/deprecation.rb +1 -38
- data/lib/formtastic/engine.rb +3 -1
- data/lib/formtastic/form_builder.rb +11 -24
- data/lib/formtastic/helpers.rb +1 -1
- data/lib/formtastic/helpers/action_helper.rb +1 -48
- data/lib/formtastic/helpers/enum.rb +13 -0
- data/lib/formtastic/helpers/errors_helper.rb +2 -2
- data/lib/formtastic/helpers/fieldset_wrapper.rb +13 -9
- data/lib/formtastic/helpers/form_helper.rb +1 -1
- data/lib/formtastic/helpers/input_helper.rb +23 -77
- data/lib/formtastic/helpers/inputs_helper.rb +27 -22
- data/lib/formtastic/i18n.rb +1 -1
- data/lib/formtastic/inputs.rb +32 -29
- data/lib/formtastic/inputs/base/choices.rb +1 -1
- data/lib/formtastic/inputs/base/collections.rb +43 -10
- data/lib/formtastic/inputs/base/database.rb +7 -2
- data/lib/formtastic/inputs/base/errors.rb +4 -4
- data/lib/formtastic/inputs/base/hints.rb +1 -1
- data/lib/formtastic/inputs/base/html.rb +7 -6
- data/lib/formtastic/inputs/base/naming.rb +4 -4
- data/lib/formtastic/inputs/base/options.rb +2 -3
- data/lib/formtastic/inputs/base/timeish.rb +5 -1
- data/lib/formtastic/inputs/base/validations.rb +38 -12
- data/lib/formtastic/inputs/check_boxes_input.rb +13 -5
- data/lib/formtastic/inputs/color_input.rb +0 -1
- data/lib/formtastic/inputs/country_input.rb +3 -1
- data/lib/formtastic/inputs/radio_input.rb +20 -0
- data/lib/formtastic/inputs/select_input.rb +29 -1
- data/lib/formtastic/inputs/time_zone_input.rb +16 -6
- data/lib/formtastic/localizer.rb +20 -22
- data/lib/formtastic/namespaced_class_finder.rb +1 -1
- data/lib/formtastic/version.rb +1 -1
- data/lib/generators/formtastic/form/form_generator.rb +1 -1
- data/lib/generators/formtastic/input/input_generator.rb +46 -0
- data/lib/generators/templates/formtastic.rb +14 -13
- data/lib/generators/templates/input.rb +19 -0
- data/script/integration-template.rb +71 -0
- data/script/integration.sh +19 -0
- data/spec/action_class_finder_spec.rb +1 -1
- data/spec/actions/button_action_spec.rb +8 -8
- data/spec/actions/generic_action_spec.rb +60 -60
- data/spec/actions/input_action_spec.rb +7 -7
- data/spec/actions/link_action_spec.rb +10 -10
- data/spec/builder/custom_builder_spec.rb +36 -20
- data/spec/builder/error_proc_spec.rb +4 -4
- data/spec/builder/semantic_fields_for_spec.rb +27 -27
- data/spec/fast_spec_helper.rb +12 -0
- data/spec/generators/formtastic/form/form_generator_spec.rb +25 -25
- data/spec/generators/formtastic/input/input_generator_spec.rb +124 -0
- data/spec/generators/formtastic/install/install_generator_spec.rb +9 -9
- data/spec/helpers/action_helper_spec.rb +328 -10
- data/spec/helpers/actions_helper_spec.rb +17 -17
- data/spec/helpers/form_helper_spec.rb +37 -37
- data/spec/helpers/input_helper_spec.rb +975 -2
- data/spec/helpers/inputs_helper_spec.rb +120 -105
- data/spec/helpers/reflection_helper_spec.rb +3 -3
- data/spec/helpers/semantic_errors_helper_spec.rb +22 -22
- data/spec/i18n_spec.rb +26 -26
- data/spec/input_class_finder_spec.rb +1 -1
- data/spec/inputs/base/collections_spec.rb +76 -0
- data/spec/inputs/base/validations_spec.rb +480 -0
- data/spec/inputs/boolean_input_spec.rb +55 -55
- data/spec/inputs/check_boxes_input_spec.rb +155 -108
- data/spec/inputs/color_input_spec.rb +51 -63
- data/spec/inputs/country_input_spec.rb +20 -20
- data/spec/inputs/custom_input_spec.rb +2 -6
- data/spec/inputs/datalist_input_spec.rb +1 -1
- data/spec/inputs/date_picker_input_spec.rb +42 -42
- data/spec/inputs/date_select_input_spec.rb +51 -37
- data/spec/inputs/datetime_picker_input_spec.rb +46 -46
- data/spec/inputs/datetime_select_input_spec.rb +53 -37
- data/spec/inputs/email_input_spec.rb +5 -5
- data/spec/inputs/file_input_spec.rb +6 -6
- data/spec/inputs/hidden_input_spec.rb +18 -18
- data/spec/inputs/include_blank_spec.rb +8 -8
- data/spec/inputs/label_spec.rb +20 -20
- data/spec/inputs/number_input_spec.rb +112 -112
- data/spec/inputs/password_input_spec.rb +5 -5
- data/spec/inputs/phone_input_spec.rb +5 -5
- data/spec/inputs/placeholder_spec.rb +5 -5
- data/spec/inputs/radio_input_spec.rb +84 -58
- data/spec/inputs/range_input_spec.rb +66 -66
- data/spec/inputs/readonly_spec.rb +50 -0
- data/spec/inputs/search_input_spec.rb +5 -5
- data/spec/inputs/select_input_spec.rb +149 -93
- data/spec/inputs/string_input_spec.rb +23 -23
- data/spec/inputs/text_input_spec.rb +16 -16
- data/spec/inputs/time_picker_input_spec.rb +43 -43
- data/spec/inputs/time_select_input_spec.rb +67 -54
- data/spec/inputs/time_zone_input_spec.rb +54 -28
- data/spec/inputs/url_input_spec.rb +5 -5
- data/spec/inputs/with_options_spec.rb +7 -7
- data/spec/localizer_spec.rb +17 -17
- data/spec/namespaced_class_finder_spec.rb +2 -2
- data/spec/schema.rb +21 -0
- data/spec/spec_helper.rb +165 -253
- data/spec/support/custom_macros.rb +72 -75
- data/spec/support/shared_examples.rb +0 -1232
- data/spec/support/test_environment.rb +23 -9
- metadata +67 -174
- data/Appraisals +0 -29
- data/CHANGELOG +0 -31
- data/gemfiles/rails_3.2.gemfile +0 -7
- data/gemfiles/rails_4.0.4.gemfile +0 -7
- data/gemfiles/rails_4.1.gemfile +0 -7
- data/gemfiles/rails_4.2.gemfile +0 -7
- data/gemfiles/rails_4.gemfile +0 -7
- data/gemfiles/rails_edge.gemfile +0 -10
- data/lib/formtastic/util.rb +0 -53
- data/spec/helpers/namespaced_action_helper_spec.rb +0 -43
- data/spec/helpers/namespaced_input_helper_spec.rb +0 -36
- data/spec/support/deferred_garbage_collection.rb +0 -21
- data/spec/util_spec.rb +0 -66
data/lib/formtastic/localizer.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
module Formtastic
|
2
|
-
# Implementation for looking up localized values within Formtastic using I18n, if no
|
2
|
+
# Implementation for looking up localized values within Formtastic using I18n, if no
|
3
3
|
# explicit value (like the `:label` option) is set and I18n-lookups are enabled in the
|
4
4
|
# configuration.
|
5
5
|
#
|
@@ -28,50 +28,50 @@ module Formtastic
|
|
28
28
|
def get(key)
|
29
29
|
cache[key]
|
30
30
|
end
|
31
|
-
|
31
|
+
|
32
32
|
def has_key?(key)
|
33
33
|
cache.has_key?(key)
|
34
34
|
end
|
35
|
-
|
35
|
+
|
36
36
|
def set(key, result)
|
37
37
|
cache[key] = result
|
38
38
|
end
|
39
|
-
|
39
|
+
|
40
40
|
def cache
|
41
41
|
@cache ||= {}
|
42
42
|
end
|
43
|
-
|
43
|
+
|
44
44
|
def clear!
|
45
45
|
cache.clear
|
46
46
|
end
|
47
47
|
end
|
48
|
-
|
48
|
+
|
49
49
|
attr_accessor :builder
|
50
|
-
|
50
|
+
|
51
51
|
def self.cache
|
52
52
|
@cache ||= Cache.new
|
53
53
|
end
|
54
|
-
|
54
|
+
|
55
55
|
def initialize(current_builder)
|
56
|
-
self.builder = current_builder
|
56
|
+
self.builder = current_builder
|
57
57
|
end
|
58
58
|
|
59
59
|
def localize(key, value, type, options = {}) # @private
|
60
60
|
key = value if value.is_a?(::Symbol)
|
61
|
-
|
61
|
+
|
62
62
|
if value.is_a?(::String)
|
63
63
|
escape_html_entities(value)
|
64
64
|
else
|
65
65
|
use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
|
66
66
|
use_cache = i18n_cache_lookups
|
67
67
|
cache = self.class.cache
|
68
|
-
|
68
|
+
|
69
69
|
if use_i18n
|
70
70
|
model_name, nested_model_name = normalize_model_name(builder.model_name.underscore)
|
71
71
|
|
72
72
|
action_name = builder.template.params[:action].to_s rescue ''
|
73
73
|
attribute_name = key.to_s
|
74
|
-
|
74
|
+
|
75
75
|
# look in the cache first
|
76
76
|
if use_cache
|
77
77
|
cache_key = [::I18n.locale, action_name, model_name, nested_model_name, attribute_name, key, value, type, options]
|
@@ -86,7 +86,7 @@ module Formtastic
|
|
86
86
|
i18n_path.gsub!('%{model}', model_name)
|
87
87
|
i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
|
88
88
|
i18n_path.gsub!('%{attribute}', attribute_name)
|
89
|
-
i18n_path.
|
89
|
+
i18n_path.tr!('..', '.')
|
90
90
|
i18n_path.to_sym
|
91
91
|
end
|
92
92
|
defaults << ''
|
@@ -101,9 +101,9 @@ module Formtastic
|
|
101
101
|
# This is effectively what Rails label helper does for i18n lookup
|
102
102
|
options[:scope] = [:helpers, type]
|
103
103
|
options[:default] = defaults
|
104
|
-
i18n_value = ::I18n.t(default_key, options)
|
104
|
+
i18n_value = ::I18n.t(default_key, **options)
|
105
105
|
end
|
106
|
-
|
106
|
+
|
107
107
|
# save the result to the cache
|
108
108
|
result = (i18n_value.is_a?(::String) && i18n_value.present?) ? escape_html_entities(i18n_value) : nil
|
109
109
|
cache.set(cache_key, result) if use_cache
|
@@ -115,16 +115,14 @@ module Formtastic
|
|
115
115
|
protected
|
116
116
|
|
117
117
|
def normalize_model_name(name)
|
118
|
-
if
|
119
|
-
#
|
120
|
-
|
121
|
-
elsif name =~ /(.+)\[(.+)\]/
|
122
|
-
# Rails 3 (and 3.1?) nested builder case with :post rather than @post
|
118
|
+
if name =~ /(.+)\[(.+)\]/
|
119
|
+
# Nested builder case with :post rather than @post
|
120
|
+
# TODO: check if this is no longer required with a minimum of Rails 4.1
|
123
121
|
[$1, $2]
|
124
122
|
elsif builder.respond_to?(:options) && builder.options.key?(:as)
|
125
123
|
[builder.options[:as].to_s]
|
126
124
|
elsif builder.respond_to?(:options) && builder.options.key?(:parent_builder)
|
127
|
-
# Rails 3.0 nested builder work-around case, where :parent_builder is provided by f.semantic_form_for
|
125
|
+
# Rails 3.0+ nested builder work-around case, where :parent_builder is provided by f.semantic_form_for
|
128
126
|
[builder.options[:parent_builder].object_name.to_s, name]
|
129
127
|
else
|
130
128
|
# Non-nested case
|
@@ -143,7 +141,7 @@ module Formtastic
|
|
143
141
|
def i18n_lookups_by_default
|
144
142
|
builder.i18n_lookups_by_default
|
145
143
|
end
|
146
|
-
|
144
|
+
|
147
145
|
def i18n_cache_lookups
|
148
146
|
builder.i18n_cache_lookups
|
149
147
|
end
|
@@ -29,7 +29,7 @@ module Formtastic
|
|
29
29
|
end
|
30
30
|
|
31
31
|
def self.use_const_defined?
|
32
|
-
defined?(Rails) && ::Rails.application && ::Rails.application.config.eager_load
|
32
|
+
defined?(Rails) && ::Rails.application && ::Rails.application.config.respond_to?(:eager_load) && ::Rails.application.config.eager_load
|
33
33
|
end
|
34
34
|
|
35
35
|
# @param namespaces [Array<Module>]
|
data/lib/formtastic/version.rb
CHANGED
@@ -75,7 +75,7 @@ module Formtastic
|
|
75
75
|
# Skips Active Record Timestamps.
|
76
76
|
def content_columns
|
77
77
|
model.content_columns.select do |column|
|
78
|
-
!Formtastic::
|
78
|
+
!Formtastic::FormBuilder.skipped_columns.include? column.name.to_sym
|
79
79
|
end
|
80
80
|
end
|
81
81
|
|
@@ -0,0 +1,46 @@
|
|
1
|
+
module Formtastic
|
2
|
+
|
3
|
+
# Modify existing inputs, subclass them, or create your own from scratch.
|
4
|
+
# @example
|
5
|
+
# !!!shell
|
6
|
+
# $ rails generate formtastic:input HatSize
|
7
|
+
|
8
|
+
# @example Define input name using underscore convention
|
9
|
+
# !!!shell
|
10
|
+
# $ rails generate formtastic:input hat_size
|
11
|
+
|
12
|
+
# @example Override an existing input behavior
|
13
|
+
# !!!shell
|
14
|
+
# $ rails generate formtastic:input string --extend
|
15
|
+
|
16
|
+
# @example Extend an existing input behavior
|
17
|
+
# !!!shell
|
18
|
+
# $ rails generate formtastic:input FlexibleText --extend string
|
19
|
+
class InputGenerator < Rails::Generators::NamedBase
|
20
|
+
|
21
|
+
argument :name, :type => :string, :required => true, :banner => 'FILE_NAME'
|
22
|
+
|
23
|
+
source_root File.expand_path('../../../templates', __FILE__)
|
24
|
+
|
25
|
+
class_option :extend
|
26
|
+
|
27
|
+
def create
|
28
|
+
normalize_file_name
|
29
|
+
define_extension_sentence
|
30
|
+
template "input.rb", "app/inputs/#{name.underscore}_input.rb"
|
31
|
+
end
|
32
|
+
|
33
|
+
protected
|
34
|
+
|
35
|
+
def normalize_file_name
|
36
|
+
name.chomp!("Input") if name.ends_with?("Input")
|
37
|
+
name.chomp!("_input") if name.ends_with?("_input")
|
38
|
+
name.chomp!("input") if name.ends_with?("input")
|
39
|
+
end
|
40
|
+
|
41
|
+
def define_extension_sentence
|
42
|
+
@extension_sentence = "< Formtastic::Inputs::#{name.camelize}Input" if options[:extend] == "extend"
|
43
|
+
@extension_sentence ||= "< Formtastic::Inputs::#{options[:extend].camelize}Input" if options[:extend]
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
@@ -17,15 +17,15 @@
|
|
17
17
|
# Defaults to true.
|
18
18
|
# Formtastic::FormBuilder.include_blank_for_select_by_default = true
|
19
19
|
|
20
|
-
# Set the string that will be appended to the labels/fieldsets which are required
|
20
|
+
# Set the string that will be appended to the labels/fieldsets which are required.
|
21
21
|
# It accepts string or procs and the default is a localized version of
|
22
22
|
# '<abbr title="required">*</abbr>'. In other words, if you configure formtastic.required
|
23
23
|
# in your locale, it will replace the abbr title properly. But if you don't want to use
|
24
|
-
# abbr tag, you can simply give a string as below
|
24
|
+
# abbr tag, you can simply give a string as below.
|
25
25
|
# Formtastic::FormBuilder.required_string = "(required)"
|
26
26
|
|
27
|
-
# Set the string that will be appended to the labels/fieldsets which are optional
|
28
|
-
# Defaults to an empty string ("") and also accepts procs (see required_string above)
|
27
|
+
# Set the string that will be appended to the labels/fieldsets which are optional.
|
28
|
+
# Defaults to an empty string ("") and also accepts procs (see required_string above).
|
29
29
|
# Formtastic::FormBuilder.optional_string = "(optional)"
|
30
30
|
|
31
31
|
# Set the way inline errors will be displayed.
|
@@ -33,7 +33,7 @@
|
|
33
33
|
# Formtastic::FormBuilder.inline_errors = :sentence
|
34
34
|
# Formtastic uses the following classes as default for hints, inline_errors and error list
|
35
35
|
|
36
|
-
# If you override the class here, please ensure to override it in your stylesheets as well
|
36
|
+
# If you override the class here, please ensure to override it in your stylesheets as well.
|
37
37
|
# Formtastic::FormBuilder.default_hint_class = "inline-hints"
|
38
38
|
# Formtastic::FormBuilder.default_inline_error_class = "inline-errors"
|
39
39
|
# Formtastic::FormBuilder.default_error_list_class = "errors"
|
@@ -70,7 +70,7 @@
|
|
70
70
|
# can change it to any class you want.
|
71
71
|
# Formtastic::Helpers::FormHelper.default_form_class = 'formtastic'
|
72
72
|
|
73
|
-
# Formtastic will infer a class name from the model, array, string
|
73
|
+
# Formtastic will infer a class name from the model, array, string or symbol you pass to the
|
74
74
|
# form builder. You can customize the way that class is presented by overriding
|
75
75
|
# this proc.
|
76
76
|
# Formtastic::Helpers::FormHelper.default_form_model_class_proc = proc { |model_class_name| model_class_name }
|
@@ -85,15 +85,14 @@
|
|
85
85
|
# Formtastic::FormBuilder.use_required_attribute = false
|
86
86
|
|
87
87
|
# You can opt-in to new HTML5 browser validations (for things like email and url inputs) by setting
|
88
|
-
# this to true. Doing so will
|
88
|
+
# this to true. Doing so will omit the `novalidate` attribute from the `<form>` tag.
|
89
89
|
# See http://diveintohtml5.org/forms.html#validation for more info.
|
90
90
|
# Formtastic::FormBuilder.perform_browser_validations = true
|
91
91
|
|
92
92
|
# By creating custom input class finder, you can change how input classes are looked up.
|
93
93
|
# For example you can make it to search for TextInputFilter instead of TextInput.
|
94
|
-
# See
|
95
|
-
#
|
96
|
-
Formtastic::FormBuilder.input_class_finder = Formtastic::InputClassFinder
|
94
|
+
# See https://github.com/justinfrench/formtastic/wiki/Custom-Class-Finders
|
95
|
+
# Formtastic::FormBuilder.input_class_finder = Formtastic::InputClassFinder
|
97
96
|
|
98
97
|
# Define custom namespaces in which to look up your Input classes. Default is
|
99
98
|
# to look up in the global scope and in Formtastic::Inputs.
|
@@ -101,10 +100,12 @@ Formtastic::FormBuilder.input_class_finder = Formtastic::InputClassFinder
|
|
101
100
|
|
102
101
|
# By creating custom action class finder, you can change how action classes are looked up.
|
103
102
|
# For example you can make it to search for MyButtonAction instead of ButtonAction.
|
104
|
-
# See
|
105
|
-
#
|
106
|
-
Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
|
103
|
+
# See https://github.com/justinfrench/formtastic/wiki/Custom-Class-Finders
|
104
|
+
# Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
|
107
105
|
|
108
106
|
# Define custom namespaces in which to look up your Action classes. Default is
|
109
107
|
# to look up in the global scope and in Formtastic::Actions.
|
110
108
|
# Formtastic::FormBuilder.action_namespaces = [ ::Object, ::MyActionsModule, ::Formtastic::Actions ]
|
109
|
+
|
110
|
+
# Which columns to skip when automatically rendering a form without any fields specified.
|
111
|
+
# Formtastic::FormBuilder.skipped_columns = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
|
@@ -0,0 +1,19 @@
|
|
1
|
+
class <%= name.camelize %>Input <%= @extension_sentence %>
|
2
|
+
<%- if !options[:extend] -%>
|
3
|
+
include Formtastic::Inputs::Base
|
4
|
+
<%- end -%>
|
5
|
+
|
6
|
+
<%- if !options[:extend] || (options[:extend] == "extend") -%>
|
7
|
+
def to_html
|
8
|
+
# Add your custom input definition here.
|
9
|
+
<%- if options[:extend] == "extend" -%>
|
10
|
+
super
|
11
|
+
<%- end -%>
|
12
|
+
end
|
13
|
+
|
14
|
+
<%- else -%>
|
15
|
+
def input_html_options
|
16
|
+
# Add your custom input extension here.
|
17
|
+
end
|
18
|
+
<%- end -%>
|
19
|
+
end
|
@@ -0,0 +1,71 @@
|
|
1
|
+
gem 'formtastic', path: '..'
|
2
|
+
gem 'bcrypt', '~> 3.1.7'
|
3
|
+
gem 'rails-dom-testing', group: :test
|
4
|
+
|
5
|
+
# to speed up travis install, reuse the bundle path
|
6
|
+
def bundle_path
|
7
|
+
File.expand_path ENV.fetch('BUNDLE_PATH', 'vendor/bundle'), ENV['TRAVIS_BUILD_DIR']
|
8
|
+
end
|
9
|
+
|
10
|
+
if Rails.version >= '6.1'
|
11
|
+
gsub_file 'Gemfile', /gem 'rails'.*/, "gem 'rails', '~> #{Rails.version}', github: 'rails/rails'"
|
12
|
+
elsif Rails.version >= '6.0'
|
13
|
+
gsub_file 'Gemfile', /gem 'rails'.*/, "gem 'rails', '~> #{Rails.version}', github: 'rails/rails', branch: '6-0-stable'"
|
14
|
+
elsif Rails.version >= '5.2'
|
15
|
+
gsub_file 'Gemfile', /gem 'rails'.*/, "gem 'rails', '~> #{Rails.version}', github: 'rails/rails', branch: '5-2-stable'"
|
16
|
+
end
|
17
|
+
|
18
|
+
### Ensure Dummy App's Ruby version matches the current environments Ruby Version
|
19
|
+
ruby_version = "ruby '#{RUBY_VERSION}'"
|
20
|
+
gsub_file 'Gemfile', /ruby '\d+.\d+.\d+'/, ruby_version
|
21
|
+
|
22
|
+
if File.directory?(bundle_path) && bundle_install?
|
23
|
+
def run_bundle
|
24
|
+
previous_bundle_path = bundle_path
|
25
|
+
|
26
|
+
require "bundler"
|
27
|
+
Bundler.with_clean_env do
|
28
|
+
system("bundle install --jobs=3 --retry=3 --path=#{previous_bundle_path}")
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
32
|
+
|
33
|
+
in_root do
|
34
|
+
ENV['BUNDLE_GEMFILE'] = File.expand_path('Gemfile')
|
35
|
+
end
|
36
|
+
|
37
|
+
formtastic = -> do
|
38
|
+
generate(:scaffold, 'user name:string password:digest')
|
39
|
+
generate('formtastic:install')
|
40
|
+
generate('formtastic:form', 'user name password:password --force')
|
41
|
+
|
42
|
+
rails_command('db:migrate')
|
43
|
+
|
44
|
+
in_root do
|
45
|
+
inject_into_class 'app/models/user.rb', 'User', " has_secure_password\n"
|
46
|
+
inject_into_file 'app/assets/stylesheets/application.css', " *= require formtastic\n", before: ' *= require_self'
|
47
|
+
inject_into_class 'test/controllers/users_controller_test.rb', 'UsersControllerTest', <<-RUBY
|
48
|
+
|
49
|
+
test "should show form" do
|
50
|
+
get edit_user_path(@user)
|
51
|
+
|
52
|
+
assert_select 'form' do
|
53
|
+
assert_select 'li.input.string' do
|
54
|
+
assert_select 'input#user_name[type=text]'
|
55
|
+
end
|
56
|
+
assert_select 'li.input.password' do
|
57
|
+
assert_select 'input#user_password[type=password]'
|
58
|
+
end
|
59
|
+
|
60
|
+
assert_select 'fieldset.actions' do
|
61
|
+
assert_select 'li.action.input_action' do
|
62
|
+
assert_select 'input[type=submit]'
|
63
|
+
end
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end # test "should show form"
|
67
|
+
RUBY
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
after_bundle(&formtastic)
|
@@ -0,0 +1,19 @@
|
|
1
|
+
#!/usr/bin/env sh
|
2
|
+
|
3
|
+
set -e
|
4
|
+
set -o verbose
|
5
|
+
|
6
|
+
test_app=dummy
|
7
|
+
|
8
|
+
rm -rf ${test_app}
|
9
|
+
|
10
|
+
bundle exec rails new ${test_app} \
|
11
|
+
--template=$(dirname "$0")/integration-template.rb \
|
12
|
+
--skip-bootsnap \
|
13
|
+
--skip-javascript \
|
14
|
+
--skip-spring \
|
15
|
+
--skip-turbolinks
|
16
|
+
|
17
|
+
cd ${test_app} && export BUNDLE_GEMFILE=Gemfile
|
18
|
+
|
19
|
+
bundle exec rake test
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
require 'spec_helper'
|
3
3
|
|
4
|
-
describe 'ButtonAction', 'when submitting' do
|
4
|
+
RSpec.describe 'ButtonAction', 'when submitting' do
|
5
5
|
|
6
6
|
include FormtasticSpecHelper
|
7
7
|
|
@@ -15,12 +15,12 @@ describe 'ButtonAction', 'when submitting' do
|
|
15
15
|
end
|
16
16
|
|
17
17
|
it 'should render a submit type of button' do
|
18
|
-
output_buffer.
|
18
|
+
expect(output_buffer).to have_tag('li.action.button_action button[@type="submit"]')
|
19
19
|
end
|
20
20
|
|
21
21
|
end
|
22
22
|
|
23
|
-
describe 'ButtonAction', 'when resetting' do
|
23
|
+
RSpec.describe 'ButtonAction', 'when resetting' do
|
24
24
|
|
25
25
|
include FormtasticSpecHelper
|
26
26
|
|
@@ -34,16 +34,16 @@ describe 'ButtonAction', 'when resetting' do
|
|
34
34
|
end
|
35
35
|
|
36
36
|
it 'should render a reset type of button' do
|
37
|
-
output_buffer.
|
37
|
+
expect(output_buffer).to have_tag('li.action.button_action button[@type="reset"]', :text => "Reset Post")
|
38
38
|
end
|
39
39
|
|
40
40
|
it 'should not render a value attribute' do
|
41
|
-
output_buffer.
|
41
|
+
expect(output_buffer).not_to have_tag('li.action.button_action button[@value]')
|
42
42
|
end
|
43
43
|
|
44
44
|
end
|
45
45
|
|
46
|
-
describe 'InputAction', 'when cancelling' do
|
46
|
+
RSpec.describe 'InputAction', 'when cancelling' do
|
47
47
|
|
48
48
|
include FormtasticSpecHelper
|
49
49
|
|
@@ -53,11 +53,11 @@ describe 'InputAction', 'when cancelling' do
|
|
53
53
|
end
|
54
54
|
|
55
55
|
it 'should raise an error' do
|
56
|
-
|
56
|
+
expect {
|
57
57
|
concat(semantic_form_for(@new_post) do |builder|
|
58
58
|
concat(builder.action(:cancel, :as => :button))
|
59
59
|
end)
|
60
|
-
}.
|
60
|
+
}.to raise_error(Formtastic::UnsupportedMethodForAction)
|
61
61
|
end
|
62
62
|
|
63
63
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
require 'spec_helper'
|
3
3
|
|
4
|
-
describe 'InputAction::Base' do
|
4
|
+
RSpec.describe 'InputAction::Base' do
|
5
5
|
|
6
6
|
# Most basic Action class to test Base
|
7
7
|
class ::GenericAction
|
@@ -36,15 +36,15 @@ describe 'InputAction::Base' do
|
|
36
36
|
end
|
37
37
|
|
38
38
|
it 'should add the #foo id to the li' do
|
39
|
-
output_buffer.
|
39
|
+
expect(output_buffer).to have_tag('li#post_submit_action')
|
40
40
|
end
|
41
41
|
|
42
42
|
it 'should add the .action and .generic_action classes to the li' do
|
43
|
-
output_buffer.
|
43
|
+
expect(output_buffer).to have_tag('li.action.generic_action')
|
44
44
|
end
|
45
45
|
|
46
46
|
it 'should pass :wrapper_html HTML attributes to the wrapper' do
|
47
|
-
output_buffer.
|
47
|
+
expect(output_buffer).to have_tag('li.action.generic_action[@foo="bah"]')
|
48
48
|
end
|
49
49
|
|
50
50
|
context "when a custom :id is provided" do
|
@@ -58,7 +58,7 @@ describe 'InputAction::Base' do
|
|
58
58
|
end
|
59
59
|
|
60
60
|
it "should use the custom id" do
|
61
|
-
output_buffer.
|
61
|
+
expect(output_buffer).to have_tag('li#foo_bah_bing')
|
62
62
|
end
|
63
63
|
|
64
64
|
end
|
@@ -74,7 +74,7 @@ describe 'InputAction::Base' do
|
|
74
74
|
end
|
75
75
|
|
76
76
|
it "should add the custom class strng to the existing classes" do
|
77
|
-
output_buffer.
|
77
|
+
expect(output_buffer).to have_tag('li.action.generic_action.foo_bah_bing')
|
78
78
|
end
|
79
79
|
|
80
80
|
end
|
@@ -90,7 +90,7 @@ describe 'InputAction::Base' do
|
|
90
90
|
end
|
91
91
|
|
92
92
|
it "should add the custom class strng to the existing classes" do
|
93
|
-
output_buffer.
|
93
|
+
expect(output_buffer).to have_tag('li.action.generic_action.foo_bah_bing.zing_boo')
|
94
94
|
end
|
95
95
|
|
96
96
|
end
|
@@ -108,7 +108,7 @@ describe 'InputAction::Base' do
|
|
108
108
|
end
|
109
109
|
|
110
110
|
it 'should pass :button_html HTML attributes to the button' do
|
111
|
-
output_buffer.
|
111
|
+
expect(output_buffer).to have_tag('li.action.generic_action input[@foo="bah"]')
|
112
112
|
end
|
113
113
|
|
114
114
|
it 'should respect a default_commit_button_accesskey configuration with nil' do
|
@@ -116,7 +116,7 @@ describe 'InputAction::Base' do
|
|
116
116
|
concat(semantic_form_for(@new_post) do |builder|
|
117
117
|
concat(builder.action(:submit, :as => :generic))
|
118
118
|
end)
|
119
|
-
output_buffer.
|
119
|
+
expect(output_buffer).not_to have_tag('li.action input[@accesskey]')
|
120
120
|
end
|
121
121
|
end
|
122
122
|
|
@@ -125,7 +125,7 @@ describe 'InputAction::Base' do
|
|
125
125
|
concat(semantic_form_for(@new_post) do |builder|
|
126
126
|
concat(builder.action(:submit, :as => :generic))
|
127
127
|
end)
|
128
|
-
output_buffer.
|
128
|
+
expect(output_buffer).to have_tag('li.action input[@accesskey="s"]')
|
129
129
|
end
|
130
130
|
end
|
131
131
|
|
@@ -134,8 +134,8 @@ describe 'InputAction::Base' do
|
|
134
134
|
concat(semantic_form_for(@new_post) do |builder|
|
135
135
|
concat(builder.action(:submit, :as => :generic, :accesskey => 'o'))
|
136
136
|
end)
|
137
|
-
output_buffer.
|
138
|
-
output_buffer.
|
137
|
+
expect(output_buffer).not_to have_tag('li.action input[@accesskey="s"]')
|
138
|
+
expect(output_buffer).to have_tag('li.action input[@accesskey="o"]')
|
139
139
|
end
|
140
140
|
end
|
141
141
|
|
@@ -152,9 +152,9 @@ describe 'InputAction::Base' do
|
|
152
152
|
concat(builder.action(:reset, :as => :generic, :label => "Reset!"))
|
153
153
|
concat(builder.action(:cancel, :as => :generic, :label => "Cancel!"))
|
154
154
|
end)
|
155
|
-
output_buffer.
|
156
|
-
output_buffer.
|
157
|
-
output_buffer.
|
155
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Click!"]')
|
156
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Reset!"]')
|
157
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel!"]')
|
158
158
|
end
|
159
159
|
end
|
160
160
|
|
@@ -185,9 +185,9 @@ describe 'InputAction::Base' do
|
|
185
185
|
concat(builder.action(:reset, :as => :generic))
|
186
186
|
concat(builder.action(:cancel, :as => :generic))
|
187
187
|
end)
|
188
|
-
output_buffer.
|
189
|
-
output_buffer.
|
190
|
-
output_buffer.
|
188
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Submit Post"]')
|
189
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel Post"]')
|
190
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Reset Post"]')
|
191
191
|
end
|
192
192
|
|
193
193
|
it 'should render an input with custom resource name localized label' do
|
@@ -196,9 +196,9 @@ describe 'InputAction::Base' do
|
|
196
196
|
concat(builder.action(:reset, :as => :generic))
|
197
197
|
concat(builder.action(:cancel, :as => :generic))
|
198
198
|
end)
|
199
|
-
output_buffer.
|
200
|
-
output_buffer.
|
201
|
-
output_buffer.
|
199
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Submit message"]')
|
200
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel message"]')
|
201
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Reset message"]')
|
202
202
|
end
|
203
203
|
end
|
204
204
|
|
@@ -237,9 +237,9 @@ describe 'InputAction::Base' do
|
|
237
237
|
concat(builder.action(:reset, :as => :generic))
|
238
238
|
concat(builder.action(:cancel, :as => :generic))
|
239
239
|
end)
|
240
|
-
output_buffer.
|
241
|
-
output_buffer.
|
242
|
-
output_buffer.
|
240
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Submit Post"]})
|
241
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset Post"]})
|
242
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel Post"]})
|
243
243
|
end
|
244
244
|
end
|
245
245
|
|
@@ -250,9 +250,9 @@ describe 'InputAction::Base' do
|
|
250
250
|
concat(builder.action(:reset, :as => :generic))
|
251
251
|
concat(builder.action(:cancel, :as => :generic))
|
252
252
|
end)
|
253
|
-
output_buffer.
|
254
|
-
output_buffer.
|
255
|
-
output_buffer.
|
253
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Submit"]})
|
254
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset"]})
|
255
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel"]})
|
256
256
|
end
|
257
257
|
end
|
258
258
|
|
@@ -262,7 +262,7 @@ describe 'InputAction::Base' do
|
|
262
262
|
|
263
263
|
describe 'when used on a new record' do
|
264
264
|
before do
|
265
|
-
@new_post.
|
265
|
+
allow(@new_post).to receive(:new_record?).and_return(true)
|
266
266
|
end
|
267
267
|
|
268
268
|
describe 'when explicit label is provided' do
|
@@ -272,9 +272,9 @@ describe 'InputAction::Base' do
|
|
272
272
|
concat(builder.action(:reset, :as => :generic, :label => "Reset!"))
|
273
273
|
concat(builder.action(:cancel, :as => :generic, :label => "Cancel!"))
|
274
274
|
end)
|
275
|
-
output_buffer.
|
276
|
-
output_buffer.
|
277
|
-
output_buffer.
|
275
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Click!"]')
|
276
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Reset!"]')
|
277
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel!"]')
|
278
278
|
end
|
279
279
|
end
|
280
280
|
|
@@ -298,9 +298,9 @@ describe 'InputAction::Base' do
|
|
298
298
|
concat(builder.action(:reset, :as => :generic))
|
299
299
|
concat(builder.action(:cancel, :as => :generic))
|
300
300
|
end)
|
301
|
-
output_buffer.
|
302
|
-
output_buffer.
|
303
|
-
output_buffer.
|
301
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Create Post"]')
|
302
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Reset Post"]')
|
303
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel Post"]')
|
304
304
|
end
|
305
305
|
end
|
306
306
|
|
@@ -337,9 +337,9 @@ describe 'InputAction::Base' do
|
|
337
337
|
concat(builder.action(:reset, :as => :generic))
|
338
338
|
concat(builder.action(:cancel, :as => :generic))
|
339
339
|
end)
|
340
|
-
output_buffer.
|
341
|
-
output_buffer.
|
342
|
-
output_buffer.
|
340
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Create Post"]})
|
341
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset Post"]})
|
342
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel Post"]})
|
343
343
|
end
|
344
344
|
end
|
345
345
|
|
@@ -350,9 +350,9 @@ describe 'InputAction::Base' do
|
|
350
350
|
concat(builder.action(:reset, :as => :generic))
|
351
351
|
concat(builder.action(:cancel, :as => :generic))
|
352
352
|
end)
|
353
|
-
output_buffer.
|
354
|
-
output_buffer.
|
355
|
-
output_buffer.
|
353
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Create"]})
|
354
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset"]})
|
355
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel"]})
|
356
356
|
end
|
357
357
|
end
|
358
358
|
|
@@ -362,7 +362,7 @@ describe 'InputAction::Base' do
|
|
362
362
|
|
363
363
|
describe 'when used on an existing record' do
|
364
364
|
before do
|
365
|
-
@new_post.
|
365
|
+
allow(@new_post).to receive(:persisted?).and_return(true)
|
366
366
|
end
|
367
367
|
|
368
368
|
describe 'when explicit label is provided' do
|
@@ -372,9 +372,9 @@ describe 'InputAction::Base' do
|
|
372
372
|
concat(builder.action(:reset, :as => :generic, :label => "Reset!"))
|
373
373
|
concat(builder.action(:cancel, :as => :generic, :label => "Cancel!"))
|
374
374
|
end)
|
375
|
-
output_buffer.
|
376
|
-
output_buffer.
|
377
|
-
output_buffer.
|
375
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Click!"]')
|
376
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Reset!"]')
|
377
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel!"]')
|
378
378
|
end
|
379
379
|
end
|
380
380
|
|
@@ -405,9 +405,9 @@ describe 'InputAction::Base' do
|
|
405
405
|
concat(builder.action(:reset, :as => :generic))
|
406
406
|
concat(builder.action(:cancel, :as => :generic))
|
407
407
|
end)
|
408
|
-
output_buffer.
|
409
|
-
output_buffer.
|
410
|
-
output_buffer.
|
408
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Save Post"]')
|
409
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Reset Post"]')
|
410
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel Post"]')
|
411
411
|
end
|
412
412
|
|
413
413
|
it 'should render an input with custom resource name localized label' do
|
@@ -416,9 +416,9 @@ describe 'InputAction::Base' do
|
|
416
416
|
concat(builder.action(:reset, :as => :generic))
|
417
417
|
concat(builder.action(:cancel, :as => :generic))
|
418
418
|
end)
|
419
|
-
output_buffer.
|
420
|
-
output_buffer.
|
421
|
-
output_buffer.
|
419
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Submit message"]')
|
420
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel message"]')
|
421
|
+
expect(output_buffer).to have_tag('li.generic_action input[@value="Reset message"]')
|
422
422
|
end
|
423
423
|
end
|
424
424
|
|
@@ -456,9 +456,9 @@ describe 'InputAction::Base' do
|
|
456
456
|
concat(builder.action(:reset, :as => :generic))
|
457
457
|
concat(builder.action(:cancel, :as => :generic))
|
458
458
|
end)
|
459
|
-
output_buffer.
|
460
|
-
output_buffer.
|
461
|
-
output_buffer.
|
459
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Save Post"]})
|
460
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset Post"]})
|
461
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel Post"]})
|
462
462
|
end
|
463
463
|
end
|
464
464
|
|
@@ -469,9 +469,9 @@ describe 'InputAction::Base' do
|
|
469
469
|
concat(builder.action(:reset, :as => :generic))
|
470
470
|
concat(builder.action(:cancel, :as => :generic))
|
471
471
|
end)
|
472
|
-
output_buffer.
|
473
|
-
output_buffer.
|
474
|
-
output_buffer.
|
472
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Save"]})
|
473
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset"]})
|
474
|
+
expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel"]})
|
475
475
|
::I18n.backend.store_translations :en, :formtastic => {}
|
476
476
|
end
|
477
477
|
end
|
@@ -502,7 +502,7 @@ describe 'InputAction::Base' do
|
|
502
502
|
end
|
503
503
|
@new_user_post = ::UserPost.new
|
504
504
|
|
505
|
-
@new_user_post.
|
505
|
+
allow(@new_user_post).to receive(:new_record?).and_return(true)
|
506
506
|
concat(semantic_form_for(@new_user_post, :url => '') do |builder|
|
507
507
|
concat(builder.action(:submit, :as => :generic))
|
508
508
|
concat(builder.action(:reset, :as => :generic))
|
@@ -511,9 +511,9 @@ describe 'InputAction::Base' do
|
|
511
511
|
end
|
512
512
|
|
513
513
|
it "should render the string as the value of the button" do
|
514
|
-
output_buffer.
|
515
|
-
output_buffer.
|
516
|
-
output_buffer.
|
514
|
+
expect(output_buffer).to have_tag('li input[@value="Create User post"]')
|
515
|
+
expect(output_buffer).to have_tag('li input[@value="Reset User post"]')
|
516
|
+
expect(output_buffer).to have_tag('li input[@value="Cancel User post"]')
|
517
517
|
end
|
518
518
|
|
519
519
|
end
|