merb-gen 0.9.3 → 0.9.4

data/lib/generators/merb/merb_very_flat.rb

@@ -0,0 +1,29 @@
+module Merb::Generators
+  
+  class MerbVeryFlatGenerator < NamedGenerator
+
+    def self.source_root
+      File.join(super, 'application', 'merb_very_flat')
+    end
+    
+    desc <<-DESC
+      This generates a very flat merb application: the whole application
+      fits in one file, very much like Sinatra or Camping.
+    DESC
+    
+    first_argument :name, :required => true, :desc => "Application name"
+    
+    template :application do
+      source('application.rbt')
+      destination("#{base_name}.rb")
+    end
+    
+    def class_name
+      self.name.camel_case
+    end
+    
+  end
+  
+  add_private :app_very_flat, MerbVeryFlatGenerator
+  
+end

data/lib/generators/merb_plugin.rb

@@ -0,0 +1,29 @@
+module Merb::Generators
+  
+  class MerbPluginGenerator < NamedGenerator
+
+    def self.source_root
+      File.join(super, 'application', 'merb_plugin')
+    end
+    
+    option :testing_framework, :default => :rspec, :desc => 'Testing framework to use (one of: spec, test_unit)'
+    option :orm, :default => :none, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
+    option :bin, :as => :boolean # TODO: explain this
+    
+    desc <<-DESC
+      Merb plugin generator: lets you kick start your Merb plugin.
+    DESC
+    
+    glob!
+    
+    first_argument :name, :required => true, :desc => "Plugin name"
+    
+    def destination_root
+      File.join(@destination_root, base_name)
+    end
+    
+  end
+  
+  add :plugin, MerbPluginGenerator
+  
+end

data/lib/generators/migration.rb

@@ -0,0 +1,54 @@
+module Merb::Generators
+  
+  class MigrationGenerator < Generator
+
+    def self.source_root
+      File.join(super, 'component', 'migration')
+    end
+    
+    desc <<-DESC
+      This is a migration generator
+    DESC
+    
+    option :orm, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
+    option :model, :as => :boolean, :desc => 'Specify this option to generate a migration which creates a table for the provided model'
+    
+    first_argument :name, :required => true
+    second_argument :attributes, :as => :hash, :default => {}
+    
+    def table_name
+      self.name.snake_case.pluralize
+    end
+    
+    def class_name
+      "#{self.name.camel_case}Migration"
+    end
+
+    def migration_name
+      self.name.snake_case
+    end
+    
+    def file_name
+      "#{version}_#{migration_name}_migration"
+    end
+    
+    def version
+      # TODO: handle ActiveRecord timestamped migrations
+      format("%03d", current_migration_nr + 1)
+    end
+
+    protected
+    
+    def destination_directory
+      File.join(destination_root, 'schema', 'migrations')
+    end
+    
+    def current_migration_nr
+      current_migration_number = Dir["#{destination_directory}/*"].map{|f| File.basename(f).match(/^(\d+)/)[0].to_i  }.max.to_i
+    end
+    
+  end
+  
+  add :migration, MigrationGenerator
+  
+end

data/lib/generators/model.rb

@@ -0,0 +1,47 @@
+module Merb::Generators
+  
+  class ModelGenerator < NamespacedGenerator
+
+    def self.source_root
+      File.join(super, 'component', 'model')
+    end
+    
+    desc <<-DESC
+      Generates a new model. You can specify an ORM different from what the rest
+      of the application uses.
+    DESC
+    
+    option :testing_framework, :desc => 'Testing framework to use (one of: spec, test_unit)'
+    option :orm, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
+    
+    first_argument :name, :required => true, :desc => "model name"
+    second_argument :attributes, :as => :hash, :default => {}, :desc => "space separated model properties in form of name:type. Example: state:string"
+    
+    template :model_none, :orm => :none do
+      source("app/models/%file_name%.rb")
+      destination("app/models", base_path, "#{file_name}.rb")
+    end
+    
+    template :spec, :testing_framework => :rspec do
+      source('spec/models/%file_name%_spec.rb')
+      destination("spec/models", base_path, "#{file_name}_spec.rb")
+    end
+    
+    template :test_unit, :testing_framework => :test_unit do
+      source('test/models/%file_name%_test.rb')
+      destination("test/models", base_path, "#{file_name}_test.rb")
+    end
+    
+    def attributes?
+      self.attributes && !self.attributes.empty?
+    end
+    
+    def attributes_for_accessor
+      self.attributes.keys.map{|a| ":#{a}" }.compact.uniq.join(", ")
+    end
+    
+  end
+  
+  add :model, ModelGenerator
+  
+end

