Changeset 867

Show
Ignore:
Timestamp:
11/06/07 09:31:09 (1 year ago)
Author:
jimfree..@gmail.com
Message:

Fixed controller generator always creating plural names.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/generators/merb_generator_helpers.rb

    r862 r867  
    205205        end 
    206206        record do |m| 
    207  
    208207          # ensure there are no other definitions of this model already defined. 
    209208          # Ensure appropriate folder(s) exists 
    …… 
    213212 
    214213          # Create stubs 
    215           m.template model_test_template_name, "#{model_test_path_name}/#{model_filename}_#{model_test_file_suffix}.rb", :assigns => {:class_name => @class_name} 
    216  
     214          m.template model_test_template_name,  
     215            "#{model_test_path_name}/#{model_filename}_#{model_test_file_suffix}.rb",  
     216            :assigns => {:class_name => @class_name} 
    217217        end 
    218218      end 
    …… 
    250250        super 
    251251        usage if args.empty? 
    252         @name = args.shift 
    253         @class_name = @name.camel_case.pluralize 
    254         @file_name = @name.snake_case.pluralize 
    255         @engine = runtime_options[:engine] || "erb" # set by subclasses only 
     252        @name             = args.shift 
     253        @class_name       = @name.camel_case #.pluralize 
     254        @file_name        = @name.snake_case #.pluralize 
     255        @engine           = runtime_options[:engine] || "erb" # set by subclasses only 
    256256        @template_actions = runtime_options[:actions] || %w[index] # Used by subclasses only 
    257         @test_generator = runtime_options[:test_stub_generator] || "merb_controller_test" 
     257        @test_generator   = runtime_options[:test_stub_generator] || "merb_controller_test" 
    258258        extract_options 
    259259      end 

  • trunk/merb_generators/controller/templates/controller.rb

    r824 r867  
    1 class <%= class_name.pluralize %> < Application 
     1class <%= class_name %> < Application 
    22<% actions.each do |action| -%> 
    33   

  • trunk/rspec_generators/merb_controller_test/merb_controller_test_generator.rb

    r862 r867  
    1111    @name = args.shift 
    1212    @class_name = @name.camel_case 
    13     @file_name = @name.snake_case.pluralize 
     13    @file_name = @name.snake_case #.pluralize 
    1414    @template_actions = runtime_options[:template_actions] || [] 
    1515    @engine = runtime_options[:engine] || "erb" # set by subclasses only 

  • trunk/rspec_generators/merb_controller_test/templates/helper_spec.rb

    r862 r867  
    11require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb') 
    22 
    3 describe Merb::<%= class_name.pluralize %>Helper do 
     3describe Merb::<%= class_name %>Helper do 
    44 
    55end