jobshop 0.0.16 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8836a59044956ad6f3a87a7ae6d1f8ed555d4206
-  data.tar.gz: 784ebaafda1c6e0e7f55c35eb9541961b0c07b3f
+  metadata.gz: ab055cb2c42dd23830b4445b94986802dee8cb97
+  data.tar.gz: 470cb0c11c4751a5fe80ceb23864432447399153
 SHA512:
-  metadata.gz: d497a7ad7a2cd3fdd6cce2fe9430fb10bc1776bb4d82088128adbd29063045b8a35304170e8d6b203752df4682f1c260da1233f0640844ef62921a09ec54feda
-  data.tar.gz: 5ca0c588a1c163ca5d51e33584732f9afabc97d58ff1d871d59c9e7904964c0bc8083a7b5b2099b3ca6a3727f9af76b7808aa8cb7030147bdf1f07a7d2d2293c
+  metadata.gz: 3d0a964d475f03ed8c269656508162b9d496b53ddaf61a2a87ba14ddfbcbdae603434941b3d68a293594b975d7a766b4925f9d84a68fdf5b42976e8fbc8bbcb6
+  data.tar.gz: 50e037a98bd3177241c5b1c6ece132918629277c9a631f5070bc0ec0f9799d1dac8dee0ea237b7f995ff10f107b965e4721823c0c4de07c91e8a56f94378b0a8

data/app/builders/jobshop/builder.rb

@@ -2,11 +2,21 @@ 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: "mdl-textfield mdl-js-textfield") do
+        output += @template.content_tag(:div, class: wrapper_classes) do
           content  = ""
-          content += super(field, class: [ "mdl-textfield__input" ])
-          content += label(field, class: [ "mdl-textfield__label" ])
+          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
@@ -30,5 +40,9 @@ module Jobshop
 
       super(value, class: button_classes)
     end
+
+    def errors_on?(attribute)
+      @object.errors[attribute].present?
+    end
   end
 end

data/app/controllers/concerns/registration_token_validation.rb

@@ -1,27 +1,25 @@
 module RegistrationTokenValidation
-  extend ActiveSupport::Concern
+  class << self
+    def before(controller)
+      @token = controller.params[:registration_token]
+      @controller = controller
+      controller.redirect_to controller.new_user_session_path unless valid?
+    end
 
-  included do
-    before_action :validate_registration_token!
-  end
-
-  def validate_registration_token!
-    redirect_to new_user_session_path unless registration_token_valid?
-  end
-
-  def registration_token_valid?
-    params[:registration_token].present? && registration_token_resolves?
-  end
+    def valid?
+      @token.present? && resolves?
+    end
 
-  def registration_token_resolves?
-    encrypted_token = Devise.token_generator.digest(
-      Jobshop::Team, :registration_token, params[:registration_token])
+    def resolves?
+      encrypted_token = Devise.token_generator.digest(
+        Jobshop::Team, :registration_token, @token)
 
-    configurable = Jobshop::Team.find_by(
-      id: params[:team_id], registration_token: encrypted_token)
+      configurable = Jobshop::Team.find_by(
+        id: @controller.params[:team_id], registration_token: encrypted_token)
 
-    configurable &&
-      configurable.registration_token_period_valid? &&
-      configurable.owner.blank?
+      configurable &&
+        configurable.registration_token_period_valid? &&
+        configurable.owner.blank?
+    end
   end
 end

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

@@ -2,7 +2,7 @@ require_dependency "jobshop/application_controller"
 
 module Jobshop
   class Teams::RegistrationsController < ApplicationController
-    include RegistrationTokenValidation
+    before_action RegistrationTokenValidation
 
     skip_before_action :authenticate_user!
 

data/app/models/jobshop/team.rb

@@ -4,6 +4,8 @@ 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/jobshop/teams/registrations/new.html.haml

@@ -2,26 +2,26 @@
   %div.mdl-grid
     %div.mdl-cell.mdl-cell--12-col
       %div#register.mdl-card
-        = form_for @registration, builder: Jobshop::Builder, url: team_registration_path(@registration.team) do |f|
+        = form_for @registration,
+          builder: Jobshop::Builder,
+          url: team_registration_path(@registration.team) do |f|
           .mdl-card__title
-            %object.logo{ type: "image/svg+xml", data: image_path("jobshop/logo.svg") }
-
+            %object.logo{ type: "image/svg+xml",
+                          data: image_path("jobshop/logo.svg") }
             %h4
               Get started with
               %br>
               %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)
+              = console
 
-            - if @registration.errors.present?
-              %p.error try again
-
-            = f.fields_for(@registration.team) do |team_f|
-              %div= team_f.text_field(:name)
-
-            = f.fields_for(@registration.user) do |user_f|
-              %div= user_f.email_field(:email)
-              %div= user_f.password_field(:password)
-              %div= user_f.password_field(:password_confirmation)
-              %div= f.button "Next »".html_safe, class: "btn waves-effect waves-light"
+            = 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"
 

data/lib/jobshop/version.rb

@@ -6,10 +6,10 @@ module Jobshop
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 16
+    TINY  = 23
     PRE   = nil
 
-    CODE_NAME = "bump it up".freeze
+    CODE_NAME = "bump it up prime".freeze
     STRING    = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobshop
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.23
 platform: ruby
 authors:
 - Frank J. Mattia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails