maquina 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a7e451e89b0cc87b356302a33dd2bf6e0ee95f3435f7f8161697e49cedac9bd
-  data.tar.gz: 4f9502c3d4d0a5ff9bd41769c542e277ec255e217370fac3dd00fafdb8cf7bc6
+  metadata.gz: 253e32217b0c2f5e0a8a352ff4ac26a1e0d904184293205135f1d60fd43392d2
+  data.tar.gz: a347016c5e76c08fc3165662b47684ff181667a4bea70c25e340bc71e760b1cc
 SHA512:
-  metadata.gz: 0ecf0e0e1fead4ee3594ccb5d9991f7490ad6b8bad8cc6a76def65ccd4ad0ccea18f7b267d7d9dba11aaeb4ffa27463185cf57ade1fdd97e43f53261c55e5f71
-  data.tar.gz: dfb73cdf21f2d9761c0ff263c12015a11a9be2fc0a1c19e48ceaf17372356de6a877df4aeafe7bb75d60306d053e71c570ee22c3959a9c64e695b0b156274e5a
+  metadata.gz: 77c5d7eb9e6927194b0ea5635f8a535b898010b755e42e254258e2af675c6c4ba08c70372141056e2fd296008d7a120d938019f5fa55966d3d3314cc61744621
+  data.tar.gz: 1013008ff3b86923b4d055c894d62e01ba23e84c4cad7d029454d1d8f9e80865ac038be1f5693c39a9828cebec1fc57c0a6591d6b16c4c7d134a83d321ef4acd

data/Gemfile.lock

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

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

@@ -25,7 +25,7 @@ export default class extends Controller {
     event.preventDefault()
 
     if (this.hasFrameTarget && this.contentTarget.classList.contains("hidden")) {
-      let url = event["detail"]["src"] || this.element.dataset["frameSrc"]
+      let url = event.target.getAttribute("href") || this.element.dataset["frameSrc"]
       this.frameTarget.setAttribute("src", url)
     } else if (!this.contentTarget.classList.contains("hidden")) {
       this.frameTarget.setAttribute("src", "")

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.toggleModal(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/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,9 +7,7 @@ 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(data_controller: "modal", class: "modal", data_frame_src: "") do
           div(class: "fixed inset-0 z-30 hidden 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

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.1"
 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.1
 platform: ruby
 authors:
 - Mario Alberto Chávez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -434,7 +434,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