maquina 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31ab94ae292dc94ebccc7ad33cd520b29a8bd945620f4d698239a6fec7a686a3
-  data.tar.gz: ee06ac7e22a088a2386cf3ca2d6f83aa3d4cff47102c22efaa495b464ac2cf97
+  metadata.gz: f491a32a98067b380165fc5998e1f62f9eb40e68a5fdd0afcdd71c2614e0ccf5
+  data.tar.gz: 1696eea4780235d2d8a4d5ec007761efe3cf2484b92f7a25d342755dac726ee1
 SHA512:
-  metadata.gz: 53eb9e8dee812c60f8c33c770dc8c0a6ad4543f55d29be3c3aa2613f166578392bab79b446e119e135f6a90f846d85ef84d39b23a820ae6cd80e3bcdf00939e7
-  data.tar.gz: c62d7bec012895f8feca619c6c753e97e4cf27d4fcb3e1f58e79f1d14d403efd55ec4257fdda5d7f70cadc80b8c6acfef84f136fa3b93d902b1f56a5f6e2cb0e
+  metadata.gz: 3d54612c668ff636cc13f5fc5bf614a05f94b9bfe99e77eac2957007cf3c9773adf5cc161215e2c0b11b6e0209866dd2a3a6b37f393af5be2d080ea7c40ce428
+  data.tar.gz: 74f3bea13f2dbb72ecdb92318276cfe24cb3b3cb6696710ed7a8569f37c2f51cea8cdf6b33e6795ada7a9f889f98a1938c69d956015f97696cfbe062027c1f77

data/Gemfile.lock

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

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

@@ -14,6 +14,10 @@ module Maquina
       redirect_to maquina.new_sessions_path if !signed_in?
     end
 
+    def authenticate
+      load_session if Maquina::Current.active_session.blank?
+    end
+
     def signed_in?
       load_session if Maquina::Current.active_session.blank?
 

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

@@ -22,6 +22,7 @@ module Maquina
       class_attribute :form_attributes, instance_writer: false
       class_attribute :show_attributes, instance_writer: false
       class_attribute :policy_class, instance_writer: false
+      class_attribute :show_link, instance_writer: false
 
       attr_reader :resource, :collection
 
@@ -137,17 +138,18 @@ module Maquina
       end
 
       helper_method :resource_class, :policy_class, :resource, :list_attributes, :form_attributes, :collection,
-        :collection_path, :resource_path, :new_resource_path, :edit_resource_path, :submit_path
+        :collection_path, :resource_path, :new_resource_path, :edit_resource_path, :submit_path, :show_link
     end
 
     class_methods do
-      def resourceful(resource_class: nil, namespace: nil, find_by_param: :id, only: [], except: [], list_attributes: [], form_attributes: [], show_attributes: [], policy_class: nil)
+      def resourceful(resource_class: nil, namespace: nil, find_by_param: :id, only: [], except: [], list_attributes: [], form_attributes: [], show_attributes: [], policy_class: nil, show_link: nil)
         self.resource_class = resource_class || controller_path.classify.safe_constantize
         self.find_by_param = find_by_param || :id
         self.list_attributes = Array(list_attributes).compact
         self.form_attributes = Array(form_attributes).compact
         self.show_attributes = Array(show_attributes).compact
         self.policy_class = policy_class
