nitro_kit 0.2.0 → 0.3.0

data/lib/generators/nitro_kit/add_generator.rb

@@ -1,87 +1,84 @@
-require "nitro_kit/schema_builder"
-
 module NitroKit
   class AddGenerator < Rails::Generators::Base
     argument :component_names, type: :array
 
-    source_root File.expand_path("../../../", __dir__)
-
-    extend SchemaBuilder
-
-    SCHEMA = build_schema do |s|
-      s.add(:badge)
-      s.add(
-        :button,
-        components: [:button, :button_group],
-        helpers: [:button, :button_group]
-      )
-      s.add(
-        :dropdown,
-        js: [:dropdown],
-        modules: ["@floating-ui/core", "@floating-ui/dom"]
-      )
-      s.add(
-        :icon,
-        gems: ["lucide-rails"]
-      )
-    end
+    source_root File.expand_path("../../../", __dir__).tap { |path| puts path }
 
     def copy_base_component
       copy_file("app/components/nitro_kit/component.rb", "app/components/nitro_kit/component.rb")
     end
 
     def copy_component_files
-      components.each do |component|
-        component.files.each do |path|
-          copy_file(path, path)
-        end
+      components.map(&:all_files).flatten.uniq.each do |path|
+        copy_file(path, path)
       end
     end
 
     def add_gems
-      gems = components.flat_map(&:gems)
+      gems = components.flat_map(&:all_gems)
 
       return unless gems.any?
 
       gems.each do |name|
-        gem(name)
+        gem(name) unless has_gem?(name)
       end
 
       run("bundle install")
     end
 
     def install_modules
-      modules = components.flat_map(&:modules)
+      modules = components.flat_map(&:all_modules).uniq
 
       return unless modules.any?
 
-      if importmaps?
+      case js_strategy
+      when :importmaps
         run("bin/importmap pin #{modules.join(" ")}")
+      when :yarn
+        run("yarn add #{modules.join(" ")}")
+      when :npm
+        run("npm install --save #{modules.join(" ")}")
+      when :bun
+        run("bun add #{modules.join(" ")}")
       else
-        say("oh hai npm/yarn/bun")
+        say("Could not determine JS strategy. Please install one of: npm, yarn, bun, or importmaps")
       end
     end
 
     private
 
     def components
-      list = component_names
+      return @components if @components
 
-      if list == ["all"]
-        list = SCHEMA.all
+      if component_names == ["all"]
+        return @components = SCHEMA.all
       end
 
-      list.map do |name|
-        unless component = SCHEMA[name.to_sym]
-          raise "Unknown component `#{name}'"
+      # Component names + their dependencies
+      @components = component_names
+        .flat_map do |name|
+          component = SCHEMA.find(name)
+          [component] + component.dependencies
         end
+    end
 
-        component
+    def js_strategy
+      if File.exist?(File.expand_path("bin/importmap", Rails.root))
+        :importmaps
+      elsif File.exist?(File.expand_path("yarn.lock", Rails.root))
+        :yarn
+      elsif File.exist?(File.expand_path("package-lock.json", Rails.root))
+        :npm
+      elsif File.exist?(File.expand_path("bun.lockb", Rails.root))
+        :bun
+      else
+        nil
       end
     end
 
-    def importmaps?
-      File.exist?(File.expand_path("bin/importmap", Rails.root))
+    def has_gem?(name)
+      gemfile = File.read(File.expand_path("Gemfile", Rails.root))
+      gemfile.include?("gem '#{name}'") || gemfile.include?("gem \"#{name}\"")
     end
   end
 end

data/lib/generators/nitro_kit/install_generator.rb

@@ -2,7 +2,8 @@ module NitroKit
   module Generators
     class InstallGenerator < Rails::Generators::Base
       def one
-        puts("hi")
+        puts("Maybe, maybe not. Seems complex. Maybe only support greenfield apps?")
+        puts("Manual instructions: https://nitrokit.dev/getting_started")
       end
     end
   end

data/lib/nitro_kit/engine.rb

@@ -0,0 +1,4 @@
+module NitroKit
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/nitro_kit/schema_builder.rb

@@ -1,15 +1,69 @@
 module NitroKit
   module SchemaBuilder
