rails_spotlight 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 797f782446bb2946abfc23b500dd6bed6032df02be0795e0d44083ca78344d19
-  data.tar.gz: a95afda90830aaa9520b1f88012091a3481ca6ac71fd031fda5f4e8dddd8b126
+  metadata.gz: 507c2c676db5d30d6af1ec0f505e067f16c53514dfd875cd4554041304d95b87
+  data.tar.gz: 8c990b6ec150e2a6c9e7b8e0c581d5b1e74987e5502907e847218a78d6324103
 SHA512:
-  metadata.gz: a5a44dc240578e5a9a639a666d6adcb5bee447e46d26af4d6f2fd3e8e1c1c39bb9129f1df13ca209a525a16413584e2a06405c1392e652c882d671389533524a
-  data.tar.gz: 047e4a531ef327f471a494d0865be7b2d2327572bfda8c5575638b62ebf768ab66d34c497177c3cf9b04586df6f95cace25ac234525acba17cea8d56c7a2ef0f
+  metadata.gz: c36b1e95facd5d437c4685a7ba66a02e45eaf152d8e4fc607468fffef5fad8d7fb9c15ed1b760feaa1501b1b2c8a27bd61166917083da90ccb5cf64529530a6c
+  data.tar.gz: d1439a47bedd079561dcecb4a8f1f8cde964eea6555da2dc0e16e330bac2b89abc9e0f90a2a499bf50c1939e1b1e64a0622209a14affa1d951abb76ad4c9732a

data/README.md

@@ -48,3 +48,6 @@ The gem is available as open source under the terms of the [MIT License](https:/
 ## Code of Conduct
 
 Everyone interacting in the RailsSpotlight project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/pniemczyk/rails_spotlight/blob/master/CODE_OF_CONDUCT.md).
+
+
+check https://github.com/alexrudall/ruby-openai

data/lib/rails_spotlight/middlewares/handlers/sql_action_handler.rb

@@ -7,26 +7,31 @@ module RailsSpotlight
     module Handlers
       class SqlActionHandler < BaseActionHandler
         def execute
-          if ActiveSupport.const_defined?('ExecutionContext')
-            ActiveSupport::Notifications.subscribed(method(:logger), 'sql.active_record', monotonic: true) do
-              ActiveSupport::ExecutionContext.set(rails_spotlight: request_id) do
-                transaction
-              end
-            end
-          else
-            ActiveSupport::Notifications.subscribed(method(:logger), 'sql.active_record') do
-              transaction
-            end
+          validate_project!
+          return transaction unless ActiveSupport.const_defined?('ExecutionContext')
+
+          ActiveSupport::ExecutionContext.set(rails_spotlight: request_id) do
+            transaction
           end
         end
 
         private
 
+        def validate_project!
+          Rails.logger.warn required_projects
+          return if required_projects.blank?
+          return if required_projects.include?(::RailsSpotlight::Support::Project.instance.name)
+
+          raise UnprocessableEntity, "Check your connetction settings the current query is not allowed to be executed on the #{::RailsSpotlight::Support::Project.instance.name} project"
+        end
+
         def transaction
           ActiveRecord::Base.transaction do
-            begin
-              self.result = ActiveRecord::Base.connection.exec_query(query)
-            rescue => e
+            begin # rubocop:disable Style/RedundantBegin
+              ActiveSupport::Notifications.subscribed(method(:logger), 'sql.active_record', monotonic: true) do
+                run
+              end
+            rescue => e # rubocop:disable Style/RescueStandardError
               self.error = e
             ensure
               raise ActiveRecord::Rollback unless force_execution?
@@ -34,14 +39,25 @@ module RailsSpotlight
           end
         end
 
-        attr_accessor :result
-        attr_accessor :error
+        def run
+          return self.result = ActiveRecord::Base.connection.exec_query(query) if connection_options.blank? || !ActiveRecord::Base.respond_to?(:connects_to)
+
+          connections = ActiveRecord::Base.connects_to(**connection_options)
+
+          adapter = connections.find { |c| c.role == use['role'] && c.shard.to_s == use['shard'] }
+          raise UnprocessableEntity, "Connection not found for role: `#{use["role"]}` and shard: `#{use["shard"]}`" if adapter.blank?
+
+          self.result = adapter.connection.exec_query(query)
+        end
+
+        attr_accessor :result, :error
 
         def json_response_body
           {
+            query: query,
             result: result,
             logs: logs,
-            error: error.inspect,
+            error: error.present? ? error.inspect : nil,
             query_mode: force_execution? ? 'force' : 'default',
             project: ::RailsSpotlight::Support::Project.instance.name
           }
@@ -61,6 +77,25 @@ module RailsSpotlight
           @query ||= json_request_body.fetch('query')
         end
 
+        def raw_options
+          @raw_options ||= json_request_body.fetch('options', {}) || {}
+        end
+
+        def required_projects
+          @required_projects ||= raw_options.fetch('projects', [])
+        end
+
+        def use
+          @use ||= { 'shard' => 'default', 'role' => 'reading' }.merge(raw_options.fetch('use', {}))
+        end
+
+        def connection_options
+          @connection_options ||= raw_options
+                                  .symbolize_keys
+                                  .slice(:database, :shards)
+                                  .reject { |_, v| v.nil? || (!v.is_a?(TrueClass) && !v.is_a?(FalseClass) && v.empty?) } # TODO: Check for each rails version
+        end
+
         def force_execution?
           @force_execution ||= json_request_body['mode'] == 'force'
         end

data/lib/rails_spotlight/support/project.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsSpotlight
   module Support
     class Project

data/lib/rails_spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsSpotlight
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_spotlight
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Pawel Niemczyk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-contrib
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Lets have a look at your rails application in details