hephaestus 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c6c89b1e31d150cbb474ed41ca2de9ae206a89c352139bcfc87d86217b9659b
-  data.tar.gz: a363e937f8d6b7c6895a218109734c75fb5d9b37cb690cd67b9582ae63c905f0
+  metadata.gz: b58de861c02e9f029be16c4ffc63a7d328569e00d17b620fe192cbc9c4788579
+  data.tar.gz: 634c07e912d979106ff8eefc6eaed83c4331321652754edd95f6ee87af2e6706
 SHA512:
-  metadata.gz: 5b9e96e4832af13875dbab52733d0a86715ab7c0f5371c71cf3f1ed64a47a8377b9e536538047e68d55ae2c6a36d64aa29f5c600edc52a5c6d8e92e99e200b75
-  data.tar.gz: 166640dc99160787a3f0547af9416ac45fe6482c65475230c7016d242167b61e9975b3ce33930ade18d9d4809ab44592ce6596e9ae1d1f2d2fcbf15de1b49c7d
+  metadata.gz: f1517fe22cb5f81eca885f702051a9546aa3088e3cad6d3159190f9673368a601b59cd243505380bd6129cbdcc3ba9e1ddb8e771c90722efabfe51d534793277
+  data.tar.gz: a3d9dffb9397754e98696bb1c1ca10718026aeb5580a36342298da0e61476e0c78dbf16429a03823cd673fba8bdbdd56121d1b184098dd93195e174eb6a4ba1a

data/.ruby-version

@@ -1 +1 @@
-3.2.1
+3.3.0

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [v0.6.0] - 19-12-2023
+## What's Changed
+* Remove switch logic from plugs by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/15
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.5.2...v0.6.0
+## [v0.5.2] - 13-11-2023
+## What's Changed
+* Fix RAILS_ENV in fly-staging.toml by @balevine in https://github.com/yettoapp/hephaestus/pull/13
+* Change dependabot checking to  by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/14
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.5.1...v0.5.2
 ## [v0.5.1] - 31-10-2023
 ## What's Changed
 * Remove excess :// characters from PROTOCOL by @balevine in https://github.com/yettoapp/hephaestus/pull/12

data/lib/hephaestus/app_builder.rb

@@ -158,7 +158,10 @@ module Hephaestus
     def replace_generic_variables
       say(set_color("Replacing generic variable names...", :cyan))
       replace_in_files(destination_root, /App(?!lication)/, short_app_name.capitalize)
+
       replace_in_files(destination_root, %r{(?<!yetto|sw|plugs\.yetto\.)app(?!lication|/|roximate)}, short_app_name.downcase)
+      replace_in_file("test/support/api.rb", "/app/", "/#{short_app_name.downcase}/")
+
       replace_in_files(destination_root, "PlugApp", app_name.underscore.camelcase)
       replace_in_files(destination_root, "plug-app", app_name.dasherize)
       replace_in_files("destination_root}/.github/workflows/test.yml", "plug-app", app_name.dasherize)

data/lib/hephaestus/version.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 module Hephaestus
-  VERSION = "0.5.2"
+  VERSION = "0.6.1"
   RAILS_VERSION = "~> 7.0"
   RUBY_VERSION = File
     .read("#{File.dirname(__FILE__)}/../../.ruby-version")

data/templates/Dockerfile

@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.2.1
+ARG RUBY_VERSION=3.3.0
 FROM ruby:$RUBY_VERSION-slim as base
 
 # The plug-app code lives here

data/templates/Gemfile.erb

@@ -27,7 +27,7 @@ gem "hiredis", "~> 0.6"
 gem "lograge", "~> 0.12"
 
 # provides middleware to make OpenAPI parsing simpler
-gem "openapi_first", "~> 0.20"
+gem "openapi_first", "~> 1.0"
 
 # For Honeycomb.io
 gem "opentelemetry-sdk", "~> 1.2"
