merb-gen 0.9.3 → 0.9.4

data/{app_generators/merb_plugin/templates → lib/generators/templates/application/merb_plugin}/lib/%base_name%.rb

@@ -2,7 +2,7 @@
 if defined?(Merb::Plugins)
 
   # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
-  Merb::Plugins.config[:<%= base_name %>] = {
+  Merb::Plugins.config[:<%= symbol_name %>] = {
     :chickens => false
   }
   

data/{app_generators/merb_plugin/templates → lib/generators/templates/application/merb_plugin}/lib/%base_name%/merbtasks.rb

@@ -1,4 +1,4 @@
-namespace :<%= base_name %> do
+namespace :<%= symbol_name %> do
   desc "Do something for <%= base_name %>"
   task :default do
     puts "<%= base_name %> doesn't do anything"

data/lib/generators/templates/application/merb_very_flat/application.rbt

@@ -0,0 +1,17 @@
+# run very flat apps with merb -I <app file>.
+
+Merb::Config.use { |c|
+  c[:framework]           = { :public => [Merb.root / "public", nil] },
+  c[:session_store]       = 'none',
+  c[:exception_details]   = true
+}
+
+Merb::Router.prepare do |r|
+  r.match('/').to(:controller => '<%= base_name %>', :action =>'index')
+end
+
+class <%= class_name %> < Merb::Controller
+  def index
+    "hi"
+  end
+end

data/lib/generators/templates/component/controller/app/controllers/%file_name%.rb

@@ -0,0 +1,11 @@
+<% with_modules(modules) do -%>
+class <%= class_name %> < Application
+
+  # ...and remember, everything returned from an action
+  # goes to the client...
+  def index
+    render
+  end
+  
+end
+<% end -%>

data/lib/generators/templates/component/controller/app/views/%file_name%/index.html.erb

@@ -0,0 +1 @@
+You're in index of the <%= class_name %> controller.

data/lib/generators/templates/component/controller/spec/controllers/%file_name%_spec.rb

@@ -0,0 +1,7 @@
+require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb')
+
+describe <%= full_class_name %>, "index action" do
+  before(:each) do
+    dispatch_to(<%= full_class_name %>, :index)
+  end
+end

data/lib/generators/templates/component/controller/test/controllers/%file_name%_test.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, "test_helper")
+
+# Re-raise errors caught by the controller.
+class <%= full_class_name %>; def rescue_action(e) raise e end; end
+
+class <%= full_class_name %>Test < Test::Unit::TestCase
+
+  def setup
+    @controller = <%= full_class_name %>.build(fake_request)
+    @controller.dispatch('index')
+  end
+
+  # Replace this with your real tests.
+  def test_should_be_setup
+    assert false
+  end
+end

data/lib/generators/templates/component/freezer/script/frozen_merb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+
+__DIR__ = File.join(File.dirname(__FILE__),"..")
+
+framework = File.join(__DIR__,"framework")
+
+if File.directory?(framework)
+  puts "Running from frozen framework"
+  core = File.join(framework,"merb-core")
+  if File.directory?(core)
+    $:.push File.join(core,"lib")
+  end
+  more = File.join(framework,"merb-more")
+  if File.directory?(more)
+    Dir.new(more).select {|d| d =~ /merb-/}.each do |d|
+      $:.push File.join(more,d,'lib')
+    end
+  end
+  plugins = File.join(framework,"merb-plugins")
+  if File.directory?(plugins)
+    Dir.new(plugins).select {|d| d =~ /merb_/}.each do |d|
+      $:.push File.join(plugins,d,'lib')
+    end
+  end
+  require "merb-core/core_ext/kernel"
+  require "merb-core/core_ext/rubygems"
+else
+  gem = Dir.glob(__DIR__ + "/gems/gems/merb-core-*").last
+  raise "Can't run frozen without framework/ or local gem" unless gem
+  require gem + "/lib/merb-core/core_ext/kernel"
+  require gem + "/lib/merb-core/core_ext/rubygems"
+  
+  Gem.clear_paths
+  Gem.path.unshift(__DIR__+"/gems")
+end
+
+require 'merb-core'
+unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
+  ARGV.push *%w[-a mongrel]
+end
+  
+Merb.frozen!
+Merb.start

data/lib/generators/templates/component/helper/app/helpers/%file_name%_helper.rb

@@ -0,0 +1,7 @@
+module Merb
+<% with_modules(modules, :indent => 1) do -%>
+  module <%= class_name %>Helper
+
+  end
+<% end -%>
+end # Merb

data/lib/generators/templates/component/helper/spec/helpers/%file_name%_helper_spec.rb

@@ -0,0 +1,5 @@
+require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb')
+
+describe Merb::<%= full_class_name %>Helper do
+
+end

