diff --git a/Gemfile b/Gemfile index 3aa501b..cd8bc14 100644 --- a/Gemfile +++ b/Gemfile @@ -33,6 +33,9 @@ gem 'mongoid', '~> 5.0.0' gem 'bootstrap-sass', '~> 3.3.5' gem 'slim' gem 'slim-rails' +gem 'simple_form' +gem 'capybara' +gem 'rails-i18n' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 0793634..268771e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,12 @@ GEM bson (3.2.4) builder (3.2.2) byebug (6.0.2) + capybara (2.5.0) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -114,6 +120,9 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) + rails-i18n (4.0.5) + i18n (~> 0.6) + railties (~> 4.0) railties (4.2.4) actionpack (= 4.2.4) activesupport (= 4.2.4) @@ -152,6 +161,9 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) + simple_form (3.1.1) + actionpack (~> 4.0) + activemodel (~> 4.0) slim (3.0.6) temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) @@ -184,6 +196,8 @@ GEM binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) + xpath (2.0.0) + nokogiri (~> 1.3) PLATFORMS ruby @@ -191,15 +205,18 @@ PLATFORMS DEPENDENCIES bootstrap-sass (~> 3.3.5) byebug + capybara coffee-rails (~> 4.1.0) jbuilder (~> 2.0) jquery-rails mongoid (~> 5.0.0) mongoid-rspec (= 3.0.0) rails (= 4.2.4) + rails-i18n rspec-rails (~> 3.0) sass-rails (~> 5.0) sdoc (~> 0.4.0) + simple_form slim slim-rails spring diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb new file mode 100644 index 0000000..9547e16 --- /dev/null +++ b/app/controllers/pages_controller.rb @@ -0,0 +1,4 @@ +class PagesController < ApplicationController + def thanks + end +end diff --git a/app/controllers/supporters_controller.rb b/app/controllers/supporters_controller.rb index c64d6b2..ab481ac 100644 --- a/app/controllers/supporters_controller.rb +++ b/app/controllers/supporters_controller.rb @@ -2,4 +2,20 @@ class SupportersController < ApplicationController def new @supporter = Supporter.new end + + def create + @supporter = Supporter.new supporter_form_params + if @supporter.save + redirect_to thanks_path + else + flash.now[:danger] = t 'shared.actions.failed' + render :new + end + end + + private + + def supporter_form_params + params.require(:supporter).permit(:first_name, :last_name, :street, :zip, :email, :support, :age_category) + end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index de6be79..a40a5fb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,2 +1,6 @@ module ApplicationHelper + def title(page_title) + content_for :title, page_title.to_s + page_title + end end diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index ab0b302..97eff1b 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -1,6 +1,6 @@ html head - title Ch420 + title #CH420 - #{content_for(:title)} = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true = javascript_include_tag 'application', 'data-turbolinks-track' => true = csrf_meta_tags diff --git a/app/views/pages/thanks.de.slim b/app/views/pages/thanks.de.slim new file mode 100644 index 0000000..56a529b --- /dev/null +++ b/app/views/pages/thanks.de.slim @@ -0,0 +1,2 @@ +.lead + h1 = title t('.title') diff --git a/app/views/supporters/_form.slim b/app/views/supporters/_form.slim new file mode 100644 index 0000000..0f7c928 --- /dev/null +++ b/app/views/supporters/_form.slim @@ -0,0 +1,10 @@ +h1 = title t('.title') += simple_form_for @supporter do |f| + = f.input :first_name + = f.input :last_name + = f.input :street + = f.input :zip + = f.input :email + = f.input :support, as: :radio_buttons, collection: t('support_type'), label_method: :last, value_method: :first + = f.input :age_category, as: :radio_buttons, collection: t('age_category'), label_method: :last, value_method: :first + = f.submit value: t('.submit'), class: 'btn btn-success' diff --git a/app/views/supporters/new.slim b/app/views/supporters/new.slim index b759d9f..2a70959 100644 --- a/app/views/supporters/new.slim +++ b/app/views/supporters/new.slim @@ -1 +1,2 @@ -h1 Test += render 'form' + diff --git a/config/application.rb b/config/application.rb index db9c6ed..afd5328 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,8 +26,8 @@ module Ch420 # config.time_zone = 'Central Time (US & Canada)' # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de + config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + config.i18n.default_locale = :de config.generators do |g| g.orm :mongoid diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb new file mode 100644 index 0000000..4d26386 --- /dev/null +++ b/config/initializers/simple_form.rb @@ -0,0 +1,165 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + # Wrappers are used by the form builder to generate a + # complete input. You can remove any component from the + # wrapper, change the order or even add your own to the + # stack. The options given below are used to wrap the + # whole input. + config.wrappers :default, class: :input, + hint_class: :field_with_hint, error_class: :field_with_errors do |b| + ## Extensions enabled by default + # Any of these extensions can be disabled for a + # given input by passing: `f.input EXTENSION_NAME => false`. + # You can make any of these extensions optional by + # renaming `b.use` to `b.optional`. + + # Determines whether to use HTML5 (:email, :url, ...) + # and required attributes + b.use :html5 + + # Calculates placeholders automatically from I18n + # You can also pass a string as f.input placeholder: "Placeholder" + b.use :placeholder + + ## Optional extensions + # They are disabled unless you pass `f.input EXTENSION_NAME => true` + # to the input. If so, they will retrieve the values from the model + # if any exists. If you want to enable any of those + # extensions by default, you can change `b.optional` to `b.use`. + + # Calculates maxlength from length validations for string inputs + b.optional :maxlength + + # Calculates pattern from format validations for string inputs + b.optional :pattern + + # Calculates min and max from length validations for numeric inputs + b.optional :min_max + + # Calculates readonly automatically from readonly attributes + b.optional :readonly + + ## Inputs + b.use :label_input + b.use :hint, wrap_with: { tag: :span, class: :hint } + b.use :error, wrap_with: { tag: :span, class: :error } + + ## full_messages_for + # If you want to display the full error message for the attribute, you can + # use the component :full_error, like: + # + # b.use :full_error, wrap_with: { tag: :span, class: :error } + end + + # The default wrapper to be used by the FormBuilder. + config.default_wrapper = :default + + # Define the way to render check boxes / radio buttons with labels. + # Defaults to :nested for bootstrap config. + # inline: input + label + # nested: label > input + config.boolean_style = :nested + + # Default class for buttons + config.button_class = 'btn' + + # Method used to tidy up errors. Specify any Rails Array method. + # :first lists the first message for each field. + # Use :to_sentence to list all errors for each field. + # config.error_method = :first + + # Default tag used for error notification helper. + config.error_notification_tag = :div + + # CSS class to add for error notification helper. + config.error_notification_class = 'error_notification' + + # ID to add for error notification helper. + # config.error_notification_id = nil + + # Series of attempts to detect a default label method for collection. + # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] + + # Series of attempts to detect a default value method for collection. + # config.collection_value_methods = [ :id, :to_s ] + + # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none. + # config.collection_wrapper_tag = nil + + # You can define the class to use on all collection wrappers. Defaulting to none. + # config.collection_wrapper_class = nil + + # You can wrap each item in a collection of radio/check boxes with a tag, + # defaulting to :span. + # config.item_wrapper_tag = :span + + # You can define a class to use in all item wrappers. Defaulting to none. + # config.item_wrapper_class = nil + + # How the label text should be generated altogether with the required text. + # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" } + + # You can define the class to use on all labels. Default is nil. + # config.label_class = nil + + # You can define the default class to be used on forms. Can be overriden + # with `html: { :class }`. Defaulting to none. + # config.default_form_class = nil + + # You can define which elements should obtain additional classes + # config.generate_additional_classes_for = [:wrapper, :label, :input] + + # Whether attributes are required by default (or not). Default is true. + # config.required_by_default = true + + # Tell browsers whether to use the native HTML5 validations (novalidate form option). + # These validations are enabled in SimpleForm's internal config but disabled by default + # in this configuration, which is recommended due to some quirks from different browsers. + # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations, + # change this configuration to true. + config.browser_validations = false + + # Collection of methods to detect if a file type was given. + # config.file_methods = [ :mounted_as, :file?, :public_filename ] + + # Custom mappings for input types. This should be a hash containing a regexp + # to match as key, and the input type that will be used when the field name + # matches the regexp as value. + # config.input_mappings = { /count/ => :integer } + + # Custom wrappers for input types. This should be a hash containing an input + # type as key and the wrapper that will be used for all inputs with specified type. + # config.wrapper_mappings = { string: :prepend } + + # Namespaces where SimpleForm should look for custom input classes that + # override default inputs. + # config.custom_inputs_namespaces << "CustomInputs" + + # Default priority for time_zone inputs. + # config.time_zone_priority = nil + + # Default priority for country inputs. + # config.country_priority = nil + + # When false, do not use translations for labels. + # config.translate_labels = true + + # Automatically discover new inputs in Rails' autoload path. + # config.inputs_discovery = true + + # Cache SimpleForm inputs discovery + # config.cache_discovery = !Rails.env.development? + + # Default class for inputs + # config.input_class = nil + + # Define the default class of the input wrapper of the boolean input. + config.boolean_label_class = 'checkbox' + + # Defines if the default input wrapper class should be included in radio + # collection wrappers. + # config.include_default_input_wrapper_class = true + + # Defines which i18n scope will be used in Simple Form. + # config.i18n_scope = 'simple_form' +end diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb new file mode 100644 index 0000000..109d29a --- /dev/null +++ b/config/initializers/simple_form_bootstrap.rb @@ -0,0 +1,149 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + config.error_notification_class = 'alert alert-danger' + config.button_class = 'btn btn-default' + config.boolean_label_class = nil + + config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'control-label' + + b.use :input, class: 'form-control' + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :vertical_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :readonly + b.use :label, class: 'control-label' + + b.use :input + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :vertical_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + + b.wrapper tag: 'div', class: 'checkbox' do |ba| + ba.use :label_input + end + + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :vertical_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'control-label' + b.use :input + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :horizontal_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'col-sm-3 control-label' + + b.wrapper tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-control' + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :horizontal_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :readonly + b.use :label, class: 'col-sm-3 control-label' + + b.wrapper tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :horizontal_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + + b.wrapper tag: 'div', class: 'col-sm-offset-3 col-sm-9' do |wr| + wr.wrapper tag: 'div', class: 'checkbox' do |ba| + ba.use :label_input + end + + wr.use :error, wrap_with: { tag: 'span', class: 'help-block' } + wr.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :horizontal_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + + b.use :label, class: 'col-sm-3 control-label' + + b.wrapper tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :inline_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'sr-only' + + b.use :input, class: 'form-control' + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :multi_select, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'control-label' + b.wrapper tag: 'div', class: 'form-inline' do |ba| + ba.use :input, class: 'form-control' + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + # Wrappers for forms and inputs using the Bootstrap toolkit. + # Check the Bootstrap docs (http://getbootstrap.com) + # to learn about the different styles for forms and inputs, + # buttons and other elements. + config.default_wrapper = :vertical_form + config.wrapper_mappings = { + check_boxes: :vertical_radio_and_checkboxes, + radio_buttons: :vertical_radio_and_checkboxes, + file: :vertical_file_input, + boolean: :vertical_boolean, + datetime: :multi_select, + date: :multi_select, + time: :multi_select + } +end diff --git a/config/locales/de.yml b/config/locales/de.yml new file mode 100644 index 0000000..1ebe7da --- /dev/null +++ b/config/locales/de.yml @@ -0,0 +1,30 @@ +de: + support_type: + supoorter: Ich unterschreibe eine Volksinitiative für die Freigabe von Cannabis + activist: Ich unterschreibe eine Volksinitiative für die Freigabe von Cannabis und helfe aktiv Unterchriften in meinr Umgebung zu sammeln. + age_category: + underage: Ich bin Jünger als 18 + young: Ich bin 18 bis 30 Jahre alt + middle: Ich bin 30 bis 64 Jahre alt + retired: Ich bin über 64 Jahre alt + + supporters: + form: + title: Ja, ich will helfen Cannabis in der Schweiz endlich zu legalieren + submit: Unterstützung zusichern + + pages: + thanks: + title: Besten dank für deine Unterstützung! + + mongoid: + attributes: + supporter: + first_name: Vorname + last_name: Nachname + street: Adresse / Strasse + zip: Postleitzahl + city: Ort + email: E-Mail + support: Unterstützung + age_category: Alterskategorie diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml new file mode 100644 index 0000000..2374383 --- /dev/null +++ b/config/locales/simple_form.en.yml @@ -0,0 +1,31 @@ +en: + simple_form: + "yes": 'Yes' + "no": 'No' + required: + text: 'required' + mark: '*' + # You can uncomment the line below if you need to overwrite the whole required html. + # When using html, text and mark won't be used. + # html: '*' + error_notification: + default_message: "Please review the problems below:" + # Examples + # labels: + # defaults: + # password: 'Password' + # user: + # new: + # email: 'E-mail to sign in.' + # edit: + # email: 'E-mail.' + # hints: + # defaults: + # username: 'User name to sign in.' + # password: 'No special characters, please.' + # include_blanks: + # defaults: + # age: 'Rather not say' + # prompts: + # defaults: + # age: 'Select your age' diff --git a/config/mongoid.yml b/config/mongoid.yml index 740be87..441c9ee 100644 --- a/config/mongoid.yml +++ b/config/mongoid.yml @@ -11,7 +11,3 @@ test: database: ch420_test hosts: - localhost:27017 - options: - read: - mode: primary - max_pool_size: 1 diff --git a/config/routes.rb b/config/routes.rb index 3c157d6..4c0db97 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,6 @@ Rails.application.routes.draw do root 'supporters#new' resources :supporters + + get '/thanks', to: 'pages#thanks', as: :thanks end diff --git a/db/be-b-00.04-osv-01.xls b/db/be-b-00.04-osv-01.xls new file mode 100644 index 0000000..43343d0 Binary files /dev/null and b/db/be-b-00.04-osv-01.xls differ diff --git a/lib/templates/slim/scaffold/_form.html.slim b/lib/templates/slim/scaffold/_form.html.slim new file mode 100644 index 0000000..a2ff775 --- /dev/null +++ b/lib/templates/slim/scaffold/_form.html.slim @@ -0,0 +1,10 @@ += simple_form_for(@<%= singular_table_name %>) do |f| + = f.error_notification + + .form-inputs +<%- attributes.each do |attribute| -%> + = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> +<%- end -%> + + .form-actions + = f.button :submit diff --git a/spec/features/support_spec.rb b/spec/features/support_spec.rb new file mode 100644 index 0000000..fe716b1 --- /dev/null +++ b/spec/features/support_spec.rb @@ -0,0 +1,20 @@ +require 'rails_helper' + +feature 'Support announcement' do + scenario 'User announces support' do + visit root_path + + fill_in 'Vorname', with: 'Christoph' + fill_in 'Nachname', with: 'Blocher' + fill_in 'Adresse / Strasse', with: 'Wängirain 53' + fill_in 'Postleitzahl', with: '8704' + fill_in 'E-Mail', with: 'blocher@blocher.ch' + fill_in 'E-Mail', with: 'blocher@blocher.ch' + + choose 'Ich unterschreibe eine Volksinitiative für die Freigabe von Cannabis und helfe aktiv Unterchriften in meinr Umgebung zu sammeln.' + + choose 'Ich bin über 64 Jahre alt' + + expect { click_button 'Unterstützung zusichern' }.to change { Supporter.count }.by(1) + end +end diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb new file mode 100644 index 0000000..ebc5603 --- /dev/null +++ b/spec/helpers/application_helper_spec.rb @@ -0,0 +1,10 @@ +require 'spec_helper' + +describe ApplicationHelper do + describe '.title' do + it 'sets content for :title' do + helper.title 'test' + expect(view.content_for :title).to eq 'test' + end + end +end