uffizzi_core 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d11e0fbdafef5829631ae769dab8ecfba065e8faf8fd16c008e6509371ae37
-  data.tar.gz: 5822903bdc95b70aef3ea7fe402332ed6f3815c9661c042597f7adde8a69fe45
+  metadata.gz: 503ded723d48c023e0c47bc007b75e704927ba6bb13e9ea672feb573b45a2b95
+  data.tar.gz: ac2d0d440e82ea78fc3a5cca1f2dcac89a9db129a4cd2eee4ca712fad2be53d1
 SHA512:
-  metadata.gz: 7617ee397e75a89ea1ddf79a445151fa3b0652008590d3893216833ba55cc1da4ffc23bb3cee448507f9a591c1ff9572fb03713ab1c3bdce652cfdc3b5de28b8
-  data.tar.gz: 465daea8766e80386c3229b20ab0a44152c860013877d14bdbcdc60b020745a834b5f67c41c3792d6fd31a5f7e84a92960ccbe0b6c905586867f65d2eabacdc5
+  metadata.gz: 46299f40846b2ef159fdd856f58cb47584907b26f1a16341007d5c6137f15a4afd905233f8db1e9d33252e652c218a4dba6ac216f59bb09ed00f6627c2b4643b
+  data.tar.gz: 2b1816b02b108dbd24ace6e4a6761fca714a62cd2226048ab2266b59bc09a9861a5f2cc425345326207feec9eeaa6f0ae1e3a539bbca8d2006ac8686fdb90edd

data/app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb

@@ -4,7 +4,7 @@ module UffizziCore::DependencyInjectionConcern
   def user_access_module
     return unless module_exists?(:rbac)
 
-    UffizziCore::UserAccessService.new(module_class(:rbac))
+    module_class(:rbac).new
   end
 
   private
@@ -14,6 +14,6 @@ module UffizziCore::DependencyInjectionConcern
   end
 
   def module_class(module_name)
-    UffizziCore.dependencies[module_name]&.constantize
+    Rails.application.config.uffizzi_core[:dependencies][module_name]&.constantize
   end
 end

data/app/controllers/uffizzi_core/application_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UffizziCore::ApplicationController < ActionController::Base
-  include Pundit
+  include Pundit::Authorization
   include UffizziCore::ResponseService
   include UffizziCore::AuthManagement
   include UffizziCore::AuthorizationConcern

data/app/lib/uffizzi_core/rbac/user_access_service.rb

@@ -1,21 +1,19 @@
 # frozen_string_literal: true
 
-module UffizziCore::Rbac::UserAccessService
-  class << self
-    def admin_access_to_account?(_user, _account)
-      true
-    end
+class UffizziCore::Rbac::UserAccessService
+  def admin_access_to_account?(_user, _account)
+    true
+  end
 
-    def any_access_to_account?(_user, _account)
-      true
-    end
+  def any_access_to_account?(_user, _account)
+    true
+  end
 
-    def admin_or_developer_access_to_project?(_user, _project)
-      true
-    end
+  def admin_or_developer_access_to_project?(_user, _project)
+    true
+  end
 
-    def any_access_to_project?(_user, _project)
-      true
-    end
+  def any_access_to_project?(_user, _project)
+    true
   end
 end

data/app/models/uffizzi_core/account.rb

@@ -5,7 +5,7 @@ class UffizziCore::Account < UffizziCore::ApplicationRecord
   include UffizziCore::StateMachineConcern
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:accounts]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:accounts]
 
   enumerize :kind, in: [:personal, :organizational], scope: true, predicates: true
   validates :kind, presence: true

data/app/models/uffizzi_core/activity_item.rb

@@ -21,7 +21,7 @@
 class UffizziCore::ActivityItem < UffizziCore::ApplicationRecord
   include UffizziCore::ActivityItemRepo
 
-  self.table_name = UffizziCore.table_names[:activity_items]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:activity_items]
 
   belongs_to :deployment
   belongs_to :container

data/app/models/uffizzi_core/build.rb

@@ -3,7 +3,7 @@
 class UffizziCore::Build < UffizziCore::ApplicationRecord
   include UffizziCore::BuildRepo
 
