uffizzi_core 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5085353e167434c11ae0155c5d55a4f3476124a2450b013de65361c303614090
-  data.tar.gz: 36d5fb3f8aa7d15a9f274cec8ccbe92fcbc4dca9c67a9573e7b05c9080db87f3
+  metadata.gz: 3cf0385b90270853a0014af3854253436050a54617c7351acb13bd93ab166e92
+  data.tar.gz: 0b0cc859f136ae6c78c358668db24b894e860f4dd56d1b2916aa90af1e3deed0
 SHA512:
-  metadata.gz: 54aa46774504fb1059e2fd5175842e3ea2544f015d5f605a1a84ad3150087910048bdbd1d27bf5bfcb32af4d8b05db30076991a4c2f2827490c473c7f2e35e5e
-  data.tar.gz: '085bb9ce07490be191221d2d44b83c5bb6b0622d139ae90a62fca7da7d8e5dcac7ae2970167ca8c49df1d14d8e067eee396200573bf337aea6c4c618defcbda9'
+  metadata.gz: 6a9b81839c201a3958e45ff607141ac0b871694e56d8ffdc9b7c0a94963b9ad620b7d3a7e631b9d346ec8944d8d2e2ce8f3df2ed23faae6c7c637ce4866217b9
+  data.tar.gz: 0eea7cb1e2e2c01d80f6b01733db2424bce357d1f6da54b3f5c118dc78b649db8ac54ff499ca315f3642de55f3d906177b705aa372ae682bc87f6c26a2ac5910

data/app/controllers/uffizzi_core/api/cli/v1/projects/compose_files_controller.rb

@@ -62,7 +62,7 @@ class UffizziCore::Api::Cli::V1::Projects::ComposeFilesController < UffizziCore:
 
   def compose_file
     compose_file = resource_project.compose_file
-    raise ActiveRecord::RecordNotFound if compose_file.blank?
+    raise ActiveRecord::RecordNotFound.new("Couldn't find UffizziCore::ComposeFile", UffizziCore::ComposeFile) if compose_file.blank?
 
     compose_file
   end

data/app/controllers/uffizzi_core/application_controller.rb

@@ -11,11 +11,13 @@ class UffizziCore::ApplicationController < ActionController::Base
   DEFAULT_PER_PAGE = 20
 
   protect_from_forgery with: :exception
-  rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
   RESCUABLE_EXCEPTIONS = [RuntimeError, TypeError, NameError, ArgumentError, SyntaxError].freeze
   rescue_from *RESCUABLE_EXCEPTIONS do |exception|
     render_server_error(exception)
   end
+  rescue_from ActiveRecord::RecordNotFound do |exception|
+    render_not_found(exception)
+  end
 
   before_action :authenticate_request!
   skip_before_action :verify_authenticity_token
@@ -29,8 +31,9 @@ class UffizziCore::ApplicationController < ActionController::Base
     UffizziCore::JsonResponder
   end
 
-  def render_not_found
-    render json: { errors: { title: ['Resource Not Found'] } }, status: :not_found
+  def render_not_found(exception)
+    resource = exception.model || 'Resource'
+    render json: { errors: { title: ["#{resource} Not Found"] } }, status: :not_found
   end
 
   def render_server_error(error)

data/app/lib/uffizzi_core/concerns/models/compose_file.rb

@@ -19,7 +19,6 @@ module UffizziCore::Concerns::Models::ComposeFile
 
     enumerize :kind, in: [:main, :temporary], predicates: true, scope: :shallow, default: :main
 
-    validates :project, uniqueness: { scope: :project }, if: -> { kind.main? }
     validates :source, presence: true
     validate :main_compose_file_uniqueness, on: :create, if: -> { kind.main? }
 

data/app/lib/uffizzi_core/concerns/models/project.rb

@@ -12,7 +12,7 @@ module UffizziCore::Concerns::Models::Project
 
     belongs_to :account
 
-    has_many :repos
+    has_many :repos, dependent: :destroy
     has_many :deployments, dependent: :destroy
     has_many :user_projects, dependent: :destroy
     has_many :users, through: :user_projects

data/app/services/uffizzi_core/compose_file/config_option_service.rb

@@ -7,7 +7,7 @@ class UffizziCore::ComposeFile::ConfigOptionService
         raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.boolean_option', value: option)
       end
 
-      option.match(/^[a-zA-Z_][a-zA-Z0-9._\-]+$/).present?
+      option.match(/^[\w.-]+$/).present?
     end
 
     def config_options(compose_data)

data/config/locales/en.yml

@@ -13,7 +13,7 @@ en:
   compose:
     unsupported_file: Unsupported compose file
     invalid_file: Invalid compose file
-    invalid_config_option: Invalid config option '%{value}' - only [a-zA-Z0-9\._\-] characters are allowed
+    invalid_config_option: Invalid config option '%{value}' - only a-zA-Z0-9._- characters are allowed
     no_services: Service services has neither an image nor a build context specified. At least one must be provided.
     no_ingress: Service ingress has not been defined.
     invalid_image_value: Invalid image value '%{value}'
@@ -30,7 +30,7 @@ en:
     invalid_memory_type: Memory '%{value}' contains an invalid type, it should be a string
     invalid_memory_value: Invalid memory value '%{value}'
     invalid_memory: The memory should be one of the `125m` `250m` `500m` `1000m` `2000m` `4000m` values
-    image_build_no_specified: Service %{value} has neither an image nor a build context specified. At least one must be provided.
+    image_build_no_specified: Service '%{value}' has neither an image nor a build context specified. At least one must be provided.
     build_context_no_specified: The context option should be specified
     config_file_not_found: Config file not found '%{name}'
     invalid_context: Invalid context value '%{value}'

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '0.2.2'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm