mack 0.4.6 → 0.4.7

data/CHANGELOG

@@ -1,3 +1,19 @@
+===0.4.7
+* Added Mack::Request::UploadFile class to make dealing with file uploads easy.
+* Fixed bug where if a controller didn't exist it wasn't checking the public directory.
+* Generated DataMapper models no longer extend DataMapper::Base, but rather 'include DataMapper::Persistence'. This corresponds to the 0.9.0 upcoming release of DataMapper.
+* Fixed a bug in request.params that was making file uploads into strings.
+* Namespaced resourced routes, such as Admin::UserController, now work.
+* Added rake generator:list task to list all the available generators.
+* scaffold generator now creates a stub functional test.
+* model generator now creates a stub unit test.
+* Rake tasks in plugins now show up in the Rake tasks list.
+* All generators, including the 'mack' binary are now using Genosaurus.
+* [dsutedja] initializer will load MACK_APP/controllers/default_controller.rb if it exists
+* [dsutedja] added link_image_to and image_tag to html helper.
+* gem: thin 0.8.1
+* gem: genosaurus 1.1.1
+
 ===0.4.6
 * Mack now uses Erubis, http://www.kuwata-lab.com/erubis/, for it's rendering engine instead of ERB. This makes Mack even faster now! Yippie!
 * Added rake generate:model name=<model_name> (optional: cols=<col_1>:<col_1_type>,<col_2>:<col_2_type>) This will also create a migration for you.

data/bin/mack

@@ -5,12 +5,15 @@ require 'optparse/time'
 require 'ostruct'
 require 'pp'
 require 'erb'
+require 'genosaurus'
+require File.join(File.dirname(__FILE__), "..", "lib", "generators", "mack_application_generator", "mack_application_generator")
 
 app = ARGV[0]
 raise "You must specify a name for this application!" if app.nil?
 
 options = OpenStruct.new
-options.orm = false
+options.orm = "data_mapper"
+options.version = "0.4.7"
 
 opts = OptionParser.new do |opts|
   
@@ -22,45 +25,4 @@ end
 
 opts.parse!(ARGV)
 
-include FileUtils
-
-def mack_version
-  "0.4.6"
-end
-
-def create_dir(dir)
-  mkdir_p(dir)
-  puts "Created: #{dir}"
-end
-
-# Create directories:
-create_dir(File.join(app, "app", "controllers"))
-create_dir(File.join(app, "app", "helpers"))
-create_dir(File.join(app, "app", "models"))
-create_dir(File.join(app, "app", "views", "default"))
-create_dir(File.join(app, "app", "views", "layouts"))
-create_dir(File.join(app, "config", "app_config"))
-create_dir(File.join(app, "config", "initializers"))
-create_dir(File.join(app, "lib", "tasks"))
-create_dir(File.join(app, "log"))
-create_dir(File.join(app, "public", "images"))
-create_dir(File.join(app, "public", "stylesheets"))
-create_dir(File.join(app, "public", "javascripts"))
-create_dir(File.join(app, "test", "unit"))
-create_dir(File.join(app, "test", "functional"))
-create_dir(File.join(app, "vendor", "plugins"))
-
-# Copy over templates:
-erb_files = Dir.glob(File.join(File.dirname(__FILE__), "templates", "**/*.template"))
-
-erb_files.each do |fl|
-  if fl.match("database.yml") && !options.orm
-  else
-    res = ERB.new(File.open(fl).read, nil, "->").result(binding)
-    n = fl.gsub(File.join(File.dirname(__FILE__), "templates"), app).gsub(".template", "")
-    File.open(n, "w") {|f| f.puts res}
-    puts "Created: #{n}"
-  end
-end
-
-cp(File.join(File.dirname(__FILE__), "templates", "public", "favicon.ico"), File.join(app, "public", "favicon.ico"))
+MackApplicationGenerator.run({"orm" => options.orm, "version" => options.version, "app" => app})

data/lib/errors/errors.rb

@@ -42,6 +42,9 @@ module Mack
       end
     end # ResourceNotFound
     
+    class UnknownController < NameError
+    end
+    
     # Raised when a route that matches the pattern of the incoming route AND the method of the request can't be found.
     # It's important to note that BOTH the PATTERN and the HTTP METHOD HAVE to match for a route to be found!
     class UndefinedRoute < StandardError

data/lib/generators/genosaurus_helpers.rb

@@ -0,0 +1,38 @@
+module Mack
+  module Genosaurus
+    module Helpers
+      
+      def columns(name = param(:name))
+        ivar_cache("form_columns") do
+          cs = []
+          cols = (param(:cols) || param(:columns))
+          if cols
+            cols.split(",").each do |x|
+              cs << Mack::Genosaurus::ModelColumn.new(name, x)
+            end
+          end
+          cs
+        end
+      end
+
+      def db_directory
+        File.join(MACK_ROOT, "db")
+      end
+      
+      def migrations_directory
+        File.join(db_directory, "migrations")
+      end
+      
+      def next_migration_number
+        last = Dir.glob(File.join(migrations_directory, "*.rb")).last
+        if last
+          return File.basename(last).match(/^\d+/).to_s.succ
+        end
+        return "001"
+      end
+      
+      ::Genosaurus.send(:include, self)
+      
+    end # Helpers
+  end # Genosaurus
+end # Mack

data/lib/generators/mack_application_generator/mack_application_generator.rb

@@ -0,0 +1,7 @@
+class MackApplicationGenerator < Genosaurus
+  
+  def app_name
+    @options["app"].underscore.downcase
+  end
+  
+end

data/lib/generators/mack_application_generator/manifest.yml

@@ -0,0 +1,71 @@
+# Files:
+default_controller:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "app", "controllers", "default_controller.rb.template") %>
+  output_path: <%= File.join(app_name, "app", "controllers", "default_controller.rb") %>
+application_helper:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "app", "helpers", "application_helper.rb.template") %>
+  output_path: <%= File.join(app_name, "app", "helpers", "application_helper.rb") %>
+index_view:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "app", "views", "default", "index.html.erb.template") %>
+  output_path: <%= File.join(app_name, "app", "views", "default", "index.html.erb") %>
+application_layout:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "app", "views", "layouts", "application.html.erb.template") %>
+  output_path: <%= File.join(app_name, "app", "views", "layouts", "application.html.erb") %>
+<% ["default", "development", "production", "test"].each do |env| -%>
+<%= env %>_yml:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "config", "app_config", "#{env}.yml.template") %>
+  output_path: <%= File.join(app_name, "config", "app_config", "#{env}.yml") %>
+<% end -%>
+<% ["database.yml", "routes.rb", "thin.ru", "thin.yml"].each do |f| -%>
+<%= f %>_config_file:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "config", "#{f}.template") %>
+  output_path: <%= File.join(app_name, "config", f) %>
+<% end -%>
+gems_rb:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "config", "initializers", "gems.rb.template") %>
+  output_path: <%= File.join(app_name, "config", "initializers", "gems.rb") %>
+favicon:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "public", "favicon.ico.template") %>
+  output_path: <%= File.join(app_name, "public", "favicon.ico") %>
+scaffold_css:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "public", "stylesheets", "scaffold.css.template") %>
+  output_path: <%= File.join(app_name, "public", "stylesheets", "scaffold.css") %>
+rakefile:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "Rakefile.template") %>
+  output_path: <%= File.join(app_name, "Rakefile") %>
+test_helper:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "test_helper.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "test_helper.rb") %>
+
+# Directories:
+models:
+  type: directory
+  output_path: <%= File.join(app_name, "app", "models") %>
+lib_tasks:
+  type: directory
+  output_path: <%= File.join(app_name, "lib", "tasks") %>
+<% ["images", "javascripts"].each do |f| -%>
+public_<%= f %>:
+  type: directory
+  output_path: <%= File.join(app_name, "public", f) %>
+<% end -%>
+test_functional:
+  type: directory
+  output_path: <%= File.join(app_name, "test", "functional") %>
+test_unit:
+  type: directory
+  output_path: <%= File.join(app_name, "test", "unit") %>
+vendor_plugins:
+  type: directory
+  output_path: <%= File.join(app_name, "vendor", "plugins") %>