+        self.show_link = show_link
         self.namespace = namespace
 
         valid_rest_actions = {

data/app/helpers/maquina/navbar_menu_helper.rb

@@ -17,11 +17,11 @@ module Maquina
     def profile_menu_options
       if Maquina::Current.signed_in?
         {
-          signout: {method: :delete, path: sessions_path}
+          signout: {method: :delete, path: maquina.sessions_path}
         }
       else
         {
-          signin: new_sessions_path
+          signin: maquina.new_sessions_path
         }
       end
     end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Maquina
+  module OrganizationScoped
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :organization, class_name: "Maquina::Organization", foreign_key: :maquina_organization_id
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Maquina
+  module UserScoped
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :user, class_name: "Maquina::User", foreign_key: :maquina_user_id
+    end
+  end
+end

data/app/policies/maquina/application_policy.rb

@@ -43,5 +43,10 @@ module Maquina
     def admin?
       (Maquina::Current.membership.present? && Maquina::Current.membership.admin?)
     end
+
+    relation_scope do |scope|
+      Rails.logger.warn("This policy scope at #{self} is not scoping by User or Organization")
+      scope
+    end
   end
 end

data/app/views/maquina/application/components/date_component.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Maquina
+  module Application
+    module Components
+      class DateComponent < ComponentBase
+        def template
+          div(**control_html) do
+            @form.label attribute_name, class: "label #{label_css_class}"
+            div(class: "mt-1") do
+              css_class = {
+                class: input_html.delete(:class) || ""
+              }
+              @form.date_select attribute_name, input_html, css_class
+              help_template
+              error_template
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/views/maquina/application/components/text_area_component.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Maquina
+  module Application
+    module Components
+      class TextAreaComponent < ComponentBase
+        def template
+          div(**control_html) do
+            @form.label attribute_name, class: "label #{label_css_class}"
+            div(class: "mt-1") do
+              @form.text_area attribute_name, **input_html
+              help_template
+              error_template
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -69,6 +69,12 @@ module Maquina
           render Maquina::Application::Components::ActionTextComponent.new(resource: @resource, form: form, options: attribute_values)
         when :select
           render Maquina::Application::Components::SelectComponent.new(resource: @resource, form: form, options: attribute_values)
+        when :date
+          render Maquina::Application::Components::DateComponent.new(resource: @resource, form: form, options: attribute_values)
+        when :text_area
+          render Maquina::Application::Components::TextAreaComponent.new(resource: @resource, form: form, options: attribute_values)
+        when :input
+          render Maquina::Application::Components::InputComponent.new(resource: @resource, form: form, options: attribute_values)
         else
           render Maquina::Application::Components::InputComponent.new(resource: @resource, form: form, options: attribute_values)
         end

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

@@ -5,7 +5,7 @@ module Maquina
     class IndexTable < Phlex::HTML
       include ApplicationView
 
-      delegate :humanized_money_with_symbol, :edit_resource_path, to: :helpers
+      delegate :humanized_money_with_symbol, :edit_resource_path, :resource_path, to: :helpers
 
       def initialize(collection: nil, pagination: nil, list_attributes: nil)
         @collection = collection
@@ -69,7 +69,7 @@ module Maquina
 
         tr do
           @list_attributes.each_with_index do |attribute, index|
-            td(class: (index == 0) ? first_css : base_css, scope: "col") { attribute_value(item, attribute) }
+            td(class: (index == 0) ? first_css : base_css, scope: "col") { attribute_to_link(item, attribute, attribute_value(item, attribute)) }
           end
           td(class: "relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6", scope: "col") do
             a(href: edit_resource_path(item), class: "text-skin-accented hover:text-skin-accented-hover") { t("index.edit") } if policy_class.blank? || allowed_to?(:edit?, item, with: policy_class)
@@ -116,6 +116,12 @@ module Maquina
           value
         end
       end
+
+      def attribute_to_link(item, attribute, value)
+        return value if show_link.nil? || show_link != attribute
+
+        link_to(value, resource_path(item), class: "link", data: {"turbo-frame": "_top"})
+      end
     end
   end
 end

data/app/views/maquina/application_view.rb

@@ -5,7 +5,7 @@ module Maquina
     include Maquina::Engine.routes.url_helpers
     include Phlex::Rails::Helpers::T
 
-    delegate :resource_class, :l, :default_url_options, :policy_class, :allowed_to?, to: :helpers
+    delegate :resource_class, :l, :default_url_options, :policy_class, :show_link, :allowed_to?, to: :helpers
 
     # TODO: Revisit this later
     def image_tag(source, options = {})

data/config/locales/flash.es.yml

@@ -0,0 +1,44 @@
+es:
+  flash:
+    create:
+      notice:
+        title:  Se creó con éxito
+        description: Tú registro fue creado 
+      alert:
+        title: No se pudo crear
+        description: Revisa los mensajes del formulario para resolver el problema
+
+    update:
+      notice:
+        title: Se actualizó con éxito
+        description:  Tú registros fue actualizado
+      alert:
+        title: No se pudo actualizar
+        description: Revisa los mensajes del formulario para resolver el problema
+
+    destroy:
+      notice:
+        title: Se eliminó con éxito
+        description:  Tú registro fue eliminado
+      alert:
+        title: No se puedo eliminar
+        description:  Revisa los mensajes del formulario para resolver el problema
+
+    maquina/invitation:
+      create:
+        notice:
+          title: Invitación enviada
+          description: La inivitación para %{email} expira en 3 días
+
+    sessions:
+      create:
+        notice:
+          title: Bievenido a la sesión
+          description: Tu sesión ha iniciado
+        alert:
+          title: No fue posible iniciar la sesión
+          description: El correo electrónico o la contraseña son inválidos
+        destroy:
+          notice:
+            title: Sesión terminada
+            description: Para continuar debes iniciar sesión

data/config/locales/forms.es.yml

@@ -0,0 +1,58 @@
+es:
+  new:
+    maquina/plan:
+      title: Configura el plan para los clientes
+    maquina/invitation:
+      title: Invitar a un usuario a colaborar
+      description: El usuario va a recibir la invitación para unirse a colaborar vía correo electrónico.
+
+  form:
+    sessions:
+      email: Correo electrónico
+      password: Contraseña
+      forgot_password: Olvidé mi contraseña
+      submit: Iniciar sesión
+
+    accept_invitations:
+      submit: Aceptar invitación
+
+  placeholder:
+    sessions:
+      email: user@mail.com
+      password: Contraseña actual
+
+    maquina/plan:
+      name: Plan básico
+
+    maquina/invitation:
+      email: Correo electrónico del usuario
+
+  help:
+    maquina/plan:
+      name: Nombre del plan 
+      trial: Número de días de prueba
+      price: Precio del plan
+      free: Indica si el plan es gratuito
+      active: Activar plan para clientes
+
+  helpers:
+    cancel: Cancelar
+    submit:
+      maquina/plan:
+        create: Crear %{model}
+        update: Actualizar %{model}
+
+      maquina/invitation:
+        create: Enviar invitación
+
+    maxlength:
+      default: 30
+
+      maquina/plan:
+        name: 60
+        trial: 3
+        price: 9
+
+      sessions:
+        email: 60
+        password: 60

data/config/locales/models.es.yml

@@ -0,0 +1,38 @@
+es:
+  activerecord:
+    models:
+      maquina/plan:
+        one: Plan
+        other: Planes
+      maquina/user:
+        one: Usuario
+        other: Usuarios
+      maquina/invitation:
+        one: Invitación
+        other: Invitaciones
+
+    attributes:
+      maquina/plan:
+        name: Nombre
+        trial: Prueba
+        price: Precio
+        free: Gratuito
+        active: Activo
+      maquina/user:
+        email: Correo electrónico
+        blocked_at: Bloqueado desde
+        created_at: Creado el
+      maquina/invitation:
+        email: Correo electrónico
+
+    errors:
+      models:
+        maquina/active_session:
+          attributes:
+            user:
+              blocked: cuenta bloqueada
+        maquina/invitation:
+          attributes:
+            email:
+              blank: se necesita el correo electrónico a enviar invitación
+              invalid: invitación ya aceptada

data/config/locales/routes.es.yml

@@ -0,0 +1,7 @@
+es:
+  routes:
+    plans: planes
+    users: usuarios
+    invitations: invitaciones
+    accept_invitation: aceptar_invitacion
+    sessions: sesiones

data/config/locales/views.es.yml

@@ -0,0 +1,44 @@
+es:
+  application_name: maquina
+  yes_value: "Sí"
+  no_value: "No"
+
+  index:
+    add_new: Nuevo %{model}
+    no_items: No hay %{model} registrados
+    edit: Modificar
+
+    maquina/plan:
+      description: Listado de planes.
+    maquina/user:
+      add_new: Invitar %{model}
+      description: Listado de usuarios.
+
+    pagination:
+      next: Siguiente
+      previous: Previo
+      information: Mostrando %{count} registro(s). Desde %{from} hasta %{to}.
+
+  menu:
+    main:
+      plans: Planes
+      users: Usuarios
+    profile:
+      signout: Cerrar sesión
+      signin: Iniciar sesión
+
+  search:
+    search: Buscar
+
+  maquina:
+    sessions:
+      new:
+        title: Iniciar sesión a tu cuenta
+        or: O
+        trial: iniciar tu prueba
+
+    accept_invitations:
+      new:
+        title: Aceptar invitación
+        description: Aquí puedes aceptar la inivitación para colaborar con %{org}
+        expired: La invitación es inválida, expiró, o ya fue aceptada. Si crees que esto es incorrecto, por favor contacta a la persona que envió la invitación y solicita una nueva invitación.

data/lib/maquina/version.rb

@@ -1,3 +1,3 @@
 module Maquina
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maquina
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Mario Alberto Chávez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -345,8 +345,10 @@ files:
 - app/models/concerns/maquina/authenticate_by.rb
 - app/models/concerns/maquina/blockeable.rb
 - app/models/concerns/maquina/multifactor.rb
+- app/models/concerns/maquina/organization_scoped.rb
 - app/models/concerns/maquina/retain_passwords.rb
 - app/models/concerns/maquina/searchable.rb
+- app/models/concerns/maquina/user_scoped.rb
 - app/models/maquina/active_session.rb
 - app/models/maquina/application_record.rb
 - app/models/maquina/current.rb
@@ -372,9 +374,11 @@ files:
 - app/views/maquina/application/components/action_text_component.rb
 - app/views/maquina/application/components/checkbox_component.rb
 - app/views/maquina/application/components/component_base.rb
+- app/views/maquina/application/components/date_component.rb
 - app/views/maquina/application/components/file_component.rb
 - app/views/maquina/application/components/input_component.rb
 - app/views/maquina/application/components/select_component.rb
+- app/views/maquina/application/components/text_area_component.rb
 - app/views/maquina/application/create.turbo_stream.erb
 - app/views/maquina/application/edit.html.erb
 - app/views/maquina/application/edit.rb
@@ -413,11 +417,16 @@ files:
 - config/initializers/money.rb
 - config/initializers/pagy.rb
 - config/locales/flash.en.yml
+- config/locales/flash.es.yml
 - config/locales/forms.en.yml
+- config/locales/forms.es.yml
 - config/locales/mailers.en.yml
 - config/locales/models.en.yml
+- config/locales/models.es.yml
 - config/locales/routes.en.yml
+- config/locales/routes.es.yml
 - config/locales/views.en.yml
+- config/locales/views.es.yml
 - config/routes.rb
 - db/migrate/20221109010726_create_maquina_plans.rb
 - db/migrate/20221113000409_create_maquina_users.rb