advanced_haml_scaffold_generator 2.3.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71bd6c4e5ad40e3325a0bcae2a21ffbea6d54f6708db2b7c79d96386040174d1
-  data.tar.gz: e512520e02b76c1bbd40ce25185666ba4953bb95783e1ea08e3f459b534f2990
+  metadata.gz: b6d25a9edb3f1b1ac72084b51d395b32ae9c359ab4f68b0b90e36bb99fdcc50a
+  data.tar.gz: 11fc63307b1aca5830bf3f3da11c9c27e4c8193ccb6c748bc1c61daf324b1e2a
 SHA512:
-  metadata.gz: dc2e386ecb1f11edad23cf6a3ea9a628ea9f58bf5455fa3314f7917b10c8586e97789759dc422fba799fa2de49dcc6d1a7a0710ce477416b4257b5784e5d4812
-  data.tar.gz: b0619c2ad24c1ec46100b0ef6fe31ade6e56440d9a9baa2656c11b1fed9eb7f67a5f1a709dc6758053f53f71b86b615e767ab473e730dbfd8ed7786a349d2e74
+  metadata.gz: f55b57a38e48b253506c6711896b6cbf2b72169a10b592727bf3b951d119c951151596c1013be1b75e6408849e062a8a562db312d3f6516b53e9a53d26f8376e
+  data.tar.gz: 263440c745d138bd7e354dcd8293e7d892365f3968f76d002d7525e5172a920b5ae3c793a0c52d9b91c88bb8aa4ae996076e708d1e812abf047fe9fbb09bf3ff

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Change log
+
+## 3.0.0 (15 Nov, 2024)
+
+- Added button "Back" and Stimulus controller to navigate back in history when Stimulus is present.
+- Old button "Back" is renamed to "index" and its class is also changed to "index".

data/Rakefile

@@ -19,8 +19,8 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MIT"
   gem.summary = %Q{Extention of the haml generator that is aware of i18n and so forth}
   gem.description = %Q{Extention of the haml generator that generates templates with the use of i18n, cancan and WiceGrid, adds classes to buttons and uses :title helper}