data/{bin → lib/generators/mack_application_generator}/templates/Rakefile.template

@@ -2,5 +2,5 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-gem 'mack', '<%= mack_version %>'
+gem 'mack', '<%= @options["version"] %>'
 require 'mack_tasks'

data/lib/generators/mack_application_generator/templates/config/app_config/default.yml.template

@@ -0,0 +1,5 @@
+whiny_config_missing: false
+
+mack::session_id: _<%= @options["app"].downcase %>_session_id
+
+orm: <%= @options["orm"] %>

data/{bin → lib/generators/mack_application_generator}/templates/config/database.yml.template

@@ -1,32 +1,32 @@
 # development:
 #   adapter: mysql
-#   database: <%= app.downcase %>_development
+#   database: <%= @options["app"].downcase %>_development
 #   host: localhost
 #   username: root
 #   password: 
 #     
 # test:
 #   adapter: mysql
-#   database: <%= app.downcase %>_test
+#   database: <%= @options["app"].downcase %>_test
 #   host: localhost
 #   username: root
 #   password:
 # 
 # production:
 #   adapter: mysql
-#   database: <%= app.downcase %>_production
+#   database: <%= @options["app"].downcase %>_production
 #   host: localhost
 #   username: root
 #   password:
 
 development:
   adapter: sqlite3
-  database: db/<%= app.downcase %>_development.db 
+  database: db/<%= @options["app"].downcase %>_development.db 
 
 test:
   adapter: sqlite3
-  database: db/<%= app.downcase %>_test.db 
+  database: db/<%= @options["app"].downcase %>_test.db 
 
 production:
   adapter: sqlite3
-  database: db/<%= app.downcase %>_production.db 
+  database: db/<%= @options["app"].downcase %>_production.db 

data/{bin → lib/generators/mack_application_generator}/templates/test/test_helper.rb.template

@@ -5,7 +5,7 @@ require 'fileutils'
 ENV["MACK_ENV"] = "test"
 
 # load the mack framework:
-gem 'mack'
+load(File.join(File.dirname(__FILE__), "..", "Rakefile"))
 require 'mack'
 
 # place common methods, assertions, and other type things in this file so

data/lib/generators/migration_generator/migration_generator.rb

@@ -55,19 +55,13 @@
 #       drop_table :users
 #     end
 #   end
-class MigrationGenerator < Mack::Generator::Migration::Base
+class MigrationGenerator < Genosaurus
 
   require_param :name
   
-  def generate # :nodoc:
-    directory(migrations_directory)
-    
-    template_dir = File.join(File.dirname(__FILE__), "templates")
-    
+  def setup
     @table_name = param(:name).underscore.plural.gsub("create_", "")
-    
-    template(File.join(template_dir, "migration.rb.template"), File.join(migrations_directory, "#{next_migration_number}_#{param(:name)}.rb"), :force => param(:force))
-    
+    @migration_name = "#{next_migration_number}_#{param(:name).underscore}"
   end
   
 end

data/lib/generators/model_column.rb

@@ -1,5 +1,5 @@
 module Mack
-  module Generator
+  module Genosaurus
     
     # Used to represent a 'column' from the param cols or columns for generators.
     class ModelColumn

data/lib/generators/model_generator/manifest.yml

@@ -0,0 +1,11 @@
+models_directory:
+  type: directory
+  output_path: <%= File.join("app", "models") %>
+model_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "#{app_config.orm}.rb.template") %>
+  output_path: <%= File.join("app", "models", "#{param(:name).singular.underscore}.rb") %>
+test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test.rb.template") %>
+  output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_test.rb") %>

data/lib/generators/model_generator/model_generator.rb

@@ -17,7 +17,9 @@
 # 
 # If using DataMapper generates:
 # app/models/user.rb:
