Remove react_on_rails_pro_licence_valid? and consolidate to react_on_rails_pro?

Author: AbanoubGhadban

lib/react_on_rails/helper.rb

@@ -377,10 +377,10 @@ def rails_context(server_side: true)
           i18nDefaultLocale: I18n.default_locale,
           rorVersion: ReactOnRails::VERSION,
           # TODO: v13 just use the version if existing
-          rorPro: ReactOnRails::Utils.react_on_rails_pro_licence_valid?
+          rorPro: ReactOnRails::Utils.react_on_rails_pro?
         }
 
-        if ReactOnRails::Utils.react_on_rails_pro_licence_valid?
+        if ReactOnRails::Utils.react_on_rails_pro?
           result[:rorProVersion] = ReactOnRails::Utils.react_on_rails_pro_version
 
           if ReactOnRails::Utils.rsc_support_enabled?

lib/react_on_rails/pro_utils.rb

@@ -5,9 +5,9 @@ module ProUtils
     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
+    # @return [Boolean] true if Pro is installed and licensed, false otherwise
     def self.support_pro_features?
-      ReactOnRails::Utils.react_on_rails_pro_licence_valid?
+      ReactOnRails::Utils.react_on_rails_pro?
     end
 
     def self.disable_pro_render_options_if_not_licensed(raw_options)

lib/react_on_rails/utils.rb

@@ -228,7 +228,12 @@ def self.gem_available?(name)
       end
     end
 
-    # Todo -- remove this for v13, as we don't need both boolean and number
+    # Checks if React on Rails Pro is installed and licensed.
+    # With startup validation enabled, if this returns true, it means:
+    # 1. The react_on_rails_pro gem is installed
+    # 2. The license is valid (or the app would have failed to start)
+    #
+    # @return [Boolean] true if Pro is available with valid license
     def self.react_on_rails_pro?
       return @react_on_rails_pro if defined?(@react_on_rails_pro)
 
@@ -246,21 +251,6 @@ def self.react_on_rails_pro_version
                                     end
     end
 
-    def self.react_on_rails_pro_licence_valid?
-      return @react_on_rails_pro_licence_valid if defined?(@react_on_rails_pro_licence_valid)
-
-      @react_on_rails_pro_licence_valid = begin
-        return false unless react_on_rails_pro?
-
-        # Maintain compatibility with legacy versions of React on Rails Pro:
-        # Earlier releases did not require license validation, as they were distributed as private gems.
-        # This check ensures that the method works correctly regardless of the installed version.
-        return true unless ReactOnRailsPro::Utils.respond_to?(:licence_valid?)
-
-        ReactOnRailsPro::Utils.licence_valid?
-      end
-    end
-
     def self.rsc_support_enabled?
       return false unless react_on_rails_pro?
 

react_on_rails_pro/CI_SETUP.md

@@ -340,27 +340,36 @@ docker run -e REACT_ON_RAILS_PRO_LICENSE="$REACT_ON_RAILS_PRO_LICENSE" your-imag
 
 ## Verification
 
-### Check License in CI
+License validation happens automatically when Rails starts.
 
-Add a verification step to your CI pipeline:
+✅ **If your CI tests run, your license is valid**
+❌ **If license is invalid, Rails fails to start immediately**
 
-```bash
-# Verify license is loaded
-bundle exec rails runner "puts ReactOnRails::Utils.react_on_rails_pro_licence_valid? ? '✅ License valid' : '❌ License invalid'"
-```
+**No verification step needed** - the application won't start without a valid license.
 
 ### Debug License Issues
 
-If tests fail with license errors:
+If Rails fails to start in CI with license errors:
 
 ```bash
-# Check if license is set
-echo "License set: ${REACT_ON_RAILS_PRO_LICENSE:0:20}..." # Shows first 20 chars
-
-# Check license format
-bundle exec rails runner "require 'jwt'; puts JWT.decode(ENV['REACT_ON_RAILS_PRO_LICENSE'], nil, false)"
+# Check if license environment variable is set (show first 20 chars only)
+echo "License set: ${REACT_ON_RAILS_PRO_LICENSE:0:20}..."
+
+# Decode the license to check expiration
+bundle exec rails runner "
+  require 'jwt'
+  payload = JWT.decode(ENV['REACT_ON_RAILS_PRO_LICENSE'], nil, false).first
+  puts 'Email: ' + payload['sub']
+  puts 'Expires: ' + Time.at(payload['exp']).to_s
+  puts 'Expired: ' + (Time.now.to_i > payload['exp']).to_s
+"
 ```
 
