plutonium 0.9.0 → 0.9.2

data/app/assets/javascripts/controllers/index.js

@@ -0,0 +1,34 @@
+// Import controllers here
+import NestedResourceFormFieldsController from "../../../views/components/nested_resource_form_fields/nested_resource_form_fields_controller.js"
+import TabBarController from "../../../views/components/tab_bar/tab_bar_controller.js"
+import ToolbarController from "../../../views/components/toolbar/toolbar_controller.js"
+import TableSearchInputController from "../../../views/components/table_search_input/table_search_input_controller.js"
+import TableToolbarController from "../../../views/components/table_toolbar/table_toolbar_controller.js"
+import TableController from "../../../views/components/table/table_controller.js"
+import FormController from "../../../views/components/form/form_controller.js"
+import ResourceDropDownController from "./resource_drop_down_controller.js"
+import ResourceDismissController from "./resource_dismiss_controller.js"
+
+export function registerControllers(application) {
+  // Register controllers here
+  application.register("nested-resource-form-fields", NestedResourceFormFieldsController)
+  application.register("tab-bar", TabBarController)
+  application.register("toolbar", ToolbarController)
+  application.register("table-search-input", TableSearchInputController)
+  application.register("table-toolbar", TableToolbarController)
+  application.register("table", TableController)
+  application.register("form", FormController)
+  application.register("resource-drop-down", ResourceDropDownController)
+  application.register("resource-dismiss", ResourceDismissController)
+}
+
+// Export controllers here
+export { NestedResourceFormFieldsController };
+export { TabBarController };
+export { ToolbarController };
+export { TableSearchInputController };
+export { TableToolbarController };
+export { TableController };
+export { FormController };
+export { ResourceDropDownController };
+export { ResourceDismissController };

data/app/assets/javascripts/plutonium-app.js

@@ -0,0 +1,7 @@
+import { Application } from "@hotwired/stimulus"
+const application = Application.start()
+
+import { registerControllers } from "./plutonium"
+registerControllers(application)
+
+import "./turbo"

data/app/assets/javascripts/plutonium.js

@@ -0,0 +1 @@
+export * from "./controllers"

data/css.manifest

@@ -0,0 +1,3 @@
+{
+  "plutonium.css": "plutonium.50232e35b5495f5ad90d.css"
+}

data/esbuild.config.js

@@ -0,0 +1,44 @@
+const esbuild = require('esbuild');
+const manifestPlugin = require('esbuild-plugin-manifest')
+
+
+if (process.argv.includes("--prod")) {
+  esbuild.build({
+    outdir: "public/plutonium-assets",
+    entryPoints: [
+      "app/assets/javascripts/plutonium-app.js"
+    ],
+    plugins: [
+      manifestPlugin({
+        filename: `${__dirname}/js.manifest`,
+        shortNames: true,
+      })
+    ],
+    minify: true,
+    sourcemap: true,
+    bundle: true,
+  })
+
+  esbuild.build({
+    outdir: "app/assets/build",
+    entryPoints: [
+      "app/assets/javascripts/plutonium.js"
+    ],
+    bundle: true,
+  })
+}
+else {
+  esbuild.context({
+    outdir: "public/plutonium-assets/build",
+    entryPoints: [
+      "app/assets/javascripts/plutonium-app.js"
+    ],
+    plugins: [
+      manifestPlugin({
+        filename: `${__dirname}/js.dev.manifest`,
+        shortNames: true,
+      })
+    ],
+    bundle: true,
+  }).then((context) => context.watch().catch((e) => console.error(e.message)))
+}

data/lib/generators/pu/gen/component/component_generator.rb

@@ -20,8 +20,10 @@ module Pu
         template "component.html.erb", "#{component_path}.html.erb"
         template "controller.js", controller_path
 
-        controllers_file = File.join __dir__, "../../../../../app/assets/js/controllers/index.js"
-        insert_into_file controllers_file, controller_registration, after: /.*Register controllers here.*\n\n/
+        controllers_index_file = File.join __dir__, "../../../../../app/assets/javascripts/controllers/index.js"
+        insert_into_file controllers_index_file, controller_import, after: /.*Import controllers here*\n/
+        insert_into_file controllers_index_file, controller_registration, after: /.*Register controllers here*\n/
+        insert_into_file controllers_index_file, controller_export, after: /.*Export controllers here*\n/
       end
 
       protected
@@ -78,9 +80,16 @@ module Pu
         [component_module, "#{component_name}Controller"].compact.join("::").gsub("::", "_")
       end
 
