effective_resources 1.8.18 → 1.8.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 180638d525bdd6d499cddd67f09595509685ebbfdc59e69ea16d89fdef6ff1fa
-  data.tar.gz: e9687c798dceef560a070a4631876ca17b401cf2e7d993c7df98dbe5af5febc4
+  metadata.gz: 125098fcfbdac7c18b9a7df8a451d3f4f7d0ac1b7d8120658b07e6c33d5b0f2b
+  data.tar.gz: 67f2018e9ed650ac1dfcc4f3143005367259a135964ce7e0bfe99c1b4b04d78f
 SHA512:
-  metadata.gz: 41b62506a91d29ebe9049ce5de063e18412ba60cf4d63636e2cbe245d2b972a8a767d4645d2f42f5b4923b73eb867b4ea0ed508bda1ab55747d68f46dc1db4af
-  data.tar.gz: de31440669699862980273c6b1ce68b786057d200b524ec1ad0a54a09d73b8fbae9bfb372918b263fe8bc23254329ca15feb305adab7a683d86833738d0c5f6c
+  metadata.gz: 6bc4633cb2e6c6c85f99d09f1c0a559547e74ebcfe7e9da21383d9b663325374efa467e2809041edc1f24ff4c37cea660a9416e3586a9c128df9b6a5a2375231
+  data.tar.gz: b3e4cc3b69b53eb69affbe7ab0eda2f7741746eb9ab43ac84fd7d907b1a365d74511bbe446037d22bee8ee6ea143b529f3889f3c3c87a6c7f9d125bfe9109d9e

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_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/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/lib/effective_resources.rb

@@ -46,4 +46,22 @@ module EffectiveResources
     (config.respond_to?(:active_job) && config.active_job.queue_adapter) ? :deliver_later : :deliver_now
   end
 
+  def self.advance_date(date, business_days: 1, holidays: [:ca, :observed])
+    raise('business_days must be an integer <= 365') unless business_days.kind_of?(Integer) && business_days <= 365
+
+    business_days.times do
+      loop do
+        date = date + 1.day
+        break if business_day?(date, holidays: holidays)
+      end
+    end
+
+    date
+  end
+
+  def self.business_day?(date, holidays: [:ca, :observed])
+    require 'holidays' unless defined?(Holidays)
+    date.wday != 0 && date.wday != 6 && Holidays.on(date, *holidays).blank?
+  end
+
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.18'.freeze
+  VERSION = '1.8.23'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.18
+  version: 1.8.23
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: holidays
+  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'
 description: Make any controller an effective resource controller.
 email:
 - info@codeandeffect.com
@@ -150,6 +164,7 @@ files:
 - app/models/effective/action_failed.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