data/lib/generators/templates/component/layout/spec/views/layout/%file_name%.html.erb_spec.rb

@@ -0,0 +1 @@
+# TODO: Add a view spec stub here.

data/lib/generators/templates/component/model/app/models/%file_name%.rb

@@ -0,0 +1,7 @@
+<% with_modules(modules) do -%>
+class <%= class_name %>
+<% if attributes? -%>
+  attr_accessor <%= attributes_for_accessor %>
+<% end -%>
+end
+<% end -%>

data/lib/generators/templates/component/model/spec/models/%file_name%_spec.rb

@@ -0,0 +1,7 @@
+require File.join( File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, "spec_helper" )
+
+describe <%= class_name %> do
+
+  it "should have specs"
+
+end

data/lib/generators/templates/component/model/test/models/%file_name%_test.rb

@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'test_helper' )
+
+class <%= test_class_name %> < Test::Unit::TestCase
+
+  def test_should_be_tested
+    assert false
+  end
+
+end

data/lib/generators/templates/component/part_controller/app/parts/%file_name%_part.rb

@@ -0,0 +1,9 @@
+<% with_modules(modules) do -%>
+class <%= class_name %>Part < Merb::PartController
+
+  def index
+    render
+  end
+
+end
+<% end -%>

data/lib/generators/templates/component/part_controller/app/parts/views/%file_name%_part/index.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_class_name %>Part controller, index action</h1>
+
+<p>Edit this file in <tt>app/parts/views/<%= file_name %>_part/index.html.erb</tt></p>

data/lib/generators/templates/component/resource_controller/app/controllers/%file_name%.rb

@@ -0,0 +1,44 @@
+<% with_modules(modules) do -%>
+class <%= class_name %> < Application
+  
+  # GET /<%= symbol_name %>
+  def index
+    render
+  end
+
+  # GET /<%= symbol_name %>/:id
+  def show
+    render
+  end
+
+  # GET /<%= symbol_name %>/new
+  def new
+    render
+  end
+
+  # GET /<%= symbol_name %>/:id/edit
+  def edit
+    render
+  end
+
+  # GET /<%= symbol_name %>/:id/delete
+  def delete
+    render
+  end
+
+  # POST /<%= symbol_name %>
+  def create
+    render
+  end
+
+  # PUT /<%= symbol_name %>/:id
+  def update
+    render
+  end
+
+  # DELETE /<%= symbol_name %>/:id
+  def destroy
+    render
+  end
+end
+<% end -%>

data/lib/generators/templates/component/resource_controller/app/views/%file_name%/edit.html.erb

@@ -0,0 +1,3 @@
+<h1><%= class_name %> controller, edit action</h1>
+
+<p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>

data/lib/generators/templates/component/resource_controller/app/views/%file_name%/index.html.erb

@@ -0,0 +1,3 @@
+<h1><%= class_name %> controller, index action</h1>
+
+<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>

data/lib/generators/templates/component/resource_controller/app/views/%file_name%/new.html.erb

@@ -0,0 +1,3 @@
+<h1><%= class_name %> controller, new action</h1>
+
+<p>Edit this file in <tt>app/views/<%= file_name %>/new.html.erb</tt></p>

data/lib/generators/templates/component/resource_controller/app/views/%file_name%/show.html.erb

@@ -0,0 +1,3 @@
+<h1><%= class_name %> controller, show action</h1>
+
+<p>Edit this file in <tt>app/views/<%= file_name %>/show.html.erb</tt></p>

data/lib/generators/templates/component/resource_controller/spec/controllers/%file_name%_spec.rb

@@ -0,0 +1,7 @@
+require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb')
+
+describe <%= full_class_name %>, "index action" do
+  before(:each) do
+    dispatch_to(<%= full_class_name %>, :index)
+  end
+end

data/lib/generators/templates/component/resource_controller/test/controllers/%file_name%_test.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, "test_helper")
+
+# Re-raise errors caught by the controller.
+class <%= full_class_name %>; def rescue_action(e) raise e end; end
+
+class <%= full_class_name %>Test < Test::Unit::TestCase
+
+  def setup
+    @controller = <%= full_class_name %>.build(fake_request)
+    @controller.dispatch('index')
+  end
+
+  # Replace this with your real tests.
+  def test_should_be_setup
+    assert false
+  end
+end

data/lib/merb-gen.rb