-  gem.email = "dima@koulikoff.ru"
-  gem.authors = ["Dmitri Koulikoff"]
+  gem.email = "dimi@kulk.eu"
+  gem.authors = ["Dimitri Kulk"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-2.3.1
+3.0.0

data/advanced_haml_scaffold_generator.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: advanced_haml_scaffold_generator 2.2.1 ruby lib
+# stub: advanced_haml_scaffold_generator 3.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "advanced_haml_scaffold_generator".freeze
-  s.version = "2.3.1"
+  s.version = "3.0.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
-  s.authors = ["Dmitri Koulikoff".freeze]
-  s.date = "2020-06-17"
+  s.authors = ["Dimitri Kulk".freeze]
+  s.date = "2024-11-15"
   s.description = "Extention of the haml generator that generates templates with the use of i18n, cancan and WiceGrid, adds classes to buttons and uses :title helper".freeze
-  s.email = "dima@koulikoff.ru".freeze
+  s.email = "dimi@kulk.eu".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    "CHANGELOG.md",
     "Gemfile",
     "LICENSE.txt",
     "README.rdoc",
@@ -34,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/rails/generators/haml/scaffold/templates/edit.html.haml",
     "lib/rails/generators/haml/scaffold/templates/index.html.haml",
     "lib/rails/generators/haml/scaffold/templates/layout.html.haml",
+    "lib/rails/generators/haml/scaffold/templates/navigation_controller.js",
     "lib/rails/generators/haml/scaffold/templates/new.html.haml",
     "lib/rails/generators/haml/scaffold/templates/show.html.haml",
     "spec/advanced_haml_scaffold_generator_spec.rb",
@@ -41,25 +43,15 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/dima4p/advanced_haml_scaffold_generator".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.1.2".freeze
+  s.rubygems_version = "3.5.11".freeze
   s.summary = "Extention of the haml generator that is aware of i18n and so forth".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-  end
+  s.specification_version = 4
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.1"])
-    s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.1"])
-    s.add_development_dependency(%q<bundler>.freeze)
-    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.0"])
-    s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.0"])
-  else
-    s.add_dependency(%q<rspec>.freeze, ["~> 3.1"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 4.1"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.6"])
-    s.add_dependency(%q<jeweler>.freeze, ["~> 2.0"])
-    s.add_dependency(%q<simplecov>.freeze, ["~> 0.0"])
-  end
+  s.add_development_dependency(%q<rspec>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<rdoc>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<bundler>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<jeweler>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
 end
 

data/lib/rails/generators/haml/scaffold/scaffold_generator.rb

@@ -43,17 +43,28 @@ module Haml
 
       def copy_layout_file
         return unless options[:layout]
-        template "layout.html.haml", File.join("app/views/layouts", controller_class_path, "#{controller_file_name}.html.haml")
+        template "layout.html.haml",
+            File.join("app/views/layouts", controller_class_path, "#{controller_file_name}.html.haml")
+      end
+
+      def copy_controller
+        return unless defined? Stimulus
+        filename = 'navigation_controller.js'
+        path = 'app/javascript/controllers/' + filename
+        return if File.file? path
+        template filename, path
       end
 
       protected
 
       def copy_coffee(view)
-        template "#{view}.js.coffee", File.join("app/views", controller_file_path, "#{view}.js.coffee")
+        template "#{view}.js.coffee",
+            File.join("app/views", controller_file_path, "#{view}.js.coffee")
       end
 
       def copy_view(view)
-          template "#{view}.html.haml", File.join("app/views", controller_file_path, "#{view}.html.haml")
+          template "#{view}.html.haml",
+              File.join("app/views", controller_file_path, "#{view}.html.haml")
       end
     end
   end

data/lib/rails/generators/haml/scaffold/templates/edit.html.haml

@@ -1,13 +1,30 @@
 - title t('.title')
 
+<% if turbo = defined? Stimulus -%>
+%p.nav{data: {controller: "navigation"}}
+<% else -%>
 %p.nav
+<% end -%>
 <% if options[:cancan] -%>
   - if can? :index, <%= class_name %>
-    = link_to t('back'), <%= plural_name %>_path, class: 'index'
+<% if turbo -%>
+    = link_to t('Back'), <%= plural_name %>_path, class: 'back',
+      data: {action: "navigation#back", turbo_action: 'replace'}
+<% end -%>
+    = link_to t('index'), <%= plural_name %>_path, class: 'index'
+<% if turbo -%>
+  - else
+    = link_to t('Back'), '', class: 'back',
+      data: {action: "navigation#back", turbo_action: 'replace'}
+<% end -%>
   - if can? :show, @<%= singular_name %>
     = link_to t('show'), @<%= singular_name %>, class: 'show'
 <% else -%>
-  = link_to t('back'), <%= plural_name %>_path, class: 'index'
+<% if turbo -%>
+  = link_to t('Back'), <%= plural_name %>_path, class: 'back',
+    data: {action: "navigation#back", turbo_action: 'replace'}
+<% end -%>
+  = link_to t('index'), <%= plural_name %>_path, class: 'index'
   = link_to t('show'), @<%= singular_name %>, class: 'show'
 <% end -%>
 

data/lib/rails/generators/haml/scaffold/templates/index.html.haml

@@ -1,12 +1,20 @@
 - title t('.title')
 
+<% if turbo = defined? Stimulus -%>
+%p.nav{data: {controller: "navigation"}}
+<% else -%>
+%p.nav
+<% end -%>
 <% if options[:cancan] -%>
-- if can? :new, <%= class_name %>
-  %p.nav= link_to t('.new_<%= singular_table_name %>'), new_<%= singular_table_name %>_path, class: 'new'
+<% if turbo -%>
+  = link_to t('Back'), <%= plural_name %>_path, class: 'back',
+    data: {action: "navigation#back", turbo_action: 'replace'}
+<% end -%>
+  - if can? :new, <%= class_name %>
+    = link_to t('.new_<%= singular_table_name %>'), new_<%= singular_table_name %>_path, class: 'new'
 <% else -%>
-%p.nav= link_to t('.new_<%= singular_table_name %>'), new_<%= singular_table_name %>_path, class: 'new'
+  = link_to t('.new_<%= singular_table_name %>'), new_<%= singular_table_name %>_path, class: 'new'
 <% end -%>
-<% turbo = defined? Turbo -%>
 
 - if @<%= plural_table_name %>.limit(1).size > 0
 <% if defined? Wice::WiceGrid -%>

data/lib/rails/generators/haml/scaffold/templates/navigation_controller.js

@@ -0,0 +1,36 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class NavigationController extends Controller {
+  connect() {
+    let main_nav = this.element
+    this.collect_nav_links_into(main_nav)
+    this.is_frist_history_entry && this.hide_back_button_in(main_nav)
+  }
+
+  back (event) {
+    if (!this.is_frist_history_entry) {
+      event.preventDefault()
+      window.history.back()
+    }
+  }
+
+  //////////////////////////
+
+  collect_nav_links_into(main_nav) {
+    document.querySelectorAll('p.nav').forEach(element => {
+      if (element != main_nav) {
+        main_nav.append(...element.childNodes)
+      }
+    })
+}
+
+  hide_back_button_in(main_nav) {
+    let link = main_nav.querySelector("a.back")
+    link && link.remove()
+  }
+
+  get is_frist_history_entry () {
+    return !window.history.state.turbo ||
+        window.history.state.turbo.restorationIndex === 0
+  }
+}

data/lib/rails/generators/haml/scaffold/templates/new.html.haml

@@ -1,10 +1,28 @@
 - title t('.title')
 
+<% if turbo = defined? Stimulus -%>
+%p.nav{data: {controller: "navigation"}}
+<% else -%>
+%p.nav
+<% end -%>
 <% if options[:cancan] -%>
-- if can? :index, <%= class_name %>
-  %p.nav= link_to t('back'), <%= index_helper %>_path, class: 'index'
+  - if can? :index, <%= class_name %>
+<% if turbo -%>
+    = link_to t('Back'), <%= plural_name %>_path, class: 'back',
+      data: {action: "navigation#back", turbo_action: 'replace'}
+<% end -%>
+    = link_to t('index'), <%= index_helper %>_path, class: 'index'
+<% if turbo -%>
+  - else
+    = link_to t('Back'), '', class: 'back',
+      data: {action: "navigation#back", turbo_action: 'replace'}
+<% end -%>
 <% else -%>
-%p= link_to t('back'), <%= index_helper %>_path, class: 'index'
+<% if turbo -%>
+  = link_to t('Back'), <%= plural_name %>_path, class: 'back',
+    data: {action: "navigation#back", turbo_action: 'replace'}
+<% end -%>
+  = link_to t('index'), <%= index_helper %>_path, class: 'index'
 <% end -%>
 
 = render 'form', <%= singular_table_name %>: @<%= singular_table_name %>

data/lib/rails/generators/haml/scaffold/templates/show.html.haml

@@ -1,13 +1,30 @@
 - title t('.title')
 
+<% if turbo = defined? Stimulus -%>
+%p.nav{data: {controller: "navigation"}}
+<% else -%>
 %p.nav
+<% end -%>
 <% if options[:cancan] -%>
   - if can? :index, <%= class_name %>
-    = link_to t('back'), <%= index_helper %>_path, class: 'index'
+<% if turbo -%>
+    = link_to t('Back'), <%= plural_name %>_path, class: 'back',
+      data: {action: "navigation#back", turbo_action: 'replace'}
+<% end -%>
+    = link_to t('index'), <%= index_helper %>_path, class: 'index'
+<% if turbo -%>
+  - else
+    = link_to t('Back'), '', class: 'back',
+      data: {action: "navigation#back", turbo_action: 'replace'}
+<% end -%>
   - if can? :edit, @<%= singular_table_name %>
     = link_to t('edit'), edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'edit'
 <% else -%>
-  = link_to t('back'), <%= plural_name %>_path, class: 'index'
+<% if turbo -%>
+  = link_to t('Back'), <%= plural_name %>_path, class: 'back',
+    data: {action: "navigation#back", turbo_action: 'replace'}
+<% end -%>
+  = link_to t('index'), <%= plural_name %>_path, class: 'index'
   = link_to t('edit'), edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'edit'
 <% end -%>
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: advanced_haml_scaffold_generator
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 3.0.0
 platform: ruby
 authors:
-- Dmitri Koulikoff
+- Dimitri Kulk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,33 +56,33 @@ dependencies:
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 description: Extention of the haml generator that generates templates with the use
   of i18n, cancan and WiceGrid, adds classes to buttons and uses :title helper
-email: dima@koulikoff.ru
+email: dimi@kulk.eu
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -91,6 +91,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -104,6 +105,7 @@ files:
 - lib/rails/generators/haml/scaffold/templates/edit.html.haml
 - lib/rails/generators/haml/scaffold/templates/index.html.haml
 - lib/rails/generators/haml/scaffold/templates/layout.html.haml
+- lib/rails/generators/haml/scaffold/templates/navigation_controller.js
 - lib/rails/generators/haml/scaffold/templates/new.html.haml
 - lib/rails/generators/haml/scaffold/templates/show.html.haml
 - spec/advanced_haml_scaffold_generator_spec.rb