Changeset 824

Timestamp:

11/02/07 23:09:30 (1 year ago)

Author:

has.s..@gmail.com

Message:

Preparation for new generator setup

Files:

• trunk/app_generators/merb/templates/config/merb_init.rb (modified) (1 diff)
• trunk/app_generators/merb/templates/script/generate (modified) (1 diff)
• trunk/lib/merb/generators/merb_generator_helpers.rb (modified) (2 diffs)
• trunk/merb_generators/merb_controller/merb_controller_generator.rb (modified) (1 diff)
• trunk/merb_generators/merb_controller/templates/controller.rb (modified) (1 diff)

trunk/app_generators/merb/templates/config/merb_init.rb

@@ -15 +15 @@
-# Load environment-specific configuration
-require File.join(MERB_ROOT, 'config', 'environments', MERB_ENV)
+
+# Set the scope for generators used in this app
+# The first generator matched will be used, where the generators are
+# searched in the following order.
+# If you are using an ORM plugin, that should come first,
+# then merb, then the test framework you want.
+#
+# Example
+#
+# To use data_mapper, merb and rspec
+# [:data_mapper, :merb, :rspec]
+#
+# To use active_record, merb and test_unit
+# [:active_record, :merb, :test_unit]
+#
+# To use plain merb without an ORM and rspec
+# [:merb, :rspec]
+Merb::GENERATOR_SCOPE = [:merb, :rspec]

trunk/app_generators/merb/templates/script/generate

@@ -25 +25 @@
-# Default is to use rspec generators in gems.  To change this to
-# Test::Unit use [:merb, :test_unit]
-[:merb, :rspec]
+Merb::GENERATOR_SCOPE
-RubiGen::Scripts::Generate.new.run(ARGV)

trunk/lib/merb/generators/merb_generator_helpers.rb

@@ -39 +39 @@
-                      "app/models/#{model_filename}.rb", 
-                      :assigns => {  :class_name => @class_name, 
- 
+
-
-          # Check to see if a scope has been set for which test framework to use.
@@ -240 +240 @@
-    end
-    
+    # Pass the following options are available to this generatrs
+    class ControllerGeneratorBase < RubiGen::Base
+
+      default_options :author => nil
+
+      attr_reader :name, :class_name, :file_name
+
+      def initialize(runtime_args, runtime_options = {})
+        super
+        usage if args.empty?
+        @name = args.shift
+        @class_name = @name.camel_case.pluralize
+        @file_name = @name.snake_case.pluralize
+        @engine = runtime_options[:engine] || "erb" # set by subclasses only
+        @template_actions = runtime_options[:actions] || %w[index] # Used by subclasses only
+        @test_generator = runtime_options[:test_stub_generator] || "merb_controller_test"
+        extract_options
+      end
+
+      def manifest
+        record do |m|
+          
+          # ensure there are no other definitions of this model already defined.
+          m.class_collisions(@class_name)
+          
+          m.directory "app/controllers"
+          m.template "controller.rb", "app/controllers/#{file_name}.rb", :assigns => {:actions => @template_actions}
+          
+          m.directory "app/views/#{file_name}"
+          
+          # Include templates if they exist
+          @template_actions.each do |the_action|  
+            template_name = "#{the_action}.html.#{@engine}"
+            template_path = "/" + source_path(spec.name).split("/")[0..-2].join("/")
+
+            if File.exists?(File.join(template_path,template_name))
+              m.template template_name, "app/views/#{file_name}/#{template_name}"
+            end
+          end
+
+          m.directory "app/helpers/"
+          m.template "helper.rb", "app/helpers/#{file_name}_helper.rb"
+          m.dependency @test_generator, [name], :destination => destination_root
+        end
+      end
+
+      protected
+        def banner
+          <<-EOS
+    Creates a Merb controller
+
+    USAGE: #{$0} #{spec.name} name"
+    EOS
+        end
+
+        def add_options!(opts)
+          # opts.separator ''
+          # opts.separator 'Options:'
+          # For each option below, place the default
+          # at the top of the file next to "default_options"
+          # opts.on("-a", "--author=\"Your Name\"", String,
+          #         "Some comment about this option",
+          #         "Default: none") { |options[:author]| }
+          # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+        end
+
+        def extract_options
+          # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+          # Templates can access these value via the attr_reader-generated methods, but not the
+          # raw instance variable value.
+          # @author = options[:author]
+        end
+    end
+    
-  end
-end

trunk/merb_generators/merb_controller/merb_controller_generator.rb

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
-  
-
-
-
-
-
-
-
-
-
-
-
+
+
-  end
-
-  def manifest
-    record do |m|
-      m.directory "app/controllers"
-      m.template "controller.rb", "app/controllers/#{file_name}.rb"
-
-      m.directory "app/views/#{file_name}"
-      m.template "index.html.erb", "app/views/#{file_name}/index.html.erb"
-      
-      m.directory "app/helpers/"
-      m.template "helper.rb", "app/helpers/#{file_name}_helper.rb"
-      m.dependency "merb_controller_test", [name], :destination => destination_root
-    end
-  end
-
-  protected
-    def banner
-      <<-EOS
-Creates a Merb controller
-
-USAGE: #{$0} #{spec.name} name"
-EOS
-    end
-
-    def add_options!(opts)
-      # opts.separator ''
-      # opts.separator 'Options:'
-      # For each option below, place the default
-      # at the top of the file next to "default_options"
-      # opts.on("-a", "--author=\"Your Name\"", String,
-      #         "Some comment about this option",
-      #         "Default: none") { |options[:author]| }
-      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-    end
-    
-    def extract_options
-      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
-      # Templates can access these value via the attr_reader-generated methods, but not the
-      # raw instance variable value.
-      # @author = options[:author]
-    end
-end

trunk/merb_generators/merb_controller/templates/controller.rb

@@ -1 @@
-
-
+
+
+
+
-    render
-  end
+<% end -%>
-end