jobshop 0.0.4.1p4 → 0.0.4.2p4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 904a781e3363d2f512cf2a6f9af9cfb39ad9fd52
-  data.tar.gz: 4b1aadcd942649c6ec69640273e8077830a30391
+  metadata.gz: ebd478bfbc679ef91271554cd5a9f8c0bd12475d
+  data.tar.gz: 81649a0c32fbfe838c26046da849bd94ad8d08db
 SHA512:
-  metadata.gz: ee19af19af5f160dd8c6bd1ebd3ad75c7d933347bdbc0feba68143eb7e051f99dc736b28386230e3a1292d81c4a86f3080189ac40a733a80b4c47b9e413ba235
-  data.tar.gz: da847d8e47e6398c55897835fcccc225cd8c80065a3e96746c31cd71a57027319e27495f32d6755fb875516014d7d4a62606cda15fa58eb389c558282d560993
+  metadata.gz: c1df82ba9a8337d6f4262bc3c3c093fc4581e0c402c7b15713b334d4b358214aa1bad765b0c5274c67ddfee9fe4131689d772e442a3002ebd2be9f91232cd6bf
+  data.tar.gz: 69071e78619c4e6d17d141cd00b89a7032a61d1201b915ed617071143d0337a281b6f6334cb750993c52f6a542ec6a5910313bad1e5ca83963dcd0512798523f

data/app/controllers/concerns/registration_token_validation.rb

@@ -0,0 +1,25 @@
+module RegistrationTokenValidation
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :validate_registration_token!
+  end
+
+  def validate_registration_token!
+    redirect_to new_user_session_path unless token_present_and_resolves?
+  end
+
+  def token_present_and_resolves?
+    params[:registration_token].present? && registration_token_resolves?
+  end
+
+  def registration_token_resolves?
+    encrypted_token = Devise.token_generator.digest(
+      Jobshop::Site, :registration_token, params[:registration_token])
+
+    configurable = Jobshop::Site.find_by(
+      id: params[:site_id], registration_token: encrypted_token)
+
+    configurable && configurable.registration_token_period_valid?
+  end
+end

data/app/controllers/jobshop/application_controller.rb

@@ -13,10 +13,5 @@ module Jobshop
   #    flash[:alert] = "Please sign in."
   #    redirect_to(request.referrer || main_app.root_path)
   #  end
-
-    def pundit_user
-#      raise Jobshop::NoCurrentUserMethodError unless respond_to?(:current_user)
-#      current_user
-    end
   end
 end

data/app/controllers/jobshop/dashboards_controller.rb

@@ -0,0 +1,6 @@
+require_dependency "jobshop/application_controller"
+
+module Jobshop
+  class DashboardsController < ApplicationController
+  end
+end

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

@@ -2,31 +2,22 @@ require_dependency "jobshop/application_controller"
 
 module Jobshop
   class Sites::RegistrationsController < ApplicationController
-    before_action :authenticate_user!, unless: :configure_by_token?, only: :new
+    include RegistrationTokenValidation
 
     def new
-      @site = Jobshop::Site.find(params[:site_id])
-      authenticate_user! if @site.owner
       @registration = Jobshop::Registration.new(params)
+      authenticate_user! if @registration.site.owner
     end
 
-    protected
-
-    def configure_by_token?
-      @configure_by_token ||= params[:configuration_token].present? &&
-        configuration_token_valid?
-    end
-
-    def configuration_token_valid?
-      @configuration_token_valid ||= begin
-        encrypted_configuration_token = Devise.token_generator.digest(
-          Jobshop::Site, :configuration_token, params[:configuration_token])
-
-        configurable = Jobshop::Site.find_by(
-          configuration_token: encrypted_configuration_token)
+    def create
+      @registration = Jobshop::Registration.new(params)
 
-        configurable && configurable.configuration_token_period_valid?
+      if @registration.save
+        sign_in_and_redirect(@registration.user)
+      else
+        render(:new)
       end
     end
   end
 end
+

