maquina 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5dffb067d8cdaf6d56c9777275907b321ec48188950945521a44d4d48fd92a2
-  data.tar.gz: 28a3e313221bd3f2e465ba565e5e493ba3ccc419512c7f5f59d80353a0d45168
+  metadata.gz: 9a7e451e89b0cc87b356302a33dd2bf6e0ee95f3435f7f8161697e49cedac9bd
+  data.tar.gz: 4f9502c3d4d0a5ff9bd41769c542e277ec255e217370fac3dd00fafdb8cf7bc6
 SHA512:
-  metadata.gz: 2b4517a5605cd8245948afec893c75b60fdc522d56982d76928726fdcf797e2552a026321f2e24d2ab8a7387e8de01158a10065300d4914f5d07cf4b1df0c3d7
-  data.tar.gz: cb442f6712c58691771d8b01f99d22038c9491b92c5cf324860d5e250b692d749c67254184194de8d2b0132fb9339d32f17ebe6976c9eacd30a903a87bf098a7
+  metadata.gz: 0ecf0e0e1fead4ee3594ccb5d9991f7490ad6b8bad8cc6a76def65ccd4ad0ccea18f7b267d7d9dba11aaeb4ffa27463185cf57ade1fdd97e43f53261c55e5f71
+  data.tar.gz: dfb73cdf21f2d9761c0ff263c12015a11a9be2fc0a1c19e48ceaf17372356de6a877df4aeafe7bb75d60306d053e71c570ee22c3959a9c64e695b0b156274e5a

data/.overmind.env

@@ -0,0 +1 @@
+OVERMIND_PROCFILE=Procfile.dev

data/Gemfile

@@ -0,0 +1,20 @@
+source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+# Specify your gem's dependencies in maquina.gemspec.
+gemspec
+
+gem "irb"
+gem "pg"
+gem "puma"
+gem "propshaft"
+gem "tailwindcss-rails"
+gem "turbo-rails"
+
+# Start debugger with binding.b [https://github.com/ruby/debug]
+#
+group :development do
+  gem "debug", ">= 1.0.0"
+  gem "letter_opener"
+  # gem "ruby-lsp", require: false
+end

data/Gemfile.lock

@@ -0,0 +1,346 @@
+PATH
+  remote: .
+  specs:
+    maquina (0.2.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)
+      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)
+
+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)
+      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)
+      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)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.7.2)
+      activesupport (= 7.0.7.2)
+      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)
+      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)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.7.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.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)
+    bundle-audit (0.1.0)
+      bundler-audit
+    bundler-audit (0.9.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
+    cgi (0.3.6)
+    concurrent-ruby (1.2.2)
+    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)
+    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)
+      concurrent-ruby (~> 1.0)
+    importmap-rails (1.2.1)
+      actionpack (>= 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)
+    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)
+      addressable (~> 2.8)
+    letter_opener (1.8.1)
+      launchy (>= 2.2, < 3)
+    lint_roller (1.1.0)
+    loofah (2.21.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.5)
+    minitest (5.19.0)
+    monetize (1.12.0)
+      money (~> 6.12)
+    money (6.16.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)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.15.4-arm64-darwin)
+      racc (~> 1.4)
+    pagy (5.10.1)
+      activesupport
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      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)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
+      railties (>= 7.0.0)
+    public_suffix (5.0.3)
+    puma (6.3.1)
+      nio4r (~> 2.0)
+    racc (1.7.1)
+    rack (2.2.8)
+    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)
+      bundler (>= 1.15.0)
+      railties (= 7.0.7.2)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    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
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rbs (2.8.4)
+    regexp_parser (2.8.1)
+    reline (0.3.8)
+      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)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.2.2.3)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.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)
+      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)
+    ruby-progressbar (1.13.0)
+    solargraph (0.49.0)
+      backport (~> 1.2)
+      benchmark
+      bundler (~> 2.0)
+      diff-lcs (~> 1.4)
+      e2mmap
+      jaro_winkler (~> 1.5)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      parser (~> 3.0)
+      rbs (~> 2.0)
+      reverse_markdown (~> 2.0)
+      rubocop (~> 1.38)
+      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)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.56.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.2)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.2.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.19.0)
+    standard-rails (0.1.0)
+      lint_roller (~> 1.0)
+      rubocop-rails (~> 2.19.0)
+    stimulus-rails (1.2.2)
+      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)
+      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)
+    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)
+
+PLATFORMS
+  arm64-darwin-22
+
+DEPENDENCIES
+  brakeman
+  bundle-audit
+  debug (>= 1.0.0)
+  irb
+  letter_opener
+  maquina!
+  pg
+  propshaft
+  puma
+  ruby-lsp
+  solargraph
+  solargraph-rails
+  standard
+  standard-rails
+  tailwindcss-rails
+  turbo-rails
+
+BUNDLED WITH
+   2.4.18

data/Procfile.dev

@@ -0,0 +1,3 @@
+web: rails server -p 3100
+# maquina_css: bin/rails app:maquina:tailwindcss:watch
+css: bin/rails app:tailwindcss:watch

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

