jobshop 0.0.29 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9e9eaab0b35f68842256715a45fda81958e87c7
-  data.tar.gz: e232d6a1bf2d96dc06010a7c5c218de6e9156898
+  metadata.gz: 6d5aae0bc0ef493f3af548a3924df2d7d3bfa20d
+  data.tar.gz: f3ec4420b0e9698bbfec1ba3d50c376c4fb8a261
 SHA512:
-  metadata.gz: b01ffea7e425b9b5a9b9b0a8717402320ca86183a4acddabf95c8deb78a06839d2cfa5558fa29d2a31060a69420c434949c7e32d3eb3489d9ee14be247887527
-  data.tar.gz: e5ea8f6e41ba2350d8b791bc770bd574b5cfc9774d706a66e843274935eb00b849892da165304f82330c684955f007233a4cff679364c76026902216f5f5a971
+  metadata.gz: 49cb1d2eda3f5e7cb29c119f8a6bc631784ab432479602df79327d6ea760be14a51d9b27fcb092765791d2646cf633f26583dd6a2c459ae0ff726e436604600d
+  data.tar.gz: 8a715e7172f5d4acef51079c0ae58153416aee02a905278b9bf33b1a716e07fab7e0af0cae39b91bc8e8af0146cb6e2bd2d783cd1e19288e0cf6892107b0373b

data/app/controllers/jobshop/setups_controller.rb

@@ -0,0 +1,8 @@
+require_dependency "jobshop/application_controller"
+
+module Jobshop
+  class SetupsController < ApplicationController
+    def show
+    end
+  end
+end

data/app/controllers/jobshop/teams/registrations_controller.rb

@@ -16,6 +16,7 @@ module Jobshop
       @registration = ::Jobshop::Registration.new(params)
 
       if @registration.save
+        store_location_for(:user, team_setup_path)
         sign_in_and_redirect(@registration.user)
       else
         render(:new)

data/app/models/jobshop/registration.rb

@@ -3,7 +3,13 @@ module Jobshop
     memo_attr(:user) { team.users.build(user_params) }
     memo_attr(:team) {
       record = ::Jobshop::Team.find(params[:team_id])
+
       record.assign_attributes(team_params)
+
+      record.singleton_class.class_eval do
+        validates :name, presence: true, on: :update, if: :name_changed?
+      end
+
       record
     }
 
@@ -27,13 +33,13 @@ module Jobshop
     end
 
     def team_params
-      registration_params.fetch(
-        :team, ActionController::Parameters.new).permit(:name)
+      registration_params.fetch(:team, ActionController::Parameters.new)
+        .permit(:name)
     end
 
     def user_params
-      registration_params.fetch(:user, ActionController::Parameters.new).
-        permit(:email, :password, :password_confirmation)
+      registration_params.fetch(:user, ActionController::Parameters.new)
+        .permit(:email, :password, :password_confirmation)
     end
   end
 end

data/app/models/jobshop/team.rb

@@ -4,8 +4,6 @@ module Jobshop
     has_many :users, class_name: "Jobshop::User"
     has_one :default_dashboard, class_name: "Jobshop::Dashboard"
 
-    validates :name, presence: true, on: :update
-
     def generate_registration_token
       raw, encrypted = Devise.token_generator.generate(
         self.class, :registration_token)

data/app/views/devise/sessions/new.html.haml

@@ -2,14 +2,14 @@
   %div.mdl-grid
     %div.mdl-cell.mdl-cell--12-col
       %div#sign-in.mdl-card
-        = form_for(resource, builder: Jobshop::Builder, as: resource_name, url: session_path(resource_name)) do |f|
+        = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
           .mdl-card__title(style="height: 200px;")
             %object.logo{ type: "image/svg+xml", data: image_path("jobshop/logo.svg") }
 
           .mdl-card__supporting-text
-            %div= f.email_field(:email)
-            %div= f.password_field(:password)
+            = f.input(:email)
+            = f.input(:password)
 
           .mdl-card__actions
-            %div= f.check_box :remember_me, "Remember me?"
-            %div= f.button "Log in", class: "mdl-js-ripple-effect"
+            = f.input :remember_me, as: :boolean, input_html: { class: "mdl-checkbox__input" }
+            = f.button :submit, "Log in"