data/app/models/jobshop/registration.rb

@@ -0,0 +1,37 @@
+module Jobshop
+  class Registration < VirtualRecord
+    memo_attr(:user) { site.users.build(user_params) }
+    memo_attr(:site) {
+      record = Jobshop::Site.find(params[:site_id])
+      record.assign_attributes(site_params)
+      record
+    }
+
+    def save
+      return false unless valid?
+
+      result = ActiveRecord::Base.transaction do
+        user.save!
+        site.update!(owner: user)
+      end
+
+      result != false
+    end
+
+    private
+
+    def registration_params
+      params.fetch(:registration, ActionController::Parameters.new)
+    end
+
+    def site_params
+      registration_params.fetch(
+        :site, ActionController::Parameters.new).permit(:name)
+    end
+
+    def user_params
+      registration_params.fetch(:user, ActionController::Parameters.new).
+        permit(:email, :password, :password_confirmation)
+    end
+  end
+end

data/app/models/jobshop/site.rb

@@ -3,19 +3,20 @@ module Jobshop
     belongs_to :owner, class_name: "Jobshop::User"
     has_many :users, class_name: "Jobshop::User"
 
-    def generate_configuration_token
-      raw, encrypted = Devise.token_generator.generate(self.class, :configuration_token)
+    def generate_registration_token
+      raw, encrypted = Devise.token_generator.generate(
+        self.class, :registration_token)
 
-      self.configuration_token = encrypted
-      self.configuration_token_sent_at = Time.now.utc
+      self.registration_token = encrypted
+      self.registration_token_sent_at = Time.now.utc
       self.save(validate: false)
 
       raw
     end
 
-    def configuration_token_period_valid?
-      configuration_token_sent_at &&
-        configuration_token_sent_at.utc >= 30.minutes.ago.utc
+    def registration_token_period_valid?
+      registration_token_sent_at &&
+        registration_token_sent_at.utc >= 30.minutes.ago.utc
     end
   end
 end

data/app/models/jobshop/user.rb

@@ -5,5 +5,7 @@ module Jobshop
     devise :database_authenticatable, :recoverable, :rememberable, :validatable
 
     belongs_to :site
+
+    validates_uniqueness_of :email
   end
 end

data/app/{resources/jobshop/application_resource.rb → models/jobshop/virtual_record.rb}

@@ -1,7 +1,7 @@
 require "jobshop/support/memo_attr"
 
 module Jobshop
-  class ApplicationResource
+  class VirtualRecord
     include ActiveModel::Model
     include MemoAttr
 

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

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

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

@@ -5,12 +5,15 @@
   %section
     = form_for @registration, url: site_registration_path(@registration.site) do |f|
       .card-content
+        = hidden_field_tag(:registration_token, params[:registration_token])
         %h1.center Getting Started
 
-        %br
+        - if @registration.errors.present?
+          %p.error try again
+
         = f.fields_for(@registration.site) do |site_f|
           %ul.input-field
-            %li= site_f.label(:name, "Organization") + site_f.text_field(:name)
+            %li= site_f.label(:name, "Organization Name") + site_f.text_field(:name)
 
         = f.fields_for(@registration.user) do |user_f|
           %ul.input-field

data/config/routes.rb

@@ -1,7 +1,9 @@
 Jobshop::Engine.routes.draw do
   devise_for :users, class_name: "Jobshop::User", module: :devise
 
-  resources :sites, only: [ :edit ] do
+  get "/dashboard", to: "dashboards#show", as: :user_root
+
+  resources :sites, only: [ ] do
     resource :registration, only: [ :new, :create ],
       controller: "sites/registrations"
   end

data/db/migrate/20160323132658_rename_configuration_token_to_registration_token.rb

@@ -0,0 +1,9 @@
+class RenameConfigurationTokenToRegistrationToken < ActiveRecord::Migration[5.0]
+  def change
+    rename_column :jobshop_sites, :configuration_token, :registration_token
+    rename_column :jobshop_sites, :configuration_token_sent_at,
+      :registration_token_sent_at
+
+    add_index :jobshop_sites, [ "registration_token" ], unique: true
+  end
+end

