jobshop 0.0.163 → 0.0.167

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 72d9c251b2bcc65848a33510d25bdee8d14ca55b
-  data.tar.gz: b0e53706a8d59d0824affb1a416fb519786a520b
+SHA256:
+  metadata.gz: 6c48065969cc31f4dbc0155fb650a57b8759fe983b7e4d2daa5d459216296d8b
+  data.tar.gz: 25a97a07fdbefc8d1e60d7af5099c8d9d2d2918a8114e0f69303b79687d35e43
 SHA512:
-  metadata.gz: 3a442988c2fcc8dc15e7bca171754a7d1ef608cf55a1021354b0be3c189ec1eadac472ffbb33c69371a8a9caceff0513dde3d7624aadf69f07fa5c6cbfe15c53
-  data.tar.gz: 1aff3bac63832e1f71be8cb40ae5949b8f45966d9752a78f0c2e7a89e8f1e3b01c70b5c58c02ab2b4d034ee419a49fe72f7f562da98bd863046d728e0886fc2b
+  metadata.gz: ebabad19298eeb8bcadf77fe19cce8f71dccc97eaf3ecc1b83244a832b10f4c60f0286ae03436808ff641d7aa04a18de5cd741487ee2a26d51b654ac4c374c90
+  data.tar.gz: 5953bb253466f946f598b52b500a8be51cb124d9968e725c2c87663b3eae920a4da6f84d6cc76b37842fbf6a685447df84f1e129dca5aac65826488f5f4199bf

data/README.md

@@ -19,9 +19,9 @@ manufacturing execution system and put it within reach of the average job shop.
 
 Jobshop only requires a few things:
 
-  - Ruby >= 2.4
-  - Rails >= 5.0
-  - PostgreSQL >= 9.5
+  - Ruby >= 2.6
+  - Rails >= 5.2
+  - PostgreSQL >= 11.0
 
 ## Quick Installation
 

data/Rakefile

@@ -1,5 +1,6 @@
 begin
   require "bundler/setup"
+  require "bundler/gem_tasks"
 rescue LoadError
   puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