-    Component = Struct.new(:files, :modules, :gems)
+    class Component
+      def initialize(schema, name, dependencies:, files:, modules:, gems:)
+        @schema = schema
+        @name = name
+        @unresolved_dependencies = dependencies
+        @files = files
+        @modules = modules
+        @gems = gems
+        @resolved = false
+      end
+
+      attr_reader :name, :files, :modules, :gems, :unresolved_dependencies
+
+      def dependencies
+        raise "Component not resolved" unless resolved?
+        @dependencies
+      end
+
+      def resolve!
+        raise "Component already resolved" if resolved?
+
+        @dependencies = @unresolved_dependencies
+          .each_with_object(Set.new) do |name, list|
+            list.add(name)
+            list.merge(@schema.find(name).unresolved_dependencies)
+          end
+          .map { |name| @schema.find(name) }
+
+        @resolved = true
+      end
+
+      def resolved?
+        @resolved
+      end
+
+      def all_files
+        (files + dependencies.flat_map(&:files)).sort
+      end
+
+      def all_modules
+        (modules + dependencies.flat_map(&:modules)).sort
+      end
 
-    class Builder
+      def all_gems
+        (gems + dependencies.flat_map(&:gems)).sort
+      end
+
+      def has_dependencies?
+        return true if gems.any?
+        return true if modules.any?
+        false
+      end
+    end
+
+    class Schema
       def initialize
-        @schema = {}
+        @schema = []
         yield self
