maquina 0.1.0 → 0.2.1

data/lib/generators/maquina/tailwind_config/templates/lib/tasks/tailwind.rake.tt

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+namespace :tailwindcss do
+  desc "Generates your tailwind config file"
+  task :config do
+    Rails::Generators.invoke("tailwind_config", ["--force"])
+  end
+end
+
+Rake::Task["tailwindcss:build"].enhance(["tailwindcss:config"])
+Rake::Task["tailwindcss:watch"].enhance(["tailwindcss:config"])

data/lib/generators/maquina/templates/config/initializers/maquina.rb.tt

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Maquina.configure do |config|
+  # Configure membership roles.
+  config.membership_roles = Maquina.postgresql? ? {admin: "admin", member: "member"} : {admin: 0, member: 1}
+end

data/lib/maquina/engine.rb

@@ -9,9 +9,5 @@ module Maquina
   class Engine < ::Rails::Engine
     config.autoload_paths += %W[#{Engine.root}/app/views]
     isolate_namespace Maquina
-
-    initializer "maquina.importmap", before: "importmap" do |app|
-      app.config.importmap.paths << Engine.root.join("config/initializers/importmap.rb")
-    end
   end
 end

data/lib/maquina/version.rb

@@ -1,3 +1,3 @@
 module Maquina
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/lib/maquina.rb

@@ -11,26 +11,33 @@ require "pagy"
 module Maquina
   class << self
     attr_accessor :configuration
+
+    def postgresql?
+      ActiveRecord::Base.connection_db_config.configuration_hash[:adapter].downcase == "postgresql"
+    end
   end
 
   class Configuration
     attr_accessor :password_retain_count, :temporary_block, :session_expiration, :signin_attempts, :tailwind_content,
-      :importmap, :root_app_path
+      :importmap, :root_app_path, :membership_roles
 
     def initialize
       @password_retain_count = 3
       @temporary_block = 5.minutes
       @session_expiration = 2.days
       @signin_attempts = 5
-      @importmap = Importmap::Map.new
       @root_app_path = nil
 
+      @membership_roles = {admin: "admin", member: "member"}
+
+      @importmap = Importmap::Map.new
+      @importmap.draw(Engine.root.join("config/importmap.rb"))
+
       @tailwind_content = [
         "#{Maquina::Engine.root}/app/views/**/*.{rb,erb}",
         "#{Maquina::Engine.root}/app/helpers/**/*.rb",
         "#{Maquina::Engine.root}/app/controllers/**/*.rb",
-        "#{Maquina::Engine.root}/app/javascript/**/*.js",
-        "#{Maquina::Engine.root}/app/assets/**/application.tailwind.css"
+        "#{Maquina::Engine.root}/app/javascript/**/*.js"
       ]
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maquina
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mario Alberto Chávez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: tailwindcss-rails
   requirement: !ruby/object:Gem::Requirement
@@ -295,9 +295,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".overmind.env"
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
+- Procfile.dev
 - README.md
 - Rakefile
+- app/assets/images/maquina/.keep
 - app/assets/images/maquina/maquina.svg
 - app/assets/javascripts/maquina/application.js
 - app/assets/javascripts/maquina/controllers/alert_controller.js
@@ -311,6 +316,7 @@ files:
 - app/assets/javascripts/maquina/controllers/submit_form_controller.js
 - app/assets/stylesheets/maquina/application.css
 - app/assets/stylesheets/maquina/application.tailwind.css
+- app/controllers/concerns/.keep
 - app/controllers/concerns/maquina/authenticate.rb
 - app/controllers/concerns/maquina/create.rb
 - app/controllers/concerns/maquina/destroy.rb
@@ -334,6 +340,7 @@ files:
 - app/jobs/maquina/application_job.rb
 - app/mailers/maquina/application_mailer.rb
 - app/mailers/maquina/user_notifications_mailer.rb
+- app/models/concerns/.keep
 - app/models/concerns/maquina/authenticate_by.rb
 - app/models/concerns/maquina/blockeable.rb
 - app/models/concerns/maquina/multifactor.rb
@@ -343,6 +350,8 @@ files:
 - app/models/maquina/application_record.rb
 - app/models/maquina/current.rb
 - app/models/maquina/invitation.rb
+- app/models/maquina/membership.rb
+- app/models/maquina/organization.rb
 - app/models/maquina/plan.rb
 - app/models/maquina/used_password.rb
 - app/models/maquina/user.rb
@@ -399,8 +408,7 @@ files:
 - app/views/maquina/unauthorized/401.html.erb
 - app/views/maquina/user_notifications_mailer/invitation_email.html.erb
 - app/views/maquina/user_notifications_mailer/invitation_email.text.erb
-- config/definitions.rb
-- config/initializers/importmap.rb
+- config/importmap.rb
 - config/initializers/money.rb
 - config/initializers/pagy.rb
 - config/locales/flash.en.yml
@@ -415,18 +423,23 @@ files:
 - db/migrate/20221113020108_create_maquina_used_passwords.rb
 - db/migrate/20221115223414_create_maquina_active_sessions.rb
 - db/migrate/20230201203922_create_maquina_invitations.rb
+- db/migrate/20230829183530_create_maquina_organizations.rb
+- db/migrate/20230829192656_create_maquina_memberships.rb
 - db/schema.rb
 - lib/generators/maquina/install_generator.rb
 - lib/generators/maquina/install_templates/install_templates_generator.rb
+- lib/generators/maquina/tailwind_config/USAGE
 - lib/generators/maquina/tailwind_config/tailwind_config_generator.rb
-- lib/generators/maquina/tailwind_config/templates/app/assets/config/maquina/tailwind.config.js.tt
-- lib/generators/maquina/templates/config/initializers/maquina.rb
+- lib/generators/maquina/tailwind_config/templates/app/assets/stylesheets/maquina.css
+- lib/generators/maquina/tailwind_config/templates/lib/generators/tailwind_config/tailwind_config_generator.rb.tt
+- lib/generators/maquina/tailwind_config/templates/lib/generators/tailwind_config/templates/config/tailwind.config.js.tt
+- lib/generators/maquina/tailwind_config/templates/lib/tasks/tailwind.rake.tt
+- lib/generators/maquina/templates/config/initializers/maquina.rb.tt
 - lib/maquina.rb
 - lib/maquina/engine.rb
 - lib/maquina/version.rb
 - lib/tasks/install.rake
 - lib/tasks/maquina_tasks.rake
-- lib/tasks/tailwind.rake
 homepage: https://mariochavez.io
 licenses:
 - MIT
@@ -449,7 +462,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Rails engine for building Rails applications.

data/config/definitions.rb

@@ -1 +0,0 @@
-/Users/marioch/Development/butaca2/config/definitions.rb

data/config/initializers/importmap.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "maquina"
-
-Maquina.configuration.importmap.draw do
-  # Stimulus & Turbo
-  pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
-  pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
-  pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
-  pin "stimulus-use", to: "https://ga.jspm.io/npm:stimulus-use@0.51.0/dist/index.js"
-  pin "hotkeys-js", to: "https://ga.jspm.io/npm:hotkeys-js@3.10.0/dist/hotkeys.esm.js"
-
-  # Maquina entrypoint
-  pin "application", to: "maquina/application.js", preload: true
-
-  pin_all_from Maquina::Engine.root.join("app/assets/javascripts/maquina/controllers"), under: "controllers", to: "maquina/controllers"
-end

data/lib/generators/maquina/templates/config/initializers/maquina.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-# TODO: Have and initializer

data/lib/tasks/tailwind.rake

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "tailwindcss-rails"
-
-TAILWIND_COMPILE_COMMAND = "#{Tailwindcss::Engine.root.join("exe/tailwindcss")} -i #{Maquina::Engine.root.join("app/assets/stylesheets/maquina/application.tailwind.css")} -o #{Rails.root.join("app/assets/builds", "maquina/tailwind.css")} -c #{Rails.root.join("app/assets/config/maquina/tailwind.config.js")}"
-
-namespace :maquina do
-  namespace :tailwindcss do
-    desc "Build your Tailwind CSS"
-    task :build do
-      Rails::Generators.invoke("maquina:tailwind_config", ["--force"])
-      system TAILWIND_COMPILE_COMMAND
-    end
-
-    desc "Watch and build your Tailwind CSS"
-    task :watch do
-      Rails::Generators.invoke("maquina:tailwind_config", ["--force"])
-      system "#{TAILWIND_COMPILE_COMMAND} -w"
-    end
-  end
-end
-
-if Rake::Task.task_defined?("assets:precompile")
-  Rake::Task["assets:precompile"].enhance(["maquina:tailwindcss:build"])
-end