@@ -2,7 +2,7 @@ import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   static targets = ["fileInput", "container", "preview", "placeholder"]
-  static values = { maxSize: Number, image: String, validationMessage: String }
+  static values = { maxSize: Number, image: String, validationMessage: String, url: String }
 
   connect() {
     if (this.hasFileInputTarget) {

data/app/assets/stylesheets/maquina/application.tailwind.css

@@ -3,100 +3,99 @@
 @tailwind utilities;
 
 /* @layer base { */
-  :root {
-    --color-base: 31 27 54;
-    --color-accented:  37 99 235;
-    --color-inverted: 255 255 255;
-    --color-accented-hover: 59 130 246;
-    --color-muted: 55 65 81;
-    --color-dimmed: 75 85 99;
-    --color-error: 220 38 38;
-
-    --color-border-base: 209 213 219;
-    --color-border-accented:  37 99 235;
-  }
-
-  .label {
-    @apply text-sm font-medium text-skin-muted;
-  }
-
-  .input {
-    @apply appearance-none rounded-md border border-skin-base px-3 py-2 placeholder-gray-400 shadow-sm focus:border-skin-accented focus:outline-none focus:ring-skin-accented sm:text-sm;
-  }
-
-  .link {
-    @apply font-medium text-skin-accented hover:text-skin-accented-hover;
-  }
-
-  .check {
-    @apply border-skin-base h-4 w-4 text-skin-accented focus:ring-skin-accented rounded;
-  }
-
-  .button {
-    @apply inline-flex justify-center py-2 px-4 border border-skin-base rounded-md shadow-sm text-sm font-medium text-skin-muted bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-skin-accented;
-  }
-
-  .control-error .label {
-    @apply text-skin-error;
-  }
-
-  .control-error .input {
-    @apply border-skin-error focus:border-skin-error focus:ring-skin-error;
-  }
-
-  .help {
-    @apply mt-2 text-sm text-skin-dimmed;
-  }
-
-  .help-error {
-    @apply text-skin-error;
-  }
-
-  .button[disabled] {
-    @apply bg-gray-50 text-skin-dimmed cursor-default;
-  }
-
-  .button-accented {
-    @apply rounded-md border border-transparent bg-skin-accented py-2 px-4 text-sm font-medium text-skin-inverted shadow-sm hover:bg-skin-accented-hover focus:outline-none focus:ring-2 focus:ring-skin-accented focus:ring-offset-2;
-  }
-
-  input[type="search"] {
-    @apply block w-full rounded-md border border-skin-base pl-10 leading-5 placeholder-gray-400 focus:placeholder-gray-300 focus:outline-none focus:ring-1 focus:ring-skin-accented focus:border-skin-accented sm:text-sm;
-  }
-
-  .desktop-menu {
-    @apply hidden lg:ml-6 lg:flex lg:space-x-8;
-  }
-
-  .desktop-menu-item {
-    @apply font-sans uppercase border-transparent text-skin-dimmed underline-offset-4 decoration-2 hover:underline hover:decoration-skin-accented hover:text-skin-muted inline-flex items-center px-1 pt-1 text-sm font-medium;
-  }
-
-  .desktop-menu-item__active {
-    @apply decoration-skin-accented underline text-skin-base;
-  }
-
-  .mobile-menu {
-    @apply pt-2 pb-3 space-y-1;
-  }
-
-  .mobile-menu-item {
-    @apply font-sans border-transparent text-skin-dimmed hover:bg-gray-200 hover:border-gray-300 hover:text-skin-muted block pl-3 pr-4 py-2 border-l-4 text-base font-medium;
-  }
-
-  .mobile-menu-item__active {
-    @apply bg-skin-accented-hover border-skin-accented text-skin-accented hover:text-skin-accented hover:bg-skin-accented-hover hover:border-skin-accented;
-  }
-
-  .desktop-profile-menu-item {
-    @apply block w-full text-left font-sans px-4 py-2 text-sm text-skin-dimmed hover:bg-gray-200 hover:text-skin-muted;
-  }
-
-  .mobile-profile-menu-item {
-    @apply block font-sans px-4 py-2 text-base font-medium text-skin-dimmed hover:text-skin-muted hover:bg-gray-200;
-  }
-
-  .mobile-button {
-    @apply inline-flex items-center justify-center p-2 rounded-md text-skin-dimmed hover:text-skin-muted hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-skin-accented;
-  }
-/* } */
+:root {
+  --color-base: 31 27 54;
+  --color-accented:  37 99 235;
+  --color-inverted: 255 255 255;
+  --color-accented-hover: 59 130 246;
+  --color-muted: 55 65 81;
+  --color-dimmed: 75 85 99;
+  --color-error: 220 38 38;
+
+  --color-border-base: 209 213 219;
+  --color-border-accented:  37 99 235;
+}
+
+.label {
+  @apply text-sm font-medium text-skin-muted;
+}
+
+.input {
+  @apply appearance-none rounded-md border border-skin-base px-3 py-2 placeholder-gray-400 shadow-sm focus:border-skin-accented focus:outline-none focus:ring-skin-accented sm:text-sm;
+}
+
+.link {
+  @apply font-medium text-skin-accented hover:text-skin-accented-hover;
+}
+
+.check {
+  @apply border-skin-base h-4 w-4 text-skin-accented focus:ring-skin-accented rounded;
+}
+
+.button {
+  @apply inline-flex justify-center py-2 px-4 border border-skin-base rounded-md shadow-sm text-sm font-medium text-skin-muted bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-skin-accented;
+}
+
+.control-error .label {
+  @apply text-skin-error;
+}
+
+.control-error .input {
+  @apply border-skin-error focus:border-skin-error focus:ring-skin-error;
+}
+
+.help {
+  @apply mt-2 text-sm text-skin-dimmed;
+}
+
+.help-error {
+  @apply text-skin-error;
+}
+
+.button[disabled] {
+  @apply bg-gray-50 text-skin-dimmed cursor-default;
+}
+
+.button-accented {
+  @apply rounded-md border border-transparent bg-skin-accented py-2 px-4 text-sm font-medium text-skin-inverted shadow-sm hover:bg-skin-accented-hover focus:outline-none focus:ring-2 focus:ring-skin-accented focus:ring-offset-2;
+}
+
+input[type="search"] {
+  @apply block w-full rounded-md border border-skin-base pl-10 leading-5 placeholder-gray-400 focus:placeholder-gray-300 focus:outline-none focus:ring-1 focus:ring-skin-accented focus:border-skin-accented sm:text-sm;
+}
+
+.desktop-menu {
+  @apply hidden lg:ml-6 lg:flex lg:space-x-8;
+}
+
+.desktop-menu-item {
+  @apply font-sans uppercase border-transparent text-skin-dimmed underline-offset-4 decoration-2 hover:underline hover:decoration-skin-accented hover:text-skin-muted inline-flex items-center px-1 pt-1 text-sm font-medium;
+}
+
+.desktop-menu-item__active {
+  @apply decoration-skin-accented underline text-skin-base;
+}
+
+.mobile-menu {
+  @apply pt-2 pb-3 space-y-1;
+}
+
+.mobile-menu-item {
+  @apply font-sans border-transparent text-skin-dimmed hover:bg-gray-200 hover:border-gray-300 hover:text-skin-muted block pl-3 pr-4 py-2 border-l-4 text-base font-medium;
+}
+
+.mobile-menu-item__active {
+  @apply bg-skin-accented-hover border-skin-accented text-skin-accented hover:text-skin-accented hover:bg-skin-accented-hover hover:border-skin-accented;
+}
+
+.desktop-profile-menu-item {
+  @apply block w-full text-left font-sans px-4 py-2 text-sm text-skin-dimmed hover:bg-gray-200 hover:text-skin-muted;
+}
+
+.mobile-profile-menu-item {
+  @apply block font-sans px-4 py-2 text-base font-medium text-skin-dimmed hover:text-skin-muted hover:bg-gray-200;
+}
+
+.mobile-button {
+  @apply inline-flex items-center justify-center p-2 rounded-md text-skin-dimmed hover:text-skin-muted hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-skin-accented;
+}

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

@@ -32,7 +32,11 @@ module Maquina
       active_session_id = session["--active_session"]
       return if active_session_id.blank?
 
-      active_session = ActiveSession.eager_load(:user).find_by(id: active_session_id)
+      active_session = ActiveSession.eager_load(user: {memberships: :organization})
+        .where(maquina_memberships: {blocked_at: nil})
+        .where(maquina_organizations: {active: true})
+        .find_by(id: active_session_id)
+
       return if active_session.blank?
 
       Maquina::Current.active_session = active_session

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

@@ -16,6 +16,7 @@ module Maquina
 
     included do
       class_attribute :resource_class, instance_writer: false
+      class_attribute :namespace, instance_writer: false
       class_attribute :find_by_param, instance_writer: false
       class_attribute :list_attributes, instance_writer: false
       class_attribute :form_attributes, instance_writer: false
@@ -28,18 +29,16 @@ module Maquina
 
       # Route proxies
 
+      def namespace_path
+        @namespace_path ||= namespace.present? ? "#{namespace&.to_s&.underscore}_" : ""
+      end
+
       def base_singular_path_name
-        @base_path_name ||= begin
-          namespace_path = ""
-          "#{namespace_path}#{resource_class.model_name.singular_route_key}_path"
-        end
+        @base_path_name ||= "#{namespace_path}#{resource_class.model_name.singular_route_key}_path"
       end
 
       def base_plural_path_name
-        @base_plural_path_name ||= begin
-          namespace_path = ""
-          "#{namespace_path}#{resource_class.model_name.route_key}_path"
-        end
+        @base_plural_path_name ||= "#{namespace_path}#{resource_class.model_name.route_key}_path"
       end
 
       def new_resource_path(options = {})
@@ -142,13 +141,14 @@ module Maquina
     end
 
     class_methods do
-      def resourceful(resource_class: 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)
         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.namespace = namespace
 
         valid_rest_actions = {
           index: Maquina::Index,