@@ -14,28 +15,18 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-require "jobshop/dummy_app"
+APP_RAKEFILE = File.expand_path("spec/canary/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
 load "rails/tasks/statistics.rake"
-
-APP_RAKEFILE = Jobshop::DummyApp.rakefile
-require "bundler/gem_tasks"
-
-load "rails/tasks/engine.rake" if File.exist?(APP_RAKEFILE)
-
-Bundler::GemHelper.install_tasks
-
-require "rspec/core"
-require "rspec/core/rake_task"
+load "rspec/rails/tasks/rspec.rake"
 
 desc "Verify that all FactoryBot factories are valid"
 task lint: :environment do
+  FACTORY_PATH = File.expand_path("spec/factories", __dir__)
+  FactoryBot.definition_file_paths = [ FACTORY_PATH ]
+  FactoryBot.find_definitions
+
   DatabaseCleaner.cleaning do
-    FactoryBot.definition_file_paths = Jobshop::DummyApp.factory_paths
-    FactoryBot.find_definitions
     FactoryBot.lint traits: true
   end
 end
-
-desc "Run all specs"
-RSpec::Core::RakeTask.new(:spec)
-task default: :spec

data/app/controllers/jobshop/application_controller.rb

@@ -1,10 +1,11 @@
 module Jobshop
-  class ApplicationController < ActionController::API
-    include Jobshop::AuthorizationHandler
-    include Jobshop::AuthenticationHandler
+  class ApplicationController < ActionController::Base
+    protect_from_forgery with: :exception
+
+    layout "jobshop/application"
 
     def current_organization
-      @current_organization ||= current_user && current_user.organization
+      @current_organization ||= current_user&.organization
     end
   end
 end

data/app/controllers/jobshop/places_controller.rb

@@ -4,9 +4,5 @@ module Jobshop
   class PlacesController < ApplicationController
     def show
     end
-
-    private def session_activations
-      current_user.session_activations
-    end
   end
 end

data/app/controllers/jobshop/users_controller.rb

@@ -2,8 +2,5 @@ require_dependency "jobshop/application_controller"
 
 module Jobshop
   class UsersController < ApplicationController
-    def current
-      render(json: Jobshop::TestUserSerializer.new(current_user))
-    end
   end
 end

data/app/mailers/jobshop/application_mailer.rb

@@ -1,7 +1,5 @@
 module Jobshop
   class ApplicationMailer < ActionMailer::Base
-    default from: "jobshop-lookup@example.com"
-
     layout "mailer"
   end
 end

data/app/mailers/jobshop/rfq_responder_mailer.rb

@@ -0,0 +1,18 @@
+# frozen_string_literals: true
+
+module Jobshop
+  class RFQResponderMailer < ApplicationMailer
+
+    # Subject can be set in your I18n file at config/locales/en.yml
+    # with the following lookup:
+    #
+    #   en.rfq_responder_mailer.verified_contact.subject
+    #
+    def verified_contact
+      @to = params[:customer_contact]
+      @greeting = "RFQ Received"
+
+      mail(to: @to.email)
+    end
+  end
+end

data/app/models/jobshop/ability.rb

@@ -1,6 +1,6 @@
 module Jobshop
   class Ability < ApplicationRecord
-    belongs_to :organization, class_name: "Jobshop::Organization"
+    belongs_to :organization, -> { readonly }
     has_many :role_abilities, -> (object) { where(organization_id: object.organization_id) }
     has_many :roles, through: :role_abilities
   end

data/app/models/jobshop/customer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literals: true
+
+module Jobshop # :nodoc:
+  class Customer < ApplicationRecord
+    self.primary_keys = %i[ organization_id customer_id ]
+
+    after_initialize { self.customer_id ||= SecureRandom.uuid if new_record? }
+    after_create { reload }
+
+    belongs_to :organization, -> { readonly }, inverse_of: :customers
+
+    belongs_to :category, inverse_of: :customers,
+      foreign_key: %i[ organization_id category_id ]
+
+    has_many :contacts, inverse_of: :customer,
+      foreign_key: %i[ organization_id customer_id ]
+
+    has_many :orders, inverse_of: :customer,
+      foreign_key: %i[ organization_id customer_id ]
+
+    has_many :rfqs, inverse_of: :customer,
+      foreign_key: %i[ organization_id customer_id ]
+
+    validates :name, presence: true
+  end
+end
+
+# TODO: CreatedBy Implementation
+# belongs_to :created_by, polymorphic: true,
+#   foreign_key: %i[ organization_id created_by_id ]

data/app/models/jobshop/customer/category.rb

@@ -0,0 +1,19 @@
+# frozen_string_literals: true
+
+module Jobshop
+  class Customer::Category < ApplicationRecord
+    self.primary_keys = %i[ organization_id category_id ]
+
+    after_initialize { self.category_id ||= SecureRandom.uuid if new_record? }
+    after_create { reload }
+
+    belongs_to :organization, -> { readonly }, inverse_of: :customer_categories
+
+    has_many :customers, inverse_of: :category,
+      foreign_key: %i[ organization_id category_id ]
+
+    validates :name, uniqueness: {
+      case_insensitive: true, scope: :organization_id
+    }
+  end
+end

data/app/models/jobshop/customer/contact.rb

@@ -0,0 +1,28 @@
+# frozen_string_literals: true
+
+module Jobshop # :nodoc:
+  class Customer::Contact < ApplicationRecord
+    self.primary_keys = %i[ organization_id customer_id contact_id ]
+
+    after_initialize { self.contact_id ||= SecureRandom.uuid if new_record? }
+    after_create { reload }
+
+    belongs_to :organization, inverse_of: :customer_contacts
+    belongs_to :customer, inverse_of: :contacts,
+      foreign_key: %i[ organization_id customer_id ]
+
+    validates :email,
+      presence:   { if: :email_required? },
+      format:     { if: :email_required?, with: /\A[^@\s]+@[^@\s]+\z/ },
+      uniqueness: { if: :email_changed?, scope: :organization_id,
+        case_sensitive: false }
+
+    def full_name
+      @name = [ forename, surname ].join(" ")
+    end
+
+    private def email_required?
+      true
+    end
+  end
+end

data/app/models/jobshop/employee.rb

@@ -0,0 +1,46 @@
+# frozen_string_literals: true
+
+module Jobshop # :nodoc:
+  class Employee < ApplicationRecord
+    self.primary_keys = %i[ organization_id employee_id ]
+
+    after_initialize { self.employee_id ||= SecureRandom.uuid if new_record? }
+    after_create { reload }
+
+    belongs_to :organization, -> { readonly }, inverse_of: :employees
+
+    has_many :employments, inverse_of: :employee,
+      foreign_key: %i[ organization_id employee_id ],
+      dependent: :restrict_with_exception
+
+    validates :email,
+      presence:   { if: :email_required? },
+      format:     { if: :email_required?, with: /\A[^@\s]+@[^@\s]+\z/ },
+      uniqueness: { if: :email_changed?, scope: :organization_id,
+                    case_sensitive: false }
+
+    scope :active, -> {
+      joins(:employments).merge(Jobshop::Employment.active)
+    }
+
+    scope :inactive, -> {
+      joins(:employments).merge(Jobshop::Employment.inactive)
+    }
+
+    def active?
+      !!employments.active.first
+    end
+
+    def inactive?
+      !employments.active.first
+    end
+
+    def name
+      @name = [ forename, surname ].join(" ")
+    end
+
+    private def email_required?
+      true
+    end
+  end
+end

data/app/models/jobshop/employment.rb

@@ -0,0 +1,25 @@
+# frozen_string_literals: true
+
+module Jobshop
+  class Employment < ApplicationRecord
+    self.primary_keys = %i[ organization_id employment_id ]
+
+    after_initialize { self.employment_id ||= SecureRandom.uuid if new_record? }
+    after_create { reload }
+
+    belongs_to :organization, inverse_of: :employments
+
+    belongs_to :employee, inverse_of: :employments,
+      foreign_key: %i[ organization_id employee_id ]
+
+    default_scope { order(ended_on: :desc, started_on: :desc) }
+
+    scope :active, -> {
+      where(ended_on: nil)
+    }
+
+    scope :inactive, -> {
+      where.not(ended_on: nil)
+    }
+  end
+end

data/app/models/jobshop/employment_version.rb

@@ -0,0 +1,10 @@
+# frozen_string_literals: true
+
+module Jobshop
+  class EmploymentVersion < ApplicationRecord
+    private_class_method :new, :create
+
+    self.table_name = :jobshop_employment_auditing
+    self.primary_key = :auditing_id
+  end
+end

data/app/models/jobshop/inspection/boolean_criterion.rb

@@ -21,11 +21,11 @@ module Jobshop
     end
 
     delegate :name, :name=, :position, :position=, to: :criterion
-
+=begin
     def specification
       @specification ||= "#{condition}\nPASS/FAIL"
     end
-
+=end
     def tolerance
       @tolerance ||= condition
     end

data/app/models/jobshop/inspection/deviation_criterion.rb

@@ -66,7 +66,7 @@ module Jobshop
         errors[:base] << "minimum must be less than maximum"
       end
     end
-
+=begin
     def specification
       @specfication ||= if symmetric?
         "#{nominal}±#{abs(upper)}"
@@ -74,7 +74,7 @@ module Jobshop
         "#{nominal}\n#{lower}/#{upper}"
       end
     end
-
+=end
     def symmetric?
       @symmetrical ||= lower == upper * -1
     end
@@ -92,7 +92,7 @@ module Jobshop
       Unitwise(value.truncate(4), self[:unit])
     end
 
-    private def oversize?(value)
+    def oversize?(value)
       value = if value.respond_to?(:unit)
         value.convert_to(self[:unit])
       else
@@ -102,7 +102,7 @@ module Jobshop
       value > upper || false
     end
 
-    private def undersize?(value)
+    def undersize?(value)
       value = if value.respond_to?(:unit)
         value.convert_to(self[:unit])
       else

data/app/models/jobshop/inspection/limit_criterion.rb

@@ -48,13 +48,13 @@ module Jobshop
         self[:maximum] = value
       end
     end
-
+=begin
     def specification
       @specification ||= [
         qualifier, [ minimum, maximum ].compact.join("/")
       ].compact.join("\n")
     end
-
+=end
     def qualifier
       @qualifier ||= if minimum && !maximum
         "Minimum"
@@ -77,18 +77,19 @@ module Jobshop
       !undersize?(value) && !oversize?(value)
     end
 
-    private def oversize?(value)
+    def oversize?(value)
       value = Unitwise(value, self[:unit]) unless value.respond_to?(:unit)
       maximum && value > maximum || false
     end
 
-    private def undersize?(value)
+    def undersize?(value)
       value = Unitwise(value, self[:unit]) unless value.respond_to?(:unit)
       minimum && value < minimum || false
     end
 
     # Generate a random value that has a 90% chance of being in spec.
     # TODO: This needs to go in the tests somewhere, not really in the model.
+    # :nocov:
     def random
       value = if bound?
         rand(self[:minimum].to_f..self[:maximum].to_f) * 1.1
@@ -100,6 +101,7 @@ module Jobshop
 
       Unitwise(value, self[:unit])
     end
+    # :nocov:
 
     private def minimum_or_maximum_or_both
       unless minimum || maximum

data/app/models/jobshop/inspection/report.rb

@@ -17,6 +17,7 @@ module Jobshop
     has_many :tuples, -> { order(:position) },  inverse_of: :report,
       foreign_key: %i[ organization_id report_id ]
 
+=begin
     def ascii
       require "terminal-table"
       table = Terminal::Table.new do |t|
@@ -33,5 +34,6 @@ module Jobshop
 
       puts table
     end
+=end
   end
 end

data/app/models/jobshop/inspection/result.rb

@@ -19,7 +19,7 @@ module Jobshop
 
     def value
       if self[:unit] == "boolean"
-        !!self[:value]
+        FALSE_VALUES.exclude?(self[:value])
       else
         self[:value] && Unitwise(self[:value].truncate(4), self[:unit])
       end
@@ -27,7 +27,7 @@ module Jobshop
 
     def value=(value)
       if criterion.unit == "boolean"
-        self[:value] = value
+        self[:value] = FALSE_VALUES.exclude?(value)
         self[:unit] = "boolean"
       else
         if value.respond_to?(:unit)