effective_resources 1.9.8 → 1.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc155a948b5a244e8a5c7beaa9d634eb1aab656cde915aecaeba3a3e69fa8d69
-  data.tar.gz: 947a11397a9b568cbd29c586fd79e310c4f512bfcf4aed7a8048be567afbadae
+  metadata.gz: c84fc7b85367038b6acea82974e25be087fe2f1f5dc02acb26a642f2e30a4456
+  data.tar.gz: 18a47801a18fd254bb1d9d4b51ec7b0582194ecfd53442108d02c5b52b6dd560
 SHA512:
-  metadata.gz: dbf358c58522cb4153495a960f5f3b46da781d0489149b87cdf4498441582b990c0399982ae3d897277d97433c03d9b1de490c3e4607af1c8ee1f935ca2efdf9
-  data.tar.gz: 4ab89fad47f59f7e18ad2ef674589e41a8fb47c4fc6f21133ce0aeccf3b892bb6c5b5832e93c1019ca8682c329b61396f5e69be8e991a6ff31fad69d53dad192
+  metadata.gz: 821be02e8c9302b4459facfddf6c64423040fd21da5627c6b32ef4ee72ea8e739df1fa4dc60037c9cf97cbf6b0eb83d4c7d6bf71268a4b0ac21513f9e8829f8e
+  data.tar.gz: 23917cb4747779edf1cd13014f1a181baebb0114c6035869dd72ee7eda95df0ec8a96ffbbb04c08c0ed631c92957d6a43418c5b9aaa7d76cc68ad86b42e5cae8

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/concerns/effective_devise_user.rb

@@ -160,9 +160,7 @@ module EffectiveDeviseUser
       args.last[:tenant] ||= tenant
     end
 
-    wait = (5 if notification == :invitation_instructions && !Rails.env.test?)
-
-    devise_mailer.send(notification, self, *args).deliver_later(wait: wait)
+    devise_mailer.send(notification, self, *args).deliver_now
   end
 
 end

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.8'.freeze
+  VERSION = '1.9.12'.freeze
 end

data/lib/effective_resources.rb

@@ -52,16 +52,27 @@ module EffectiveResources
   end
 
   def self.transaction(resource = nil, &block)
-    connection = (resource if resource.respond_to?(:transaction))
-    connection ||= (resource.class if resource.class.respond_to?(:transaction))
-    connection ||= '::ApplicationRecord'.safe_constantize
-    connection ||= 'ActiveRecord::Base'.safe_constantize
-
+    connection = 'ActiveRecord::Base'.safe_constantize
     raise('unable to determine transaction class') unless connection.present?
 
     connection.transaction { yield }
   end
 
+  # Used by streaming CSV export in datatables
+  def self.with_resource_enumerator(&block)
+    raise('expected a block') unless block_given?
+
+    tenant = Tenant.current if defined?(Tenant)
+
+    if tenant
+      Enumerator.new do |enumerator|
+        Tenant.as(tenant) { yield(enumerator) }
+      end
+    else
+      Enumerator.new { |enumerator| yield(enumerator) }
+    end
+  end
+
   def self.truthy?(value)
     if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails <5
       ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)

metadata

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