+**Common issues:**
+- License not set in CI environment variables
+- License truncated when copying (should be 500+ characters)
+- License expired (get a new FREE license at https://shakacode.com/react-on-rails-pro)
+
 ## Security Best Practices
 
 1. ✅ **Always use secrets/encrypted variables** - Never commit licenses to code

react_on_rails_pro/LICENSE_SETUP.md

@@ -118,14 +118,16 @@ Set up CI with a license (see [CI_SETUP.md](./CI_SETUP.md) for detailed instruct
 **Ruby Console:**
 ```ruby
 rails console
-> ReactOnRails::Utils.react_on_rails_pro_licence_valid?
+> ReactOnRails::Utils.react_on_rails_pro?
 # Should return: true
 ```
 
+**Note:** With startup validation enabled, your Rails app won't start with an invalid license. If you can run the Rails console, your license is valid.
+
 **Check License Details:**
 ```ruby
 > ReactOnRailsPro::LicenseValidator.license_data
-# Shows: {"sub"=>"[email protected]", "exp"=>1234567890, ...}
+# Shows: {"sub"=>"[email protected]", "exp"=>1234567890, "plan"=>"free", ...}
 ```
 
 **Browser JavaScript Console:**

spec/dummy/spec/helpers/react_on_rails_helper_spec.rb

@@ -22,7 +22,7 @@ class PlainReactOnRailsHelper
     }
 
     allow(ReactOnRails::Utils).to receive_messages(
-      react_on_rails_pro_licence_valid?: true
+      react_on_rails_pro?: true
     )
 
     # Configure immediate_hydration to true for tests since they expect that behavior
@@ -389,7 +389,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:react_app) { react_component("App", props: props, immediate_hydration: true) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
         end
 
         it { is_expected.to include(badge_html_string) }
@@ -405,7 +405,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:react_app) { react_component("App", props: props) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
         end
 
         around do |example|
@@ -421,7 +421,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:react_app) { react_component("App", props: props, immediate_hydration: false) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
         end
 
         it { is_expected.not_to include(badge_html_string) }
@@ -437,7 +437,7 @@ def helper.append_javascript_pack_tag(name, **options)
 
         before do
           allow(ReactOnRails::Utils).to receive_messages(
-            react_on_rails_pro_licence_valid?: true
+            react_on_rails_pro?: true
           )
         end
 
@@ -483,7 +483,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:react_app) { react_component_hash("App", props: props, immediate_hydration: true) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
         end
 
         it "adds badge to componentHtml" do
@@ -496,7 +496,7 @@ def helper.append_javascript_pack_tag(name, **options)
 
         before do
           allow(ReactOnRails::Utils).to receive_messages(
-            react_on_rails_pro_licence_valid?: true
+            react_on_rails_pro?: true
           )
         end
 
@@ -541,7 +541,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:store) { redux_store("reduxStore", props: props, immediate_hydration: true) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
         end
 
         it { is_expected.to include(badge_html_string) }
@@ -557,7 +557,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:store) { redux_store("reduxStore", props: props, immediate_hydration: false) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
         end
 
         it { is_expected.not_to include(badge_html_string) }
@@ -568,7 +568,7 @@ def helper.append_javascript_pack_tag(name, **options)
 
         before do
           allow(ReactOnRails::Utils).to receive_messages(
-            react_on_rails_pro_licence_valid?: true
+            react_on_rails_pro?: true
           )
         end
 

spec/dummy/spec/system/integration_spec.rb

@@ -88,7 +88,7 @@ def finished_all_ajax_requests?
 
 shared_context "with pro features and immediate hydration" do
   before do
-    allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(true)
+    allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(true)
   end
 
   around do |example|

spec/react_on_rails/react_component/render_options_spec.rb

@@ -21,7 +21,7 @@ def the_attrs(react_component_name: "App", options: {})
 
   # TODO: test pro features without license
   before do
-    allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(true)
+    allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(true)
   end
 
   it "works without raising error" do