jobshop 0.0.4.0p1 → 0.0.4.0p13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f32c72b0d85a46741051ac4eed44ec3afcc450
-  data.tar.gz: f03e99a3069119e232c82b6e4553180e941d8955
+  metadata.gz: db8928c85fe8d5da471dcd3d6019453fee0fe672
+  data.tar.gz: 763e51b7b0abfca5a5ee5853ffa87c859fa892cf
 SHA512:
-  metadata.gz: 64d8a1cee77f6d4ab1f477fdc210b0d48ace03ef943b267562dc0f13033044be3e44277230aa80c0c4e03fdae86e321a8c29fc9135924a8b771ac6a680832604
-  data.tar.gz: d29e592ad90d5c80c4170fa44b0fe8597902065cea2266cabd579660ee2a29bd7043e4d80fa7c8e47f9cdf2d3885a1c1b0c8956a5eb8be64cc8a8773b882ad88
+  metadata.gz: f9cf806314eb0f51a5fca8f33e74e0895f78525146b0bb97814905b11f857b6692c74011d3e78da61bd2fd2d123db8af4a2afb27cb18f272407beccde4584d19
+  data.tar.gz: 25c0275b6f0ea2b874b90d4368d1923fae6d87526c9211791e2c382a11642a58e4de29a59ec6bca1793479f43c32f1430eba27e36e0af7ca20078de70a2d9010

data/app/assets/javascripts/jobshop/application.js

@@ -12,4 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require materialize
 //= require_tree .

data/app/assets/stylesheets/jobshop/application.scss

@@ -53,4 +53,4 @@ html {
   }
 }
 
-@import "pages/index";
+@import "generics";

data/app/assets/stylesheets/jobshop/generics.scss

@@ -0,0 +1,25 @@
+html {
+  body {
+    > header,
+    > main,
+    > footer {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+
+      > section {
+        @extend .card;
+        @extend .bubble;
+
+        max-width: 80%;
+        min-width: 38%;
+
+        @media #{$small-and-down} {
+          max-width: 100%;
+          width: 100%;
+        }
+      }
+    }
+  }
+}

data/app/assets/stylesheets/jobshop/site/configuration.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the site/configuration controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

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

@@ -0,0 +1,32 @@
+require_dependency "jobshop/application_controller"
+
+module Jobshop
+  class Sites::RegistrationsController < ApplicationController
+    before_action :authenticate_user!, unless: :configure_by_token?, only: :new
+
+    def new
+      @site = Jobshop::Site.find(params[:site_id])
+      authenticate_user! if @site.owner
+      @registration = Jobshop::Registration.new(params)
+    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)
+
+        configurable && configurable.configuration_token_period_valid?
+      end
+    end
+  end
+end

data/app/controllers/jobshop/sites_controller.rb

@@ -2,26 +2,5 @@ require_dependency "jobshop/application_controller"
 
 module Jobshop
   class SitesController < ApplicationController
-    before_action :authenticate_user!, unless: :configure_by_token?, only: :edit
-
-    def edit
-
-    end
-
-    protected
-
-    def configure_by_token?
-      params[:configuration_token].present? && configuration_token_valid?
-    end
-
-    def configuration_token_valid?
-      encrypted_configuration_token = Devise.token_generator.digest(
-        Jobshop::Site, :configuration_token, params[:configuration_token])
-
-      configurable = Jobshop::Site.find_by(
-        configuration_token: encrypted_configuration_token)
-
-      configurable && configurable.configuration_token_period_valid?
-    end
   end
 end

data/app/models/jobshop/site.rb

@@ -1,5 +1,8 @@
 module Jobshop
-  class Site < ActiveRecord::Base
+  class Site < ApplicationRecord
+    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)
 

data/app/models/jobshop/user.rb

@@ -1,7 +1,9 @@
 module Jobshop
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
     # Include default devise modules. Others available are:
     # :confirmable, :lockable, :timeoutable and :omniauthable
     devise :database_authenticatable, :recoverable, :rememberable, :validatable
+
+    belongs_to :site
   end
 end

data/app/resources/jobshop/application_resource.rb

@@ -0,0 +1,15 @@
+require "jobshop/support/memo_attr"
+
+module Jobshop
+  class ApplicationResource
+    include ActiveModel::Model
+    include MemoAttr
+
+    attr_reader :errors, :params
+
+    def initialize(params = ActionController::Parameters.new)
+      @errors = ActiveModel::Errors.new(self)
+      @params = params
+    end
+  end
+end

