scaffold_plus 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 450cf4b87abe4a2a86ad00fe8b053a71c6fba8c7
-  data.tar.gz: 74a215ecd8504a343c96ce597d8135208b0c0d36
+  metadata.gz: 8708dc46850e0461defb7300d245701316cf8ebb
+  data.tar.gz: 890e0dd4a202e7266e140a8d260ac02dd85ed6f9
 SHA512:
-  metadata.gz: 398ecfa0f85c0d931fabc4a844e1864a10851fe758d97e6478d270e3d29758c38f1da2c212ace792473d0edb462f97a1f498b6ed41d1d5f09f786605b0c59e24
-  data.tar.gz: d8af2ce1c3b5ed8455c80edd10d0bd0da937a82eb44f649ab10518ed24a39693589596b4efecf22868036d37b1d3496c2aba6dc9f0109c37d0d38aed4d29e0d3
+  metadata.gz: c87225f56c51195d16dd58a3851d36a358a1d93559adf4b56de652a36e39ffe634bfa3d2fff09c70d001b1bfdab1784136f85f98abd1ccee458623d4b9dbe4f7
+  data.tar.gz: 3964f33ce1a8c2a227cc3c5639e6310e66c1289f2196ca80e3aeb44387c9ea6f9efd4fcfb25f888c7b94786931b9d27bba6c43e1d220195aa3829fd134cdf9eb

data/lib/generators/scaffold_plus/enumerize/enumerize_generator.rb

@@ -49,7 +49,7 @@ module ScaffoldPlus
       protected
 
       def migration_name
-        "add_ancestry_to_#{table_name}"
+        "add_#{column}_to_#{table_name}"
       end
     end
   end

data/lib/generators/scaffold_plus/has_many/has_many_generator.rb

@@ -60,7 +60,7 @@ module ScaffoldPlus
           text << ", dependent: :#{dependent}" if options.dependent.present?
           text << "\n"
           if options.nested.present?
-            text << "  accepts_nested_attributes_for :#{children}\n"
+            text << "  accepts_nested_attributes_for :#{children}, allow_destroy: true, reject_if: :all_blank\n"
           end
           text << "\n" if after_array.include?(name)
           text

data/lib/generators/scaffold_plus/has_one/has_one_generator.rb

@@ -50,9 +50,9 @@ module ScaffoldPlus
           text = before_array.include?(name) ? "\n" : ""
           text << "  has_one :#{child}"
           text << ", inverse_of: :#{name}" if options.inverse?
-          text << ", dependent: :#{dependent}" if options.dependent
+          text << ", dependent: :#{dependent}" if options.dependent.present?
           text << "\n"
-          if options.nested
+          if options.nested.present?
             text << "  accepts_nested_attributes_for :#{child}, allow_destroy: true\n"
           end
           text << "\n" if after_array.include?(name)
@@ -77,6 +77,7 @@ module ScaffoldPlus
         list = options.nested.map{|n| ":#{n}"}.join(', ')
         text = "#{child}_attributes: [ #{list} ]"
         file = "app/controllers/#{table_name}_controller.rb"
+        return unless File.exist?(file)
         gsub_file file, /(permit\(.*)\)/, "\\1, #{text})"
         # Special case: no previous permit
         gsub_file file, /^(\s*params)\[:#{name}\]$/, "\\1.require(:#{name}).permit(#{text})"
@@ -86,6 +87,7 @@ module ScaffoldPlus
         return unless options.permit?
         text = ":#{name}_id"
         file = "app/controllers/#{child.pluralize}_controller.rb"
+        return unless File.exist?(file)
         gsub_file file, /(permit\(.*)\)/, "\\1, #{text})"
         # Special case: no previous permit
         gsub_file file, /^(\s*params)\[:#{name}\]$/, "\\1.require(:#{name}).permit(#{text})"
@@ -95,16 +97,20 @@ module ScaffoldPlus
         return unless options.route?
         children = child.pluralize
         file = "app/controllers/#{children}_controller.rb"
-        gsub_file file, /GET .#{children}.new$/ do |match|
-          match = "GET /#{table_name}/:id/#{children}/new"
-        end
-        gsub_file file, /^    @#{child} = #{child.camelize}.new$/ do |match|
-          match = "    @#{name} = #{class_name}.find(params[:#{name}_id])\n" +
-                  "    @#{child} = @#{name}.#{children}.build"
+        if File.exist?(file)
+          gsub_file file, /GET .#{children}.new$/ do |match|
+            match = "GET /#{table_name}/:id/#{children}/new"
+          end
+          gsub_file file, /^    @#{child} = #{child.camelize}.new$/ do |match|
+            match = "    @#{name} = #{class_name}.find(params[:#{name}_id])\n" +
+                    "    @#{child} = @#{name}.#{children}.build"
+          end
         end
         file = "app/views/#{children}/_form.html.erb"
-        gsub_file file, /form_for\(@#{child}/ do |match|
-          match = "form_for([@#{name}, @#{child}]"
+        if File.exist?(file)
+          gsub_file file, /form_for\(@#{child}/ do |match|
+            match = "form_for([@#{name}, @#{child}]"
+          end
         end
       end
 
@@ -119,7 +125,7 @@ module ScaffoldPlus
       end
 
       def dependent
-        if options.dependent && options.dependent == "restrict"
+        if options.dependent.present? && options.dependent == "restrict"
           "restrict_with_exception"
         else
           options.dependent
@@ -132,3 +138,5 @@ module ScaffoldPlus
     end
   end
 end
+
+# vim: set expandtab softtabstop=2 shiftwidth=2 autoindent :

data/lib/scaffold_plus/version.rb

@@ -1,3 +1,3 @@
 module ScaffoldPlus
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scaffold_plus
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Volker Wiegand