jobshop 0.0.101 → 0.0.107

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd90b50e7feb98aff7c02039f85914a92b21789
-  data.tar.gz: b08d3ec5ff1e5160bee39de1077be79cf870209e
+  metadata.gz: 6db9a1343f8edf846847e1805973f11c915e45da
+  data.tar.gz: a453bf3b77f34f67eb3280d088b1ab3389940504
 SHA512:
-  metadata.gz: 715aaa6e6ea388e208074804f4141c36bca7a303579379d727afa67d118449128eba94e2ebe99a87a2784476031ae18c894df5db1ba39baaded235c55fa2efe9
-  data.tar.gz: ada7575067365e3785eb7eecb2f32bd040ba06ec1c2ba613962348e60418c84462acd570e7ca11ce55fb7a7bae8a861755a0211f6cef9aff8b0f30079ed31e38
+  metadata.gz: 86214fb2f21c808174824429f5e8bc2329adbd4352cd825bb7f229731f8c914b294966ced7ec89b876343cdba02f80e0fd68e391b4507538f5784f1836dd6fb9
+  data.tar.gz: '08a3d69eceb4475b000f0504a4a3d8956ed5eef8e11e4312876841e6824139f5edb8d264e3d66d5d90541dd542d885fb486ca1d4b9f033fb63e317a6d0d732dc'

data/README.md

@@ -1,11 +1,20 @@
 # Jobshop
 
