Fix RuboCop offenses in Pro helper files

ihabadham · claude · ihabadham · commit 28137ea28911 · 2025-09-19T20:01:59.000+03:00
- Fix self-assignment issue in main helper - Apply nested module structure for Pro modules - Fix indentation and formatting issues - Use string interpolation instead of concatenation - Clean up redundant assignment 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/lib/react_on_rails/helper.rb b/lib/react_on_rails/helper.rb
@@ -222,14 +222,13 @@ def react_component_hash(component_name, options = {})
       end
 
       if server_rendered_html.is_a?(Hash)
-        result = build_react_component_result_for_server_rendered_hash(
+        build_react_component_result_for_server_rendered_hash(
           server_rendered_html: server_rendered_html,
           component_specification_tag: internal_result[:tag],
           console_script: console_script,
           render_options: render_options
         )
-        result[COMPONENT_HTML_KEY] = result[COMPONENT_HTML_KEY]
-        result
+
       else
         msg = <<~MSG
           Render-Function used by react_component_hash for #{component_name} is expected to return
@@ -268,7 +267,7 @@ def redux_store(store_name, props: {}, defer: false, immediate_hydration: nil)
       else
         registered_stores << redux_store_data
         result = render_redux_store_data(redux_store_data)
-        (prepend_render_rails_context(result)).html_safe
+        prepend_render_rails_context(result).html_safe
       end
     end
 
@@ -655,7 +654,7 @@ def internal_react_component(react_component_name, options = {})
       {
         render_options: render_options,
         tag: component_specification_tag,
-        result: result,
+        result: result
       }
     end
 
diff --git a/lib/react_on_rails/pro/helper.rb b/lib/react_on_rails/pro/helper.rb
@@ -14,106 +14,107 @@
 #  * https://github.com/shakacode/react_on_rails/blob/master/REACT-ON-RAILS-PRO-LICENSE.md
 #  */
 
-module ReactOnRails::Pro
-  module Helper
-    IMMEDIATE_HYDRATION_PRO_WARNING = "[REACT ON RAILS] The 'immediate_hydration' feature requires a " \
-                                      "React on Rails Pro license. " \
-                                      "Please visit https://shakacode.com/react-on-rails-pro to learn more."
+module ReactOnRails
+  module Pro
+    module Helper
+      IMMEDIATE_HYDRATION_PRO_WARNING = "[REACT ON RAILS] The 'immediate_hydration' feature requires a " \
+                                        "React on Rails Pro license. " \
+                                        "Please visit https://shakacode.com/react-on-rails-pro to learn more."
 
-    # Generates the complete component specification script tag.
-    # Handles both immediate hydration (Pro feature) and standard cases.
-    def generate_component_script(render_options)
-      # Setup the page_loaded_js, which is the same regardless of prerendering or not!
-      # The reason is that React is smart about not doing extra work if the server rendering did its job.
-      component_specification_tag = content_tag(:script,
-        json_safe_and_pretty(render_options.client_props).html_safe,
-        type: "application/json",
-        class: "js-react-on-rails-component",
-        id: "js-react-on-rails-component-#{render_options.dom_id}",
-        "data-component-name" => render_options.react_component_name,
-        "data-trace" => (render_options.trace ? true : nil),
-        "data-dom-id" => render_options.dom_id,
-        "data-store-dependencies" => render_options.store_dependencies&.to_json,
-        "data-immediate-hydration" =>
-          (render_options.immediate_hydration ? true : nil))
+      # Generates the complete component specification script tag.
+      # Handles both immediate hydration (Pro feature) and standard cases.
+      def generate_component_script(render_options)
+        # Setup the page_loaded_js, which is the same regardless of prerendering or not!
+        # The reason is that React is smart about not doing extra work if the server rendering did its job.
+        component_specification_tag = content_tag(:script,
+                                                  json_safe_and_pretty(render_options.client_props).html_safe,
+                                                  type: "application/json",
+                                                  class: "js-react-on-rails-component",
+                                                  id: "js-react-on-rails-component-#{render_options.dom_id}",
+                                                  "data-component-name" => render_options.react_component_name,
+                                                  "data-trace" => (render_options.trace ? true : nil),
+                                                  "data-dom-id" => render_options.dom_id,
+                                                  "data-store-dependencies" => render_options.store_dependencies&.to_json,
+                                                  "data-immediate-hydration" =>
+                                                    (render_options.immediate_hydration ? true : nil))
 
-      # Add immediate invocation script if immediate hydration is enabled
-      spec_tag = if render_options.immediate_hydration
-        # Escape dom_id for JavaScript context
-        escaped_dom_id = escape_javascript(render_options.dom_id)
-        immediate_script = content_tag(:script, %(
+        # Add immediate invocation script if immediate hydration is enabled
+        spec_tag = if render_options.immediate_hydration
+                     # Escape dom_id for JavaScript context
+                     escaped_dom_id = escape_javascript(render_options.dom_id)
+                     immediate_script = content_tag(:script, %(
           typeof ReactOnRails === 'object' && ReactOnRails.reactOnRailsComponentLoaded('#{escaped_dom_id}');
         ).html_safe)
-        "#{component_specification_tag}\n#{immediate_script}"
-      else
-        component_specification_tag
+                     "#{component_specification_tag}\n#{immediate_script}"
+                   else
+                     component_specification_tag
+                   end
+
+        pro_warning_badge = pro_warning_badge_if_needed(render_options.explicitly_disabled_pro_options)
+        "#{pro_warning_badge}\n#{spec_tag}".html_safe
       end
 
-      pro_warning_badge = pro_warning_badge_if_needed(render_options.explicitly_disabled_pro_options)
-      "#{pro_warning_badge}\n#{spec_tag}".html_safe
-    end
+      # Generates the complete store hydration script tag.
+      # Handles both immediate hydration (Pro feature) and standard cases.
+      def generate_store_script(redux_store_data)
+        pro_options_check_result = ReactOnRails::Pro::Utils.disable_pro_render_options_if_not_licensed(redux_store_data)
+        redux_store_data = pro_options_check_result[:raw_options]
+        explicitly_disabled_pro_options = pro_options_check_result[:explicitly_disabled_pro_options]
 
-    # Generates the complete store hydration script tag.
-    # Handles both immediate hydration (Pro feature) and standard cases.
-    def generate_store_script(redux_store_data)
-      pro_options_check_result = ReactOnRails::Pro::Utils.disable_pro_render_options_if_not_licensed(redux_store_data)
-      redux_store_data = pro_options_check_result[:raw_options]
-      explicitly_disabled_pro_options = pro_options_check_result[:explicitly_disabled_pro_options]
+        store_hydration_data = content_tag(:script,
+                                           json_safe_and_pretty(redux_store_data[:props]).html_safe,
+                                           type: "application/json",
+                                           "data-js-react-on-rails-store" => redux_store_data[:store_name].html_safe,
+                                           "data-immediate-hydration" =>
+                                             (redux_store_data[:immediate_hydration] ? true : nil))
 
-      store_hydration_data = content_tag(:script,
-        json_safe_and_pretty(redux_store_data[:props]).html_safe,
-        type: "application/json",
-        "data-js-react-on-rails-store" => redux_store_data[:store_name].html_safe,
-        "data-immediate-hydration" =>
-          (redux_store_data[:immediate_hydration] ? true : nil))
+        # Add immediate invocation script if immediate hydration is enabled and Pro license is valid
+        store_hydration_scripts = if redux_store_data[:immediate_hydration]
+                                    # Escape store_name for JavaScript context
+                                    escaped_store_name = escape_javascript(redux_store_data[:store_name])
+                                    immediate_script = content_tag(:script, <<~JS.strip_heredoc.html_safe
+                                      typeof ReactOnRails === 'object' && ReactOnRails.reactOnRailsStoreLoaded('#{escaped_store_name}');
+                                    JS
+                                    )
+                                    "#{store_hydration_data}\n#{immediate_script}"
+                                  else
+                                    store_hydration_data
+                                  end
 
-      # Add immediate invocation script if immediate hydration is enabled and Pro license is valid
-      store_hydration_scripts =if redux_store_data[:immediate_hydration]
-        # Escape store_name for JavaScript context
-        escaped_store_name = escape_javascript(redux_store_data[:store_name])
-        immediate_script = content_tag(:script, <<~JS.strip_heredoc.html_safe
-          typeof ReactOnRails === 'object' && ReactOnRails.reactOnRailsStoreLoaded('#{escaped_store_name}');
-        JS
-        )
-        "#{store_hydration_data}\n#{immediate_script}"
-      else
-        store_hydration_data
+        pro_warning_badge = pro_warning_badge_if_needed(explicitly_disabled_pro_options)
+        "#{pro_warning_badge}\n#{store_hydration_scripts}".html_safe
       end
 
-      pro_warning_badge = pro_warning_badge_if_needed(explicitly_disabled_pro_options)
-      "#{pro_warning_badge}\n#{store_hydration_scripts}".html_safe
-    end
-
-    def pro_warning_badge_if_needed(explicitly_disabled_pro_options)
-      return "" unless explicitly_disabled_pro_options.any?
+      def pro_warning_badge_if_needed(explicitly_disabled_pro_options)
+        return "" unless explicitly_disabled_pro_options.any?
 
-      disabled_features_message = disabled_pro_features_message(explicitly_disabled_pro_options)
-      warning_message = "[REACT ON RAILS] #{disabled_features_message}" + "\n" +
-                        "Please visit https://shakacode.com/react-on-rails-pro to learn more."
-      puts warning_message
-      Rails.logger.warn warning_message
+        disabled_features_message = disabled_pro_features_message(explicitly_disabled_pro_options)
+        warning_message = "[REACT ON RAILS] #{disabled_features_message}\n" \
+                          "Please visit https://shakacode.com/react-on-rails-pro to learn more."
+        puts warning_message
+        Rails.logger.warn warning_message
 
-      tooltip_text = "#{disabled_features_message} Click to learn more."
+        tooltip_text = "#{disabled_features_message} Click to learn more."
 
-      badge_html = <<~HTML.strip
-        <a href="https://shakacode.com/react-on-rails-pro" target="_blank" rel="noopener noreferrer" title="#{tooltip_text}">
-          <div style="position: fixed; top: 0; right: 0; width: 180px; height: 180px; overflow: hidden; z-index: 9999; pointer-events: none;">
-            <div style="position: absolute; top: 50px; right: -40px; transform: rotate(45deg); background-color: rgba(220, 53, 69, 0.85); color: white; padding: 7px 40px; text-align: center; font-weight: bold; font-family: sans-serif; font-size: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.3); pointer-events: auto;">
-              React On Rails Pro Required
+        <<~HTML.strip
+          <a href="https://shakacode.com/react-on-rails-pro" target="_blank" rel="noopener noreferrer" title="#{tooltip_text}">
+            <div style="position: fixed; top: 0; right: 0; width: 180px; height: 180px; overflow: hidden; z-index: 9999; pointer-events: none;">
+              <div style="position: absolute; top: 50px; right: -40px; transform: rotate(45deg); background-color: rgba(220, 53, 69, 0.85); color: white; padding: 7px 40px; text-align: center; font-weight: bold; font-family: sans-serif; font-size: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.3); pointer-events: auto;">
+                React On Rails Pro Required
+              </div>
             </div>
-          </div>
-        </a>
-      HTML
-      badge_html
-    end
+          </a>
+        HTML
+      end
 
-    def disabled_pro_features_message(explicitly_disabled_pro_options)
-      return "".html_safe unless explicitly_disabled_pro_options.any?
+      def disabled_pro_features_message(explicitly_disabled_pro_options)
+        return "".html_safe unless explicitly_disabled_pro_options.any?
 
-      feature_list = explicitly_disabled_pro_options.join(', ')
-      feature_word = explicitly_disabled_pro_options.size == 1 ? "feature" : "features"
-      "The '#{feature_list}' #{feature_word} #{explicitly_disabled_pro_options.size == 1 ? 'requires' : 'require'} a " \
-      "React on Rails Pro license. "
+        feature_list = explicitly_disabled_pro_options.join(", ")
+        feature_word = explicitly_disabled_pro_options.size == 1 ? "feature" : "features"
+        "The '#{feature_list}' #{feature_word} #{explicitly_disabled_pro_options.size == 1 ? 'requires' : 'require'} a " \
+          "React on Rails Pro license. "
+      end
     end
   end
 end
diff --git a/lib/react_on_rails/pro/utils.rb b/lib/react_on_rails/pro/utils.rb
@@ -14,38 +14,40 @@
 #  * https://github.com/shakacode/react_on_rails/blob/master/REACT-ON-RAILS-PRO-LICENSE.md
 #  */
 
-module ReactOnRails::Pro
-  module Utils
-    PRO_ONLY_OPTIONS = %i[immediate_hydration].freeze
-
-    # Checks if React on Rails Pro features are available
-    # @return [Boolean] true if Pro license is valid, false otherwise
-    def self.support_pro_features?
-      ReactOnRails::Utils.react_on_rails_pro_licence_valid?
-    end
-
-    def self.disable_pro_render_options_if_not_licensed(raw_options)
-      if support_pro_features?
-        return {
-          raw_options: raw_options,
-          explicitly_disabled_pro_options: []
-        }
+module ReactOnRails
+  module Pro
+    module Utils
+      PRO_ONLY_OPTIONS = %i[immediate_hydration].freeze
+
+      # Checks if React on Rails Pro features are available
+      # @return [Boolean] true if Pro license is valid, false otherwise
+      def self.support_pro_features?
+        ReactOnRails::Utils.react_on_rails_pro_licence_valid?
       end
 
-      raw_options_after_disable = raw_options.dup
+      def self.disable_pro_render_options_if_not_licensed(raw_options)
+        if support_pro_features?
+          return {
+            raw_options: raw_options,
+            explicitly_disabled_pro_options: []
+          }
+        end
 
-      explicitly_disabled_pro_options = PRO_ONLY_OPTIONS.select do |option|
-        # Use global configuration if it's not overridden in the options
-        next ReactOnRails.configuration.send(option) if raw_options[option].nil?
+        raw_options_after_disable = raw_options.dup
 
-        raw_options[option]
-      end
-      explicitly_disabled_pro_options.each { |option| raw_options_after_disable[option] = false }
+        explicitly_disabled_pro_options = PRO_ONLY_OPTIONS.select do |option|
+          # Use global configuration if it's not overridden in the options
+          next ReactOnRails.configuration.send(option) if raw_options[option].nil?
 
-      {
-        raw_options: raw_options_after_disable,
-        explicitly_disabled_pro_options: explicitly_disabled_pro_options
-      }
+          raw_options[option]
+        end
+        explicitly_disabled_pro_options.each { |option| raw_options_after_disable[option] = false }
+
+        {
+          raw_options: raw_options_after_disable,
+          explicitly_disabled_pro_options: explicitly_disabled_pro_options
+        }
+      end
     end
   end
-end
+end
