jobshop 0.0.4.2p4 → 0.0.5

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

@@ -0,0 +1,26 @@
+%div(class="registration-layout")
+  %main
+    %div#register
+      = 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") }
+
+          %h4
+            Get started with
+            %br>
+            %strong Jobshop
+        .mdl-card__supporting-text
+          = hidden_field_tag(:registration_token, params[:registration_token])
+
+          - 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"
+

data/app/views/layouts/jobshop/application.html.haml

@@ -1,14 +1,15 @@
 !!!
-%html{ lang: "en", data: { controller: controller_path, action: action_name }}
+%html{ lang: "en" }
   %head
-    %meta{ content: "text/html; charset=UTF-8", "http-equiv": "Content-Type" }/
-    %meta{ name: "viewport", content: "width=device-width, initial-scale=1.0" }/
+    %meta(charset="UTF-8")
+    %meta(http-equiv="X-UA-Compatible" content="IE=edge")
+    %meta(name="viewport" content="width=device-width, initial-scale=1.0")
+
     %title Jobshop
 
-    = stylesheet_link_tag    "jobshop/application", media: "all", "data-turbolinks-track": "reload"
-    = stylesheet_link_tag    "https://fonts.googleapis.com/icon?family=Material+Icons"
+    = stylesheet_link_tag "jobshop/application", media: "all", "data-turbolinks-track": "reload"
     = javascript_include_tag "jobshop/application", "data-turbolinks-track": "reload"
     = csrf_meta_tags
 
-  %body{ data: { slug: yield(:data_slug) }}
+  %body{ class: body_class }
     = content_for?(:content) ? yield(:content) : yield

data/config/initializers/devise.rb

@@ -160,7 +160,7 @@ Devise.setup do |config|
   # Email regex used to validate email formats. It simply asserts that
   # one (and only one) @ exists in the given string. This is mainly
   # to give user feedback and not to assert the e-mail validity.
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
+  config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
 
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this

data/config/routes.rb

@@ -3,9 +3,9 @@ Jobshop::Engine.routes.draw do
 
   get "/dashboard", to: "dashboards#show", as: :user_root
 
-  resources :sites, only: [ ] do
+  resources :teams, only: [ ] do
     resource :registration, only: [ :new, :create ],
-      controller: "sites/registrations"
+      controller: "teams/registrations"
   end
 
   get "/"      => "pages#show", page: "index"

data/db/migrate/20160417210218_create_jobshop_dashboards.rb

@@ -0,0 +1,15 @@
+class CreateJobshopDashboards < ActiveRecord::Migration[5.0]
+  def change
+    enable_extension "pgcrypto" unless extension_enabled?("pgcrypto")
+
+    create_table(:jobshop_dashboards, id: :uuid,
+                 default: "gen_random_uuid()")do |t|
+      t.uuid :site_id
+
+      t.timestamps
+    end
+
+    add_foreign_key(:jobshop_dashboards, :jobshop_sites, column: "site_id",
+                    on_delete: :cascade)
+  end
+end

data/db/migrate/20160425062447_rename_site_to_team.rb

@@ -0,0 +1,30 @@
+class RenameSiteToTeam < ActiveRecord::Migration[5.0]
+  def change
+    reversible do |dir|
+      dir.up do
+        remove_foreign_key :jobshop_users, column: "site_id"
+        remove_foreign_key :jobshop_dashboards, column: "site_id"
+        remove_foreign_key :jobshop_sites, column: "owner_id"
+      end
+      dir.down do
+        add_foreign_key :jobshop_users, :jobshop_sites, column: "site_id",
+          on_delete: :cascade
+        add_foreign_key :jobshop_dashboards, :jobshop_sites, column: "site_id",
+          on_delete: :cascade
+        add_foreign_key :jobshop_sites, :jobshop_users, column: "owner_id",
+          on_delete: :restrict
+      end
+    end
+
+    rename_table :jobshop_sites, :jobshop_teams
+    rename_column :jobshop_users, :site_id, :team_id
+    rename_column :jobshop_dashboards, :site_id, :team_id
+
+    add_foreign_key :jobshop_users, :jobshop_teams, column: "team_id",
+        on_delete: :cascade
+    add_foreign_key :jobshop_dashboards, :jobshop_teams, column: "team_id",
+        on_delete: :cascade
+    add_foreign_key :jobshop_teams, :jobshop_users, column: "owner_id",
+        on_delete: :restrict
+  end
+end

data/lib/generators/jobshop/team/USAGE

@@ -0,0 +1,7 @@
+Description:
+    Create a new Jobshop team.
+
+Example:
+    rails generate team "team name"
+
+    This will generate a new team and print a configuration link on the console.

data/lib/generators/jobshop/{site/site_generator.rb → team/team_generator.rb}

@@ -1,11 +1,11 @@
 module Jobshop
   module Generators
-    class SiteGenerator < Rails::Generators::NamedBase
+    class TeamGenerator < Rails::Generators::NamedBase
       source_root File.expand_path("../templates", __FILE__)
 
-      desc "Create a jobshop site."
+      desc "Create a jobshop team."
 
-      attr_reader :site, :link_text, :first_site
+      attr_reader :team, :link_text, :first_team
 
       def require_environment
         ENV['RAILS_ENV'] ||= "development"
@@ -17,12 +17,12 @@ module Jobshop
         require environment_filename
       end
 
-      def create_site
-        @site = Jobshop::Site.create!(name: name)
+      def create_team
+        @team = Jobshop::Team.create!(name: name)
       end
 
       def generate_token