data/app/views/jobshop/setups/show.html.haml

@@ -0,0 +1 @@
+Welcome aboard!

data/app/views/jobshop/teams/lookups/show.html.haml

@@ -2,15 +2,13 @@
   %div.mdl-grid
     %div.mdl-cell.mdl-cell--12-col
       %div#sign-in.mdl-card
-        = form_for @lookup, builder: Jobshop::Builder, url: teams_lookup_path do |f|
+        = simple_form_for @lookup, url: teams_lookup_path do |f|
           .mdl-card__title
-            %h4
-              Can't find your team?
+            %h4 Can't find your team?
 
           .mdl-card__supporting-text
-            %p
-              Enter your email address and we'll send you the link.
-            %div= f.email_field(:email)
+            %p Enter your email address and we'll send you the link.
+            = f.input :email
 
           .mdl-card__actions
-            %div= f.button "Send the link to my email!", class: "mdl-js-ripple-effect"
+            = f.button :submit, "Send the link to my email!"

data/app/views/jobshop/teams/registrations/new.html.haml

@@ -2,8 +2,7 @@
   %div.mdl-grid
     %div.mdl-cell.mdl-cell--12-col
       %div#register.mdl-card
-        = form_for @registration,
-          builder: Jobshop::Builder,
+        = simple_form_for @registration,
           url: team_registration_path(@registration.team) do |f|
           .mdl-card__title
             %object.logo{ type: "image/svg+xml",
@@ -14,13 +13,17 @@
               %strong Jobshop
           .mdl-card__supporting-text
             = hidden_field_tag(:registration_token, params[:registration_token])
-            = f.fields_for(@registration.team) do |tf|
-              %div= tf.text_field(:name)
-
-            = f.fields_for(@registration.user) do |uf|
-              %div= uf.email_field(:email)
-              %div= uf.password_field(:password)
-              %div= uf.password_field(:password_confirmation)
-              %div= f.button "Next »".html_safe,
-                      class: "btn waves-effect waves-light"
+            = f.fields_for(f.object.team) do |tf|
+              %p
+                Pick a name for your team. It will usually be (or include) your
+                company's name.
+              = tf.input :name, label: "Team Name"
 
+            = f.fields_for(f.object.user) do |uf|
+              = uf.input :email
+              %p
+                Pick a strong password, ideally being: longer than 8 characters,
+                of mixed upper/lower case, including numbers and symbols.
+              = uf.input :password
+              = uf.input :password_confirmation
+              = f.button :submit, "Next »".html_safe

data/config/initializers/simple_form.rb

@@ -0,0 +1,158 @@
+# 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 :string, class: [ "mdl-textfield", "mdl-js-textfield" ],
+    error_class: "is-invalid" do |b|
+
+    b.use :html5
+    b.use :input, class: "mdl-textfield__input"
+    b.use :label, class: "mdl-textfield__label"
+    b.use :error, wrap_with: { tag: :span, class: "mdl-textfield__error" }
+  end
+
+  config.wrappers :default, class: :input,
+    hint_class: :field_with_hint,
+    error_class: "is-invalid" do |b|
+
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.use :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label_input
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :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 = [
+    "mdl-button",
+    "mdl-js-button",
+    "mdl-button--raised",
+    "mdl-button--primary"
+  ]
+
+  # 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 = :to_sentence
+
+  # 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 = true
+
+  # 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 }
+  config.wrapper_mappings = {
+    email:    :string,
+    password: :string,
+    string:   :string
+  }
+
+  # 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 = [
+    "mdl-checkbox",
+    " mdl-js-checkbox",
+    " mdl-js-ripple-effect"
+  ]
+
+  # 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

data/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: '<abbr title="required">*</abbr>'
+    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'

data/config/routes.rb

@@ -7,6 +7,8 @@ Jobshop::Engine.routes.draw do
         as: "teams_lookup"
     end
 
+    resource :setup, only: [ :show ]
+
     resource :registration, only: [ :new, :create ],
       controller: "teams/registrations"
   end

data/lib/jobshop/engine.rb

@@ -5,6 +5,7 @@ require "material_design_lite-sass"
 require "pundit"
 require "rolify"
 require "sass-rails"
+require "simple_form"
 require "turbolinks"
 
 module Jobshop