+        resolve!
       end
 
       def add(
         name,
+        dependencies = [],
         components: nil,
         helpers: nil,
         js: [],
@@ -20,28 +74,48 @@ module NitroKit
         components ||= [name]
         helpers ||= [name]
 
-        @schema[name] = Component.new(
-          [
-            components.map { |c| "app/components/nitro_kit/#{c}.rb" },
-            helpers.map { |c| "app/helpers/nitro_kit/#{c}_helper.rb" },
-            js.map { |c| "app/javascript/controllers/nk/#{c}_controller.js" }
-          ].flatten,
-          modules,
-          gems
+        files = [
+          components.map { |c| "app/components/nitro_kit/#{c}.rb" },
+          helpers.map { |c| "app/helpers/nitro_kit/#{c}_helper.rb" },
+          js.map { |c| "app/javascript/controllers/nk/#{c}_controller.js" }
+        ].flatten
+
+        component = Component.new(
+          self,
+          name,
+          dependencies:,
+          files:,
+          modules:,
+          gems:
         )
-      end
 
-      def [](key)
-        @schema[key]
+        @schema.push(component)
       end
 
       def all
-        @schema.keys.map(&:to_s)
+        @schema
+      end
+
+      def find(name)
+        component = @schema.find { |c| c.name == name.to_sym }
+        raise "Component not found: #{name}" unless component
+        component
+      end
+
+      def resolved?
+        @resolved
+      end
+
+      private
+
+      def resolve!
+        all.each(&:resolve!)
+        @resolved = true
       end
     end
 
     def build_schema(&block)
-      Builder.new(&block)
+      Schema.new(&block)
     end
   end
 end

data/lib/nitro_kit/version.rb

@@ -1,3 +1,3 @@
 module NitroKit
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/nitro_kit.rb

@@ -1,8 +1,46 @@
 require "tailwind_merge"
 require "phlex/rails"
 
+require "nitro_kit/version"
+require "nitro_kit/engine"
 require "nitro_kit/variants"
-require "nitro_kit/railtie"
+require "nitro_kit/schema_builder"
 
 module NitroKit
+  extend SchemaBuilder
+
+  SCHEMA = build_schema do |s|
+    s.add(:accordion, js: [:accordion])
+    s.add(:alert)
+    s.add(:avatar)
+    s.add(:badge)
+    s.add(:button, [:icon], components: [:button, :button_group], helpers: [:button, :button_group])
+    s.add(:card)
+    s.add(:checkbox, [:label], components: [:checkbox, :checkbox_group])
+    s.add(
+      :combobox,
+      [:input],
+      js: [:combobox],
+      modules: ["@floating-ui/core", "@floating-ui/dom", "@github/combobox-nav"]
+    )
+    s.add(:datepicker)
+    s.add(:dialog, [:button, :icon], js: [:dialog])
+    s.add(:dropdown, [:button], js: [:dropdown], modules: ["@floating-ui/core", "@floating-ui/dom"])
+    s.add(:field, [:label, :checkbox, :combobox, :label, :radio_button, :select, :switch, :textarea])
+    s.add(:field_group)
+    s.add(:fieldset, [:field_group])
+    s.add(:form_builder, [:field], helpers: [:form])
+    s.add(:icon, gems: ["lucide-rails"])
+    s.add(:input)
+    s.add(:label)
+    s.add(:pagination, [:icon, :button])
+    s.add(:radio_button, [:label], components: [:radio_button, :radio_button_group])
+    s.add(:select)
+    s.add(:switch, js: [:switch])
+    s.add(:table)
+    s.add(:tabs, js: [:tabs])
+    s.add(:textarea)
+    s.add(:toast, js: [:toast])
+    s.add(:tooltip, js: [:tooltip], modules: ["@floating-ui/core", "@floating-ui/dom"])
+  end
 end

data/lib/tasks/nitro_kit_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :nitro_kit do
+#   # Task goes here
+# end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: nitro_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mikkel Malmberg
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2025-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,15 +58,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
 - README.md
 - Rakefile
 - app/components/nitro_kit/accordion.rb
+- app/components/nitro_kit/alert.rb
+- app/components/nitro_kit/avatar.rb
 - app/components/nitro_kit/badge.rb
 - app/components/nitro_kit/button.rb
 - app/components/nitro_kit/button_group.rb
 - app/components/nitro_kit/card.rb
 - app/components/nitro_kit/checkbox.rb
+- app/components/nitro_kit/checkbox_group.rb
+- app/components/nitro_kit/combobox.rb
 - app/components/nitro_kit/component.rb
+- app/components/nitro_kit/datepicker.rb
+- app/components/nitro_kit/dialog.rb
 - app/components/nitro_kit/dropdown.rb
 - app/components/nitro_kit/field.rb
 - app/components/nitro_kit/field_group.rb
@@ -76,29 +82,52 @@ files:
 - app/components/nitro_kit/icon.rb
 - app/components/nitro_kit/input.rb
 - app/components/nitro_kit/label.rb
+- app/components/nitro_kit/pagination.rb
 - app/components/nitro_kit/radio_button.rb
-- app/components/nitro_kit/radio_group.rb
+- app/components/nitro_kit/radio_button_group.rb
+- app/components/nitro_kit/select.rb
 - app/components/nitro_kit/switch.rb
-- app/helpers/application_helper.rb
+- app/components/nitro_kit/table.rb
+- app/components/nitro_kit/tabs.rb
+- app/components/nitro_kit/textarea.rb
+- app/components/nitro_kit/toast.rb
+- app/components/nitro_kit/tooltip.rb
 - app/helpers/nitro_kit/accordion_helper.rb
+- app/helpers/nitro_kit/alert_helper.rb
+- app/helpers/nitro_kit/avatar_helper.rb
 - app/helpers/nitro_kit/badge_helper.rb
 - app/helpers/nitro_kit/button_group_helper.rb
 - app/helpers/nitro_kit/button_helper.rb
 - app/helpers/nitro_kit/card_helper.rb
 - app/helpers/nitro_kit/checkbox_helper.rb
+- app/helpers/nitro_kit/combobox_helper.rb
+- app/helpers/nitro_kit/datepicker_helper.rb
+- app/helpers/nitro_kit/dialog_helper.rb
 - app/helpers/nitro_kit/dropdown_helper.rb
+- app/helpers/nitro_kit/field_group_helper.rb
 - app/helpers/nitro_kit/field_helper.rb
+- app/helpers/nitro_kit/fieldset_helper.rb
+- app/helpers/nitro_kit/form_helper.rb
 - app/helpers/nitro_kit/icon_helper.rb
+- app/helpers/nitro_kit/input_helper.rb
 - app/helpers/nitro_kit/label_helper.rb
+- app/helpers/nitro_kit/pagination_helper.rb
 - app/helpers/nitro_kit/radio_button_helper.rb
+- app/helpers/nitro_kit/select_helper.rb
 - app/helpers/nitro_kit/switch_helper.rb
+- app/helpers/nitro_kit/table_helper.rb
+- app/helpers/nitro_kit/tabs_helper.rb
+- app/helpers/nitro_kit/textarea_helper.rb
+- app/helpers/nitro_kit/toast_helper.rb
+- app/helpers/nitro_kit/tooltip_helper.rb
 - lib/generators/nitro_kit/add_generator.rb
 - lib/generators/nitro_kit/install_generator.rb
 - lib/nitro_kit.rb
-- lib/nitro_kit/railtie.rb
+- lib/nitro_kit/engine.rb
 - lib/nitro_kit/schema_builder.rb
 - lib/nitro_kit/variants.rb
 - lib/nitro_kit/version.rb
+- lib/tasks/nitro_kit_tasks.rake
 homepage: https://github.com/mikker/nitro_kit
 licenses:
 - MIT
@@ -106,7 +135,6 @@ metadata:
   homepage_uri: https://github.com/mikker/nitro_kit
   source_code_uri: https://github.com/mikker/nitro_kit
   changelog_uri: https://github.com/mikker/nitro_kit/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: WIP, not usable yet
 test_files: []

data/app/components/nitro_kit/radio_group.rb

@@ -1,35 +0,0 @@
-module NitroKit
-  class RadioGroup < Component
-    include ActionView::Helpers::FormTagHelper
-
-    def initialize(name, value: nil, **options)
-      super(**options)
-      @name = name
-      @group_value = value
-    end
-
-    attr_reader :name, :id, :group_value
-
-    def view_template
-      div(class: "flex items-start flex-col gap-2") do
-        yield
-      end
-    end
-
-    def title(text = nil, **options)
-      render(Label.new(**options)) { text || yield }
-    end
-
-    def item(value, text = nil, **options)
-      render(
-        RadioButton.new(
-          name,
-          id:,
-          value:,
-          checked: group_value.presence == value,
-          **options
-        )
-      ) { text || yield }
-    end
-  end
-end

data/app/helpers/application_helper.rb

@@ -1,109 +0,0 @@
-module ApplicationHelper
-  def component_page(&block)
-    tag.div(class: "p-5") do
-      capture(&block)
-    end
-  end
-
-  def title(text = nil, **attrs, &block)
-    text = capture(&block) if block_given?
-    tag.h1(**attrs, class: class_names("text-3xl font-semibold mb-6", attrs[:class])) { text }
-  end
-
-  def lead(text = nil, &block)
-    text = capture(&block) if block_given?
-    tag.div(class: "text-lg text-gray-600 dark:text-gray-400 mb-6") do
-      text
-    end
-  end
-
-  def section(**attrs)
-    tag.div(
-      **attrs,
-      class: class_names("mt-8 space-y-4", attrs[:class])
-    ) do
-      yield
-    end
-  end
-
-  def section_title(text)
-    tag.h2(class: "text-2xl font-semibold mb-4") { text }
-  end
-
-  def example(**attrs)
-    tag
-      .div(
-        **attrs,
-        class: class_names(
-          [
-            "flex flex-wrap gap-2 justify-center items-center min-h-[200px] py-12 p-5 w-full rounded border overflow-scroll",
-            attrs[:class]
-          ]
-        )
-      ) do
-        yield
-      end
-  end
-
-  def code_example(str = nil, language: :erb, toolbar: true, &block)
-    if block_given?
-      str = capture(&block)
-        .gsub(/{#/, "<%")
-        .gsub(/#}/, "%>")
-    end
-
-    lexer = Rouge::Lexer.find(language)
-    formatter = Rouge::Formatters::HTML.new
-
-    tag
-      .div(
-        class: "bg-[#f7f8fa] dark:bg-[#161b22] divide-y border rounded-sm overflow-hidden",
-        data: {controller: "copy-to-clipboard"}
-      ) do
-        if toolbar
-          concat(
-            tag.div(class: "px-1 py-1 flex w-full") do
-              concat(
-                nk_ghost_button(
-                  icon: :copy,
-                  size: :xs,
-                  data: {copy_to_clipboard_target: "button", action: "copy-to-clipboard#copy"}
-                ) { "Copy" }
-              )
-              concat(
-                nk_ghost_button(
-                  icon: :check,
-                  size: :xs,
-                  data: {copy_to_clipboard_target: "successMessage"},
-                  class: "hidden"
-                ) { "Copied!" }
-              )
-            end
-          )
-        end
-
-        concat(
-          tag
-            .pre(
-              class: "text-sm highlight py-3 px-4 font-mono overflow-scroll",
-              data: {copy_to_clipboard_target: "source"}
-            ) do
-              tag.code do
-                formatter.format(lexer.lex(str.strip_heredoc.strip)).html_safe
-              end
-            end
-        )
-      end
-  end
-
-  def markdown(str)
-    Commonmarker
-      .to_html(
-        str.strip_heredoc,
-        options: {
-          parse: {smart: true}
-        }
-      )
-      .html_safe
-  end
-end

data/lib/nitro_kit/railtie.rb

@@ -1,8 +0,0 @@
-module NitroKit
-  class Railtie < ::Rails::Railtie
-    initializer("nitro_kit.initialize") do
-      # Ignore our generators as they confuse Zeitwerk
-      Rails.autoloaders.main.ignore(File.expand_path("../generators", __dir__))
-    end
-  end
-end