-        @token = site.generate_registration_token
+        @token = team.generate_registration_token
       end
 
       def generate_secure_registration_link
@@ -32,7 +32,7 @@ module Jobshop
         # protocol. HTTPS isn't mandatory in production but it is very, VERY
         # highly recommended.
         @link_text = Jobshop::Engine.routes.url_helpers.
-          new_site_registration_url(@site,
+          new_team_registration_url(@team,
           protocol: link_protocol,
           host: link_host,
           registration_token: @token
@@ -43,7 +43,7 @@ module Jobshop
         say <<-MESSAGE
 ### JOBSHOP - IMPORTANT INFORMATION ############################################
 
-      Your Jobshop site "#{name}" has been initialized.
+      Your Jobshop team "#{name}" has been initialized.
       You may use the following link to complete the setup process.
 
       #{link_text}

data/lib/jobshop/engine.rb

@@ -1,7 +1,7 @@
 require "devise"
 require "haml-rails"
 require "jquery-rails"
-require "materialize-sass"
+require "material_design_lite-sass"
 require "pundit"
 require "rolify"
 require "sass-rails"

data/lib/jobshop/version.rb

@@ -6,9 +6,10 @@ module Jobshop
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
-    PRE   = "2p4"
+    TINY  = 5
+    PRE   = nil
 
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+    CODE_NAME = "bump it up".freeze
+    STRING    = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze
   end
 end

data/lib/tasks/jobshop_tasks.rake

@@ -1,4 +1,20 @@
-# desc "Explaining what the task does"
-# task :jobshop do
-#   # Task goes here
-# end
+# This effectively hides the rake task from `$ rake -T`.
+Rake::Task["jobshop:install:migrations"].instance_variable_set(:@comments, [])
+
+namespace :jobshop do
+  task :disable_autoload do
+    ActiveSupport::Dependencies.class_eval do
+      extend Module.new {
+        def load_file(path, const_paths = loadable_constants_for_path(path))
+          jobshop_models_path = File.join(Jobshop::Engine.root, "app", "models")
+          return if path.starts_with?(jobshop_models_path)
+          super
+        end
+      }
+    end
+  end
+end
+
+%w( db:migrate db:rollback db:migrate:up db:migrate:down ).each do |t|
+  Rake::Task[t].prerequisites << "jobshop:disable_autoload"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobshop
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2p4
+  version: 0.0.5
 platform: ruby
 authors:
 - Frank J. Mattia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -28,22 +28,16 @@ dependencies:
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -73,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: materialize-sass
+  name: material_design_lite-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.97.5
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.97.5
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +100,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
@@ -116,7 +110,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
@@ -126,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +148,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1
+        version: 5.0.0.beta2
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
@@ -164,7 +158,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1
+        version: 5.0.0.beta2
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
@@ -188,14 +182,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -244,7 +238,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta1
+        version: 3.5.0.beta3
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.6'
@@ -254,7 +248,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta1
+        version: 3.5.0.beta3
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.6'
@@ -301,26 +295,38 @@ 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/site/configuration.scss
+- app/assets/stylesheets/jobshop/breakpoints.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/pages_controller.rb
-- app/controllers/jobshop/sites/registrations_controller.rb
-- app/controllers/jobshop/sites_controller.rb
+- app/controllers/jobshop/teams/registrations_controller.rb
+- app/controllers/jobshop/teams_controller.rb
 - app/helpers/jobshop/application_helper.rb
 - app/jobs/jobshop/application_job.rb
 - app/models/jobshop/application_record.rb
+- app/models/jobshop/dashboard.rb
 - app/models/jobshop/registration.rb
-- app/models/jobshop/site.rb
+- app/models/jobshop/team.rb
 - app/models/jobshop/user.rb
 - app/models/jobshop/virtual_record.rb
 - app/policies/jobshop/application_policy.rb
+- app/views/devise/confirmations/new.html.haml
+- app/views/devise/mailer/confirmation_instructions.html.haml
+- app/views/devise/mailer/password_change.html.haml
+- app/views/devise/mailer/reset_password_instructions.html.haml
+- app/views/devise/mailer/unlock_instructions.html.haml
+- app/views/devise/passwords/edit.html.haml
+- app/views/devise/passwords/new.html.haml
+- app/views/devise/registrations/edit.html.haml
+- app/views/devise/registrations/new.html.haml
+- app/views/devise/sessions/new.html.haml
+- app/views/devise/shared/_links.html.haml
+- app/views/devise/unlocks/new.html.haml
 - app/views/jobshop/dashboards/show.html.haml
 - app/views/jobshop/pages/index.html.haml
-- app/views/jobshop/sites/registrations/new.html.haml
+- app/views/jobshop/teams/registrations/new.html.haml
 - app/views/layouts/jobshop/application.html.haml
 - config/initializers/assets.rb
 - config/initializers/devise.rb
@@ -333,12 +339,14 @@ files:
 - 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/20160417210218_create_jobshop_dashboards.rb
+- db/migrate/20160425062447_rename_site_to_team.rb
 - db/migrate/keep
 - lib/generators/jobshop/config/config_generator.rb
 - lib/generators/jobshop/config/templates/jobshop.rb.tt
 - lib/generators/jobshop/orm_helpers.rb
-- lib/generators/jobshop/site/USAGE
-- lib/generators/jobshop/site/site_generator.rb
+- lib/generators/jobshop/team/USAGE
+- lib/generators/jobshop/team/team_generator.rb
 - lib/jobshop.rb
 - lib/jobshop/dummy.rb
 - lib/jobshop/engine.rb
@@ -363,9 +371,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1