@@ -68,7 +68,7 @@ group :development, :test do
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem "debug", platforms: [:mri, :mingw, :x64_mingw], require: false
 
-  gem "faker", "~> 2.20"
+  gem "faker", "~> 3.0"
   gem "rubocop", require: false
   gem "rubocop-standard", require: false
 end
@@ -113,7 +113,7 @@ group :test do
 end
 
 group :ci do
-  gem "brakeman", "~> 5.3"
+  gem "brakeman", "~> 6.0"
   gem "bundle-audit", "~> 0.1"
 end
 

data/templates/app/controllers/yetto_controller.rb

@@ -11,22 +11,11 @@ class YettoController < ApplicationController
 
   before_action :from_yetto?
 
-  AFTER_CREATE_MESSAGE_SWITCH = JSON.parse(Rails.root.join("app/lib/plug_app/switches/message_created.jsonc").read)
-
   def event
     case pparam_yetto_event
     when Headers::Yetto::EVENT_AFTER_CREATE
       case pparam_yetto_record_type
       when Headers::Yetto::RECORD_TYPE_PLUG_INSTALLATION
-        create_inbox_switch_data = {
-          type: "create_inbox_switch",
-          inbox: { id: bparam_inbox_id },
-          plug_installation: { id: bparam_plug_installation_id },
-          payload: AFTER_CREATE_MESSAGE_SWITCH,
-        }
-
-        UpdateYettoJob.perform_later(create_inbox_switch_data)
-
         no_content
       when Headers::Yetto::RECORD_TYPE_MESSAGE
 

data/templates/app/jobs/update_yetto_job.rb

@@ -10,15 +10,13 @@ class UpdateYettoJob < ApplicationJob
   def perform(params)
     type = params.delete(:type)
 
-    inbox_id = params.fetch(:inbox, {}).fetch(:id, nil)
+    params.fetch(:inbox, {}).fetch(:id, nil)
     plug_installation_id = params.fetch(:plug_installation, {}).fetch(:id, nil)
     message_id = params.fetch(:message, {}).fetch(:id, nil)
 
     case type
     when "update_plug_installation"
       YettoService.update_installation(plug_installation_id, params)
-    when "create_inbox_switch"
-      YettoService.create_inbox_switch(inbox_id, plug_installation_id, params)
     when "create_message_reply"
       YettoService.create_message_reply(message_id, plug_installation_id, params)
     when "add_message_metadata"

data/templates/app/lib/body_parameter/yetto_parameters.rb

@@ -101,7 +101,7 @@ module BodyParameter
       title = conversation.fetch(:title, "")
       created_by_user = message.fetch(:created_by_user, {})
       created_by_plug = message.fetch(:created_by_plug, {})
-      author = (created_by_user.presence || created_by_plug)
+      author = created_by_user.presence || created_by_plug
       name = author.fetch(:name, "")
       metadata = message.fetch(:metadata, {}).to_unsafe_hash
 

data/templates/app/lib/plug_app/middleware/openapi_validation.rb

@@ -12,42 +12,71 @@ module PlugApp
 
       def initialize(app)
         @app = app
-        @response_validator = OpenapiFirst::ResponseValidator.new(SPEC)
-        @request_validator = OpenapiFirst::RequestValidation.new(->(_env) {}, spec: SPEC, raise_error: true)
       end
 
       def call(env)
         request = Rack::Request.new(env)
 
-        if request.path.starts_with?(API_PATH_PREFIX)
+        return @app.call(env) unless request.path.starts_with?(API_PATH_PREFIX) && request.path.exclude?("/settings")
+
+        begin
           # force content-type to JSON