-  self.table_name = UffizziCore.table_names[:builds]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:builds]
 
   BUILDING = 1
   SUCCESS = 2

data/app/models/uffizzi_core/comment.rb

@@ -3,7 +3,7 @@
 class UffizziCore::Comment < UffizziCore::ApplicationRecord
   include UffizziCore::CommentRepo
 
-  self.table_name = UffizziCore.table_names[:comments]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:comments]
 
   has_ancestry(cache_depth: true)
   MAX_DEPTH_LEVEL = 1

data/app/models/uffizzi_core/compose_file.rb

@@ -14,7 +14,7 @@ class UffizziCore::ComposeFile < UffizziCore::ApplicationRecord
   include AASM
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:compose_files]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:compose_files]
 
   belongs_to :project
   belongs_to :added_by, class_name: UffizziCore::User.name, foreign_key: :added_by_id, optional: true

data/app/models/uffizzi_core/config_file.rb

@@ -11,7 +11,7 @@ class UffizziCore::ConfigFile < UffizziCore::ApplicationRecord
   include UffizziCore::ConfigFileRepo
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:config_files]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:config_files]
 
   belongs_to :project
   belongs_to :added_by, class_name: UffizziCore::User.name, foreign_key: :added_by_id, optional: true

data/app/models/uffizzi_core/container.rb

@@ -17,7 +17,7 @@ class UffizziCore::Container < UffizziCore::ApplicationRecord
   include UffizziCore::StateMachineConcern
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:containers]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:containers]
 
   enumerize :kind, in: [:internal, :user], predicates: true
 

data/app/models/uffizzi_core/container_config_file.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UffizziCore::ContainerConfigFile < UffizziCore::ApplicationRecord
-  self.table_name = UffizziCore.table_names[:container_config_files]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:container_config_files]
 
   belongs_to :container
   belongs_to :config_file

data/app/models/uffizzi_core/coupon.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Coupon < UffizziCore::ApplicationRecord
-  self.table_name = UffizziCore.table_names[:coupons]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:coupons]
 end

data/app/models/uffizzi_core/credential.rb

@@ -4,7 +4,7 @@ class UffizziCore::Credential < UffizziCore::ApplicationRecord
   include AASM
   include UffizziCore::CredentialRepo
 
-  self.table_name = UffizziCore.table_names[:credentials]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:credentials]
 
   belongs_to :account
 

data/app/models/uffizzi_core/deployment.rb

@@ -25,7 +25,7 @@ class UffizziCore::Deployment < UffizziCore::ApplicationRecord
   include UffizziCore::DeploymentRepo
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:deployments]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:deployments]
 
   enumerize :kind, in: [:standard, :performance, :enterprise, :free], predicates: true, default: :standard
 

data/app/models/uffizzi_core/event.rb

@@ -4,7 +4,7 @@ class UffizziCore::Event < UffizziCore::ApplicationRecord
   include UffizziCore::EventRepo
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:events]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:events]
 
   enumerize :state, in: [:queued, :successful, :deployed, :failed, :building, :timeout, :cancelled, :deploying], predicates: true,
                     scope: true

data/app/models/uffizzi_core/invitation.rb

@@ -5,7 +5,7 @@ class UffizziCore::Invitation < UffizziCore::ApplicationRecord
   include UffizziCore::StateMachineConcern
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:invitations]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:invitations]
 
   enumerize :role, in: [:admin, :developer, :viewer], predicates: true
 

data/app/models/uffizzi_core/membership.rb

@@ -4,7 +4,7 @@ class UffizziCore::Membership < UffizziCore::ApplicationRecord
   include UffizziCore::MembershipRepo
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:memberships]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:memberships]
 
   enumerize :role, in: [:admin, :developer, :viewer], predicates: true
   validates :role, presence: true

data/app/models/uffizzi_core/payment.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UffizziCore::Payment < UffizziCore::ApplicationRecord
-  self.table_name = UffizziCore.table_names[:payments]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:payments]
 
   belongs_to :account
 

data/app/models/uffizzi_core/price.rb

@@ -3,7 +3,7 @@
 class UffizziCore::Price < UffizziCore::ApplicationRecord
   include UffizziCore::PriceRepo
 
-  self.table_name = UffizziCore.table_names[:prices]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:prices]
 
   belongs_to :product
 end