data/lib/jobshop/version.rb

@@ -6,7 +6,7 @@ module Jobshop
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 29
+    TINY  = 37
     PRE   = nil
 
     CODE_NAME = "bump it up prime".freeze

data/lib/templates/haml/scaffold/_form.html.haml

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobshop
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.37
 platform: ruby
 authors:
 - Frank J. Mattia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -98,22 +98,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rolify
   requirement: !ruby/object:Gem::Requirement
@@ -143,25 +137,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.4
 - !ruby/object:Gem::Dependency
-  name: turbolinks
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
-    - - "<"
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: turbolinks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -319,10 +321,10 @@ files:
 - app/assets/stylesheets/jobshop/application.scss
 - app/assets/stylesheets/jobshop/breakpoints.scss
 - app/assets/stylesheets/jobshop/static.scss
-- app/builders/jobshop/builder.rb
 - app/controllers/concerns/registration_token_validation.rb
 - app/controllers/jobshop/application_controller.rb
 - app/controllers/jobshop/dashboards_controller.rb
+- app/controllers/jobshop/setups_controller.rb
 - app/controllers/jobshop/teams/lookups_controller.rb
 - app/controllers/jobshop/teams/registrations_controller.rb
 - app/controllers/jobshop/teams_controller.rb
@@ -350,6 +352,7 @@ files:
 - app/views/devise/shared/_links.html.haml
 - app/views/devise/unlocks/new.html.haml
 - app/views/jobshop/dashboards/show.html.haml
+- app/views/jobshop/setups/show.html.haml
 - app/views/jobshop/teams/lookups/show.html.haml
 - app/views/jobshop/teams/registrations/new.html.haml
 - app/views/jobshop/teams_mailer/found_teams.text.erb
@@ -359,7 +362,9 @@ files:
 - config/initializers/assets.rb
 - config/initializers/devise.rb
 - config/initializers/field_with_errors.rb
+- config/initializers/simple_form.rb
 - config/locales/devise.en.yml
+- config/locales/simple_form.en.yml
 - config/routes.rb
 - db/migrate/20160314122952_devise_create_jobshop_users.rb
 - db/migrate/20160314190424_create_jobshop_sites.rb
@@ -388,6 +393,7 @@ files:
 - lib/jobshop/templates/secrets.yml.erb
 - lib/jobshop/version.rb
 - lib/tasks/jobshop_tasks.rake
+- lib/templates/haml/scaffold/_form.html.haml
 homepage: https://jobshop.io
 licenses:
 - AGPL-3.0

data/app/builders/jobshop/builder.rb

@@ -1,48 +0,0 @@
-module Jobshop
-  class Builder < ActionView::Helpers::FormBuilder # :nodoc:
-    [ :email_field, :password_field, :text_field ].each do |field_method|
-      define_method field_method do |field, options = {}|
-        wrapper_classes = [
-          "mdl-textfield",
-          "mdl-js-textfield",
-          ("is-invalid" if errors_on?(field))
-        ].compact
-        output  = ""
-        output += @template.content_tag(:div, class: wrapper_classes) do
-          content  = ""
-          content += super(field, class: "mdl-textfield__input")
-          content += label(field, class: "mdl-textfield__label")
-          if errors_on?(field)
-            content += @template.content_tag(:span, class: "mdl-textfield__error") do
-              @object.errors[field].first
-            end
-          end
-          content.html_safe
-        end
-        output.html_safe
-      end
-    end
-
-    def check_box(field, *args)
-      output = ""
-      output += label(field, class: [ "mdl-checkbox", "mdl-js-checkbox", "mdl-js-ripple-effect" ]) do
-        content  = ""
-        content += super(field, class: [ "mdl-checkbox__input" ])
-        content += @template.content_tag(:span, field.to_s.humanize, class: [ "mdl-checkbox__label" ])
-        content.html_safe
-      end
-      output.html_safe
-    end
-
-    def button(value = nil, *args)
-      button_classes = [ "mdl-button", "mdl-js-button", "mdl-button--raised",
-        "mdl-button--colored", "mdl-js-ripple-effect" ]
-
-      super(value, class: button_classes)
-    end
-
-    def errors_on?(attribute)
-      @object.errors[attribute].present?
-    end
-  end
-end