@@ -1,38 +1,36 @@
-require 'rubigen'
-module Merb
-  require File.join(File.dirname(__FILE__), "merb-gen", "base")
-  
-  class ApplicationGenerator
-    def self.run(path, argv, generator, command)
-      if command == "destroy"
-        puts "destroying app"
-        FileUtils.rm_rf(File.expand_path(path))
-        puts "done"
-        exit
-      end
-      
-      source = RubiGen::PathSource.new(:application, 
-        File.join(File.dirname(__FILE__), "..", "app_generators"))
-      RubiGen::Base.reset_sources
-      RubiGen::Base.append_sources source
-      puts RubiGen::Scripts.const_get(command.capitalize).inspect
-      RubiGen::Scripts.const_get(command.capitalize).new.run([File.expand_path(path), *argv], :generator => generator, :backtrace => true)
-    end
-  end
-  
-  class ComponentGenerator
-    def self.run(name, argv, generator, command)
-      app_root = Dir.pwd
-      
-      # Merb.start :environment => 'development'
-      
-      Gem.clear_paths
-      Gem.path.unshift(app_root / "gems")
-      
-      require "rubigen/scripts/#{command}"
-      
-      RubiGen::Base.use_component_sources! Merb.generator_scope
-      RubiGen::Scripts.const_get(command.capitalize).new.run(argv, :generator => generator, :destination => app_root)
-    end
+require 'rubygems'
+require 'merb-core'
+require 'sha1'
+gem 'templater', '>= 0.1.4'
+require 'templater'
+
+path = File.join(File.dirname(__FILE__))
+
+require path / "merb-gen" / "generator"
+require path / "merb-gen" / "named_generator"
+require path / "merb-gen" / "namespaced_generator"
+require path / "merb-gen" / "spec_helper"
+require path / "generators" / "merb"
+require path / "generators" / "merb" / "merb_full"
+require path / "generators" / "merb" / "merb_flat"
+require path / "generators" / "merb" / "merb_very_flat"
+require path / "generators" / "merb_plugin"
+require path / "generators" / "controller"
+require path / "generators" / "helper"
+require path / "generators" / "part_controller"
+require path / "generators" / "migration"
+require path / "generators" / "session_migration"
+require path / "generators" / "model"
+require path / "generators" / "resource_controller"
+require path / "generators" / "resource"
+require path / "generators" / "freezer"
+require path / "generators" / "layout"
+
+Templater::Discovery.discover!("merb-gen")
+
+# Require all generators that plugins have added to merb, after the app has loaded.
+Merb::BootLoader.after_app_loads do
+  Merb.generators.each do |file|
+    require file
   end
 end

data/lib/merb-gen/generator.rb

@@ -0,0 +1,54 @@
+module Merb
+
+  module Generators
+    
+    extend Templater::Manifold
+    
+    desc <<-DESC
+      Generate components for your application or entirely new applications.
+    DESC
+    
+    class Generator < Templater::Generator
+      
+      def initialize(*args)
+        super
+        options[:orm] ||= Merb.orm_generator_scope
+        options[:testing_framework] ||= Merb.test_framework_generator_scope
+        
+        options[:orm] = :none if options[:orm] == :merb_default # FIXME: temporary until this is fixed in merb-core 
+      end
+    
+      # Inside a template, wraps a block of code properly in modules, keeping the indentation correct
+      # 
+      # @param modules<Array[#to_s]> an array of modules to use for nesting
+      # @option indent<Integer> number of integers to indent the modules by
+      def with_modules(modules, options={}, &block)
+        indent = options[:indent] || 0
+        text = capture(&block)
+        modules.each_with_index do |mod, i|
+          concat(("  " * (indent + i)) + "module #{mod}\n", block.binding)
+        end
+        text = text.to_a.map{ |line| ("  " * modules.size) + line }.join
+        concat(text, block.binding)
+        modules.reverse.each_with_index do |mod, i|
+          concat(("  " * (indent + modules.size - i - 1)) + "end # #{mod}\n", block.binding)
+        end
+      end
+      
+      # Returns a string of num times '..', useful for example in tests for namespaced generators
+      # to find the spec_helper higher up in the directory structure.
+      #
+      # @param num<Integer> number of directories up
+      # @return <String> concatenated string 
+      def go_up(num)
+        (["'..'"] * num).join(', ')
+      end
+    
+      def self.source_root
+        File.join(File.dirname(__FILE__), '..', 'generators', 'templates')
+      end
+    end
+    
+  end  
+  
+end

data/lib/merb-gen/named_generator.rb

@@ -0,0 +1,33 @@
+module Merb
+  module Generators
+
+    class NamedGenerator < Generator
+      
+      # NOTE: Currently this is not inherited, it will have to be declared in each generator
+      # that inherits from this.
+      first_argument :name, :required => true
+      
+      def class_name
+        name.gsub('-', '_').camel_case
+      end
+      
+      alias_method :module_name, :class_name
+
+      def test_class_name
+        class_name + "Test"
+      end
+
+      def file_name
+        name.snake_case
+      end
+      
+      alias_method :base_name, :file_name
+
+      def symbol_name
+        file_name.gsub('-', '_')
+      end
+
+    end
+ 
+  end
+end