data/lib/generators/part_controller.rb

@@ -0,0 +1,33 @@
+module Merb::Generators
+  
+  class PartControllerGenerator < NamespacedGenerator
+
+    def self.source_root
+      File.join(super, 'component', 'part_controller')
+    end
+    
+    desc <<-DESC
+      This is a part controller generator
+    DESC
+    
+    first_argument :name, :required => true
+    
+    invoke :helper do |generator|
+      generator.new(destination_root, options, "#{full_class_name}Part")
+    end
+    
+    template :controller do
+      source('app/parts/%file_name%_part.rb')
+      destination("app/parts", base_path, "#{file_name}_part.rb")
+    end
+    
+    template :index do
+      source('app/parts/views/%file_name%_part/index.html.erb')
+      destination("app/parts/views", base_path, "#{file_name}_part/index.html.erb")
+    end
+    
+  end
+  
+  add :part, PartControllerGenerator
+  
+end

data/lib/generators/resource.rb

@@ -0,0 +1,32 @@
+module Merb::Generators
+  
+  class ResourceGenerator < Generator
+    
+    desc <<-DESC
+      Generates a new resource.
+    DESC
+    
+    first_argument :name, :required => true, :desc => "resource name"
+    second_argument :attributes, :as => :hash, :default => {}, :desc => "space separated resource model properties in form of name:type. Example: state:string"
+    
+    invoke :model do |generator|
+      generator.new(destination_root, options, model_name, attributes)
+    end
+    
+    invoke :resource_controller do |generator|
+      generator.new(destination_root, options, controller_name, attributes)
+    end
+    
+    def controller_name
+      name.pluralize
+    end
+    
+    def model_name
+      name.singularize
+    end
+    
+  end
+  
+  add :resource, ResourceGenerator
+  
+end

data/lib/generators/resource_controller.rb

@@ -0,0 +1,78 @@
+module Merb::Generators
+  
+  class ResourceControllerGenerator < NamespacedGenerator
+
+    def self.source_root
+      File.join(super, 'component', 'resource_controller')
+    end
+    
+    desc <<-DESC
+      Generates a new resource controller.
+    DESC
+    
+    option :testing_framework, :desc => 'Testing framework to use (one of: spec, test_unit)'
+    option :orm, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
+    option :template_engine, :default => :erb, :desc => 'Template Engine to use (one of: erb, haml, markaby, etc...)'
+    
+    first_argument :name, :required => true,
+                          :desc     => "model name"
+    second_argument :attributes, :as      => :hash,
+                                 :default => {},
+                                 :desc    => "space separated resource model properties in form of name:type. Example: state:string"
+    
+    invoke :helper do |generator|
+      generator.new(destination_root, options, name)
+    end
+    
+    # add controller and view templates for each of the four big ORM's
+
+    
+    template :controller_none, :orm => :none do
+      source("app/controllers/%file_name%.rb")
+      destination("app/controllers", base_path, "#{file_name}.rb")
+    end
+  
+    [:index, :show, :edit, :new].each do |view|
+      template "view_#{view}_none".to_sym, :orm => :none do
+        source("app/views/%file_name%/#{view}.html.erb")
+        destination("app/views", base_path, "#{file_name}/#{view}.html.erb")
+      end
+    end
+    
+    template :controller_spec, :testing_framework => :rspec, :orm => :none do
+      source('spec/controllers/%file_name%_spec.rb')
+      destination("spec/controllers", base_path, "#{file_name}_spec.rb")
+    end
+    
+    template :controller_test_unit, :testing_framework => :test_unit, :orm => :none do
+      source('test/controllers/%file_name%_test.rb')
+      destination("test/controllers", base_path, "#{file_name}_test.rb")
+    end
+    
+    def model_class_name
+      class_name.singularize
+    end
+    
+    def plural_model
+      class_name.snake_case
+    end
+    
+    def singular_model
+      plural_model.singularize
+    end
+    
+    # TODO: fix this for Datamapper, so that it returns the primary keys for the model
+    def params_for_get
+      "params[:id]"
+    end
+    
+    # TODO: implement this for Datamapper so that we get the model properties
+    def properties
+      []
+    end
+    
+  end
+  
+  add :resource_controller, ResourceControllerGenerator
+  
+end

