maquina 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a7e451e89b0cc87b356302a33dd2bf6e0ee95f3435f7f8161697e49cedac9bd
-  data.tar.gz: 4f9502c3d4d0a5ff9bd41769c542e277ec255e217370fac3dd00fafdb8cf7bc6
+  metadata.gz: 040c1d643734bb33ae456b0bd092b87b250d0b4d56f03548d569594f3d6892f3
+  data.tar.gz: a17889606d8033a9e068cd212d5557f7cc77b60fd8f82d7f6f951974a526866f
 SHA512:
-  metadata.gz: 0ecf0e0e1fead4ee3594ccb5d9991f7490ad6b8bad8cc6a76def65ccd4ad0ccea18f7b267d7d9dba11aaeb4ffa27463185cf57ade1fdd97e43f53261c55e5f71
-  data.tar.gz: dfb73cdf21f2d9761c0ff263c12015a11a9be2fc0a1c19e48ceaf17372356de6a877df4aeafe7bb75d60306d053e71c570ee22c3959a9c64e695b0b156274e5a
+  metadata.gz: 4654d0514915f2fe7d7577ad73487a78d5b0036df114c82950a80e8f737a5b9d92bf7b163eeb316c2758428c80e0fe5dc52b13563cfeb9a2666323b62a4c773f
+  data.tar.gz: fe807c89c747bcf9b7fc95b7590edcd331b0ee6eab5e966ebe5576fb48e580bc445552d3e5d0fd4d773cf8b36054e8b2e9c90c0d9a1c29631c96312d0b0a670e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maquina (0.2.0)
+    maquina (0.2.2)
       action_policy (~> 0.6.3)
       bcrypt (~> 3.1.7)
       importmap-rails (~> 1.2.0)

data/app/assets/javascripts/maquina/controllers/backdrop_controller.js

@@ -0,0 +1,10 @@
+import { Controller } from "@hotwired/stimulus"
+import { useTransition } from "stimulus-use";
+
+export default class extends Controller {
+  static targets = ["backdrop"]
+
+  connect() {
+    useTransition(this, { element: this.backdropTarget })
+  }
+}

data/app/assets/javascripts/maquina/controllers/modal_controller.js

@@ -2,38 +2,92 @@ import { Controller } from "@hotwired/stimulus"
 import { useTransition } from "stimulus-use"
 
 export default class extends Controller {
-  static targets = ["content", "container", "frame"]
+  static targets = ["modal", "container", "frame", "form", "submit"]
+  static outlets = ["backdrop"]
 
   connect() {
-    useTransition(this, { element: this.contentTarget })
+    this.timeouts = []
+    this.root = document.querySelector("html")
 
-    this.resultCallback = this.modalResult.bind(this)
-    addEventListener("turbo:submit-end", this.resultCallback)
+    useTransition(this, { element: this.modalTarget })
+
+    if (this.hasFormTarget) addEventListener("turbo:submit-end", this.submitResult.bind(this))
   }
 
   disconnect() {
-    removeEventListener("turbo:submit-end", this.resultCallback)
+    this.timeouts.forEach(t => clearTimeout(t))
+
+    if (this.hasFormTarget) removeEventListener("turbo:submit-end", this.submitResult.bind(this))
   }
 
-  modalResult(event) {
-    if (event.detail.fetchResponse.response.status == 202) {
-      this.toggleModal(event)
+  submitResult(event) {
+    if (this.hasFormTarget) this.submitTarget.removeAttribute("disabled")
+
+    const status = event.detail.fetchResponse.response.status
+    if (status == 201 || status == 202) {
+      this.close(event)
     }
   }
 
-  toggleModal(event) {
+  submit(event) {
     event.preventDefault()
 
-    if (this.hasFrameTarget && this.contentTarget.classList.contains("hidden")) {
-      let url = event["detail"]["src"] || this.element.dataset["frameSrc"]
-      this.frameTarget.setAttribute("src", url)
-    } else if (!this.contentTarget.classList.contains("hidden")) {
-      this.frameTarget.setAttribute("src", "")
-      this.frameTarget.innerText = ""
+    if (!this.hasFormTarget) {
+      return
     }
 
-    document.documentElement.classList.toggle("overflow-hidden")
-    this.containerTarget.classList.toggle("hidden")
+    this.submitTarget.setAttribute("disabled", "true")
+    this.formTarget.requestSubmit()
+  }
+
+  open(event) {
+    event.preventDefault()
+
+    this.configureModal(event.target)
+    this.root.classList.toggle("overflow-hidden")
+
+    this.toggleBackdrop()
+    this.toggleTransition()
+  }
+
+  close(event) {
+    event.preventDefault()
+
+    this.timeouts.forEach(t => clearTimeout(t))
+
+    this.root.classList.toggle("overflow-hidden")
     this.toggleTransition()
+    this.toggleBackdrop()
+
+
+    this.timeouts.push(
+      setTimeout(() => this.restoreModal(), 500)
+    )
+  }
+
+  configureModal(target) {
+    if (this.hasSubmitTarget) {
+      const label = target.dataset["submit-label"]
+      this.submitTarget.innerText = label
+    }
+
+    const url = target.getAttribute("href")
+    this.frameTarget.setAttribute("src", url)
+
+    this.containerTarget.classList.toggle("hidden")
+  }
+
+  restoreModal() {
+    this.containerTarget.classList.toggle("hidden")
+
+    if (this.hasSubmitTarget) {
+      this.submitTarget.innerText = ""
+      this.submitTarget.removeAttribute("disabled")
+    }
+    this.frameTarget.setAttribute("src", "")
+  }
+
+  toggleBackdrop() {
+    this.backdropOutlets.forEach(backdrop => backdrop.toggleTransition())
   }
 }

data/app/assets/javascripts/maquina/controllers/modal_open_controller.js

@@ -1,15 +1,10 @@
 import { Controller } from "@hotwired/stimulus";
-import { useDispatch } from "stimulus-use";
 
 export default class extends Controller {
-  static targets = [];
-
-  connect() {
-    useDispatch(this)
-  }
+  static outlets = ["modal"];
 
   open(event) {
-    event.preventDefault();
-    this.dispatch("toggle", {src: event.target.getAttribute("href")});
+    event.preventDefault()
+    this.modalOutlets.forEach(modal => modal.open(event))
   }
 }

data/app/controllers/concerns/maquina/authenticate.rb

@@ -35,6 +35,9 @@ module Maquina
       active_session = ActiveSession.eager_load(user: {memberships: :organization})
         .where(maquina_memberships: {blocked_at: nil})
         .where(maquina_organizations: {active: true})
+        .or(
+          ActiveSession.where(maquina_users: {management: true})
+        )
         .find_by(id: active_session_id)
 
       return if active_session.blank?

data/app/models/concerns/maquina/searchable.rb

@@ -11,13 +11,13 @@ module Maquina
     end
 
     class_methods do
-      def search_scope(fields: [], options: {})
+      def search_scope(fields: [], options: {}, associated_against: {})
         return if fields.empty?
 
         default_options = {tsearch: {prefix: true, any_word: true}}
         search_options = options.deep_merge(default_options)
 
-        pg_search_scope :search_full, against: fields, using: search_options # , ignoring: :accents
+        pg_search_scope :search_full, against: fields, using: search_options, associated_against: associated_against # , ignoring: :accents
       end
     end
   end

data/app/models/maquina/application_record.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "pg_search"
-
 module Maquina
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
 
-    include PgSearch::Model
+    def self.searchable?
+      false
+    end
   end
 end

data/app/models/maquina/plan.rb

@@ -25,8 +25,6 @@ module Maquina
   # attributes and use the provided methods and scopes for querying and manipulating plan data.
 
   class Plan < ApplicationRecord
-    include Searchable
-
     has_many :organizations, class_name: "Maquina::Organization", foreign_key: :maquina_plan_id, dependent: :nullify
 
     monetize :price_cents
@@ -34,7 +32,5 @@ module Maquina
     validates :price, numericality: {greater_than_or_equal_to: 0}, if: ->(plan) { plan.free? }
     validates :price, numericality: {greater_than: 0}, if: ->(plan) { !plan.free? }
     validates :name, presence: true, uniqueness: true
-
-    search_scope(fields: [:name])
   end
 end

data/app/models/maquina/user.rb

@@ -2,7 +2,6 @@
 
 module Maquina
   class User < ApplicationRecord
-    include Maquina::Searchable
     include Maquina::RetainPasswords
     include Maquina::AuthenticateBy
     include Maquina::Blockeable
@@ -18,8 +17,6 @@ module Maquina
 
     before_save :downcase_email
 
-    search_scope(fields: [:email])
-
     def expired_password?
       return false if password_expires_at.blank?
 

data/app/policies/maquina/invitation_policy.rb

@@ -3,11 +3,11 @@
 module Maquina
   class InvitationPolicy < ApplicationPolicy
     def new?
-      management?
+      management? || admin?
     end
 
     def create?
-      new?
+      new? || admin?
     end
   end
 end

data/app/views/maquina/application/_navbar.html.erb

@@ -6,7 +6,7 @@
         <%= render Maquina::Navbar::Menu.new %>
       </div>
 
-      <%= render Maquina::Navbar::Search.new(query: params[:q], url: collection_path) if action_name == "index" && respond_to?(:collection_path) && collection_path.present? %>
+      <%= render Maquina::Navbar::Search.new(query: params[:q], url: collection_path) if action_name == "index" && respond_to?(:collection_path) && collection_path.present? && respond_to?(:resource_class) && resource_class.searchable? %>
 
       <%= render Maquina::Navbar::MobileButton.new %>
 

data/app/views/maquina/application/form.rb

@@ -30,7 +30,7 @@ module Maquina
 
             div(class: "pt-5") do
               div(class: "flex justify-end") do
-                link_to t("helpers.cancel"), collection_path, class: "button", data: @modal ? {action: "modal#toggleModal"} : {turbo_frame: :_top}
+                link_to t("helpers.cancel"), collection_path, class: "button", data: @modal ? {action: "modal#close"} : {turbo_frame: :_top}
                 form.submit class: "ml-3 button button-accented"
               end
             end

data/app/views/maquina/application/index_header.rb

@@ -27,7 +27,7 @@ module Maquina
         return if policy_class.blank? || !allowed_to?(:new?, with: policy_class)
 
         options = {}
-        options[:data] = {controller: "modal-open", action: "modal-open#open"} if policy_class.present? && allowed_to?(:new_modal?, with: policy_class)
+        options[:data] = {controller: "modal-open", modal_open_modal_outlet: ".modal", action: "modal-open#open"} if policy_class.present? && allowed_to?(:new_modal?, with: policy_class)
 
         div(class: "mt-4 sm:mt-0 sm:ml-16 sm:flex-none") do
           a(href: new_resource_path, class: "inline-flex items-center justify-center button button-accented", **options) { add_new }

data/app/views/maquina/application/index_modal.rb

@@ -7,13 +7,13 @@ module Maquina
       register_element :turbo_frame
 
       def template
-        div(data_controller: "modal",
-          data_action: " modal-open:toggle@window->modal#toggleModal close-frame-modal:toggle@window->modal#toggleModal",
-          data_frame_src: "") do
-          div(class: "fixed inset-0 z-30 hidden overflow-y-auto", aria_labelledby: "modal-title", role: "dialog",
+        div(data_controller: "modal", class: "modal", data_modal_backdrop_outlet: ".modal-backdrop") do
+          div(class: "hidden fixed inset-0 z-30 overflow-y-auto", aria_labelledby: "modal-title", role: "dialog",
             aria_modal: "true", data_modal_target: "container") do
             div(class: "flex items-end justify-center min-h-screen px-4 pt-4 pb-20 text-center sm:block sm:p-0") do
-              div(class: "fixed inset-0 transition-opacity",
+              div(class: "hidden fixed inset-0 transition-opacity modal-backdrop",
+                data_controller: "backdrop",
+                data_backdrop_target: "backdrop",
                 data_transition_enter: "ease-out duration-300",
                 data_transition_enter_active: "opacity-0",
                 data_transition_enter_to: "opacity-100",
@@ -24,8 +24,8 @@ module Maquina
                 div(class: "fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity", aria_hidden: "true")
               end
               span(class: "hidden sm:inline-block sm:align-middle sm:h-screen", aria_hidden: "true") { "​" }
-              div(class: "inline-block align-bottom bg-white rounded-lg px-4 pt-5 pb-4 text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full sm:p-6",
-                data_modal_target: "content",
+              div(class: "hidden inline-block align-bottom bg-white rounded-lg px-4 pt-5 pb-4 text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full sm:p-6",
+                data_modal_target: "modal",
                 data_transition_enter: "ease-out duration-300",
                 data_transition_enter_active: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95",
                 data_transition_enter_to: "opacity-100 translate-y-0 sm:scale-100",

data/app/views/maquina/sessions/form.rb

@@ -47,8 +47,8 @@ module Maquina
       def field_attributes(field_name, scope = nil)
         scope ||= "sessions"
         {
-          maxlength: t("maxlength.#{scope}.#{field_name}", default: t("maxlength.default")),
-          placeholder: t("placeholder.#{scope}.#{field_name}", default: "")
+          maxlength: t("helpers.maxlength.#{scope}.#{field_name}", default: t("helpers.maxlength.default")),
+          placeholder: t("helpers.placeholder.#{scope}.#{field_name}", default: "")
         }
       end
     end

data/config/locales/forms.en.yml

@@ -3,7 +3,8 @@ en:
     maquina/plan:
       title: Configure a plan for your customers
     maquina/invitation:
-      title: User will receive an invitation to join this application in the provided email.
+      title: Invite user to collaborate
+      description: User will receive an invitation to join this application in the provided email.
 
   form:
     sessions:
@@ -26,18 +27,6 @@ en:
     maquina/invitation:
       email: Enter user's email
 
-  maxlength:
-    default: 30
-
-    maquina/plan:
-      name: 60
-      trial: 3
-      price: 9
-
-    sessions:
-      email: 60
-      password: 60
-
   help:
     maquina/plan:
       name: Descriptive plan name
@@ -56,3 +45,14 @@ en:
       maquina/invitation:
         create: Send invitation
 
+    maxlength:
+      default: 30
+
+      maquina/plan:
+        name: 60
+        trial: 3
+        price: 9
+
+      sessions:
+        email: 60
+        password: 60

data/lib/generators/maquina/install_generator.rb

@@ -24,9 +24,5 @@ module Maquina
     def copy_migrations
       rake "maquina:install:migrations"
     end
-
-    def build_tailwind
-      rake "maquina:tailwindcss:build"
-    end
   end
 end

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/version.rb

@@ -1,3 +1,3 @@
 module Maquina
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/lib/maquina.rb

@@ -11,6 +11,10 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maquina
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Mario Alberto Chávez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -307,6 +307,7 @@ files:
 - app/assets/javascripts/maquina/application.js
 - app/assets/javascripts/maquina/controllers/alert_controller.js
 - app/assets/javascripts/maquina/controllers/application.js
+- app/assets/javascripts/maquina/controllers/backdrop_controller.js
 - app/assets/javascripts/maquina/controllers/file_controller.js
 - app/assets/javascripts/maquina/controllers/index.js
 - app/assets/javascripts/maquina/controllers/mobile_menu_controller.js
@@ -434,7 +435,7 @@ files:
 - 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
+- lib/generators/maquina/templates/config/initializers/maquina.rb.tt
 - lib/maquina.rb
 - lib/maquina/engine.rb
 - lib/maquina/version.rb

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

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