+      def controller_import
+        "import #{controller_reference} from \"../../../../#{controller_path}\"\n"
+      end
+
       def controller_registration
-        %(import #{controller_reference} from "../../../../#{controller_path}"\n) +
-          %(application.register("#{controller_identifier}", #{controller_reference})\n\n)
+        "  application.register(\"#{controller_identifier}\", #{controller_reference})\n"
+      end
+
+      def controller_export
+        "export { #{controller_reference} }\n"
       end
     end
   end

data/lib/generators/pu/lib/plutonium_generators/concerns/actions.rb

@@ -11,87 +11,89 @@ module PlutoniumGenerators
       protected
 
       #
-      # Sets the ruby version for the project in .ruby-version and Gemfile to `PlutoniumGenerators::RUBY_VERSION`
+      # Sets the ruby version for the project in .ruby-version and Gemfile to `version`
       #
-      # @return [void]
-      #
-      def set_ruby_version!
-        log :set_ruby_version!, PlutoniumGenerators::RUBY_VERSION
-
-        in_root do
-          create_file ".ruby-version", PlutoniumGenerators::RUBY_VERSION, force: true, verbose: false
-          gsub_file "Gemfile", /^ruby ["'].*["']/, "ruby '~> #{PlutoniumGenerators::RUBY_VERSION}'", verbose: false
-        end
-      end
-
-      #
-      # Adds a new gem into the Gemfile
-      # Existing directives are updated if they do not match
-      # When `:group` is specified, the gem is inserted into the approriate gem group.
-      #
-      # @param [String] name the name of the gem
-      # @param [Hash] **kwargs set of options to append see #super
+      # @param [string] version semantic ruby version you want to use e.g. 3.3.0
       #
       # @return [void]
       #
-      def gem(name, **kwargs)
-        groups = Array(kwargs.delete(:group))
+      def set_ruby_version!(version)
+        log :set_ruby_version!, version
 
         in_root do
-          begin
-            # Create a temp gemfile
-            File.rename("Gemfile", "Gemfile.bak")
-            File.write("Gemfile", "")
-            # Generate the directive
-            super
-            # Get the generated directive
-            directive = gemfile.strip
-          ensure
-            # Restore our gemfile
-            File.delete "Gemfile"
-            File.rename "Gemfile.bak", "Gemfile"
-          end
-
-          pattern = /^# gem ['"]#{name}['"].*/
-          if gemfile.match(pattern)
-            # Replace commented out directive
-            gsub_file("Gemfile", pattern, directive)
-            break
-          end
-
-          # Remove existing directive
-          remove_gem name
-
-          # Insert the new directive
-          if groups != []
-            str = groups.sort.map(&:inspect).join(", ")
-            after_sentinel = "group #{str} do\n"
-
-            unless File.read("Gemfile").match?(/^#{after_sentinel}/)
-              inject_into_file "Gemfile", "\n#{after_sentinel}end\n"
-            end
-          else
-            after_sentinel = "# Project gems\n\n"
-            unless File.read("Gemfile").match?(/^#{after_sentinel}/)
-              inject_into_file "Gemfile", "\n#{after_sentinel}", after: /^ruby .*\n/
-            end
-          end
-
-          inject_into_file "Gemfile", "#{directive}\n", after: /^#{after_sentinel}/
+          create_file ".ruby-version", version, force: true, verbose: false
+          gsub_file "Gemfile", /^ruby ["'].*["']/, "ruby '~> #{version}'", verbose: false
         end
       end
 
-      #
-      # Removes a gem and any preceeding comments from the Gemfile
-      #
-      # @param gem [String] the name of the gem to remove
-      #
-      # @return [void]
-      #
-      def remove_gem(gem)
-        log :remove_gem, gem
-        gsub_file "Gemfile", /(:?^.*#.*\n)*.*gem ['"]#{gem}['"].*\n/, "", verbose: false
-      end
+      # #
+      # # Adds a new gem into the Gemfile
+      # # Existing directives are updated if they do not match
+      # # When `:group` is specified, the gem is inserted into the approriate gem group.
+      # #
+      # # @param [String] name the name of the gem
+      # # @param [Hash] **kwargs set of options to append see #super
+      # #
+      # # @return [void]
+      # #
+      # def gem(name, **kwargs)
+      #   groups = Array(kwargs.delete(:group))
+
+      #   in_root do
+      #     begin
+      #       # Create a temp gemfile
+      #       File.rename("Gemfile", "Gemfile.bak")
+      #       File.write("Gemfile", "")
+      #       # Generate the directive
+      #       super
+      #       # Get the generated directive
+      #       directive = gemfile.strip
+      #     ensure
+      #       # Restore our gemfile
+      #       File.delete "Gemfile"
+      #       File.rename "Gemfile.bak", "Gemfile"
+      #     end
+
+      #     pattern = /^# gem ['"]#{name}['"].*/
+      #     if gemfile.match(pattern)
+      #       # Replace commented out directive
+      #       gsub_file("Gemfile", pattern, directive)
+      #       break
+      #     end
+
+      #     # Remove existing directive
+      #     remove_gem name
+
+      #     # Insert the new directive
+      #     if groups != []
+      #       str = groups.sort.map(&:inspect).join(", ")
+      #       after_sentinel = "group #{str} do\n"
+
+      #       unless File.read("Gemfile").match?(/^#{after_sentinel}/)
+      #         inject_into_file "Gemfile", "\n#{after_sentinel}end\n"
+      #       end
+      #     else
+      #       after_sentinel = "# Project gems\n\n"
+      #       unless File.read("Gemfile").match?(/^#{after_sentinel}/)
+      #         inject_into_file "Gemfile", "\n#{after_sentinel}", after: /^ruby .*\n/
+      #       end
+      #     end
+
+      #     inject_into_file "Gemfile", "#{directive}\n", after: /^#{after_sentinel}/
+      #   end
+      # end
+
+      # #
+      # # Removes a gem and any preceeding comments from the Gemfile
+      # #
+      # # @param gem [String] the name of the gem to remove
+      # #
+      # # @return [void]
+      # #
+      # def remove_gem(gem)
+      #   log :remove_gem, gem
+      #   gsub_file "Gemfile", /(:?^.*#.*\n)*.*gem ['"]#{gem}['"].*\n/, "", verbose: false
+      # end
 
       #
       # Evaluates the given template and merges it with the project's docker-compose.yml
@@ -348,6 +350,18 @@ module PlutoniumGenerators
           File.read("Gemfile")
         end
       end
+
+      def bundle(*gems)
+        Bundler.with_unbundled_env do
+          run "bundle add #{Array(gems).join " "}"
+        end
+      end
+
+      def unbundle(*gems)
+        Bundler.with_unbundled_env do
+          run "bundle remove #{Array(gems).join " "}"
+        end
+      end
     end
   end
 end

data/lib/generators/pu/lib/plutonium_generators/model_generator.rb

@@ -7,7 +7,7 @@ module PlutoniumGenerators
   class ModelGenerator < ActiveRecord::Generators::ModelGenerator
     include PlutoniumGenerators::Generator
 
-    # remove_hook_for :test_framework
+    remove_hook_for :test_framework
     remove_task :create_migration_file
     remove_task :create_model_file
     remove_task :create_module_file

data/lib/generators/pu/rodauth/install_generator.rb

@@ -18,8 +18,7 @@ module Pu
 
       def add_rodauth
         Bundler.with_unbundled_env do
-          run "bundle add bcrypt"
-          run "bundle add rodauth-rails"
+          run "bundle add bcrypt rodauth-rails"
         end
       end
 

data/lib/plutonium/core/fields/renderers/factory.rb

@@ -9,7 +9,6 @@ module Plutonium
 
           map_type :belongs_to, :has_one, :has_many, to: Plutonium::Core::Fields::Renderers::AssociationRenderer
           map_type :attachment, to: Plutonium::Core::Fields::Renderers::AttachmentRenderer
-          map_type :map, to: Plutonium::Core::Fields::Renderers::MapRenderer
 
           def self.build(name, type:, **)
             mapping = mappings[type] || Plutonium::Core::Fields::Renderers::BasicRenderer

data/lib/plutonium/pkg/base.rb

@@ -17,10 +17,6 @@ module Plutonium
           add_view_paths_initializer.instance_variable_set(:@block, ->(app) {})
         end
       end
-
-      def scoped_to_entity?
-        raise NotImplementedError, "scoped_to_entity?"
-      end
     end
   end
 end

data/lib/plutonium/railtie.rb

@@ -2,7 +2,15 @@ require "view_component"
 
 module Plutonium
   class Railtie < Rails::Railtie
-    initializer "plutonium.assets_server" do
+    config.plutonium = ActiveSupport::OrderedOptions.new
+
+    initializer "plutonium.append_assets_path" do |app|
+      config.to_prepare do
+        Rails.application.config.assets.paths << Plutonium.root.join("app/assets/build").to_s
+      end
+    end
+
+    initializer "plutonium.asset_server" do
       # setup a middleware to serve our assets
       config.app_middleware.insert_before(
         ActionDispatch::Static,
@@ -17,7 +25,7 @@ module Plutonium
       )
     end
 
-    initializer "plutonium.view_components" do
+    initializer "plutonium.view_components_capture_compat" do
       config.view_component.capture_compatibility_patch_enabled = true
     end
   end

data/lib/plutonium/version.rb

@@ -1,3 +1,3 @@
 module Plutonium
-  VERSION = "0.9.0"
+  VERSION = "0.9.2"
 end

data/lib/plutonium.rb

@@ -21,28 +21,31 @@ module Plutonium
 
   def self.stylesheet_link
     if Plutonium::Config.development
-      file = JSON.parse(File.read(root.join("css.manifest")))["plutonium-dev.css"]
-      "/plutonium-assets/build/#{file}"
+      base_dir = "/plutonium-assets/build"
+      manifest = "css.dev.manifest"
+      filename = "plutonium-dev.css"
     else
-      raise NotImplementedError, "TODO: implement asset resolution for prod"
-      # @stylesheet ||= begin
-      #   file = JSON.parse(File.read(root.join("css.manifest")))["plutonium.css"]
-      #   "/plutonium-assets/#{file}"
-      # end
+      base_dir = "/plutonium-assets"
+      manifest = "css.manifest"
+      filename = "plutonium.css"
     end
+
+    file = JSON.parse(File.read(root.join(manifest)))[filename]
+    "#{base_dir}/#{file}"
   end
 
   def self.script_link
+    filename = "plutonium-app.js"
     if Plutonium::Config.development
-      file = JSON.parse(File.read(root.join("js.manifest")))["plutonium.js"]
-      "/plutonium-assets/build/#{file}"
+      base_dir = "/plutonium-assets/build"
+      manifest = "js.dev.manifest"
     else
-      raise NotImplementedError, "TODO: implement asset resolution for prod"
-      # @stylesheet ||= begin
-      #   file = JSON.parse(File.read(root.join("css.manifest")))["plutonium.css"]
-      #   "/plutonium-assets/#{file}"
-      # end
+      base_dir = "/plutonium-assets"
+      manifest = "js.manifest"
     end
+
+    file = JSON.parse(File.read(root.join(manifest)))[filename]
+    "#{base_dir}/#{file}"
   end
 end
 

data/package-lock.json

@@ -13,7 +13,6 @@
         "esbuild-plugin-manifest": "^1.0.3",
         "flowbite": "^2.3.0",
         "lodash.debounce": "^4.0.8",
-        "mapkick": "^0.2.6",
         "postcss": "^8.4.35",
         "postcss-cli": "^11.0.0",
         "postcss-hash": "^3.0.0",
@@ -1381,12 +1380,6 @@
         "node": "14 || >=16.14"
       }
     },
-    "node_modules/mapkick": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/mapkick/-/mapkick-0.2.6.tgz",
-      "integrity": "sha512-sDfPCOhTpQrzJc3Yzwg5XOBy5o2TTNEfH2dG2QZM7RUtfQzhY+xErfhQHrQvSOaWbf4zOegPq/dhaWuv2fo4CA==",
-      "dev": true
-    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",

data/package.json

@@ -11,12 +11,12 @@
     "postcss": "^8.4.35",
     "postcss-cli": "^11.0.0",
     "postcss-hash": "^3.0.0",
-    "tailwindcss": "^3.4.1",
-    "mapkick": "^0.2.6"
+    "tailwindcss": "^3.4.1"
   },
   "scripts": {
-    "watch-css": "postcss app/assets/css/plutonium.css -o public/plutonium-assets/build/plutonium-dev.css --watch",
-    "watch-js": "node build.js",
-    "build-css": "postcss app/assets/css/plutonium.css -o public/plutonium-assets/build/plutonium.css --watch"
+    "css:dev": "postcss app/assets/stylesheets/plutonium.css -o public/plutonium-assets/build/plutonium-dev.css --watch",
+    "js:dev": "node esbuild.config.js",
+    "css:prod": "postcss app/assets/stylesheets/plutonium.css -o public/plutonium-assets/plutonium.css --prod",
+    "js:prod": "node esbuild.config.js --prod"
   }
 }

data/postcss.config.js

@@ -5,7 +5,7 @@ module.exports = {
     'postcss-hash': {
       algorithm: 'sha256',
       trim: 20,
-      manifest: './css.manifest'
+      manifest: process.argv.includes("--prod") ? './css.manifest' : './css.dev.manifest'
     },
   }
 }