data/lib/generators/session_migration.rb

@@ -0,0 +1,34 @@
+module Merb::Generators
+  
+  class SessionMigrationGenerator < Generator
+
+    def self.source_root
+      File.join(super, 'component', 'session_migration')
+    end
+    
+    desc <<-DESC
+      Generates a new session migration.
+    DESC
+    
+    option :orm, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
+    
+    def version
+      # TODO: handle ActiveRecord timestamped migrations
+      format("%03d", current_migration_nr + 1)
+    end
+
+    protected
+    
+    def destination_directory
+      File.join(destination_root, 'schema', 'migrations')
+    end
+    
+    def current_migration_nr
+      current_migration_number = Dir["#{destination_directory}/*"].map{|f| File.basename(f).match(/^(\d+)/)[0].to_i  }.max.to_i
+    end
+    
+  end
+  
+  add :session_migration, SessionMigrationGenerator
+  
+end

data/lib/generators/templates/application/merb/Rakefile

@@ -0,0 +1,75 @@
+require 'rubygems'
+Gem.clear_paths
+Gem.path.unshift(File.join(File.dirname(__FILE__), "gems"))
+
+require 'rake'
+require 'rake/rdoctask'
+require 'rake/testtask'
+require 'spec/rake/spectask'
+require 'fileutils'
+
+##
+# requires frozen merb-core (from /framework)
+# adds the other components to the load path
+def require_frozen_framework
+  framework = File.join(File.dirname(__FILE__), "framework")
+  if File.directory?(framework)
+    puts "Running from frozen framework"
+    core = File.join(framework,"merb-core")
+    if File.directory?(core)
+      puts "using merb-core from #{core}"
+      $:.unshift File.join(core,"lib")
+      require 'merb-core'
+    end
+    more = File.join(framework,"merb-more")
+    if File.directory?(more)
+      Dir.new(more).select {|d| d =~ /merb-/}.each do |d|
+        $:.unshift 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|
+        $:.unshift File.join(plugins,d,'lib')
+      end
+    end
+    require "merb-core/core_ext/kernel"
+    require "merb-core/core_ext/rubygems"
+  else
+    p "merb doesn't seem to be frozen in /framework"
+    require 'merb-core'
+  end
+end
+
+if ENV['FROZEN']
+  require_frozen_framework
+else
+  require 'merb-core'
+end
+
+require 'merb-core/tasks/merb'
+include FileUtils
+
+# Load the basic runtime dependencies; this will include 
+# any plugins and therefore plugin rake tasks.
+init_env = ENV['MERB_ENV'] || 'rake'
+Merb.load_dependencies(:environment => init_env)
+     
+# Get Merb plugins and dependencies
+Merb::Plugins.rakefiles.each { |r| require r } 
+
+# Load any app level custom rakefile extensions from lib/tasks
+tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks")
+rake_files = Dir["#{tasks_path}/*.rake"]
+rake_files.each{|rake_file| load rake_file }
+
+
+desc "start runner environment"
+task :merb_env do
+  Merb.start_environment(:environment => init_env, :adapter => 'runner')
+end
+
+##############################################################################
+# ADD YOUR CUSTOM TASKS IN /lib/tasks
+# NAME YOUR RAKE FILES file_name.rake
+##############################################################################

data/{app_generators/merb/templates → lib/generators/templates/application/merb}/app/views/exceptions/internal_server_error.html.erb

@@ -131,7 +131,7 @@
 		<div class="header">
 			<h1><%%= @exception_name %> <sup class="error_<%%= @exception.class::STATUS %>"><%%= @exception.class::STATUS %></sup></h1>
 			<%% if show_details = ::Merb::Config[:exception_details] -%>
-				<h2><%%= @exception.message %></h2>
+				<h2><%%=h @exception.message %></h2>
 			<%% else -%>
 				<h2>Sorry about that...</h2>
 			<%% end -%>