effective_resources 1.8.19 → 1.8.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e557ad6dfb235c393169c14d3475f37784eddb5e19e90bfa759083fb184cdc48
-  data.tar.gz: f4b9c10641496b8383c4a6086394c168e2c8b28ef443e998c094c1ece6184738
+  metadata.gz: 9ef5eba619e3764fdc204b3e1b72ec0063b16c2319866688f4c8e7ff3808354d
+  data.tar.gz: '09e02f90c4db8a1f0f416ec6ece7471db4e9ab865a4bac701a4977c9c6f4e18a'
 SHA512:
-  metadata.gz: 640902ab866c9302df97d98ddb6ad027c26ef295181cbbdb8d03b560c9a71870cf63e8576422d36b319c6782ff44919d41724ff9ffa48c26fdec1f3a8ea1c529
-  data.tar.gz: a7a1c6aec9a59577060aac820aca413eb6d9d7f7ac97e0089ed56b3928c5ff67229c0e86d7632203431b17d02a84642f106ad996a8daf9686d3700833a4931ad
+  metadata.gz: 65b2ec2e37dd19c24375b02533b86519733d83652b24fc131f267d625de17bdd0210efea61ca84e7186e2b3b0d5821a94e7faf1805665bf752c0b2636456eb8f
+  data.tar.gz: 8bf7c81fd895011224ffa0ed49942bf3c8517ca7e7a2c8141820247c859014de9fa1eed17517b25ed5951bff7d904c091b165d4ab1f2710ad8e674c34d9a8d06

data/app/controllers/concerns/effective/crud_controller.rb

@@ -125,8 +125,10 @@ module Effective
     end
 
     def resource_layout
-      namespace = controller_path.include?('admin/') ? 'admin' : 'application'
-      defined?(Tenant) ? "#{Tenant.current}/#{namespace}" : namespace
+      if defined?(Tenant)
+        namespace = controller_path.include?('admin/') ? 'admin' : 'application'
+        "#{Tenant.current}/#{namespace}"
+      end
     end
 
     def resource_params_method_name

data/app/controllers/concerns/effective/flash_messages.rb

@@ -41,7 +41,7 @@ module Effective
 
       messages = resource.errors.map do |error|
         attribute = error.respond_to?(:attribute) ? error.attribute : error
-        message = error.respond_to?(:message) ? error.message : resource.errors[attribute].to_sentence
+        message = error.respond_to?(:attribute) ? error.message : resource.errors[attribute].to_sentence
 
         if message[0] == message[0].upcase # If the error begins with a capital letter
           message

data/app/models/concerns/effective_after_commit.rb

@@ -0,0 +1,29 @@
+# EffectiveAfterCommit
+#
+# Inspired by https://github.com/Envek/after_commit_everywhere
+#
+# This is automatically included into ActiveRecord::Base
+#
+# after_commit { MyMailer.welcome.deliver_later }
+
+module EffectiveAfterCommit
+  extend ActiveSupport::Concern
+
+  module Base
+    def after_commit(connection: self.class.connection, &callback)
+      Effective::AfterCommit.register_callback(connection: connection, name: __method__, callback: callback, no_tx_action: :execute)
+    end
+
+    def before_commit(connection: self.class.connection, &callback)
+      raise(NotImplementedError, "#{__method__} works only with Rails 5.0+") if ActiveRecord::VERSION::MAJOR < 5
+
+      Effective::AfterCommit.register_callback(connection: connection, name: __method__, callback: callback, no_tx_action: :warn_and_execute)
+    end
+
+    def after_rollback(connection: self.class.connection, &callback)
+      raise('expected a block') unless block_given?
+      Effective::AfterCommit.register_callback(connection: connection, name: __method__, callback: callback, no_tx_action: :exception)
+    end
+  end
+
+end

data/app/models/concerns/effective_devise_user.rb

@@ -65,6 +65,8 @@ module EffectiveDeviseUser
   end
 
   module ClassMethods
+    def effective_devise_user?; true; end
+
     def permitted_sign_up_params # Should contain all fields as per views/users/_sign_up_fields
       raise('please define a self.permitted_sign_up_params')
       [:email, :password, :password_confirmation, :first_name, :last_name, :name, :login]

data/app/models/effective/after_commit.rb

@@ -0,0 +1,53 @@
+module Effective
+  class AfterCommit
+
+    def initialize(connection:, **handlers)
+      @connection = connection
+      @handlers = handlers
+    end
+
+    def has_transactional_callbacks?
+      true
+    end
+
+    def trigger_transactional_callbacks?
+      true
+    end
+
+    def before_committed!(*)
+      @handlers[:before_commit]&.call
+    end
+
+    def committed!(args)
+      @handlers[:after_commit]&.call
+    end
+
+    def rolledback!(*)
+      @handlers[:after_rollback]&.call
+    end
+
+    def add_to_transaction(*)
+      @connection.add_transaction_record(self)
+    end
+
+    def self.register_callback(connection:, name:, no_tx_action:, callback:)
+      raise ArgumentError, "#{name} expected a block" unless callback
+
+      unless (connection.transaction_open? && connection.current_transaction.joinable?)
+        case no_tx_action
+        when :warn_and_execute
+          warn "#{name}: No transaction open. Executing callback immediately."
+          return callback.call
+        when :execute
+          return callback.call
+        when :exception
+          raise("#{name} is useless outside transaction")
+        end
+      end
+
+      after_commit = Effective::AfterCommit.new(connection: connection, "#{name}": callback)
+      connection.add_transaction_record(after_commit)
+    end
+
+  end
+end

