daisyui_on_phlex 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24ac5156bc91427821a11f2108b2c032509111ab15d992dda5d51b65124b400c
-  data.tar.gz: dee06d63293a83653935f57ce78e0f9f032a6c039b5db5e78683cc8e818237bf
+  metadata.gz: 1e9055e975f76616e36477a2ea3059883373a49075d372ad51f60558736f6314
+  data.tar.gz: d7db288599b6b4b5d3de7f177536c2aca03fee43fee2fabaf927219029c2aa00
 SHA512:
-  metadata.gz: '08175ac9c264c255c2e4968332e31f7a9ee242c5b7f7af9c99bacad2e6e9ae929015f17e5935a193b289f94c9500b8ec5f6ec272a7361ab0587cf36b057c915f'
-  data.tar.gz: 64b6b0b51988acb8fb926fc84bb2d45f7dd9f80381b775f447236f0dbb54bda85160a96ea6fd5270027293c0fd3d8b936c8c399f894f7f317f4a1ce3e1066ad8
+  metadata.gz: 49605f81a46a56a2f9a577bb664e3232dfd0aa4f888c5246186d356c8048a2d544d08f0a3a4f0472c6eda77fafbc6fe6def330fc2f18053f154da3e9ed3a399f
+  data.tar.gz: 5f2c9c05cef94935aa95b7f8dab039ddf695cc917363269542b997f43c3a8d677b745d3862f5dca9edb6c27da1ed2955493bb5a7931ed9be35238689ab56bd81

data/lib/daisyui_on_phlex/generators/install_generator.rb

@@ -21,12 +21,34 @@ module DaisyuiOnPhlex
         end
       end
 
+      def install_daisyui_npm
+        if File.exist?("package.json")
+          say "Installing DaisyUI via NPM...", :green
+          
+          # Check if daisyui is already installed
+          package_json = File.read("package.json")
+          unless package_json.include?('"daisyui"')
+            if system("which npm > /dev/null")
+              run "npm install daisyui"
+              say "DaisyUI installed via NPM", :green
+            elsif system("which yarn > /dev/null")
+              run "yarn add daisyui"
+              say "DaisyUI installed via Yarn", :green
+            else
+              say "Neither NPM nor Yarn found. Please install DaisyUI manually: npm install daisyui", :yellow
+            end
+          else
+            say "DaisyUI already installed in package.json", :yellow
+          end
+        else
+          say "No package.json found. Skipping NPM installation.", :yellow
+          say "Please install DaisyUI manually: npm install daisyui", :yellow
+        end
+      end
+
       def copy_daisyui_files
-        say "Installing DaisyUI files...", :green
-        
-        # Download DaisyUI files
-        run "curl -sLo app/assets/tailwind/daisyui.js https://github.com/saadeghi/daisyui/releases/latest/download/daisyui.js" rescue nil
-        run "curl -sLo app/assets/tailwind/daisyui-theme.js https://github.com/saadeghi/daisyui/releases/latest/download/daisyui-theme.js" rescue nil
+        say "DaisyUI assets are now provided automatically via Rails Engine! 🎉", :green
+        say "CSS and JS files are included automatically in your application.", :blue
       end
 
       def copy_components_to_vendor
@@ -38,7 +60,7 @@ module DaisyuiOnPhlex
         
         component_files.each do |component_path|
           component_file_name = File.basename(component_path)
-          # Używamy relatywnej ścieżki względem source_root
+          # We are using relative path from source_root
           relative_path = File.join("components", component_file_name)
           destination_path = Rails.root.join("vendor/daisyui_on_phlex/components", component_file_name)
           
@@ -48,46 +70,54 @@ module DaisyuiOnPhlex
 
       def copy_base_class
         say "Copying base class...", :green
-        # Używamy relatywnej ścieżki względem source_root
+        # We are using relative path from source_root
         copy_file "base.rb", Rails.root.join("vendor/daisyui_on_phlex/base.rb"), force: options["force"]
       end
 
       def create_vendor_initializer
-        vendor_initializer_path = Rails.root.join("config/initializers/daisyui_on_phlex_vendor.rb")
+        vendor_initializer_path = Rails.root.join("config/initializers/daisyui_on_phlex.rb")
         
         create_file vendor_initializer_path, <<~RUBY, force: options["force"]
           # frozen_string_literal: true
 
-          # Load vendor DaisyUI components
-          Rails.autoloaders.main.push_dir(
-            Rails.root.join("vendor/daisyui_on_phlex"), namespace: DaisyuiOnPhlex
-          )
+          module DaisyuiOnPhlex
+            extend Phlex::Kit
+          end
+
+          # Require base.rb first
+          require Rails.root.join("vendor/daisyui_on_phlex/base.rb")
+
+          # Load all DaisyUI components from vendor directory
+          Dir[Rails.root.join("vendor/daisyui_on_phlex/components/*.rb")].each do |file|
+            require file
+          end
+
+          # Configure TailwindMerge for CSS class merging
+          if defined?(TailwindMerge) && defined?(ClassVariants)
+            ClassVariants.configure do |config|
+              merger = TailwindMerge::Merger.new
+              config.process_classes_with do |classes|
+                merger.merge(classes)
+              end
+            end
+          end
         RUBY
+        
+        say "Created vendor initializer: config/initializers/daisyui_on_phlex.rb", :green
       end
 
       def update_tailwind_config
-        tailwind_config_path = "app/assets/tailwind/application.css"
-        
-        if File.exist?(tailwind_config_path)
-          say "Updating Tailwind CSS configuration...", :green
-          
-          content = File.read(tailwind_config_path)
-          
-          unless content.include?("@plugin \"./daisyui.js\"")
-            # Add DaisyUI plugin line after @import "tailwindcss"
-            updated_content = content.gsub(
-              /@import "tailwindcss" source\(none\);/,
-              "@import \"tailwindcss\" source(none);\n@plugin \"./daisyui.js\";"
-            )
-            
-            File.write(tailwind_config_path, updated_content)
-            say "Added DaisyUI plugin to Tailwind CSS configuration", :green
-          else
-            say "DaisyUI plugin already configured in Tailwind CSS", :yellow
-          end
-        else
-          say "Tailwind CSS configuration not found. Please add @plugin \"./daisyui.js\"; to your Tailwind CSS configuration manually.", :yellow
-        end
+        say "📝 To include DaisyUI styles in your application:", :green
+        say ""
+        say "1. Add to your main CSS file (application.css or application.tailwind.css):", :yellow
+        say "   //= require daisyui_on_phlex", :cyan
+        say ""
+        say "2. Or in your JavaScript file (application.js):", :yellow
+        say "   //= require daisyui_on_phlex", :cyan
+        say ""
+        say "3. For Tailwind CSS, ensure your tailwind.config.js includes:", :yellow
+        say '   content: ["./vendor/daisyui_on_phlex/**/*.rb"]', :cyan
+        say ""
       end
 
       def show_readme
@@ -99,10 +129,20 @@ module DaisyuiOnPhlex
         DaisyUI On Phlex has been installed! 🎉
 
         ✅ All #{component_count} components have been copied to vendor/daisyui_on_phlex/
-        ✅ DaisyUI plugin configured for Tailwind CSS
+        ✅ DaisyUI CSS & JS automatically provided via Rails Engine
+        ✅ Vendor initializer created (config/initializers/daisyui_on_phlex.rb)
         ✅ Ready to use in your Phlex views
 
-        You can now use DaisyUI components in your Phlex views:
+        📦 Optional: Install DaisyUI via NPM for latest features:
+          npm install daisyui
+          # or
+          yarn add daisyui
+
+        🎨 Recommended gems for better CSS handling:
+          gem 'tailwind_merge'
+          gem 'class_variants'
+
+        🚀 You can now use DaisyUI components in your Phlex views:
 
           # In your Phlex view
           class MyView < Phlex::HTML
@@ -117,16 +157,15 @@ module DaisyuiOnPhlex
             end
           end
 
-        All 61+ components are now available:
+        🎯 All 61+ components are now available:
         - Button, Alert, Card, Badge, Modal, Input
         - Navigation: Navbar, Menu, Breadcrumbs, Tabs
         - Data Display: Table, Stat, Timeline, Avatar
         - Forms: Checkbox, Radio, Select, Toggle
         - And many more...
 
-        Components are in vendor/daisyui_on_phlex/components/ and can be customized.
-
-        For documentation: https://github.com/jacob/daisyui-on-phlex
+        📁 Components are in vendor/daisyui_on_phlex/components/ and can be customized.
+        📚 For documentation: https://github.com/jacob/daisyui-on-phlex
 
         TEXT
       end

data/lib/daisyui_on_phlex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DaisyuiOnPhlex
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daisyui_on_phlex
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - JacobAlexander