data/app/resources/jobshop/registration.rb

@@ -0,0 +1,26 @@
+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

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

@@ -0,0 +1,27 @@
+%header
+  %object.logo{ type: "image/svg+xml", data: image_path("jobshop/logo.svg") }
+
+%main
+  %section
+    = form_for @registration, url: site_registration_path(@registration.site) do |f|
+      .card-content
+        %h1.center Getting Started
+
+        %br
+        = f.fields_for(@registration.site) do |site_f|
+          %ul.input-field
+            %li= site_f.label(:name, "Organization") + site_f.text_field(:name)
+
+        = f.fields_for(@registration.user) do |user_f|
+          %ul.input-field
+            %li= user_f.label(:email) + user_f.email_field(:email)
+
+          %ul.input-field
+            %li= user_f.label(:password) + user_f.password_field(:password)
+
+          %ul.input-field
+            %li= user_f.label(:password_confirmation) + user_f.password_field(:password_confirmation)
+
+        %ul.right
+          %li= f.button "Next »".html_safe, class: "btn waves-effect waves-light"
+

data/config/routes.rb

@@ -1,9 +1,10 @@
 Jobshop::Engine.routes.draw do
-  get 'sites/edit'
-
   devise_for :users, class_name: "Jobshop::User", module: :devise
 
-  resources :sites, only: [ :edit, :update ]
+  resources :sites, only: [ :edit ] do
+    resource :registration, only: [ :new, :create ],
+      controller: "sites/registrations"
+  end
 
   get "/"      => "pages#show", page: "index"
   get "/about" => redirect("https://jobshop.io"), as: :about

data/db/migrate/20160321212058_add_site_id_to_users.rb

@@ -0,0 +1,5 @@
+class AddSiteIdToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :jobshop_users, :site_id, :uuid
+  end
+end

data/db/migrate/20160321213638_add_foreign_key_for_site.rb

@@ -0,0 +1,6 @@
+class AddForeignKeyForSite < ActiveRecord::Migration[5.0]
+  def change
+    add_foreign_key :jobshop_users, :jobshop_sites, column: "site_id",
+      on_delete: :cascade
+  end
+end

data/db/migrate/20160322040604_add_owner_id_to_sites.rb

@@ -0,0 +1,7 @@
+class AddOwnerIdToSites < ActiveRecord::Migration[5.0]
+  def change
+    add_column :jobshop_sites, :owner_id, :uuid
+    add_foreign_key :jobshop_sites, :jobshop_users, column: "owner_id",
+      on_delete: :restrict
+  end
+end

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

@@ -9,11 +9,16 @@ module Jobshop
 
       def require_environment
         ENV['RAILS_ENV'] ||= "development"
-        require File.expand_path("config/environment.rb")
+        abort "Please run this command within a Rails app." unless Rails.root
+
+        environment_filename = File.expand_path(
+          Rails.root + "config/environment.rb")
+
+        require environment_filename
       end
 
       def create_site
-        @site = Jobshop::Site.new
+        @site = Jobshop::Site.create!(name: name)
       end
 
       def generate_token
@@ -26,8 +31,8 @@ module Jobshop
         # TODO: Give environments besides development a decent host and
         # protocol. HTTPS isn't mandatory in production but it is very, VERY
         # highly recommended.