data/app/models/uffizzi_core/product.rb

@@ -3,7 +3,7 @@
 class UffizziCore::Product < UffizziCore::ApplicationRecord
   include UffizziCore::ProductRepo
 
-  self.table_name = UffizziCore.table_names[:products]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:products]
 
   has_one :price, dependent: :destroy
 

data/app/models/uffizzi_core/project.rb

@@ -8,7 +8,7 @@ class UffizziCore::Project < UffizziCore::ApplicationRecord
   include UffizziCore::StateMachineConcern
   include UffizziCore::ProjectRepo
 
-  self.table_name = UffizziCore.table_names[:projects]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:projects]
 
   belongs_to :account
 

data/app/models/uffizzi_core/rating.rb

@@ -3,7 +3,7 @@
 class UffizziCore::Rating < UffizziCore::ApplicationRecord
   include AASM
 
-  self.table_name = UffizziCore.table_names[:ratings]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:ratings]
 
   aasm(:state) do
     state :active, initial: true

data/app/models/uffizzi_core/repo.rb

@@ -4,7 +4,7 @@ class UffizziCore::Repo < UffizziCore::ApplicationRecord
   extend Enumerize
   include UffizziCore::RepoRepo
 
-  self.table_name = UffizziCore.table_names[:repos]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:repos]
 
   enumerize :kind, in: [:buildpacks18, :dockerfile, :dotnet, :gatsby, :barestatic], predicates: true
 

data/app/models/uffizzi_core/role.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class UffizziCore::Role < UffizziCore::ApplicationRecord
-  self.table_name = UffizziCore.table_names[:roles]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:roles]
 
-  has_and_belongs_to_many :users, join_table: UffizziCore.table_names[:users_roles]
+  has_and_belongs_to_many :users, join_table: Rails.application.config.uffizzi_core[:table_names][:users_roles]
 
   belongs_to :resource,
              polymorphic: true,

data/app/models/uffizzi_core/secret.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UffizziCore::Secret < ApplicationRecord
-  self.table_name = UffizziCore.table_names[:secrets]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:secrets]
 
   belongs_to :resource, polymorphic: true
 

data/app/models/uffizzi_core/template.rb

@@ -4,7 +4,7 @@ class UffizziCore::Template < UffizziCore::ApplicationRecord
   include UffizziCore::TemplateRepo
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:templates]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:templates]
 
   belongs_to :added_by, class_name: UffizziCore::User.name, foreign_key: :added_by_id
   belongs_to :project, touch: true

data/app/models/uffizzi_core/user.rb

@@ -8,7 +8,7 @@ class UffizziCore::User < ActiveRecord::Base
   include UffizziCore::UserRepo
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:users]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:users]
 
   rolify
 

data/app/models/uffizzi_core/user_project.rb

@@ -3,7 +3,7 @@
 class UffizziCore::UserProject < UffizziCore::ApplicationRecord
   extend Enumerize
 
-  self.table_name = UffizziCore.table_names[:user_projects]
+  self.table_name = Rails.application.config.uffizzi_core[:table_names][:user_projects]
 
   enumerize :role, in: [:admin, :developer, :viewer], predicates: true
   validates :role, presence: true

data/lib/uffizzi_core/engine.rb

@@ -10,6 +10,41 @@ module UffizziCore
       config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
     end
 
+    config.uffizzi_core = ActiveSupport::OrderedOptions.new
+
+    config.uffizzi_core.dependencies = {
+      rbac: 'UffizziCore::Rbac::UserAccessService',
+    }
+
+    config.uffizzi_core.table_names = {
+      accounts: :uffizzi_core_accounts,
+      activity_items: :uffizzi_core_activity_items,
+      builds: :uffizzi_core_builds,
+      comments: :uffizzi_core_comments,
+      compose_files: :uffizzi_core_compose_files,
+      config_files: :uffizzi_core_config_files,
+      container_config_files: :uffizzi_core_container_config_files,
+      containers: :uffizzi_core_containers,
+      coupons: :uffizzi_core_coupons,
+      credentials: :uffizzi_core_credentials,
+      deployments: :uffizzi_core_deployments,
+      events: :uffizzi_core_events,
+      invitations: :uffizzi_core_invitations,
+      memberships: :uffizzi_core_memberships,
+      payments: :uffizzi_core_payments,
+      prices: :uffizzi_core_prices,
+      products: :uffizzi_core_products,
+      projects: :uffizzi_core_projects,
+      ratings: :uffizzi_core_ratings,
+      repos: :uffizzi_core_repos,
+      roles: :uffizzi_core_roles,
+      secrets: :uffizzi_core_secrets,
+      templates: :uffizzi_core_templates,
+      user_projects: :uffizzi_core_user_projects,
+      users: :uffizzi_core_users,
+      users_roles: :uffizzi_core_users_roles,
+    }
+
     ActiveModelSerializers.config.adapter = :json
   end
 end

