scaffold_plus 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1076ab26d1d0f4d8b72e02f9cb1bbdd04b641580
-  data.tar.gz: 199d61b5ceaaef8e3387894ce4bea977c67a6be5
+  metadata.gz: dbfbc1604c1f6d200fbd60cc086e9dd1276512ea
+  data.tar.gz: 533ec872a540106525ea897c3538e16cf0135019
 SHA512:
-  metadata.gz: b59cb120b626bfe7ed9bc210522eb0a1b8a13e202125b9c2d6d13b611ba18f0d32b5359bb7e30bf27d8da57fac751783add28c28ded8d6955b488a59b070d099
-  data.tar.gz: 0d8ec2256a793223eaf3276ddeb5135c7b902eefb2bc9548b5d00f084647564de4270b9f58d97edfbd7fc6cc29bf0e973e3d9d973f460b792ec96b1f252ea38f
+  metadata.gz: 9e8e4e1a13f2e736099adf843d0eaf8bfbe57d2ab712abd221a9bcbf952c4f77d4d2065079a9237662069e2bec37855efe6fa9310c441d0d16bb749024c56874
+  data.tar.gz: 8c7c02bc8ca4ce04a9414cfe7080f10bc821b000e520ee93a5fed40bb5f23b399e1d9313949f84b1c7ea03b58b4c55a6f68422bb47232863032ee70a85b9e3e6

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

@@ -12,6 +12,8 @@ module ScaffoldPlus
                desc: 'Can be destroy, delete, or restrict'
       class_option :nested, type: :array, banner: 'attribute [...]',
                desc: 'Add accepts_nested_attributes_for (incl. whitelisting)'
+      class_option :route, type: :boolean, default: false,
+               desc: 'Add a nested route and update CHILD controller'
       class_option :foreign_key, type: :string,
                desc: 'Set the name of the foreign key directly'
       class_option :inverse, type: :boolean, default: false,
@@ -27,17 +29,27 @@ module ScaffoldPlus
       class_option :after, type: :array,
                desc: 'Add a line after generated text in models'
       source_root File.expand_path('../templates', __FILE__)
-      
+
       def add_migration
         return unless options.migration?
         migration_template 'child_migration.rb', "db/migrate/#{migration_name}.rb"
       end
-      
+
       def add_counter
         return unless options.counter?
         migration_template 'counter_migration.rb', "db/migrate/#{counter_migration}.rb"
       end
-      
+
+      def add_to_route
+        return unless options.route?
+        gsub_file "config/routes.rb", /^  resources :#{table_name} do$/ do |match|
+          match << "\n    resources :#{children}"
+        end
+        gsub_file "config/routes.rb", /^  resources :#{table_name}$/ do |match|
+          match << " do\n    resources :#{children}\n  end"
+        end
+      end
+
       def add_to_models
         inject_into_class "app/models/#{name}.rb", class_name do
           text = before_array.include?(name) ? "\n" : ""
@@ -51,7 +63,7 @@ module ScaffoldPlus
           text << "\n" if after_array.include?(name)
           text
         end
-        
+
         child = children.singularize
         inject_into_class "app/models/#{child}.rb", child.camelize do
           text = before_array.include?(child) ? "\n" : ""
@@ -66,7 +78,7 @@ module ScaffoldPlus
           text
         end
       end
-      
+
       def add_to_permit
         return unless options[:nested].present?
         list = options[:nested].map{|n| ":#{n}"}.join(', ')
@@ -76,17 +88,34 @@ module ScaffoldPlus
         # Special case: no previous permit
         gsub_file file, /^(\s*params)\[:#{name}\]$/, "\\1.require(:#{name}).permit(#{text})"
       end
-      
+
+      def update_child_controller_and_view
+        return unless options.route?
+        child = children.singularize
+        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"
+        end
+        file = "app/views/#{children}/_form.html.erb"
+        gsub_file file, /form_for\(@#{child}/ do |match|
+          match = "form_for([@#{name}, @#{child}]"
+        end
+      end
+
       protected
-      
+
       def before_array
         options['before'] || []
       end
-      
+
       def after_array
         options['after'] || []
       end
-      
+
       def dependent
         if options[:dependent].present? && options[:dependent] == "restrict"
           "restrict_with_exception"
@@ -94,15 +123,11 @@ module ScaffoldPlus
           options[:dependent]
         end
       end
-      
+
       def migration_name
         "add_#{name}_id_to_#{children}"
       end
-      
-      def create_index?
-        options[:index]
-      end
-      
+
       def counter_migration
         "add_#{children}_count_to_#{table_name}"
       end

data/lib/generators/scaffold_plus/has_many/templates/child_migration.rb

@@ -1,7 +1,7 @@
 class <%= migration_name.camelize %> < ActiveRecord::Migration
   def change
     add_column :<%= children %>, :<%= name %>_id, :integer
-<%- if create_index? -%>
+<%- if options.index? -%>
     add_index :<%= children %>, :<%= name %>_id
 <%- end -%>
   end

data/lib/scaffold_plus/version.rb

@@ -1,3 +1,3 @@
 module ScaffoldPlus
-  VERSION = "1.7.4"
+  VERSION = "1.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaffold_plus
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord