effective_resources 1.9.9 → 1.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 144152b4742a10b3d574bbe0458c8f80db4490dd178d0dbe323a180a05a87b46
-  data.tar.gz: 533c8ef7927b1782d85efaea9affc6c2a16d56452ae3c8d0df45f1ec8535f795
+  metadata.gz: 36829df631b235ec0cb1a9cc26616fd15c100bfcb2314f57edd1a70f5eda3f86
+  data.tar.gz: 3b93094b4d501b4d737f0011b337d806eb67305642b4bb4f2e6263672c5b9267
 SHA512:
-  metadata.gz: cdd68a72ad36d7745ea3178d9f9b640799e1c406f0f1dec2d2e7c376dccadc02724c7298c10a96198dc552c9de21591457b36c601b74a91b60222675d8569386
-  data.tar.gz: 1d126ded3ea4f19d8d4d2040bf32037eb7a0e0c3f7adbdc2e9514d31fa35f54f301bdf6bafb27c3b1e7757ba680577440b2c6a7110f2103d94a07c98f702518b
+  metadata.gz: 032ca3f256846e3b666bc33f5452fb7aefefd910abc9b4c1d9f068ec04b82e6b5c61999e0107a4feb03509921b0f333ce43b9a155c2fcb04eebe7a4d955544db
+  data.tar.gz: 2d1c59030ea9e8ec2d78efe2d5c9b15571abc0ec9f86fbc506250af2703b8ad87388e2ebc3f517c1d47101b31fcbacada059ca94bfdc51fb7d24b363121af5ad

data/app/helpers/effective_resources_private_helper.rb

@@ -1,11 +1,9 @@
-# frozen_sting_literals: true
+# frozen_string_literal: true
 
 module EffectiveResourcesPrivateHelper
   REPLACE_PAGE_ACTIONS = {'update' => :edit, 'create' => :new}
   BLACKLIST = [:default, :only, :except, :if, :unless, :redirect, :success, :danger, :klass]
 
-  DATA_CONFIRM = 'data-confirm'
-
   def permitted_resource_actions(resource, actions)
     page_action = REPLACE_PAGE_ACTIONS[params[:action]] || params[:action].try(:to_sym) || :save
     executor = Effective::ResourceExec.new(self, resource)
@@ -38,8 +36,8 @@ module EffectiveResourcesPrivateHelper
       end
 
       # Replace resource name in any token strings
-      if opts[DATA_CONFIRM].present? && opts[DATA_CONFIRM].include?('@resource'.freeze)
-        opts[DATA_CONFIRM] = opts[DATA_CONFIRM].gsub('@resource'.freeze, resource_to_s)
+      if opts['data-confirm'].present? && opts['data-confirm'].include?('@resource'.freeze)
+        opts['data-confirm'] = opts['data-confirm'].gsub('@resource'.freeze, resource_to_s)
       end
 
       # Assign class

data/app/models/effective/resources/actions.rb

@@ -14,9 +14,7 @@ module Effective
 
       def route_engines
         if tenant? && Tenant.current.present?
-          [Rails.application, Tenant.Engine] + Rails::Engine.subclasses.reverse.reject do |klass|
-            tenant_engines_blacklist.any? { |name| klass.name.start_with?(name) }
-          end
+          [Rails.application, Tenant.Engine] + (Rails::Engine.subclasses.reverse - Tenant.route_engines)
         else
           [Rails.application] + Rails::Engine.subclasses.reverse
         end

data/app/models/effective/resources/associations.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Associations
-
       def macros
         [:belongs_to, :belongs_to_polymorphic, :has_many, :has_and_belongs_to_many, :has_one]
       end

data/app/models/effective/resources/attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Attributes

data/app/models/effective/resources/controller.rb

@@ -1,4 +1,4 @@
-# frozen_sting_literals: true
+# frozen_string_literal: true
 
 module Effective
   module Resources

data/app/models/effective/resources/forms.rb

@@ -1,4 +1,4 @@
-# frozen_sting_literals: true
+# frozen_string_literal: true
 
 module Effective
   module Resources

data/app/models/effective/resources/generator.rb

@@ -1,4 +1,4 @@
-# frozen_sting_literals: true
+# frozen_string_literal: true
 
 module Effective
   module Resources

data/app/models/effective/resources/init.rb

@@ -1,4 +1,4 @@
-# frozen_sting_literals: true
+# frozen_string_literal: true
 
 module Effective
   module Resources

data/app/models/effective/resources/instance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Instance

data/app/models/effective/resources/klass.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Klass

data/app/models/effective/resources/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Model
@@ -18,7 +20,3 @@ module Effective
     end
   end
 end
-
-
-
-

data/app/models/effective/resources/naming.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Naming

data/app/models/effective/resources/relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Relation

data/app/models/effective/resources/sql.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Sql
-
       def column(name)
         name = name.to_s
-        columns.find { |col| col.name == name || (belongs_to(name) && col.name == belongs_to(name).foreign_key) }
+        bt = belongs_to(name)
+
+        columns.find { |col| col.name == name || (bt && col.name == bt.foreign_key) }
       end
 
       def columns
@@ -32,17 +35,18 @@ module Effective
       end
 
       def sql_direction(name)
-        name.to_s.downcase == 'desc' ? 'DESC'.freeze : 'ASC'.freeze
+        name.to_s.downcase == 'desc' ? 'DESC' : 'ASC'
       end
 
       # This is for EffectiveDatatables (col as:)
       # Might be :name, or 'users.name'
       def sql_type(name)
-        name = name.to_s.split('.').first
+        name = (name.kind_of?(String) ? name.split('.').first : name.to_s)
 
         return :belongs_to if belongs_to(name)
 
-        column = column(name)
+        # Skip using columns() cause we dont need to check for belongs_to
+        column = columns.find { |col| col.name == name }
 
         if column.present?
           column.type
@@ -105,13 +109,11 @@ module Effective
       end
 
       def postgres?
-        return @postgres unless @postgres.nil?
-        @postgres ||= (klass.connection.kind_of?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) rescue false)
+        klass.connection.adapter_name == 'PostgreSQL'
       end
 
       def mysql?
-        return @mysql unless @mysql.nil?
-        @mysql ||= (klass.connection.kind_of?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) rescue false)
+        klass.connection.adapter_name == 'MySQL'
       end
 
       def is_null(sql_column)

data/app/models/effective/resources/tenants.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Tenants
@@ -15,10 +17,6 @@ module Effective
         name if Rails.application.config.tenants[name].present?
       end
 
-      def tenant_engines_blacklist
-        return [] unless tenant?
-        Rails.application.config.tenants.map { |name, _| name.to_s.classify }
-      end
     end
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.9.9'.freeze
+  VERSION = '1.9.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 1.9.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails