actions.rb in padrino-gen-0.9.25

- old
+ new

@@ -10,13 +10,13 @@
           if behavior == :revoke
             remove_migration(filename)
           else
             return if migration_exist?(filename)
             model_name = name.to_s.pluralize
-            field_tuples = fields.collect { |value| value.split(":") }
-            field_tuples.collect! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] } # fix datetime
-            column_declarations = field_tuples.collect(&options[:column_format]).join("\n      ")
+            field_tuples = fields.map { |value| value.split(":") }
+            field_tuples.map! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] } # fix datetime
+            column_declarations = field_tuples.map(&options[:column_format]).join("\n      ")
             contents = options[:base].dup.gsub(/\s{4}!UP!\n/m, options[:up]).gsub(/!DOWN!\n/m, options[:down])
             contents = contents.gsub(/!NAME!/, model_name.camelize).gsub(/!TABLE!/, model_name.underscore)
             contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.camelize)
             current_migration_number = return_last_migration_number
             contents = contents.gsub(/!FIELDS!/, column_declarations).gsub(/!VERSION!/, (current_migration_number + 1).to_s)
@@ -36,14 +36,14 @@
           else
             return if migration_exist?(filename)
             change_format = options[:change_format]
             migration_scan = filename.camelize.scan(/(Add|Remove)(?:.*?)(?:To|From)(.*?)$/).flatten
             direction, table_name = migration_scan[0].downcase, migration_scan[1].downcase.pluralize if migration_scan.any?
-            tuples = direction ? columns.collect { |value| value.split(":") } : []
-            tuples.collect! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] } # fix datetime
-            add_columns    = tuples.collect(&options[:add]).join("\n    ")
-            remove_columns = tuples.collect(&options[:remove]).join("\n    ")
+            tuples = direction ? columns.map { |value| value.split(":") } : []
+            tuples.map! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] } # fix datetime
+            add_columns    = tuples.map(&options[:add]).join("\n    ")
+            remove_columns = tuples.map(&options[:remove]).join("\n    ")
             forward_text = change_format.gsub(/!TABLE!/, table_name).gsub(/!COLUMNS!/, add_columns) if tuples.any?
             back_text    = change_format.gsub(/!TABLE!/, table_name).gsub(/!COLUMNS!/, remove_columns) if tuples.any?
             contents = options[:base].dup.gsub(/\s{4}!UP!\n/m,   (direction == 'add' ? forward_text.to_s : back_text.to_s))
             contents.gsub!(/\s{4}!DOWN!\n/m, (direction == 'add' ? back_text.to_s : forward_text.to_s))
             contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.camelize)
@@ -106,11 +106,11 @@
         end
 
         # For Controller action generation
         # Takes in fields for routes in the form of get:index post:test delete:yada and such
         def controller_actions(fields)
-          field_tuples = fields.collect { |value| value.split(":") }
-          action_declarations = field_tuples.collect do |request, name|
+          field_tuples = fields.map { |value| value.split(":") }
+          action_declarations = field_tuples.map do |request, name|
             "#{request} :#{name} do\n  end\n"
           end
           action_declarations.join("\n  ")
         end
       end # Actions
\ No newline at end of file