data/app/models/effective/http.rb

@@ -0,0 +1,111 @@
+module Effective
+  class Http
+
+    def self.get(endpoint, params: nil, headers: nil)
+      headers = { 'Content-Type': 'application/json' }.merge(headers || {})
+      query = ('?' + params.compact.map { |k, v| "$#{k}=#{v}" }.join('&')) if params.present?
+
+      uri = URI.parse(endpoint + query.to_s)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.read_timeout = 10
+      http.use_ssl = true if endpoint.start_with?('https')
+
+      response = with_retries do
+        puts "[GET] #{uri}" if Rails.env.development?
+        http.get(uri, headers)
+      end
+
+      unless ['200', '204'].include?(response.code.to_s)
+        puts("Response code: #{response.code} #{response.body}")
+        return false
+      end
+
+      JSON.parse(response.body)
+    end
+
+    def self.post(endpoint, params:, headers: nil)
+      headers = { 'Content-Type': 'application/json' }.merge(headers || {})
+
+      uri = URI.parse(endpoint)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.read_timeout = 10
+      http.use_ssl = true if endpoint.start_with?('https')
+
+      response = with_retries do
+        puts "[POST] #{uri} #{params}" if Rails.env.development?
+        http.post(uri.path, params.to_json, headers)
+      end
+
+      unless ['200', '204'].include?(response.code.to_s)
+        puts("Response code: #{response.code} #{response.body}")
+        return false
+      end
+
+      JSON.parse(response.body)
+    end
+
+    def self.patch(endpoint, params:, headers: nil)
+      headers = { 'Content-Type': 'application/json' }.merge(headers || {})
+
+      uri = URI.parse(endpoint)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.read_timeout = 10
+      http.use_ssl = true if endpoint.start_with?('https')
+
+      response = with_retries do
+        puts "[PATCH] #{uri} #{params}" if Rails.env.development?
+        http.post(uri.path, params.to_json, headers)
+      end
+
+      unless ['200', '204'].include?(response.code.to_s)
+        puts("Response code: #{response.code} #{response.body}")
+        return false
+      end
+
+      JSON.parse(response.body)
+    end
+
+    def self.delete(endpoint, params: nil, headers: nil)
+      headers = { 'Content-Type': 'application/json' }.merge(headers || {})
+      query = ('?' + params.compact.map { |k, v| "$#{k}=#{v}" }.join('&')) if params.present?
+
+      uri = URI.parse(endpoint + query.to_s)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.read_timeout = 10
+      http.use_ssl = true if endpoint.start_with?('https')
+
+      response = with_retries do
+        puts "[DELETE] #{uri}" if Rails.env.development?
+        http.delete(uri, headers)
+      end
+
+      unless ['200', '204'].include?(response.code.to_s)
+        puts("Response code: #{response.code} #{response.body}")
+        return false
+      end
+
+      JSON.parse(response.body)
+    end
+
+    private
+
+    def self.with_retries(retries: 3, wait: 2, &block)
+      raise('expected a block') unless block_given?
+
+      begin
+        return yield
+      rescue Exception => e
+        if (retries -= 1) > 0
+          sleep(wait); retry
+        else
+          raise
+        end
+      end
+    end
+
+  end
+end

data/app/models/effective/model_reader.rb

@@ -11,6 +11,11 @@ module Effective
       @attributes = {}
     end
 
+    # For EffectiveLogging. This is a protected keyword I think.
+    def message(*args)
+      method_missing(:message, args)
+    end
+
     def read(&block)
       instance_exec(&block)
     end

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

@@ -105,8 +105,10 @@ module Effective
         attributes = (klass.new().attributes rescue nil)
         return [] unless attributes
 
-        names = attributes.keys - belong_tos.map { |reference| reference.foreign_key }
-        names = names - [klass.primary_key, 'created_at', 'updated_at'] unless all
+        names = attributes.keys
+        names -= belong_tos.map { |reference| reference.foreign_key }
+        names -= belong_tos.map { |reference| reference.foreign_type if reference.options[:polymorphic] }
+        names -= [klass.primary_key, 'created_at', 'updated_at'] unless all
 
         attributes = names.inject({}) do |h, name|
           if klass.respond_to?(:column_for_attribute) # Rails 4+

data/lib/effective_resources/engine.rb

@@ -32,6 +32,7 @@ module EffectiveResources
 
         ActiveRecord::Base.extend(EffectiveDeviseUser::Base)
         ActiveRecord::Base.extend(EffectiveResource::Base)
+        ActiveRecord::Base.include(EffectiveAfterCommit::Base)
       end
     end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.19'.freeze
+  VERSION = '1.8.24'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.19
+  version: 1.8.24
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -157,13 +157,16 @@ files:
 - app/models/concerns/acts_as_statused.rb
 - app/models/concerns/acts_as_tokened.rb
 - app/models/concerns/acts_as_wizard.rb
+- app/models/concerns/effective_after_commit.rb
 - app/models/concerns/effective_devise_user.rb
 - app/models/concerns/effective_resource.rb
 - app/models/concerns/has_many_rich_texts.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/action_failed.rb
+- app/models/effective/after_commit.rb
 - app/models/effective/attribute.rb
 - app/models/effective/code_reader.rb
+- app/models/effective/http.rb
 - app/models/effective/model_reader.rb
 - app/models/effective/resource.rb
 - app/models/effective/resource_exec.rb