-          if env["CONTENT_TYPE"] == "application/x-www-form-urlencoded"
-            env["CONTENT_TYPE"] = "application/json"
-          end
+          env["CONTENT_TYPE"] = "application/json" if env["CONTENT_TYPE"] != "application/json"
+
+          validated_request = SPEC.validate_request(request)
+
+          return @app.call(env) if validated_request.valid?
+
+          case validated_request.error
+          when OpenapiFirst::Schema::ValidationError
+            error_arr = format_arr(validated_request.error.errors.map(&:error))
+            Rails.logger.error(error_arr) if print_user_api_errors?
+            [PlugApp::HTTP::BAD_REQUEST_I, { "Content-Type" => "application/json" }, [error_arr]]
+          else
+            case validated_request.error.error_type
+            when :not_found
+              [PlugApp::HTTP::NOT_FOUND_I, { "Content-Type" => "application/json" }, [format_str("Not Found")]]
+            else
+              error_message = if validated_request.error.errors.present?
+                format_arr(validated_request.error.errors.map(&:error))
+              else
+                format_str(validated_request.error.message)
+              end
 
-          begin
-            @request_validator.call(env)
-            # response = @app.call(env)
-            # @response_validator.validate(request, response)
-          rescue OpenapiFirst::NotFoundError
-            PlugApp::Middleware::NotFound.new.call(env)
-          rescue OpenapiFirst::RequestInvalidError => e
-            error_hsh = ::ErrorSerializer.format(e.message)
-            Rails.logger.error(error_hsh) if print_user_api_errors?
-            return [PlugApp::HTTP::BAD_REQUEST_I, { "Content-Type" => "application/json" }, [error_hsh]]
-          rescue StandardError => e
-            raise e unless Rails.env.production?
-
-            logger.error(
-              "openapi.request_validation.error",
-              path: request.path,
-              method: request.env["REQUEST_METHOD"],
-              error_message: e.message,
-            )
+              Rails.logger.error(error_message) if print_user_api_errors?
+              [PlugApp::HTTP::BAD_REQUEST_I, { "Content-Type" => "application/json" }, [error_message]]
+            end
           end
+        rescue StandardError => e
+          raise e unless Rails.env.production?
+
+          logger.error(
+            "openapi.request_validation.error",
+            path: request.path,
+            method: request.env["REQUEST_METHOD"],
+            error_message: e.message,
+          )
         end
+      end
+
+      private def format_str(error)
+        {
+          errors: [
+            {
+              message: error,
+            },
+          ],
+        }.to_json
+      end
 
-        @app.call(env)
+      private def format_arr(errors)
+        {
+          errors: errors.each_with_object([]) do |error, arr|
+            arr << {
+              message: error,
+            }
+          end,
+        }.to_json
       end
     end
   end

data/templates/app/services/yetto_service.rb

@@ -34,13 +34,6 @@ class YettoService
       yetto_client.with_headers("Authorization" => "Bearer #{token}").patch("#{YETTO_API_VERSION_TLD}/installations/#{plug_installation_id}", json: plug_installation)
     end
 
-    def create_inbox_switch(inbox_id, plug_installation_id, params)
-      payload = params[:payload]
-      token = perform_token_exchange(plug_installation_id)
-
-      yetto_client.with_headers("Authorization" => "Bearer #{token}").post("#{YETTO_API_VERSION_TLD}/inboxes/#{inbox_id}/switches", json: payload)
-    end
-
     def update_message(message_id, plug_installation_id, params)
       payload = params[:payload]
       token = perform_token_exchange(plug_installation_id)

data/templates/test/support/webmocks/yetto_webmock.rb

@@ -115,24 +115,5 @@ module Webmocks
           body: {}.to_json,
         )
     end
-
-    def assert_requested_create_inbox_switch(inbox_id, plug_installation_id)
-      assert_requested_post_access_token(plug_installation_id)
-      assert_requested(:post, "#{::YettoService::YETTO_API_VERSION_TLD}/inboxes/#{inbox_id}/switches")
-    end
-
-    def stub_create_inbox_switch(inbox_id, plug_installation_id, payload)
-      stub_post_access_token(plug_installation_id)
-
-      stub_request(:post, "#{::YettoService::YETTO_API_VERSION_TLD}/inboxes/#{inbox_id}/switches")
-        .with(
-          body: payload,
-        )
-        .to_return(
-          status: 200,
-          headers: { content_type: "application/json; charset=utf-8" },
-          body: {}.to_json,
-        )
-    end
   end
 end

