jobshop 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b40482d948a58938955b3133971e53032caa54fb
-  data.tar.gz: fadf4c7b7f987f810b732a1eeded4ca4edaf2be7
+  metadata.gz: 8836a59044956ad6f3a87a7ae6d1f8ed555d4206
+  data.tar.gz: 784ebaafda1c6e0e7f55c35eb9541961b0c07b3f
 SHA512:
-  metadata.gz: ca99cbcb216815970ea4111c708c74450f49942c536ff14953c6f7c78f2d465dbb9bb4c6e1163823a1fe4aa81ee1fe482743d2539eeb3605c84d919e4ea0c5cf
-  data.tar.gz: 550c1aa4d0e8ac61a9e38b2c5742200f49d1ba819b8f9750f805941036b0f18ebb2914b879d8d1cd0e4c9c7e520e93ce7ae3ff05712a407b6753e1f38445d247
+  metadata.gz: d497a7ad7a2cd3fdd6cce2fe9430fb10bc1776bb4d82088128adbd29063045b8a35304170e8d6b203752df4682f1c260da1233f0640844ef62921a09ec54feda
+  data.tar.gz: 5ca0c588a1c163ca5d51e33584732f9afabc97d58ff1d871d59c9e7904964c0bc8083a7b5b2099b3ca6a3727f9af76b7808aa8cb7030147bdf1f07a7d2d2293c

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

@@ -1,6 +1,7 @@
 body.sessions-new,
 body.lookups-show,
-body.registrations-new {
+body.registrations-new,
+body.registrations-create {
   header {
     @extend .mdl-color--white;
     @extend .mdl-color-text--black;

data/app/controllers/jobshop/application_controller.rb

@@ -14,7 +14,7 @@ module Jobshop
     before_action :authenticate_user!
 
     # after_action :verify_authorized, except: :index
-    # after_action :verify_policy_scoped, :only => :index
+    # after_action :verify_policy_scoped, only: :index
 
     private
 

data/app/models/jobshop/user.rb

@@ -7,6 +7,15 @@ module Jobshop
     belongs_to :team, optional: true
     has_one :default_dashboard, class_name: "Jobshop::Dashboard", through: :team
 
+    validates :email,
+      presence:   { if: :email_required? },
+      format:     { if: :email_required?, with: /\A[^@\s]+@[^@\s]+\z/ },
+      uniqueness: { if: :email_changed?, scope: :team_id }
+
+    validates :password,
+      presence:     { if: :password_required? },
+      confirmation: { if: :password_required? }
+
     private
 
     def generate_email_authentication_token
@@ -15,5 +24,13 @@ module Jobshop
         break token unless Jobshop::User.where(email_authentication_token: token).first
       end
     end
+
+    def password_required?
+      !persisted? || !password.nil? || !password_confirmation.nil?
+    end
+
+    def email_required?
+      true
+    end
   end
 end

data/lib/generators/jobshop/team/team_generator.rb

@@ -1,14 +1,12 @@
 module Jobshop
   module Generators
-    class TeamGenerator < Rails::Generators::NamedBase
+    class TeamGenerator < Rails::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
 
       desc "Create a jobshop team."
 
-      attr_reader :team, :link_text, :first_team
-
       def require_environment
-        ENV['RAILS_ENV'] ||= "development"
+        ENV["RAILS_ENV"] ||= "development"
         abort "Please run this command within a Rails app." unless Rails.root
 
         environment_filename = File.expand_path(
@@ -18,11 +16,11 @@ module Jobshop
       end
 
       def create_team
-        @team = ::Jobshop::Team.create!(name: name)
+        @team = ::Jobshop::Team.create!
       end
 
       def generate_token
-        @token = team.generate_registration_token
+        @token = @team.generate_registration_token
       end
 
       def generate_secure_registration_link
@@ -31,7 +29,7 @@ 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.
+        @secure_url = ::Jobshop::Engine.routes.url_helpers.
           new_team_registration_url(@team,
           protocol: link_protocol,
           host: link_host,
@@ -43,10 +41,10 @@ module Jobshop
         say <<-MESSAGE
 ### JOBSHOP - IMPORTANT INFORMATION ############################################
 
-      Your Jobshop team "#{name}" has been initialized.
+      Your Jobshop team has been initialized.
       You may use the following link to complete the setup process.
 
-      #{link_text}
+      #{@secure_url}
 
       This link is valid for 30 minutes from now and will expire at:
       #{30.minutes.from_now.in_time_zone("Eastern Time (US & Canada)")}

data/lib/jobshop/version.rb

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

data/lib/tasks/jobshop_tasks.rake

@@ -22,6 +22,23 @@ namespace :jobshop do
       puts "#{team_name} | #{team.id} | #{team.owner_email} "
     end
   end
+
+  namespace :teams do
+    desc "Clear out teams that haven't been registered after 24 hours"
+    task purge: :environment do
+      deleted_teams = Jobshop::Team
+        .where(Jobshop::Team.arel_table[:registration_token_sent_at]
+          .lt(24.hours.ago))
+        .where(owner_id: nil)
+        .destroy_all
+
+      count = deleted_teams.count
+      inflection = "team".pluralize(count)
+      list = deleted_teams.map(&:id).join("\n")
+
+      puts "Purged #{count} #{inflection}\n#{list}"
+    end
+  end
 end
 
 %w( db:migrate db:rollback db:migrate:up db:migrate:down ).each do |t|

metadata

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