recurrence_ui 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30bda1d3e659e5be4acd1c5addc226c2bddcbb9d862bbee836a15542b896722c
-  data.tar.gz: e68a05739a7cc1e34a6d01b9b0cbc16f8a569a28ab0d2cd1c998f028d4eeb360
+  metadata.gz: '069d35c9479d4f10916502bc7e13e13db0b26a758b3ff8b41619d632918f78c2'
+  data.tar.gz: f88fdf5a43cbbd18858f53ba8eb1592de132cc9ab5d711e38375322f4c3fdada
 SHA512:
-  metadata.gz: 3cc4b0b312432613d8c5780648d373a48286527c8864458c149d73244a449fb9c2b445dde608fe246b6980aef8a74ec62b4cbabc14f06ad8bf4e654d53f50133
-  data.tar.gz: 2fb010565904f3f9635c277c1834607200b6f35e30058568da1722b5b9bd60d77d82ce7242d419b6d711e09c5773e7387df0b472508932face14a8b474d91576
+  metadata.gz: 72ac32f1763a7ef149adcc46356ed811e8dbd2c2b6dcd8e469631e902765f039ca170b2d7a183d8620a3df2d8dffb9f71f7eca1459794700e15c0d1469cd4c50
+  data.tar.gz: d80d3ddd4307f2a0a45d59e03c915b91a76d24c68956b2ecd91966faa6ec46eea106cac44d8d302e9ec7aa3cefc31d305ef3935b5ec5eb6a786b59b66d685664

data/app/assets/stylesheets/recurrence_ui/components.css

@@ -220,7 +220,7 @@
 
   /* Edit Icon wrapper */
   .rui-summary-icon {
-    @apply opacity-0 group-hover:opacity-100 transition-opacity duration-200 text-gray-400 dark:text-gray-500;
+    @apply opacity-0 group-hover:opacity-100 transition-opacity duration-200 text-[var(--app-text-muted)] dark:text-gray-500;
   }
   /* Rule Accordion Card Container */
   .rui-card-container {

data/app/javascript/recurrence_ui/index.js

@@ -1,4 +1,4 @@
-import RecurrenceUiController from "recurrence_ui/recurrence_ui_controller"
+import RecurrenceUiController from "./recurrence_ui_controller"
 
 export function registerRecurrenceUiController(application) {
   if (application) {

data/config/importmap.rb

@@ -1,6 +1,3 @@
 # config/importmap.rb in the recurrence_ui gem
 pin "recurrence_ui", to: "recurrence_ui/index.js"
 pin "recurrence_ui/recurrence_ui_controller", to: "recurrence_ui/recurrence_ui_controller.js"
-
-# Явно указываем Importmap, где лежат файлы гема на диске
-pin_all_from File.expand_path("../app/javascript/recurrence_ui", __dir__), under: "recurrence_ui"

data/lib/generators/recurrence_ui/install/install_generator.rb

@@ -3,9 +3,24 @@ module RecurrenceUi
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path("templates", __dir__)
 
-      desc "Installs RecurrenceUi JavaScript and CSS integration into the application"
+      desc "Installs RecurrenceUi importmap, JS controller registration, and Tailwind CSS styles"
 
-      def register_js
+      def add_importmap_pin
+        importmap_file = "config/importmap.rb"
+        if File.exist?(importmap_file)
+          pin_code = "\npin \"recurrence_ui\", to: \"recurrence_ui/index.js\"\n"
+          if File.read(importmap_file).include?("recurrence_ui")
+            say "RecurrenceUi pin already exists in #{importmap_file}", :blue
+          else
+            append_to_file importmap_file, pin_code
+            say "Added recurrence_ui pin to #{importmap_file}", :green
+          end
+        else
+          say "Could not find #{importmap_file}. Importmap configuration skipped.", :yellow
+        end
+      end
+
+      def register_controller
         app_js_paths = [
           Rails.root.join("app/javascript/application.js"),
           Rails.root.join("app/javascript/packs/application.js")
@@ -17,13 +32,15 @@ module RecurrenceUi
           content = File.read(target_js)
           
           if content.include?("recurrence_ui")
-            say "RecurrenceUi is already registered in #{target_js.relative_path_from(Rails.root)}", :yellow
+            say "RecurrenceUi is already registered in #{target_js.relative_path_from(Rails.root)}", :blue
           else
             append_to_file target_js, <<~JS
 
               // Register RecurrenceUi Stimulus controller
               import { registerRecurrenceUiController } from "recurrence_ui"
-              registerRecurrenceUiController(application)
+              if (typeof window.Stimulus !== "undefined") {
+                registerRecurrenceUiController(window.Stimulus)
+              }
             JS
             say "Added RecurrenceUi registration to #{target_js.relative_path_from(Rails.root)}", :green
           end
@@ -33,30 +50,27 @@ module RecurrenceUi
       end
 
       def register_styles
-        tailwind_css_path = Rails.root.join("app/assets/tailwind/application.css")
-        tailwind_css_alt_path = Rails.root.join("app/assets/stylesheets/application.tailwind.css")
+        tailwind_css_paths = [
+          Rails.root.join("app/assets/tailwind/application.css"),
+          Rails.root.join("app/assets/stylesheets/application.tailwind.css"),
+          Rails.root.join("app/assets/stylesheets/application.css")
+        ]
 
-        target_css = if File.exist?(tailwind_css_path)
-                       tailwind_css_path
-                     elsif File.exist?(tailwind_css_alt_path)
-                       tailwind_css_alt_path
-                     else
-                       nil
-                     end
+        target_css = tailwind_css_paths.find { |path| File.exist?(path) }
 
         if target_css
           content = File.read(target_css)
           import_line = '@import "recurrence_ui/application.css";'
 
-          unless content.include?(import_line)
+          if content.include?(import_line)
+            say "RecurrenceUi styles import already exists in #{target_css.relative_path_from(Rails.root)}", :blue
+          else
             if content.include?('@import "tailwindcss";')
               inject_into_file target_css, "\n#{import_line}", after: '@import "tailwindcss";'
             else
               prepend_to_file target_css, "#{import_line}\n"
             end
             say "Added RecurrenceUi styles import to #{target_css.relative_path_from(Rails.root)}", :green
-          else
-            say "RecurrenceUi styles import already exists in #{target_css.relative_path_from(Rails.root)}", :blue
           end
         else
           say "Tailwind CSS file not found. Please add `@import \"recurrence_ui/application.css\";` manually.", :yellow

data/lib/recurrence_ui/engine.rb

@@ -6,11 +6,11 @@ module RecurrenceUi
     isolate_namespace RecurrenceUi
 
     # 1. Add importmap support for the gem
-    initializer "recurrence_ui.importmap", before: "importmap" do |app|
-      if app.config.respond_to?(:importmap)
-        app.config.importmap.paths << Engine.root.join("config/importmap.rb")
-      end
-    end
+    #initializer "recurrence_ui.importmap", before: "importmap" do |app|
+    #  if app.config.respond_to?(:importmap)
+    #    app.config.importmap.paths << Engine.root.join("config/importmap.rb")
+    #  end
+    #end
 
     # 2. Assets (только стили и картинки, если нужны, т.к. JS обслуживает Importmap)
     initializer "recurrence_ui.assets" do |app|

data/lib/recurrence_ui/version.rb

@@ -1,3 +1,3 @@
 module RecurrenceUi
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recurrence_ui
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Katerina German