data/templates/vendor/fly/fly-production.toml

@@ -13,6 +13,18 @@ LD_PRELOAD_PATH = "/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"
 web = "./bin/rails server"
 worker = "bundle exec sidekiq"
 
+[[vm]]
+cpu_kind = "performance"
+cpus = 2
+memory = "4gb"
+processes = ["web"]
+
+[[vm]]
+cpu_kind = "performance"
+cpus = 1
+memory = "2gb"
+processes = ["worker"]
+
 [http_service]
 internal_port = 3000
 force_https = true

data/templates/vendor/fly/fly-staging.toml

@@ -9,6 +9,18 @@ LD_PRELOAD_PATH = "/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"
 web = "./bin/rails server"
 worker = "bundle exec sidekiq"
 
+[[vm]]
+cpu_kind = "shared"
+cpus = 2
+memory = "2gb"
+processes = ["web"]
+
+[[vm]]
+cpu_kind = "shared"
+cpus = 2
+memory = "1gb"
+processes = ["worker"]
+
 [http_service]
 internal_port = 3000
 force_https = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hephaestus
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,10 +168,8 @@ files:
 - templates/app/lib/path_parameter/yetto_parameters.rb
 - templates/app/lib/plug_app/http.rb
 - templates/app/lib/plug_app/middleware/malformed_request.rb
-- templates/app/lib/plug_app/middleware/not_found.rb
 - templates/app/lib/plug_app/middleware/openapi_validation.rb
 - templates/app/lib/plug_app/middleware/tracing_attributes.rb
-- templates/app/lib/plug_app/switches/message_created.jsonc
 - templates/app/lib/query_parameter.rb
 - templates/app/serializers/error_serializer.rb
 - templates/app/services/http_service.rb
@@ -244,14 +242,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.1
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.4.7
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app that can be used to create plugs for Yetto.

data/templates/app/lib/plug_app/middleware/not_found.rb

@@ -1,41 +0,0 @@
-# typed: false
-# frozen_string_literal: true
-
-require "openapi_first"
-
-module PlugApp
-  module Middleware
-    # frozen_string_literal: true
-
-    # Rack::NotFound is a default endpoint. Optionally initialize with the
-    # path to a custom 404 page, to override the standard response body.
-    #
-    # Examples:
-    #
-    # Serve default 404 response:
-    #   run Rack::NotFound.new
-    #
-    # Serve a custom 404 page:
-    #   run Rack::NotFound.new('path/to/your/404.html')
-
-    class NotFound
-      F = ::File
-
-      def initialize(path = nil, content_type = "text/html")
-        if path.nil?
-          @content = "Not found\n"
-        else
-          @content = F.read(path)
-          @content = F.read(path)
-        end
-        @length = @content.bytesize.to_s
-
-        @content_type = content_type
-      end
-
-      def call(env)
-        [404, { "Content-Type" => @content_type, "Content-Length" => @length }, [@content]]
-      end
-    end
-  end
-end

data/templates/app/lib/plug_app/switches/message_created.jsonc

@@ -1,25 +0,0 @@
-{
-    "name": "Send internal comments to App",
-    "configuration": {
-        "version": "2023-03-06",
-        "events": {
-            "message.created": {
-                "conditions": {
-                    "if": "{% data.message.visibility == 'internal' and data.message.text_content contains '@App' %}"
-                },
-                "actions": [
-                    {
-                        "name": "Send to App",
-                        "uses": "send_to_plug",
-                        "with": {
-                            "plug_id": "{{ data.switch.created_by_plug.id }}",
-                            "message": "{{ data.message }}",
-                            "plug_installation": "{{ data.plug_installation }}",
-                            "inbox": "{{ data.inbox }}"
-                        }
-                    }
-                ]
-            }
-        }
-    }
-}