bootscaf 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7284f9226845dfc6c7bac1406dd5fa14df6e0ad0
-  data.tar.gz: adfe34af3c49e01521ff4530b45ef55dbd6b0568
+  metadata.gz: 129faf95168b2857433903fc6f792bee2f4398b5
+  data.tar.gz: dc173adebccf566e31d376c7929ae8c4da943080
 SHA512:
-  metadata.gz: 3132bfd560e6d1079da26676eeeec1d0f99e38fc30880abad81e9d688c157a9646334a6c5c34173481d08e74983fc34a6ed560c5c6ab26d124f2291e164234e2
-  data.tar.gz: 152237da9a1931835e8ff85167c6805f0d23da749beacd37576011b36f9a6d0c9dddd36fbcbe8b95469a6ae9fa661bfc90f22863130ac0c3896999d73d1b4f23
+  metadata.gz: 3e2faf625116dcfd4d2470871803098ad0a0e8fca4d6422ba8019ed0276478531a785253c61cc49a396f57b2de0f63f8678c0eab5407dfaae63b7314dfaf5f8d
+  data.tar.gz: 7cd0dd8ea4b34570d5ba6dde771f7f04f395339bfbf8d57b0d7efddfefd359935d57b9dfb3ec31f1ffef0e80e1612887ef2a639a8669237411acfb3b4128dbe3

data/lib/bootscaf/cli.rb

@@ -32,9 +32,13 @@ module Bootscaf
       print "Running on #{modelname} scaffolds with nesting path `#{singularized_ancestors.join(' > ')}`.\n"
       
       print "Updating app/controllers/#{modelname}_controller.rb.\n"
-      singularized_ancestors.each do |sa|
+      singularized_ancestors.each_with_index do |sa, idx|
         print `sed #{icmd} -e 's/Controller < ApplicationController/Controller < ApplicationController\\\nbefore_action :set_#{sa}/' app/controllers/#{modelname}_controller.rb`
-        print `sed #{icmd} -e 's/private/private\\\n\\\ndef set_#{sa}\\\n@#{sa} = #{sa.capitalize}.find_by_id(params[:#{sa}_id])\\\nraise ActiveRecord::RecordNotFound unless @#{sa}\\\nend\\\n/' app/controllers/#{modelname}_controller.rb`
+        if idx == 0
+          print `sed #{icmd} -e 's/private/private\\\n\\\ndef set_#{sa}\\\n@#{sa} = #{sa.capitalize}.find_by_id(params[:#{sa}_id])\\\nraise ActiveRecord::RecordNotFound unless @#{sa}\\\nend\\\n/' app/controllers/#{modelname}_controller.rb`
+        else
+          print `sed #{icmd} -e 's/private/private\\\n\\\ndef set_#{sa}\\\n@#{sa} = @#{singularized_ancestors[idx-1]}.#{ancestors_only[idx]}.find_by_id(params[:#{sa}_id])\\\nraise ActiveRecord::RecordNotFound unless @#{sa}\\\nend\\\n/' app/controllers/#{modelname}_controller.rb`
+        end
         print `sed #{icmd} -e 's/.permit(\\(.*\\):#{sa}_id, \\(.*\\))/.permit(\\1\\2)/' app/controllers/#{modelname}_controller.rb`
       end
       print `sed #{icmd} -e 's/#{singular_modelname.capitalize}.all/@#{singularized_ancestors.last}.#{modelname}.all/' app/controllers/#{modelname}_controller.rb`
@@ -50,7 +54,8 @@ module Bootscaf
       print "Updating app/views/#{modelname}/edit.html.erb.\n"
       print `sed #{icmd} -e 's/Edit \\(.*\\) - $/Edit \\1 - #{singularized_ancestors.last.to_s.capitalize} <%= @#{singularized_ancestors.last}.id %>/' app/views/#{modelname}/edit.html.erb`
       print `sed #{icmd} -e 's/<h1>Editing \\(.*\\)<\\/h1>/<h1>Editing \\1 <small>#{singularized_ancestors.last.capitalize} <%= @#{singularized_ancestors.last}.id %><\\/small><\\/h1>/' app/views/#{modelname}/edit.html.erb`
-      print `sed #{icmd} -e 's/.html_safe, @#{singular_modelname}, /.html_safe, [@#{singularized_ancestors.join(', @')}, @#{singular_modelname}], /' app/views/#{modelname}/edit.html.erb`
+      print `sed #{icmd} -e 's/.html_safe, @#{singular_modelname}, class:/.html_safe, [@#{singularized_ancestors.join(', @')}, @#{singular_modelname}], class:/' app/views/#{modelname}/edit.html.erb`
+      print `sed #{icmd} -e 's/.html_safe, @#{singular_modelname}, method:/.html_safe, [@#{singularized_ancestors.join(', @')}, @#{singular_modelname}], method:/' app/views/#{modelname}/edit.html.erb`
     
       print "Updating app/views/#{modelname}/index.html.erb.\n"
       print `sed #{icmd} -e 's/#{modelname.capitalize} - $/#{modelname.capitalize} - #{singularized_ancestors.last.capitalize} <%= @#{singularized_ancestors.last}.id %>/' app/views/#{modelname}/index.html.erb`
@@ -217,7 +222,7 @@ module Bootscaf
         print `sed #{icmd} -e 's/<td><%= link_to '\\''Show'\\'', \\(.*\\) %><\\/td>//' app/views/#{modelname}/index.html.erb`
         print `sed #{icmd} -e 's/<td><%= link_to '\\''Edit'\\'', edit_\\(.*\\)_path(\\(.*\\)) %><\\/td>//' app/views/#{modelname}/index.html.erb`
         print `sed #{icmd} -e 's/<td><%= link_to '\\''Destroy'\\'', \\(.*\\), method: :delete, data: { confirm: '\\''Are you sure?'\\'' } %><\\/td>//' app/views/#{modelname}/index.html.erb`
-        print `sed #{icmd} -e 's/<% @\\(.*\\)s.each do \\|\\(.*\\)\\| %>/<% unless @\\1s.any? %>\\\n<tr id="empty-table">\\\n<td class="bg-warning" colspan="2">No \\1s created yet.<\\/td>\\\n<\\/tr>\\\n<% end %>\\\n<% @\\1s.each do \\|\\1\\| %>\\\n<tr class="linked-row" data-href="<%= \\1_path(\\1) %>">/' app/views/#{modelname}/index.html.erb`
+        print `sed #{icmd} -e 's/<% @#{modelname}.each do \\|\\(.*\\)\\| %>/<% unless @#{modelname}.any? %>\\\n<tr id="empty-table">\\\n<td class="bg-warning" colspan="2">No #{modelname} created yet.<\\/td>\\\n<\\/tr>\\\n<% end %>\\\n<% @#{modelname}.each do \\|\\2\\| %>\\\n<tr class="linked-row" data-href="<%= \\2_path(\\2) %>">/' app/views/#{modelname}/index.html.erb`
         print `sed #{icmd} -e 's/<tr>//' app/views/#{modelname}/index.html.erb`
         print `sed #{icmd} -e 's/<thead>/<thead>\\\n<tr>/' app/views/#{modelname}/index.html.erb`
         print `sed #{icmd} -e 's/<td><%= \\(.*\\)\\.\\(.*\\) %><\\/td>/<td><%= link_to \\1.\\2, \\1 %><\\/td>/' app/views/#{modelname}/index.html.erb`

data/lib/bootscaf/version.rb

@@ -1,3 +1,3 @@
 module Bootscaf
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootscaf
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Matthew Moore