-        @link_text = Jobshop::Engine.routes.url_helpers.edit_site_url(
-          @site,
+        @link_text = Jobshop::Engine.routes.url_helpers.
+          new_site_registration_url(@site,
           protocol: link_protocol,
           host: link_host,
           configuration_token: @token

data/lib/jobshop/support/memo_attr.rb

@@ -0,0 +1,34 @@
+module MemoAttr
+private
+  def __memoized
+    @__memoized ||= {}
+  end
+
+  def self.included(mod)
+    mod.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def memo_attr(name, &block)
+      raise LocalJumpError.new('no block given') unless block_given?
+
+      instance_eval { define_memoized_method(name, &block) }
+      class_eval    { define_validation_block(name) }
+    end
+
+  private
+    def define_memoized_method(name, &block)
+      define_method(name) do
+        __memoized.fetch(name) { |k| __memoized[k] = instance_eval(&block) }
+      end
+    end
+
+    def define_validation_block(name)
+      validate do
+        send(name).errors.each do |key, value|
+          errors.add("#{send(name).class.name.underscore}_#{key}", value)
+        end unless send(name).valid?
+      end
+    end
+  end
+end

data/lib/jobshop/templates/dummy_template.rb

@@ -7,6 +7,17 @@ end
 remove_file "config/boot.rb"
 copy_file "boot.rb.tt", "config/boot.rb"
 
+# The generated config/secrets.yml file uses hardcoded values for
+# test/development environments. Generate secrets pragmatically.
+remove_file "config/secrets.yml"
+copy_file "secrets.yml.tt", "config/secrets.yml"
+
+# The db/migrate folder never gets created for the dummy_app so do it manually.
+unless Dir.exists?("db/migrate")
+  say_status :create, "db/migrate"
+  Dir.mkdir("db/migrate")
+end
+
 route "mount Jobshop::Engine => \"/\""
 
 rake "db:create"

data/lib/jobshop/templates/secrets.yml.tt

@@ -0,0 +1,38 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: <%=
+    path_to_key = File.expand_path("tmp/development_secret_key_base")
+    if File.exists?(path_to_key)
+      File.read(path_to_key).chomp
+    else
+      new_key = SecureRandom.hex(64)
+      File.write(path_to_key, new_key)
+      new_key
+    end %>
+
+test:
+  secret_key_base: <%=
+    path_to_key = File.expand_path("tmp/test_secret_key_base")
+    if File.exists?(path_to_key)
+      File.read(path_to_key).chomp
+    else
+      new_key = SecureRandom.hex(64)
+      File.write(path_to_key, new_key)
+      new_key
+    end %>
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/lib/jobshop/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobshop
 version: !ruby/object:Gem::Version
-  version: 0.0.4.0p1
+  version: 0.0.4.0p13
 platform: ruby
 authors:
 - Frank J. Mattia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -258,6 +258,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: web-console
   requirement: !ruby/object:Gem::Requirement
@@ -287,10 +301,12 @@ files:
 - app/assets/images/jobshop/logo.svg
 - app/assets/javascripts/jobshop/application.js
 - app/assets/stylesheets/jobshop/application.scss
+- app/assets/stylesheets/jobshop/generics.scss
 - app/assets/stylesheets/jobshop/material-icons.scss
-- app/assets/stylesheets/jobshop/pages/index.scss
+- app/assets/stylesheets/jobshop/site/configuration.scss
 - app/controllers/jobshop/application_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
@@ -298,8 +314,10 @@ files:
 - app/models/jobshop/site.rb
 - app/models/jobshop/user.rb
 - app/policies/jobshop/application_policy.rb
+- app/resources/jobshop/application_resource.rb
+- app/resources/jobshop/registration.rb
 - app/views/jobshop/pages/index.html.haml
-- app/views/jobshop/sites/edit.html.haml
+- app/views/jobshop/sites/registrations/new.html.haml
 - app/views/layouts/jobshop/application.html.haml
 - config/initializers/assets.rb
 - config/initializers/devise.rb
@@ -307,6 +325,9 @@ files:
 - config/routes.rb
 - db/migrate/20160314122952_devise_create_jobshop_users.rb
 - db/migrate/20160314190424_create_jobshop_sites.rb
+- 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/keep
 - lib/generators/jobshop/config/config_generator.rb
 - lib/generators/jobshop/config/templates/jobshop.rb.tt
@@ -316,8 +337,10 @@ files:
 - lib/jobshop.rb
 - lib/jobshop/dummy.rb
 - lib/jobshop/engine.rb
+- lib/jobshop/support/memo_attr.rb
 - lib/jobshop/templates/boot.rb.tt
 - lib/jobshop/templates/dummy_template.rb
+- lib/jobshop/templates/secrets.yml.tt
 - lib/jobshop/version.rb
 - lib/tasks/jobshop_tasks.rake
 homepage: https://jobshop.io

data/app/assets/stylesheets/jobshop/pages/index.scss

@@ -1,19 +0,0 @@
-html[data-controller="jobshop/pages"] {
-  body[data-slug~="index"] {
-    margin: 1rem;
-
-    > header,
-    > main,
-    > footer {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-
-      > section {
-        width: 24rem;
-        @media #{$small-and-down} { width: 100%; }
-      }
-    }
-  }
-}

data/app/views/jobshop/sites/edit.html.haml

@@ -1,2 +0,0 @@
-%h1 Sites#edit
-%p Find me in app/views/jobshop/sites/edit.html.haml