railsui 3.2.7 → 3.3.0

data/lib/railsui/configuration.rb

@@ -8,7 +8,7 @@ module Railsui
     include ActiveModel::Model
     include Thor::Actions
 
-    attr_accessor :application_name, :support_email, :theme, :body_classes
+    attr_accessor :application_name, :support_email, :theme, :body_classes, :build_mode
     attr_writer :pages
 
     def initialize(options = {})
@@ -16,6 +16,7 @@ module Railsui
       assign_attributes(options)
       self.application_name ||= "Rails UI"
       self.support_email ||= "support@example.com"
+      self.build_mode ||= detect_build_mode
       theme
       initialize_theme_classes if theme
     end
@@ -26,10 +27,16 @@ module Railsui
 
     def self.load!
       if File.exist?(config_path)
-        config = Psych.load_file(config_path, permitted_classes: [Hash, Railsui::Configuration])
-        return config if config.is_a?(Railsui::Configuration)
-
-        new(config)
+        begin
+          config = Psych.load_file(config_path, permitted_classes: [Hash, Railsui::Configuration])
+          return config if config.is_a?(Railsui::Configuration)
+
+          new(config)
+        rescue Psych::SyntaxError => e
+          raise "❌ Failed to parse config/railsui.yml: #{e.message}. Please check the YAML syntax."
+        rescue => e
+          raise "❌ Failed to load Rails UI configuration: #{e.message}"
+        end
       else
         new
       end
@@ -63,25 +70,45 @@ module Railsui
       Rails.root.join("config", "railsui.yml")
     end
 
-    def save
-      # Create config/railsui.yml
-      File.write(self.class.config_path, to_yaml)
+    def save(skip_build: false)
+      # Validate configuration before saving
+      validate_configuration!
+
+      begin
+        # Create config/railsui.yml
+        File.write(self.class.config_path, to_yaml)
+      rescue => e
+        raise "❌ Failed to save configuration to config/railsui.yml: #{e.message}"
+      end
 
       # Change the Rails UI config to the latest version
       Railsui.config = self
 
       sleep 1
 
-      Railsui.build_css
+      # Only build CSS if not explicitly skipped and CSS file exists
+      if !skip_build && should_build_css? && File.exist?(Rails.root.join("app/assets/tailwind/application.css"))
+        begin
+          Railsui.build_css
+        rescue => e
+          puts "⚠️  Warning: CSS build failed: #{e.message}"
+          puts "You can rebuild manually with: rails tailwindcss:build"
+        end
+      end
     end
 
     def self.update(params = {})
-      config = load!
-      config.assign_attributes(params)
-      config.pages = Railsui::Pages.theme_pages.keys
-      config.save
-
-      Railsui.run_command "rails g railsui:update"
+      begin
+        config = load!
+        config.assign_attributes(params)
+        config.pages = Railsui::Pages.theme_pages.keys
+        config.save
+
+        Railsui.run_command "rails g railsui:update"
+      rescue => e
+        puts "❌ Failed to update configuration: #{e.message}"
+        raise
+      end
     end
 
     def self.synchronize_pages
@@ -115,8 +142,82 @@ module Railsui
       end
     end
 
+    # Validate build mode
+    def build_mode=(value)
+      valid_modes = ["build", "nobuild", :build, :nobuild]
+      unless valid_modes.include?(value)
+        raise ArgumentError, "❌ Invalid build_mode: '#{value}'. Must be 'build' or 'nobuild'"
+      end
+      @build_mode = value.to_s
+    end
+
+    # Validate entire configuration
+    def validate_configuration!
+      errors = []
+
+      errors << "Application name cannot be blank" if application_name.blank?
+      errors << "Support email cannot be blank" if support_email.blank?
+      errors << "Theme cannot be blank" if theme.blank?
+
+      # Validate theme exists (check against available themes)
+      available_themes = ["hound", "shepherd", "corgie"]
+      unless available_themes.include?(theme)
+        errors << "Invalid theme: '#{theme}'. Available themes: #{available_themes.join(', ')}"
+      end
+
+      # Validate build mode
+      unless ["build", "nobuild"].include?(build_mode.to_s)
+        errors << "Invalid build_mode: '#{build_mode}'. Must be 'build' or 'nobuild'"
+      end
+
+      # Validate email format
+      unless support_email =~ URI::MailTo::EMAIL_REGEXP
+        errors << "Invalid email format for support_email: '#{support_email}'"
+      end
+
+      if errors.any?
+        raise ArgumentError, "❌ Configuration validation failed:\n  - #{errors.join("\n  - ")}"
+      end
+    end
+
+    # Check if build mode is nobuild
+    def nobuild?
+      build_mode.to_s == "nobuild"
+    end
+
+    # Check if build mode is build
+    def build?
+      build_mode.to_s == "build"
+    end
+
     private
 
+    def detect_build_mode
+      return "build" unless defined?(Rails) && Rails.root
+
+      # Check for importmap.rb existence
+      if File.exist?(Rails.root.join("config", "importmap.rb"))
+        "nobuild"
+      else
+        "build"
+      end
+    rescue
+      # Fallback to build mode if detection fails
+      "build"
+    end
+
+    def should_build_css?
+      # Always try to build CSS if tailwindcss-rails is available
+      return true if defined?(Tailwindcss)
+
+      # Fallback to checking for package.json in build mode
+      return false unless defined?(Rails) && Rails.root
+
+      build? && File.exist?(Rails.root.join("package.json"))
+    rescue
+      false
+    end
+
     def copy_template(filename)
       return if File.exist?(Rails.root.join(filename))
 

data/lib/railsui/engine.rb

@@ -26,9 +26,24 @@ module Railsui
     end
 
     initializer "railsui.assets.precompile" do |app|
+      # Add engine builds path
       app.config.assets.paths << root.join("builds").to_s
+
+      # Add engine JavaScript path for propshaft to serve
+      app.config.assets.paths << root.join("app/javascript").to_s
+
+      # Precompile Rails UI assets
       app.config.assets.precompile << "railsui/application.css"
       app.config.assets.precompile << %w[*.svg]
+
+      # Support for both importmap and JS bundling modes
+      # Importmap: JavaScript loaded via importmap pins (no precompilation needed)
+      # Build mode: JavaScript bundled via jsbundling-rails (handled by bundler)
+
+      # Ensure propshaft compatibility (Rails 7+)
+      if defined?(Propshaft)
+        app.config.assets.excluded_paths << Rails.root.join("node_modules")
+      end
     end
   end
 end