data/lib/generators/jobshop/site/site_generator.rb

@@ -22,10 +22,10 @@ module Jobshop
       end
 
       def generate_token
-        @token = site.generate_configuration_token
+        @token = site.generate_registration_token
       end
 
-      def generate_secure_configuration_link
+      def generate_secure_registration_link
         link_protocol = Rails.env.development? ? "http" : "https"
         link_host = Rails.env.development? ? "localhost:3000" : "YOUR-HOST-NAME"
         # TODO: Give environments besides development a decent host and
@@ -35,11 +35,11 @@ module Jobshop
           new_site_registration_url(@site,
           protocol: link_protocol,
           host: link_host,
-          configuration_token: @token
+          registration_token: @token
         )
       end
 
-      def print_secure_configuration_link
+      def print_secure_registration_link
         say <<-MESSAGE
 ### JOBSHOP - IMPORTANT INFORMATION ############################################
 

data/lib/jobshop/version.rb

@@ -7,7 +7,7 @@ module Jobshop
     MAJOR = 0
     MINOR = 0
     TINY  = 4
-    PRE   = "1p4"
+    PRE   = "2p4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jobshop
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1p4
+  version: 0.0.4.2p4
 platform: ruby
 authors:
 - Frank J. Mattia
@@ -304,18 +304,21 @@ files:
 - app/assets/stylesheets/jobshop/generics.scss
 - app/assets/stylesheets/jobshop/material-icons.scss
 - app/assets/stylesheets/jobshop/site/configuration.scss
+- app/controllers/concerns/registration_token_validation.rb
 - app/controllers/jobshop/application_controller.rb
+- app/controllers/jobshop/dashboards_controller.rb
 - app/controllers/jobshop/pages_controller.rb
 - app/controllers/jobshop/sites/registrations_controller.rb
 - app/controllers/jobshop/sites_controller.rb
 - app/helpers/jobshop/application_helper.rb
 - app/jobs/jobshop/application_job.rb
-- app/models/application_record.rb
+- app/models/jobshop/application_record.rb
+- app/models/jobshop/registration.rb
 - app/models/jobshop/site.rb
 - app/models/jobshop/user.rb
+- app/models/jobshop/virtual_record.rb
 - app/policies/jobshop/application_policy.rb
-- app/resources/jobshop/application_resource.rb
-- app/resources/jobshop/registration.rb
+- app/views/jobshop/dashboards/show.html.haml
 - app/views/jobshop/pages/index.html.haml
 - app/views/jobshop/sites/registrations/new.html.haml
 - app/views/layouts/jobshop/application.html.haml
@@ -329,6 +332,7 @@ files:
 - db/migrate/20160321212058_add_site_id_to_users.rb
 - db/migrate/20160321213638_add_foreign_key_for_site.rb
 - db/migrate/20160322040604_add_owner_id_to_sites.rb
+- db/migrate/20160323132658_rename_configuration_token_to_registration_token.rb
 - db/migrate/keep
 - lib/generators/jobshop/config/config_generator.rb
 - lib/generators/jobshop/config/templates/jobshop.rb.tt

data/app/resources/jobshop/registration.rb

@@ -1,26 +0,0 @@
-module Jobshop
-  class Registration < Jobshop::ApplicationResource
-    memo_attr(:user) { site.users.build(user_params) }
-    memo_attr(:site) { Jobshop::Site.find(params[:site_id]) }
-
-    def save
-      return false unless valid?
-
-      result = ActiveRecord::Base.transaction do
-        user.save!
-        site.update!(owner: user)
-      end
-
-      result != false
-    end
-
-  private
-    def site_params
-      params.fetch(:site, ActionController::Parameters.new).permit(:name)
-    end
-
-    def user_params
-      params.fetch(:user, ActionController::Parameters.new).permit(:email, :password, :password_confirmation)
-    end
-  end
-end