dhs 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f42a1fdc00478fe3e24e797f52396c953442e4e0d2da738b28fb7cc55b908ea3
-  data.tar.gz: 1465403fb48c2dca7f2b955550309a7983a4d264ef10cbb35d620df88f01f1fe
+  metadata.gz: b7d6af021c9cf582a27709769c0355f5b9c978df218606456887641f7fcf83fc
+  data.tar.gz: 8cc46642942b9804799c74c2568b0dc8d9b131a87f8b2f9fe5615f2b510759e1
 SHA512:
-  metadata.gz: bd6412647a124e42350e185d60a6a0040aa9ef30db503fddf529db0979f4c6b7151bc3e9cdad8378a111512b4f481868a39839c89e42f7ea420c3a27e2539050
-  data.tar.gz: a6936544068aa3b6591163f768a6e3c96ce38317abc183ca3bec8e62c50da10d25518f215b939945acd990f449615865d19dec5886a8cd2e88e59965c1fcb5d8
+  metadata.gz: d8a4620d4f6861dde1bc5cf577fe73f37fca800c4c5758cc0664ef5bd0f2d52b870839275446d5a29cd8b00f5d0fbf518310fdf55f1e40e2bb9c3f169550f766
+  data.tar.gz: 9c6a6ff69bc89e7ee2b84518c7c60ff673bdace69def5ee778ea54f4dd513705eb06d599a218353be7182f9487ac000ed0acad711cc56c8eb34e948817451638

data/lib/dhs.rb

@@ -58,10 +58,12 @@ module DHS
   autoload :Unprocessable, 'dhs/unprocessable'
 
   include Configuration
-  include AutoloadRecords if defined?(Rails)
   include OptionBlocks
 
   require 'dhs/record' # as dhs records in an application are directly inheriting it
 
-  require 'dhs/railtie' if defined?(Rails)
+  if defined?(Rails)
+    include AutoloadRecords
+    require 'dhs/railtie'
+  end
 end

data/lib/dhs/concerns/autoload_records.rb

@@ -18,6 +18,9 @@ module AutoloadRecords
       end
 
       class Middleware
+
+        MODEL_FILES = 'app/models/**/*.rb'
+
         def initialize(app)
           @app = app
         end
@@ -27,24 +30,24 @@ module AutoloadRecords
           @app.call(env)
         end
 
-        def self.model_files
-          Dir.glob(Rails.root.join('app', 'models', '**', '*.rb'))
-        end
-
         def self.require_direct_inheritance
-          model_files.sort.map do |file|
-            next unless File.read(file).match('DHS::Record')
-            require_dependency file
-            file.split('models/').last.gsub('.rb', '').classify
-          end.compact
+          Rails.application.reloader.to_prepare do
+            Dir.glob(Rails.root.join(MODEL_FILES)).each do |file|
+              next unless File.read(file).match('DHS::Record')
+              require_dependency file
+              file.split('models/').last.gsub('.rb', '').classify
+            end.compact
+          end
         end
 
         def self.require_inheriting_records(parents)
-          model_files.each do |file|
-            file_content = File.read(file)
-            next if parents.none? { |parent| file_content.match(/\b#{parent}\b/) }
-            next if file_content.match?('extend ActiveSupport::Concern')
-            require_dependency file
+          Rails.application.reloader.to_prepare do
+            Dir.glob(Rails.root.join(MODEL_FILES)).each do |file|
+              file_content = File.read(file)
+              next if parents.none? { |parent| file_content.match(/\b#{parent}\b/) }
+              next if file_content.match?('extend ActiveSupport::Concern')
+              require_dependency file
+            end
           end
         end
 

data/lib/dhs/railtie.rb

@@ -3,31 +3,8 @@
 module DHS
   class Railtie < Rails::Railtie
     initializer 'dhs.hook_into_controller_initialization' do
-      class ActionController::Base
-
-        def initialize
-          prepare_dhs_request_cycle_cache
-          reset_option_blocks
-          reset_extended_rollbar_request_logs
-          super
-        end
-
-        private
-
-        def prepare_dhs_request_cycle_cache
-          return unless DHS.config.request_cycle_cache_enabled
-          DHS::Interceptors::RequestCycleCache::ThreadRegistry.request_id = [Time.now.to_f, request.object_id].join('#')
-        end
-
-        def reset_option_blocks
-          DHS::OptionBlocks::CurrentOptionBlock.options = nil
-        end
-
-        def reset_extended_rollbar_request_logs
-          return unless defined?(::Rollbar)
-          return unless DHC.config.interceptors.include?(DHS::Interceptors::ExtendedRollbar::Interceptor)
-          DHS::Interceptors::ExtendedRollbar::ThreadRegistry.log = []
-        end
+      Rails.application.reloader.to_prepare do
+        require_relative 'railtie/action_controller_extension'
       end
     end
   end

data/lib/dhs/railtie/action_controller_extension.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module DHS
+  class Railtie < Rails::Railtie
+
+    class ::ActionController::Base
+
+      def initialize
+        prepare_dhs_request_cycle_cache
+        reset_option_blocks
+        reset_extended_rollbar_request_logs
+        super
+      end
+
+      private
+
+      def prepare_dhs_request_cycle_cache
+        return unless DHS.config.request_cycle_cache_enabled
+        DHS::Interceptors::RequestCycleCache::ThreadRegistry.request_id = [Time.now.to_f, request.object_id].join('#')
+      end
+
+      def reset_option_blocks
+        DHS::OptionBlocks::CurrentOptionBlock.options = nil
+      end
+
+      def reset_extended_rollbar_request_logs
+        return unless defined?(::Rollbar)
+        return unless DHC.config.interceptors.include?(DHS::Interceptors::ExtendedRollbar::Interceptor)
+        DHS::Interceptors::ExtendedRollbar::ThreadRegistry.log = []
+      end
+    end
+
+  end
+end

data/lib/dhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DHS
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhs
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - https://github.com/DePayFi/dhs/graphs/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -333,6 +333,7 @@ files:
 - lib/dhs/problems/warnings.rb
 - lib/dhs/proxy.rb
 - lib/dhs/railtie.rb
+- lib/dhs/railtie/action_controller_extension.rb
 - lib/dhs/record.rb
 - lib/dhs/rspec.rb
 - lib/dhs/test/stubbable_records.rb