jobshop 0.0.163 → 0.0.167

data/lib/jobshop/helpers/migration.rb

@@ -10,11 +10,11 @@ module Jobshop
         SQL
       end
 
-      def fk_organization_id(table_name)
+      def fk_organization(table_name)
         foreign_key table_name, :jobshop_organizations, :organization_id
       end
 
-      def fk_created_by_id(table_name)
+      def fk_created_by(table_name)
         foreign_key table_name, :jobshop_people, {
           organization_id: :organization_id,
           created_by_id: :person_id
@@ -54,6 +54,82 @@ module Jobshop
               #{options};
         SQL
       end
+
+      def create_table_with_auditing(table_name, *args) # rubocop: disable Metrics/MethodLength
+        options = args.extract_options!
+        primary_key_columns = options.delete(:primary_key)
+
+        if primary_key_columns.is_a?(Hash)
+          primary_key = []
+          types = []
+
+          primary_key_columns.each do |name, type|
+            primary_key.push(name)
+            types.push(type)
+          end
+        else
+          primary_key = Array(primary_key_columns)
+          types = Array.new(primary_key.count, :uuid)
+        end
+
+        primary_key_hash = Hash[primary_key.zip(types)]
+        auditing_table_name = table_name.to_s.singularize.concat("_auditing")
+        args << options
+
+        create_table(table_name, id: false) do |t|
+          # Put version column first because it is an auditing column
+          t.bigint :version
+
+          primary_key_hash.each { |name, type| t.send(type, name, null: false) }
+          t.index primary_key, unique: true, name: :"idx_#{table_name}_pkey"
+
+          # Preserve column order from migration
+          yield t
+        end
+
+        idx_table_name_pkey table_name
+
+        create_table(auditing_table_name, id: false) do |t|
+          # Put auditing columns first for the trigger to work properly
+          # Do not set a default on the primary key because the trigger sets it
+          # If the trigger fails to set the ID then this should probably blow up
+          t.uuid :auditing_id, null: false
+          t.index :auditing_id, unique: true,
+            name: :"idx_#{auditing_table_name}_pkey"
+
+          # Called audited_at so it does not conflict with created_at on the
+          # model being audited
+          t.datetime :audited_at, null: false
+
+          # Version being audited
+          t.bigint :version
+
+          # Put primary keys after auditing columns
+          primary_key_hash.each { |name, type| t.send(type, name, null: false) }
+
+          # Preserve column order and put everything else last
+          yield t
+        end
+
+        idx_table_name_pkey auditing_table_name
+        foreign_key auditing_table_name, table_name, primary_key
+
+        execute <<~SQL
+          CREATE
+            TRIGGER before_audit_#{table_name}
+            BEFORE INSERT OR UPDATE
+              ON #{table_name}
+              FOR EACH ROW EXECUTE PROCEDURE
+                prepare_auditable();
+
+          CREATE
+            TRIGGER #{table_name}_process_audit
+            AFTER INSERT OR UPDATE
+              ON #{table_name}
+              FOR EACH ROW EXECUTE PROCEDURE
+                process_auditable('#{auditing_table_name}');
+        SQL
+      end
     end
   end
 end

data/lib/jobshop/mailroom/base_handler.rb

@@ -0,0 +1,33 @@
+# frozen_string_literals: true
+
+module Jobshop
+  module  Mailroom
+    class BaseHandler
+      attr_accessor :organization, :to, :from, :customer_contact, :customer,
+        :subject, :content
+
+      # Prefix for archive
+      class_attribute :archive_prefix
+
+      # Default From address when responding to incoming mail
+      class_attribute :reply_as,
+        default: Jobshop.configuration.smtp.default_from
+
+      def initialize(message, mailman)
+        self.organization = mailman.organization
+
+        self.to   = Mail::Address.new(message.to.first)
+        self.from = Mail::Address.new(message.from.first)
+
+        self.customer_contact = organization.customer_contacts
+          .find_by(email: from.address)
+
+        self.customer = customer_contact&.customer ||
+          organization.customers.find_by(from_domain)
+
+        self.subject = message.subject
+        self.content = parse_body(message)
+      end
+    end
+  end
+end

data/lib/jobshop/mailroom/null_handler.rb

@@ -0,0 +1,10 @@
+# frozen_string_literals: true
+
+module Jobshop
+  module  Mailroom
+    class NullHandler < BaseHandler
+      def initialize(*); end
+      def process; false; end
+    end
+  end
+end

data/lib/jobshop/mailroom/postmaster.rb

@@ -0,0 +1,77 @@
+# frozen_string_literals: true
+
+require "aws-sdk-s3"
+require "mail"
+require "shoryuken"
+
+module Jobshop
+  module Mailroom
+    # Jobshop::Mailroom::Postmaster
+    #
+    # Reponsible for processing incoming email and dispatching it to its handler.
+    class Postmaster
+      include Shoryuken::Worker
+
+      shoryuken_options queue: Jobshop.configuration.aws.incoming_email_queue
+
+      def perform(sqs_msg, *)
+        @event = S3EventMessage.new(sqs_msg.body) || return
+        tempfile = Tempfile.new
+        s3.get_object({ bucket: @event.bucket, key: @event.key }, target: tempfile)
+        message = Mail.new(File.read(tempfile))
+        handler = Mailman.handler_for(message)
+
+        if handler.process
+          copy_to(handler.archive_prefix)
+          delete_original
+          sqs_msg.delete
+        end
+
+      ensure
+        @event = nil
+        tempfile.close
+        tempfile.unlink
+      end
+
+      def s3
+        @s3 ||= Aws::S3::Client.new
+      end
+
+      def copy_to(prefix)
+        key = prefix + "/" + @event.key.split("/").last
+
+        s3.copy_object({
+          copy_source: @event.bucket + "/" + @event.key,
+          bucket: Jobshop.configuration.aws.s3_bucket,
+          key: key
+        }) || raise("Could not copy incoming rfq to processed folder")
+      end
+
+      def delete_original
+        s3.delete_object({
+          bucket: @event.bucket, key: @event.key
+        }) || raise("Could not delete original email")
+      end
+
+      class S3EventMessage
+        def initialize(message)
+          @message = JSON.parse(message)
+
+          return false unless records
+        end
+
+        def records
+          @records ||= @message["Records"] || []
+        end
+
+        def bucket
+          records.first.dig "s3", "bucket", "name"
+        end
+
+        def key
+          records.first.dig "s3", "object", "key"
+        end
+      end
+    end
+  end
+end

data/lib/jobshop/mailroom/rfq_handler.rb

@@ -0,0 +1,39 @@
+# frozen_string_literals: true
+
+module Jobshop
+  module  Mailroom
+    class RFQHandler < BaseHandler
+      self.archive_prefix = "rfqs/processed"
+
+      def process
+        new_rfq = organization.rfqs.create!({
+          requested_by: customer_contact,
+          customer: customer,
+          from: from,
+          subject: subject,
+          content: content
+        })
+
+        if customer_contact
+          RFQResponderMailer.with(customer_contact: customer_contact)
+            .verified_contact.deliver_later
+        end
+        # TODO: Send rfq to quoting queue with low priority if customer.nil?
+        return new_rfq
+      end
+
+      private def from_domain
+        [ "reverse(lower(email_from_domain)) LIKE ?",
+          "#{from.domain.reverse.downcase}%" ]
+      end
+
+      private def parse_body(message)
+        if message.multipart?
+          message.parts[0].decode_body
+        else
+          message.decode_body
+        end
+      end
+    end
+  end
+end

data/lib/jobshop/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literals: true
+
 module Jobshop
   def self.gem_version
     Gem::Version.new VERSION::STRING
@@ -6,7 +8,7 @@ module Jobshop
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 163
+    TINY  = 167
     PRE   = nil
 
     CODE_NAME = "prime time to bump the version"

data/lib/tasks/jobshop_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literals: true
+
 # This effectively hides `rake jobshop:install:migrations` from `$ rake -T`.
 Rake::Task["jobshop:install:migrations"].instance_variable_set(:@comments, [])
 
@@ -14,19 +16,18 @@ namespace :jobshop do
     end
   end
 
-  desc "Outputs organization[:name] and organization[:id] for all sites within Jobshop."
+  desc "Outputs all organization_ids"
   task organizations: :environment do
-    Jobshop::Organization
-      .select([ "jobshop_organizations.id", "name" ]).each do |organization|
-      organization_name = organization.name.ljust(32)
-      puts "#{organization_name} | #{organization.id}"
+    Jobshop::Organization.all.each do |organization|
+      puts organization.organization_id
     end
   end
 
   desc "Start Incoming Email Worker"
   task postmaster: :environment do
     queue_name = Jobshop.configuration.aws.incoming_email_queue
-    postmaster_path = File.join(Jobshop::Engine.root, "lib", "jobshop", "postmaster.rb")
+    postmaster_path = File.join(Jobshop::Engine.root, "lib", "jobshop",
+                                "mailroom", "postmaster.rb")
 
     exec <<~SHELL
       bundle exec \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobshop
 version: !ruby/object:Gem::Version
-  version: 0.0.163
+  version: 0.0.167
 platform: ruby
 authors:
 - Frank J. Mattia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord_json_validator
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.1
+        version: 1.30.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.1
+        version: 1.30.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: composite_primary_keys
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 11.1.0
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: fast_jsonapi
   requirement: !ruby/object:Gem::Requirement
@@ -81,33 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: jwt
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: liner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack-cors
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.2
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: shoryuken
   requirement: !ruby/object:Gem::Requirement
@@ -179,19 +221,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: bootsnap
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
+        version: 5.2.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -263,47 +291,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.6'
 - !ruby/object:Gem::Dependency
-  name: generator_spec
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: bcrypt
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -360,7 +388,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: An open source Manufacturing Execution System
+description: An Open Source Manufacturing Execution System
 email:
 - frankjmattia@gmail.com
 executables:
@@ -372,27 +400,25 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/concerns/email_token_validation.rb
-- app/controllers/concerns/jobshop/authentication_handler.rb
-- app/controllers/concerns/jobshop/authorization_handler.rb
 - app/controllers/jobshop/application_controller.rb
 - app/controllers/jobshop/dashboards_controller.rb
 - app/controllers/jobshop/organizations/lookups_controller.rb
 - app/controllers/jobshop/places_controller.rb
 - app/controllers/jobshop/registrations_controller.rb
-- app/controllers/jobshop/session_activations_controller.rb
-- app/controllers/jobshop/sessions_controller.rb
 - app/controllers/jobshop/users_controller.rb
-- app/email_handlers/jobshop/rfq_handler.rb
 - app/jobs/jobshop/application_job.rb
 - app/mailers/jobshop/application_mailer.rb
+- app/mailers/jobshop/rfq_responder_mailer.rb
 - app/models/jobshop/ability.rb
 - app/models/jobshop/application_record.rb
 - app/models/jobshop/collection.rb
-- app/models/jobshop/company.rb
-- app/models/jobshop/company/type.rb
-- app/models/jobshop/company_person.rb
+- app/models/jobshop/customer.rb
+- app/models/jobshop/customer/category.rb
+- app/models/jobshop/customer/contact.rb
 - app/models/jobshop/dashboard.rb
+- app/models/jobshop/employee.rb
+- app/models/jobshop/employment.rb
+- app/models/jobshop/employment_version.rb
 - app/models/jobshop/inspection.rb
 - app/models/jobshop/inspection/boolean_criterion.rb
 - app/models/jobshop/inspection/criterion.rb
@@ -405,7 +431,6 @@ files:
 - app/models/jobshop/order.rb
 - app/models/jobshop/order_line.rb
 - app/models/jobshop/organization.rb
-- app/models/jobshop/person.rb
 - app/models/jobshop/place.rb
 - app/models/jobshop/product.rb
 - app/models/jobshop/registration.rb
@@ -416,25 +441,26 @@ files:
 - app/models/jobshop/role_assignment.rb
 - app/models/jobshop/routing_process.rb
 - app/models/jobshop/routing_step.rb
-- app/models/jobshop/session_activation.rb
 - app/models/jobshop/thing.rb
 - app/models/jobshop/user.rb
 - app/models/jobshop/virtual_record.rb
-- app/serializers/jobshop/test_user_serializer.rb
-- app/services/jobshop/authentication_service.rb
-- app/services/jobshop/authorization_service.rb
-- app/services/jobshop/jwt_service.rb
+- app/views/jobshop/rfq_responder_mailer/verified_contact.html.erb
+- app/views/jobshop/rfq_responder_mailer/verified_contact.text.erb
+- app/views/layouts/jobshop/application.html.haml
+- app/views/layouts/jobshop/mailer.html.erb
 - app/views/layouts/jobshop/mailer.text.erb
+- config/initializers/devise.rb
+- config/locales/devise.en.yml
 - config/routes.rb
 - db/migrate/20170311194758_initialize_jobshop.rb
 - db/migrate/20171216021339_create_organizations.rb
+- db/migrate/20171216021400_create_employees.rb
 - db/migrate/20171216021554_create_people.rb
-- db/migrate/20171216021853_create_companies.rb
+- db/migrate/20171216021853_create_customers.rb
 - db/migrate/20171216022020_create_places.rb
 - db/migrate/20171216022135_create_products.rb
 - db/migrate/20171216022605_create_orders.rb
 - db/migrate/20171216023018_create_roles.rb
-- db/migrate/20171216023022_create_sessions.rb
 - db/migrate/20171216035357_create_things.rb
 - db/migrate/20171219022118_create_routing_processes.rb
 - db/migrate/20180107203241_create_inspections.rb
@@ -447,19 +473,23 @@ files:
 - lib/generators/jobshop/app/templates/Procfile.tt
 - lib/generators/jobshop/app/templates/README.md.tt
 - lib/generators/jobshop/app/templates/config/database.yml.tt
+- lib/generators/jobshop/canary/canary_generator.rb
+- lib/generators/jobshop/canary/templates/config/boot.rb.tt
 - lib/generators/jobshop/config/config_generator.rb
 - 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
 - lib/jobshop.rb
 - lib/jobshop/cli.rb
-- lib/jobshop/cli/spinner.rb
+- lib/jobshop/cli/app_generator.rb
+- lib/jobshop/cli/application.rb
+- lib/jobshop/cli/canary.rb
 - lib/jobshop/configuration.rb
-- lib/jobshop/dummy_app.rb
 - lib/jobshop/engine.rb
 - lib/jobshop/helpers/migration.rb
-- lib/jobshop/postmaster.rb
+- lib/jobshop/mailroom/base_handler.rb
+- lib/jobshop/mailroom/null_handler.rb
+- lib/jobshop/mailroom/postmaster.rb
+- lib/jobshop/mailroom/rfq_handler.rb
 - lib/jobshop/support/memo_attr.rb
 - lib/jobshop/version.rb
 - lib/tasks/jobshop_tasks.rake
@@ -482,9 +512,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: An open source Manufacturing Execution System
+summary: An Open Source Manufacturing Execution System
 test_files: []