data/lib/uffizzi_core/version.rb

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

data/lib/uffizzi_core.rb

@@ -27,35 +27,5 @@ require 'sidekiq'
 require 'virtus'
 
 module UffizziCore
-  mattr_accessor :dependencies, default: {
-    rbac: 'UffizziCore::Rbac::UserAccessService',
-  }
-  mattr_accessor :table_names, default: {
-    accounts: :uffizzi_core_accounts,
-    activity_items: :uffizzi_core_activity_items,
-    builds: :uffizzi_core_builds,
-    comments: :uffizzi_core_comments,
-    compose_files: :uffizzi_core_compose_files,
-    config_files: :uffizzi_core_config_files,
-    container_config_files: :uffizzi_core_container_config_files,
-    containers: :uffizzi_core_containers,
-    coupons: :uffizzi_core_coupons,
-    credentials: :uffizzi_core_credentials,
-    deployments: :uffizzi_core_deployments,
-    events: :uffizzi_core_events,
-    invitations: :uffizzi_core_invitations,
-    memberships: :uffizzi_core_memberships,
-    payments: :uffizzi_core_payments,
-    prices: :uffizzi_core_prices,
-    products: :uffizzi_core_products,
-    projects: :uffizzi_core_projects,
-    ratings: :uffizzi_core_ratings,
-    repos: :uffizzi_core_repos,
-    roles: :uffizzi_core_roles,
-    secrets: :uffizzi_core_secrets,
-    templates: :uffizzi_core_templates,
-    user_projects: :uffizzi_core_user_projects,
-    users: :uffizzi_core_users,
-    users_roles: :uffizzi_core_users_roles,
-  }
+  mattr_accessor :table_names, default: {}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -451,6 +451,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.7
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -661,7 +675,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: uffizzi_core
+description: uffizzi-core
 email:
 - info@uffizzi.com
 executables: []
@@ -887,7 +901,6 @@ files:
 - app/services/uffizzi_core/response_service.rb
 - app/services/uffizzi_core/template_service.rb
 - app/services/uffizzi_core/token_service.rb
-- app/services/uffizzi_core/user_access_service.rb
 - app/services/uffizzi_core/user_generator_service.rb
 - app/utils/uffizzi_core/converters.rb
 - app/validators/uffizzi_core/email_validator.rb
@@ -917,8 +930,8 @@ licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://uffizzi.com
-  source_code_uri: https://github.com/UffizziCloud/uffizzi_app/tree/main/core
-  changelog_uri: https://github.com/UffizziCloud/uffizzi_app/blob/main/core/CHANGELOG.md
+  source_code_uri: https://github.com/UffizziCloud/uffizzi_core
+  changelog_uri: https://github.com/UffizziCloud/uffizzi_core/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -937,5 +950,5 @@ requirements: []
 rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
-summary: uffizzi_core
+summary: uffizzi-core
 test_files: []

data/app/services/uffizzi_core/user_access_service.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::UserAccessService
-  attr_accessor :user_access_module
-
-  delegate :admin_access_to_account?, :developer_access_to_account?, :viewer_access_to_account?,
-           :admin_or_developer_access_to_account?, :any_access_to_account?, :admin_access_to_project?,
-           :developer_access_to_project?, :viewer_access_to_project?, :admin_or_developer_access_to_project?,
-           :any_access_to_project?, :global_admin?, to: :@user_access_module
-
-  def initialize(user_access_module)
-    @user_access_module = user_access_module
-  end
-end