+Real-time production tracking and process evaluation in the cloud - or under your own roof.
+
 [![Gem Version](https://badge.fury.io/rb/jobshop.svg)](https://badge.fury.io/rb/jobshop)
 [![Code Climate](https://codeclimate.com/github/jobshop/jobshop/badges/gpa.svg)](https://codeclimate.com/github/jobshop/jobshop)
 [![Build Status](https://semaphoreci.com/api/v1/frankjmattia/jobshop/branches/master/shields_badge.svg)](https://semaphoreci.com/frankjmattia/jobshop)
 [![Test Coverage](https://codeclimate.com/github/jobshop/jobshop/badges/coverage.svg)](https://codeclimate.com/github/jobshop/jobshop/coverage)
+[![Dependency Status](https://gemnasium.com/badges/github.com/jobshop/jobshop.svg)](https://gemnasium.com/github.com/jobshop/jobshop)
 
-Real-time production tracking and process evaluation in the cloud - or under your own roof.
+## TL;DR
+
+**Jobshop is still a proof-of-concept.**
+
+It may eat your homework or do nothing at all; there are no promises, but there
+is a vision. Jobshop aims to take the complex machinery of a full-blown
+manufacturing execution system and put it within reach of the average job shop.
 
 ## Requirements
 
@@ -20,7 +29,7 @@ Jobshop only requires a few things:
 The Quick Installation is designed to get you up and running a local Jobshop
 server with minimum effort. This instance will be ideal for evaluating Jobshop
 at any number of stations within your organization. If you would like to
-deploy to a production server or create a local development instance, a few
+deploy to a production server or create a local development environment, a few
 extra considerations will need to be made. There are no guides yet but pull
 requests are always welcome.
 

data/app/models/jobshop/active_session.rb

@@ -0,0 +1,30 @@
+module Jobshop
+  class ActiveSession < ApplicationRecord
+    LIMIT = 20
+
+    class << self
+      def active?(id)
+        id && where(activation_id: id).exists?
+      end
+
+      def activate(id)
+        activation = create!(activation_id: id)
+        enforce_active_session_quota
+        activation
+      end
+
+      def deactivate(id)
+        return unless id
+        where(activation_id: id).delete_all
+      end
+
+      def enforce_active_session_quota
+        order("created_at desc").offset(LIMIT).destroy_all
+      end
+
+      def exclusive(id)
+        where("activation_id != ?", id).delete_all
+      end
+    end
+  end
+end

data/app/models/jobshop/user.rb

@@ -6,6 +6,7 @@ module Jobshop
 
     belongs_to :team, optional: true
     has_one :default_dashboard, class_name: "Jobshop::Dashboard", through: :team
+    has_many :active_sessions, dependent: :destroy
 
     validates :email,
       presence:   { if: :email_required? },
@@ -26,6 +27,18 @@ module Jobshop
       false
     end
 
+    def activate_session
+      active_sessions.activate(SecureRandom.hex).activation_id
+    end
+
+    def exclusive_session(id)
+      active_sessions.exclusive(id)
+    end
+
+    def session_active?(id)
+      active_sessions.active?(id)
+    end
+
   private
     def generate_email_authentication_token
       loop do

data/config/routes.rb

@@ -1,6 +1,4 @@
 Jobshop::Engine.routes.draw do
-  default_url_options(Jobshop.configuration.default_url_options)
-
   devise_for(:users, class_name: "Jobshop::User", module: "devise", skip: [ :sessions ])
 
   devise_scope :user do

data/db/migrate/20170309001357_create_jobshop_active_sessions.rb

@@ -0,0 +1,13 @@
+class CreateJobshopActiveSessions < ActiveRecord::Migration[5.0]
+  def change
+    create_table :jobshop_active_sessions, id: :uuid, default: -> { "gen_random_uuid()" } do |t|
+      t.uuid :user_id, null: false
+      t.string :activation_id
+
+      t.timestamps
+    end
+
+    add_index :jobshop_active_sessions, :user_id
+    add_index :jobshop_active_sessions, :activation_id, unique: true
+  end
+end

data/lib/generators/jobshop/app/app_generator.rb

@@ -16,11 +16,6 @@ module Jobshop
       GEMFILE
     end
 
-    def config
-      super
-      template "config/secrets.yml.tt", force: true
-    end
-
     def mount_engine
       route %Q(mount Jobshop::Engine => "/")
     end
@@ -51,7 +46,12 @@ module Jobshop
         "jobshop new #{arguments.map(&:usage).join(' ')} [options]"
       end
 
+      def remove_session_store_initializer_until_rails_5_1
+        remove_file "config/initializers/session_store.rb"
+      end
+
       def finish_template
+        generate "jobshop:config"
         build :mount_engine
         super
       end

data/lib/generators/jobshop/config/config_generator.rb

@@ -8,7 +8,7 @@ module Jobshop
       desc "Creates a Jobshop initializer."
 
       def copy_template
-        template "jobshop.rb.tt", "config/initializers/jobshop.rb"
+        template "config/initializers/jobshop.rb"
       end
     end
   end

data/lib/generators/jobshop/config/templates/config/initializers/jobshop.rb.tt

@@ -0,0 +1,2 @@
+Jobshop.configure do |config|
+end

data/lib/generators/jobshop/dummy/dummy_generator.rb

@@ -86,10 +86,10 @@ module Jobshop
 
       def run_bundle
         super
-        bundle_command("binstub jobshop --path=\"#{Jobshop::DummyApp.path}/bin\" --force")
-        bundle_command("exec rails db:drop RAILS_ENV=test")
-        bundle_command("exec rails db:create RAILS_ENV=test")
-        bundle_command("exec rails db:migrate RAILS_ENV=test")
+        bundle_command("exec rails db:drop:all")
+        bundle_command("exec rails db:create")
+        bundle_command("exec rails db:migrate")
+        bundle_command("exec rails db:test:load_schema")
       end
 
     protected

data/lib/jobshop/cli.rb

@@ -19,8 +19,22 @@ module Jobshop
     end
 
     class Dummy < Thor
+      desc "server", "Start the dummy app"
+      default_command def server
+        if Jobshop::DummyApp.exist?
+          Dir.chdir(Jobshop::DummyApp.path)
+          exec("rails s")
+        else
+          abort <<~MESSAGE
+            Dummy app does not exist at #{Jobshop::DummyApp.path}
+            Please run `jobshop dummy create` first to initialize it.
+          MESSAGE
+        end
+      end
+
       desc "create", "Create the dummy app"
-      default_command def create
+      def create
+        Jobshop::DummyApp.destroy! if Jobshop::DummyApp.exist?
         ARGV.shift; ARGV.unshift("new", Jobshop::DummyApp.path)
         Jobshop::Generators::DummyGenerator.start \
           Rails::Generators::ARGVScrubber.new(ARGV).prepare!

data/lib/jobshop/dummy_app.rb

@@ -16,7 +16,7 @@ module Jobshop
       end
 
       def path
-        @path ||= File.expand_path("spec/dummy-#{Rails::VERSION::STRING}")
+        @path ||= File.expand_path("spec/dummy")
       end
     end
   end

data/lib/jobshop/engine.rb

@@ -4,6 +4,7 @@ require "haml-rails"
 require "jquery-rails"
 require "material_design_lite-sass"
 require "pundit"
+require "redis-rails"
 require "rolify"
 require "sass-rails"
 require "simple_form"
@@ -24,5 +25,35 @@ module Jobshop
         Rails.application.config.paths["db/migrate"] << expanded_path
       end
     end
+
+    initializer "jobshop.redis_session_store" do
+      Rails.application.config.session_store(:redis_store, {
+        servers: Jobshop.configuration.session_store_url
+      })
+    end
+
+    initializer "jobshop.action_mailer.default_url_options" do
+      config.action_mailer.default_url_options = {
+        host: Jobshop.configuration.mailer_host
+      }
+    end
+
+    initializer "jobshop.active_sessions", after: :load_config_initializers do
+      Warden::Manager.after_set_user except: :fetch do |user, warden, opts|
+        ActiveSession.deactivate(warden.raw_session["activation_id"])
+        warden.raw_session["activation_id"] = user.activate_session
+      end
+
+      Warden::Manager.after_fetch do |user, warden, opts|
+        unless user.session_active?(warden.raw_session["activation_id"])
+          warden.logout
+          throw :warden, message: :unauthenticated
+        end
+      end
+
+      Warden::Manager.before_logout do |user, warden, opts|
+        ActiveSession.deactivate warden.raw_session["activation_id"]
+      end
+    end
   end
 end

data/lib/jobshop/version.rb

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

data/lib/jobshop.rb

@@ -1,5 +1,3 @@
-require "jobshop/engine"
-
 module Jobshop
   class << self
     attr_writer :configuration
@@ -14,14 +12,14 @@ module Jobshop
   end
 
   class Configuration
-    attr_writer :canonical_name
+    attr_accessor :mailer_host,
+      :session_store_url
 
     def initialize
-      @canonical_name = "localhost:3000"
-    end
-
-    def default_url_options
-      { host: @canonical_name }
+      @mailer_host = ENV.fetch("JOBSHOP_MAILER_HOST", "localhost:3000")
+      @session_store_url ||= ENV.fetch("SESSION_STORE_URL", "redis://localhost:6379/0")
     end
   end
 end
+
+require "jobshop/engine"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobshop
 version: !ruby/object:Gem::Version
-  version: 0.0.101
+  version: 0.0.107
 platform: ruby
 authors:
 - Frank J. Mattia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: redis-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rolify
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -335,6 +349,7 @@ files:
 - app/jobs/jobshop/application_job.rb
 - app/mailers/jobshop/application_mailer.rb
 - app/mailers/jobshop/teams_mailer.rb
+- app/models/jobshop/active_session.rb
 - app/models/jobshop/application_record.rb
 - app/models/jobshop/dashboard.rb
 - app/models/jobshop/registration.rb
@@ -380,14 +395,14 @@ files:
 - db/migrate/20160425062447_rename_site_to_team.rb
 - db/migrate/20160718130211_reindex_jobshop_users_by_email_and_team_id.rb
 - db/migrate/20160720201947_add_authentication_token_to_jobshop_users.rb
+- db/migrate/20170309001357_create_jobshop_active_sessions.rb
 - db/migrate/keep
 - exe/jobshop
 - lib/generators/jobshop/app/USAGE
 - lib/generators/jobshop/app/app_generator.rb
 - lib/generators/jobshop/app/templates/README.md.tt
-- lib/generators/jobshop/app/templates/config/secrets.yml.tt
 - lib/generators/jobshop/config/config_generator.rb
-- lib/generators/jobshop/config/templates/jobshop.rb.tt
+- lib/generators/jobshop/config/templates/config/initializers/jobshop.rb.tt
 - lib/generators/jobshop/dummy/dummy_generator.rb
 - lib/generators/jobshop/dummy/templates/config/boot.rb.tt
 - lib/generators/jobshop/orm_helpers.rb
@@ -421,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: An open source Manufacturing Execution System.

data/lib/generators/jobshop/app/templates/config/secrets.yml.tt

@@ -1,27 +0,0 @@
-# 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.
-
-defaults: &defaults
-  canonical_name: "localhost"
-  secret_key_base: <%= SecureRandom.hex(64) %>
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-# Do not keep production secrets in the repository,
-# instead read values from the environment.
-production:
-  canonical_name: <%%= ENV["CANONICAL_NAME"] %>
-  secret_key_base: <%%= ENV["SECRET_KEY_BASE"] %>

data/lib/generators/jobshop/config/templates/jobshop.rb.tt

@@ -1,3 +0,0 @@
-Jobshop.configure do |config|
-  # TODO: Add some configure options.
-end