-#   class User < DataMapper::Base
+#   class User
+#     include DataMapper::Persistence
+#     
 #   end
 # db/migrations/<number>_create_users.rb:
 #   class CreateUsers < DataMapper::Migration
@@ -51,7 +53,9 @@
 # 
 # If using DataMapper generates:
 # app/models/user.rb:
-#   class User < DataMapper::Base
+#   class User
+#     include DataMapper::Persistence
+# 
 #     property :username, :string
 #     property :email_address, :string
 #     property :created_at, :datetime
@@ -71,26 +75,19 @@
 #       drop_table :users
 #     end
 #   end
-class ModelGenerator < Mack::Generator::Base
+class ModelGenerator < Genosaurus
   
   require_param :name
   
-  def generate
-    directory(File.join(MACK_APP, "models"))
-    
-    @columns = ""
-    cols = (param(:cols) || param(:columns))
-    if cols
-      cols = cols.split("|")
-      cols.each_with_index do |v, i|
-        x = v.split(":")
-        @columns << "property :#{x.first}, :#{x.last}\n  "
-      end
-      @columns.strip!
-    end
-    
-    template(File.join(File.dirname(__FILE__), "templates", "app", "models", "#{app_config.orm}.rb.template"), File.join(MACK_APP, "models", "#{param(:name).singular.underscore}.rb"), :force => param(:force))
-    MigrationGenerator.new(@env.merge({"name" => "create_#{param(:name).plural}"})).generate
+  # def generate
+  #   directory(File.join(MACK_APP, "models"))
+  #   
+  #   template(File.join(File.dirname(__FILE__), "templates", "app", "models", "#{app_config.orm}.rb.template"), File.join(MACK_APP, "models", "#{param(:name).singular.underscore}.rb"), :force => param(:force))
+  #   MigrationGenerator.new(@env.merge({"name" => "create_#{param(:name).plural}"})).generate
+  # end
+  
+  def after_generate
+    MigrationGenerator.run(@options.merge({"name" => "create_#{param(:name).plural}"}))
   end
   
 end

data/lib/generators/model_generator/templates/{app/models/data_mapper.rb.template → data_mapper.rb.template}

@@ -1,4 +1,6 @@
-class <%= param(:name).singular.camelcase %> < DataMapper::Base
+class <%= param(:name).singular.camelcase %>
+  include DataMapper::Persistence
+  
 <% 
 for column in columns
 -%>

data/lib/generators/model_generator/templates/test.rb.template

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+class <%= param(:name).singular.camelcase %>Test < Test::Unit::TestCase
+  
+  def test_truth
+    assert true
+  end
+  
+end

data/lib/generators/plugin_generator/plugin_generator.rb

@@ -7,26 +7,12 @@
 #   vendor/plugins/my_cool_plugin/init.rb
 #   vendor/plugins/my_cool_plugin/lib
 #   vendor/plugins/my_cool_plugin/lib/my_cool_plugin.rb
-class PluginGenerator < Mack::Generator::Base
+class PluginGenerator < Genosaurus
   
   require_param :name
   
-  def generate # :nodoc:
-    plugin_dir = File.join(MACK_ROOT, "vendor", "plugins", param(:name).downcase)
-    template_dir = File.join(File.dirname(__FILE__), "templates")
-    
-    # create vendor/plugins/<name>
-    directory(plugin_dir)
-    # create vendor/plugins/<name>/lib
-    directory(File.join(plugin_dir, "lib"))
-    # create vendor/plugins/<name>/lib/tasks
-    directory(File.join(plugin_dir, "lib", "tasks"))
-    
-    # create vendor/plugins/<name>/init.rb
-    template(File.join(template_dir, "init.rb.template"), File.join(plugin_dir, "init.rb"), :force => param(:force))
-    # create vendor/plugins/<name>/lib/<name>.rb
-    template(File.join(template_dir, "lib", "plugin.rb.template"), File.join(plugin_dir, "lib", "#{param(:name).downcase}.rb"), :force => param(:force))
-    
+  def setup
+    @plugin_name = param(:name).underscore.downcase
   end
   
 end