maquina 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f491a32a98067b380165fc5998e1f62f9eb40e68a5fdd0afcdd71c2614e0ccf5
-  data.tar.gz: 1696eea4780235d2d8a4d5ec007761efe3cf2484b92f7a25d342755dac726ee1
+  metadata.gz: e51a9efb272de4b998c5f61912374dbebbc5b869f59032bbee8144ab281e7ab1
+  data.tar.gz: a7a2f654e839f0b354f9318956fd2591968946394ddbc269eaa44e1b10e1009b
 SHA512:
-  metadata.gz: 3d54612c668ff636cc13f5fc5bf614a05f94b9bfe99e77eac2957007cf3c9773adf5cc161215e2c0b11b6e0209866dd2a3a6b37f393af5be2d080ea7c40ce428
-  data.tar.gz: 74f3bea13f2dbb72ecdb92318276cfe24cb3b3cb6696710ed7a8569f37c2f51cea8cdf6b33e6795ada7a9f889f98a1938c69d956015f97696cfbe062027c1f77
+  metadata.gz: 94aed90ec94af63c1e55d155b3cebe623eeb5e4d1443cf6c0504292de215d88e7cb738bc9c6c7d3bcdae950926fc0c79b3658ab5d59e22fb5e4418743d21aa8e
+  data.tar.gz: 06d69def1b1e34e7b425d030850504cca5ca7363efcb2b4c3d298020a55f8ccd705fd5a9ccc2e7e4b3748b83ebae21d206423fbb5779034fa956f15bff4e9478

data/.ruby-version

@@ -0,0 +1 @@
+3.3.4

data/Gemfile

@@ -6,6 +6,7 @@ gemspec
 
 gem "irb"
 gem "pg"
+gem "pg_search"
 gem "puma"
 gem "propshaft"
 gem "tailwindcss-rails"

data/Gemfile.lock

@@ -1,139 +1,150 @@
 PATH
   remote: .
   specs:
-    maquina (0.3.0)
-      action_policy (~> 0.6.3)
-      bcrypt (~> 3.1.7)
-      importmap-rails (~> 1.2.0)
-      money-rails (~> 1.15.0)
-      pagy (~> 5.10, >= 5.10.1)
-      pg_search (~> 2.3.0)
-      phlex-rails (~> 1.0.0)
+    maquina (0.5.1)
+      action_policy (>= 0.6.0)
+      bcrypt (>= 3.1.7)
+      importmap-rails (>= 2.0.0)
+      money-rails (>= 1.15.0)
+      pagy (>= 6.2)
+      phlex-rails (>= 1.1.0)
       rails (>= 7.0.4)
-      rotp (~> 6.2, >= 6.2.1)
-      stimulus-rails (~> 1.2.0)
-      tailwindcss-rails (~> 2.0.0)
-      turbo-rails (~> 1.3.0)
+      rotp (>= 6.2.1)
+      stimulus-rails (>= 1.3.0)
+      tailwindcss-rails (>= 2.1.0)
+      turbo-rails (>= 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    action_policy (0.6.5)
-      ruby-next-core (>= 0.14.0)
-    actioncable (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    action_policy (0.7.1)
+      ruby-next-core (>= 1.0)
+    actioncable (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activestorage (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      actionview (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.7.2)
-      actionview (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-      rack (~> 2.0, >= 2.2.4)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
+      mail (>= 2.8.0)
+    actionmailer (7.2.1)
+      actionpack (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activesupport (= 7.2.1)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4, < 3.2)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activestorage (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (7.2.1)
+      actionpack (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.7.2)
-      activesupport (= 7.0.7.2)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activerecord (7.0.7.2)
-      activemodel (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activestorage (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
+      timeout (>= 0.4.0)
+    activestorage (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activesupport (= 7.2.1)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.1)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     backport (1.2.0)
-    base64 (0.1.1)
-    bcrypt (3.1.19)
-    benchmark (0.2.1)
-    brakeman (6.0.1)
-    builder (3.2.4)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
+    benchmark (0.3.0)
+    bigdecimal (3.1.8)
+    brakeman (6.2.1)
+      racc
+    builder (3.3.0)
     bundle-audit (0.1.0)
       bundler-audit
-    bundler-audit (0.9.1)
+    bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
-    cgi (0.3.6)
-    concurrent-ruby (1.2.2)
+    childprocess (5.1.0)
+      logger (~> 1.5)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    date (3.3.3)
-    debug (1.8.0)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
-    diff-lcs (1.5.0)
+    date (3.3.4)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
     e2mmap (0.1.0)
-    erb (4.0.3)
-      cgi (>= 0.3.3)
-    erubi (1.12.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    i18n (1.14.1)
+    erubi (1.13.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    importmap-rails (1.2.1)
+    importmap-rails (2.0.1)
       actionpack (>= 6.0.0)
+      activesupport (>= 6.0.0)
       railties (>= 6.0.0)
-    io-console (0.6.0)
-    irb (1.7.4)
-      reline (>= 0.3.6)
-    jaro_winkler (1.5.6)
-    json (2.6.3)
+    io-console (0.7.2)
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    jaro_winkler (1.6.0)
+    json (2.7.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
+    launchy (3.0.1)
       addressable (~> 2.8)
-    letter_opener (1.8.1)
-      launchy (>= 2.2, < 3)
+      childprocess (~> 5.0)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
     lint_roller (1.1.0)
-    loofah (2.21.3)
+    logger (1.6.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -141,76 +152,76 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
-    method_source (1.0.0)
+    marcel (1.0.4)
     mini_mime (1.1.5)
-    minitest (5.19.0)
-    monetize (1.12.0)
+    minitest (5.25.1)
+    monetize (1.13.0)
       money (~> 6.12)
-    money (6.16.0)
+    money (6.19.0)
       i18n (>= 0.6.4, <= 2)
     money-rails (1.15.0)
       activesupport (>= 3.0)
       monetize (~> 1.9)
       money (~> 6.13)
       railties (>= 3.0)
-    net-imap (0.3.7)
+    net-imap (0.4.16)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.15.4-arm64-darwin)
+    nio4r (2.7.3)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    pagy (5.10.1)
-      activesupport
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    pagy (9.0.8)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.3)
-    pg_search (2.3.6)
-      activerecord (>= 5.2)
-      activesupport (>= 5.2)
-    phlex (1.8.1)
-      concurrent-ruby (~> 1.2)
-      erb (>= 4)
-      zeitwerk (~> 2.6)
-    phlex-rails (1.0.0)
-      phlex (~> 1.7)
-      rails (>= 6.1, < 8)
-      zeitwerk (~> 2.6)
-    prettier_print (1.2.1)
-    propshaft (0.7.0)
+    pg (1.5.8)
+    pg_search (2.3.7)
+      activerecord (>= 6.1)
+      activesupport (>= 6.1)
+    phlex (1.10.3)
+    phlex-rails (1.2.1)
+      phlex (~> 1.10.0)
+      railties (>= 6.1, < 8)
+    propshaft (0.9.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
-    public_suffix (5.0.3)
-    puma (6.3.1)
+    psych (5.1.2)
+      stringio
+    public_suffix (6.0.1)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.7.1)
-    rack (2.2.8)
+    racc (1.8.1)
+    rack (3.1.7)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.7.2)
-      actioncable (= 7.0.7.2)
-      actionmailbox (= 7.0.7.2)
-      actionmailer (= 7.0.7.2)
-      actionpack (= 7.0.7.2)
-      actiontext (= 7.0.7.2)
-      actionview (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activemodel (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activestorage (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails (7.2.1)
+      actioncable (= 7.2.1)
+      actionmailbox (= 7.2.1)
+      actionmailer (= 7.2.1)
+      actionpack (= 7.2.1)
+      actiontext (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activemodel (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.7.2)
+      railties (= 7.2.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -218,52 +229,51 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-      method_source
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.2.1)
     rbs (2.8.4)
-    regexp_parser (2.8.1)
-    reline (0.3.8)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.10)
       io-console (~> 0.5)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.6)
-    rotp (6.2.2)
-    rubocop (1.56.2)
-      base64 (~> 0.1.1)
+    rexml (3.3.7)
+    rotp (6.3.0)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.19.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.19.1)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.26.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-    ruby-lsp (0.9.2)
-      language_server-protocol (~> 3.17.0)
-      sorbet-runtime
-      syntax_tree (>= 6.1.1, < 7)
-      yarp (>= 0.9, < 0.10)
-    ruby-next-core (0.15.3)
+      rubocop (>= 1.52.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-next-core (1.0.3)
     ruby-progressbar (1.13.0)
-    solargraph (0.49.0)
+    securerandom (0.3.1)
+    solargraph (0.50.0)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
@@ -279,50 +289,47 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    solargraph-rails (1.1.0)
-      activesupport
-      solargraph
-    sorbet-runtime (0.5.10990)
-    standard (1.31.0)
+    standard (1.40.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.56.0)
+      rubocop (~> 1.65.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.2)
+      standard-performance (~> 1.4)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.2.0)
+    standard-performance (1.4.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.19.0)
-    standard-rails (0.1.0)
+      rubocop-performance (~> 1.21.0)
+    standard-rails (1.2.0)
       lint_roller (~> 1.0)
-      rubocop-rails (~> 2.19.0)
-    stimulus-rails (1.2.2)
+      rubocop-rails (~> 2.26.0)
+    stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    syntax_tree (6.1.1)
-      prettier_print (>= 1.2.0)
-    tailwindcss-rails (2.0.30-arm64-darwin)
-      railties (>= 6.0.0)
-    thor (1.2.2)
-    tilt (2.2.0)
-    timeout (0.4.0)
-    turbo-rails (1.3.3)
+    stringio (3.1.1)
+    tailwindcss-rails (2.7.3-arm64-darwin)
+      railties (>= 7.0.0)
+    thor (1.3.2)
+    tilt (2.4.0)
+    timeout (0.4.1)
+    turbo-rails (2.0.6)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
+    useragent (0.16.10)
+    webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    yard (0.9.34)
-    yarp (0.9.0)
-    zeitwerk (2.6.11)
+    yard (0.9.37)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-24
 
 DEPENDENCIES
   brakeman
@@ -332,15 +339,14 @@ DEPENDENCIES
   letter_opener
   maquina!
   pg
+  pg_search
   propshaft
   puma
-  ruby-lsp
   solargraph
-  solargraph-rails
   standard
   standard-rails
   tailwindcss-rails
   turbo-rails
 
 BUNDLED WITH
-   2.4.18
+   2.5.1

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

@@ -5,32 +5,45 @@ module Maquina
     extend ActiveSupport::Concern
 
     included do
-      helper_method :signed_in?, :current_user
+      before_action :require_authentication
+      helper_method :signed_in?, :current_user, :authenticated?
     end
 
-    def authenticate!
-      load_session
+    class_methods do
+      def allow_unauthenticated_access(...)
+        skip_before_action(:require_authentication, ...)
+      end
+    end
 
-      redirect_to maquina.new_sessions_path if !signed_in?
+    def authenticated?
+      Maquina::Current.signed_in?
     end
+    alias_method :signed_in?, :authenticated?
 
-    def authenticate
-      load_session if Maquina::Current.active_session.blank?
+    def current_user
+      Maquina::Current.user
     end
 
-    def signed_in?
-      load_session if Maquina::Current.active_session.blank?
+    def after_authentication_url
+      session.delete(:return_to_after_authenticating) || root_url
+    end
 
-      Maquina::Current.signed_in?
+    def require_authentication
+      load_session || request_authentication
     end
 
-    def current_user
-      load_session if Maquina::Current.active_session.blank?
+    private
 
-      Maquina::Current.user
+    def request_authentication
+      session[:return_to_after_authenticating] = request.url
+
+      # TODO: Allow to configure sign in path
+      redirect_to maquina.new_sessions_path, format: :html, status: :see_other
     end
 
-    private
+    def authenticate
+      load_session
+    end
 
     def load_session
       active_session_id = session["--active_session"]
@@ -48,5 +61,12 @@ module Maquina
 
       Maquina::Current.active_session = active_session
     end
+
+    def start_new_session_for(user)
+      ActiveSession.create(user: user, user_agent: request.user_agent, remote_addr: request.remote_ip).tap do |active_session|
+        session["--active_session"] = active_session.id
+        Maquina::Current.active_session = active_session
+      end
+    end
   end
 end

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

@@ -118,7 +118,7 @@ module Maquina
           respond_to do |format|
             if has_errors
               format.html { render object.persisted? ? :edit : :new }
-              format.turbo_stream
+              # format.turbo_stream
               format.json { render json: {errors: object.errors.map { |error| {error.attribute => error.message} }} }
             else
               format.html { redirect_to collection_path, status: :see_other }