mack 0.4.7 → 0.5.0

data/CHANGELOG

@@ -1,5 +1,24 @@
+===0.5.0
+* Added rake db:create and db:create:all rake tasks.
+* Refactored out constants, such as MACK_ROOT and MACK_ENV and made them into Mack::Configuration.env, Mack::Configuration.root, etc...
+* Added test:stats and test:coverage Rake tasks.
+* Removed support for ActiveRecord and DataMapper and moved them into their own gems.
+* Fixed a bug where yields in ERB weren't giving the desired results.
+* DataMapper database.yml file can now be nested, and is generated as such.
+* Cleaned up some tests, and refactored the HTML generation stuff.
+* Fixed a bug with the scaffold generating 'bad' methods instead of 'post'
+* Made error_messages_for more compatible with DataMapper.
+* Fixed a bug loading url.rb and uploaded_file.rb found by Phil Darnowsky
+* [dsutedja] Render method (in controller_base) now accepts response status code.
+* gem: mack_ruby_core_extensions 0.1.23
+* gem: genosaurus 1.1.4
+* gem: datamapper 0.3.2
+* gem: rcov 0.8.1.2.0
+* gem: mack-data_mapper 0.5.0
+* gem: erubis 2.6.0
+
 ===0.4.7
-* Added Mack::Request::UploadFile class to make dealing with file uploads easy.
+* Added Mack::Request::UploadedFile 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.
@@ -9,7 +28,7 @@
 * 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] initializer will load Mack::Configuration.app_directory/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

data/README

@@ -10,9 +10,6 @@ Mack is also about performance. Because Mack uses technologies like Thin[http://
 ==Getting Started
 First things first, let's generate your application:
   $ mack <app_name>
-  
-If you'd like to configure your application to use an ORM, then when you generate it, use the following command:
-  $ mack <app_name> -o <data_mapper|active_record>
 
 To run a Mack application:
   $ rake script:server
@@ -23,7 +20,7 @@ It will try and run the app using the following servers in this order:
   * WEBrick
 
 rake script:server takes the following options:
-  $ rake script:server PORT=<port> MACK_ENV=<environment> HANDLER=<rack_handler>
+  $ rake script:server PORT=<port> Mack::Configuration.env=<environment> HANDLER=<rack_handler>
   
 The port and rack_handler flags don't apply if you're using Thin[http://code.macournoyer.com/thin] to run the app, which is the default if it is installed. Use the thin.yml file in your application's config directory to configure Thin. The rack_handler one will allow you to switch which server is used to run the app. See Rack for more Rack::Handlers.
   

data/bin/mack

@@ -13,7 +13,7 @@ raise "You must specify a name for this application!" if app.nil?
 
 options = OpenStruct.new
 options.orm = "data_mapper"
-options.version = "0.4.7"
+options.version = "0.5.0"
 
 opts = OptionParser.new do |opts|
   
@@ -25,4 +25,4 @@ end
 
 opts.parse!(ARGV)
 
-MackApplicationGenerator.run({"orm" => options.orm, "version" => options.version, "app" => app})
+MackApplicationGenerator.run({"version" => options.version, "app" => app, "orm" => options.orm})

data/lib/errors/errors.rb

@@ -58,7 +58,7 @@ module Mack
     class UnknownLayout < StandardError
       # Takes a layout name.
       def initialize(layout)
-        super("Could not find layout in: #{File.join(MACK_ROOT, "app", "views", layout.to_s + ".html.erb")}")
+        super("Could not find layout in: #{File.join(Mack::Configuration.root, "app", "views", layout.to_s + ".html.erb")}")
       end
     end
     
@@ -103,14 +103,5 @@ module Mack
       end
     end
     
-    # Raised if there are migrations that need to be run before a task is performed.
-    class UnrunMigrations < StandardError
-      # Taks the number of migrations that need to be run.
-      def initialize(number)
-        super("You currently have #{number} #{number == 1 ? "migration" : "migrations"} that #{number == 1 ? "needs" : "need"} to be run.")
-      end
-      
-    end
-    
   end # Errors
 end # Mack

data/lib/generators/mack_application_generator/manifest.yml

@@ -21,7 +21,11 @@ application_layout:
   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| -%>
+database_yml:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "config", "database.yml.template") %>
+  output_path: <%= File.join(app_name, "config", "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") %>

data/lib/generators/mack_application_generator/templates/config/database.yml.template

@@ -1,3 +1,46 @@
+<% 
+case @options["orm"]
+when "data_mapper"
+-%>
+# development:
+#   default:
+#     adapter: mysql
+#     database: <%= @options["app"].downcase %>_development
+#     host: localhost
+#     username: root
+#     password: 
+#     
+# test:
+#   default:
+#     adapter: mysql
+#     database: <%= @options["app"].downcase %>_test
+#     host: localhost
+#     username: root
+#     password:
+# 
+# production:
+#   default:
+#     adapter: mysql
+#     database: <%= @options["app"].downcase %>_production
+#     host: localhost
+#     username: root
+#     password:
+
+development:
+  default:
+    adapter: sqlite3
+    database: db/<%= @options["app"].downcase %>_development.db 
+
+test:
+  default:
+    adapter: sqlite3
+    database: db/<%= @options["app"].downcase %>_test.db 
+
+production:
+  default:
+    adapter: sqlite3
+    database: db/<%= @options["app"].downcase %>_production.db 
+<% else -%>
 # development:
 #   adapter: mysql
 #   database: <%= @options["app"].downcase %>_development
@@ -29,4 +72,5 @@ test:
 
 production:
   adapter: sqlite3
-  database: db/<%= @options["app"].downcase %>_production.db 
+  database: db/<%= @options["app"].downcase %>_production.db
+<% end -%>

data/lib/generators/mack_application_generator/templates/test/test_helper.rb.template

@@ -2,7 +2,7 @@ require 'rubygems'
 require "test/unit"
 require 'fileutils'
 
-ENV["MACK_ENV"] = "test"
+ENV["_mack_env"] = "test"
 
 # load the mack framework:
 load(File.join(File.dirname(__FILE__), "..", "Rakefile"))

data/lib/initialization/configuration.rb

@@ -1,9 +1,31 @@
 module Mack
+  
   # All configuration for the Mack subsystem happens here. Each of the default environments,
   # production, development, and test have their own default configuration options. These
   # get merged with overall default options.
   module Configuration # :nodoc:
 
+    def self.method_missing(sym, *args)
+      ev = "_mack_#{sym}".downcase
+      return ENV[ev]
+    end
+    
+    def self.set(name, value)
+      ENV["_mack_#{name.to_s.downcase}"] = value
+    end
+    
+    self.set(:env, "development") if self.env.nil?
+    self.set(:root, FileUtils.pwd) if self.root.nil?
+    self.set(:public_directory, File.join(self.root, "public")) if self.public_directory.nil?
+    self.set(:app_directory, File.join(self.root, "app")) if self.app_directory.nil?
+    self.set(:lib_directory, File.join(self.root, "lib")) if self.lib_directory.nil?
+    self.set(:config_directory, File.join(self.root, "config")) if self.config_directory.nil?
+    self.set(:views_directory, File.join(self.app_directory, "views")) if self.views_directory.nil?
+    self.set(:layouts_directory, File.join(self.views_directory, "layouts")) if self.layouts_directory.nil?
+    self.set(:plugins, File.join(self.root, "vendor", "plugins")) if self.plugins.nil?
+
+    
+
     # use local memory and store stuff for 24 hours:
     # use file for sessions and store them for 4 hours: 
     DEFAULTS_PRODUCTION = {
@@ -15,12 +37,12 @@ module Mack
         "debug" => false,
         "adapter" => "file",
         "store_options" => 
-          {"dir" => File.join(MACK_ROOT, "tmp")},
+          {"dir" => File.join(Mack::Configuration.root, "tmp")},
         "expiry_time" => 14400,
         "logging" => {
           "logger_1" => {
             "type" => "file",
-            "file" => File.join(MACK_ROOT, "log", "cachetastic_caches_mack_session_cache.log")
+            "file" => File.join(Mack::Configuration.root, "log", "cachetastic_caches_mack_session_cache.log")
           }
         }
       }
@@ -58,7 +80,7 @@ module Mack
           "logging" => {
             "logger_1" => {
               "type" => "file",
-              "file" => File.join(MACK_ROOT, "log", "cachetastic.log")
+              "file" => File.join(Mack::Configuration.root, "log", "cachetastic.log")
             }
           }
         },
@@ -73,12 +95,12 @@ module Mack
         "log::file" => true,
         "log::console_format" => "%l:\t[%d]\t%M",
         "log::file_format" => "%l:\t[%d]\t%M"
-      }.merge(eval("DEFAULTS_#{MACK_ENV.upcase}"))
+      }.merge(eval("DEFAULTS_#{Mack::Configuration.env.upcase}"))
     end
     
     app_config.load_hash(DEFAULTS, "mack_defaults")
-    app_config.load_file(File.join(MACK_CONFIG, "app_config", "default.yml"))
-    app_config.load_file(File.join(MACK_CONFIG, "app_config", "#{MACK_ENV}.yml"))
+    app_config.load_file(File.join(Mack::Configuration.config_directory, "app_config", "default.yml"))
+    app_config.load_file(File.join(Mack::Configuration.config_directory, "app_config", "#{Mack::Configuration.env}.yml"))
     # app_config.reload
     
   end

data/lib/initialization/console.rb

@@ -5,6 +5,8 @@
 # * Mack::TestHelpers
 # * Mack::Routes::Urls
 
+require File.join(File.dirname(__FILE__), "initializer")
+
 fl = File.join(File.dirname(__FILE__), "..")
 
 require File.join(fl, "test_extensions", "test_helpers")

data/lib/initialization/initializer.rb

@@ -17,33 +17,13 @@ require 'erubis'
 require 'erb'
 require 'genosaurus'
 
-# Set up Mack constants, if they haven't already been set up.
-unless Object.const_defined?("MACK_ENV")
-  (Object::MACK_ENV = (ENV["MACK_ENV"] ||= "development")).to_sym
-end
-(Object::MACK_ROOT = (ENV["MACK_ROOT"] ||= FileUtils.pwd)) unless Object.const_defined?("MACK_ROOT")
+require File.join(File.dirname(__FILE__), "configuration.rb")
 
-Object::MACK_PUBLIC = File.join(MACK_ROOT, "public") unless Object.const_defined?("MACK_PUBLIC")
-Object::MACK_APP = File.join(MACK_ROOT, "app") unless Object.const_defined?("MACK_APP")
-Object::MACK_LIB = File.join(MACK_ROOT, "lib") unless Object.const_defined?("MACK_LIB")
-Object::MACK_CONFIG = File.join(MACK_ROOT, "config") unless Object.const_defined?("MACK_CONFIG")
-Object::MACK_VIEWS = File.join(MACK_APP, "views") unless Object.const_defined?("MACK_VIEWS")
-Object::MACK_LAYOUTS = File.join(MACK_VIEWS, "layouts") unless Object.const_defined?("MACK_LAYOUTS")
-Object::MACK_PLUGINS = File.join(MACK_ROOT, "vendor", "plugins") unless Object.const_defined?("MACK_PLUGINS")
-
-unless Object.const_defined?("MACK_INITIALIZED")
-  puts "Starting application in #{MACK_ENV} mode."
-  puts "Mack root: #{MACK_ROOT}"
+unless Mack::Configuration.initialized
   
-  Object::MACK_INITIALIZED = true
+  puts "Starting application in #{Mack::Configuration.env} mode."
+  puts "Mack root: #{Mack::Configuration.root}"
   
-  # Set up 'Rails' constants to allow for easier use of existing gems/plugins like application_configuration.
-  # I would like to take these out eventually, but for right now, it's not doing too much harm.
-  # Object::RAILS_ENV = MACK_ENV unless Object.const_defined?("RAILS_ENV")
-  # Object::RAILS_ROOT = MACK_ROOT unless Object.const_defined?("RAILS_ROOT")
-
-  require File.join(File.dirname(__FILE__), "configuration.rb")
-
   require File.join(File.dirname(__FILE__), "initializers", "logging.rb")
   
   require File.join(File.dirname(__FILE__), "initializers", "orm_support.rb")
@@ -65,10 +45,10 @@ unless Object.const_defined?("MACK_INITIALIZED")
   # set up application stuff:
 
   # set up routes:
-  require File.join(MACK_CONFIG, "routes")
+  require File.join(Mack::Configuration.config_directory, "routes")
   
   # set up initializers:
-  Dir.glob(File.join(MACK_CONFIG, "initializers", "**/*.rb")) do |d|
+  Dir.glob(File.join(Mack::Configuration.config_directory, "initializers", "**/*.rb")) do |d|
     require d
   end
   Mack::Utils::GemManager.instance.do_requires
@@ -77,26 +57,31 @@ unless Object.const_defined?("MACK_INITIALIZED")
   require File.join(File.dirname(__FILE__), "initializers", "plugins.rb")
   
   # make sure that default_controller is available to other controllers
-  path = File.join(MACK_APP, "controllers", "default_controller.rb")
+  path = File.join(Mack::Configuration.app_directory, "controllers", "default_controller.rb")
   require path if File.exists?(path) 
   
   # require 'app' files:
-  Dir.glob(File.join(MACK_APP, "**/*.rb")).each do |d|
+  Dir.glob(File.join(Mack::Configuration.app_directory, "**/*.rb")).each do |d|
+    # puts "d: #{d}"
     begin
       require d
     rescue NameError => e
-      mod = e.message.gsub("uninitialized constant ", "")
-      x =%{
-        module ::#{mod}
-        end
-      }
-      eval(x)
-      require d
+      if e.message.match("uninitialized constant")
+        mod = e.message.gsub("uninitialized constant ", "")
+        x =%{
+          module ::#{mod}
+          end
+        }
+        eval(x)
+        require d
+      else
+        raise e
+      end
     end
   end
   
   # require 'lib' files:
-  Dir.glob(File.join(MACK_LIB, "**/*.rb")).each do |d|
+  Dir.glob(File.join(Mack::Configuration.lib_directory, "**/*.rb")).each do |d|
     require d
   end
   
@@ -120,4 +105,6 @@ unless Object.const_defined?("MACK_INITIALIZED")
       h = "Mack::ViewHelpers::#{cont}".constantize
       h.include_safely_into(Mack::ViewBinder)
   end
+  
+  Mack::Configuration.set(:initialized, "true") if Mack::Configuration.initialized.nil?
 end

data/lib/initialization/initializers/logging.rb

@@ -3,7 +3,7 @@
 #++
 include Log4r
 
-log_dir_loc = File.join(MACK_ROOT, "log")
+log_dir_loc = File.join(Mack::Configuration.root, "log")
 FileUtils.mkdir_p(log_dir_loc)
 
 unless Object.const_defined?("MACK_DEFAULT_LOGGER")
@@ -17,7 +17,7 @@ unless Object.const_defined?("MACK_DEFAULT_LOGGER")
   # file:
   if app_config.log.file
     file_format = PatternFormatter.new(:pattern => app_config.log.file_format)
-    log.add(FileOutputter.new('fileOutputter', :filename => File.join(log_dir_loc, "#{MACK_ENV}.log"), :trunc => false, :formatter => file_format))
+    log.add(FileOutputter.new('fileOutputter', :filename => File.join(log_dir_loc, "#{Mack::Configuration.env}.log"), :trunc => false, :formatter => file_format))
   end
   
   Object::MACK_DEFAULT_LOGGER = log

data/lib/initialization/initializers/orm_support.rb

@@ -1,63 +1,4 @@
-#--
-# setup ORM:
-#++
-
-unless app_config.orm.nil?
-  dbs = YAML::load(Erubis::Eruby.new(IO.read(File.join(MACK_CONFIG, "database.yml"))).result)
-  case app_config.orm
-  when 'active_record'
-  when 'data_mapper'
-  else
-    MACK_DEFAULT_LOGGER.warn("Attempted to configure an unknown ORM: #{app_config.orm}")
-  end
-else
-  MACK_DEFAULT_LOGGER.warn("No ORM has been configured!")
-end
-
-if app_config.orm == 'active_record'
-  
-  begin
-  
-    module ActiveRecord # :nodoc:
-    end
-  
-    require 'activerecord'
-
-    ActiveRecord::Base.establish_connection(dbs[MACK_ENV])
-    class ArSchemaInfo < ActiveRecord::Base # :nodoc:
-      set_table_name :schema_info
-    end
-
-  rescue Exception => e
-  end
-
-end
-
-begin
-  
-  module DataMapper # :nodoc:
-  end
-  
-  require 'data_mapper'
-  
-  DataMapper::Database.setup(dbs[MACK_ENV])
-  class DmSchemaInfo # :nodoc:
-    include DataMapper::Persistence
-    
-    set_table_name "schema_info"
-    property :version, :integer, :default => 0
-  end
-  
-rescue Exception => e
-end
-
-
-# Returns true if the system is setup to use ActiveRecord
-def using_active_record?
-  app_config.orm == 'active_record'
-end
-
-# Returns true if the system is setup to use DataMapper
-def using_data_mapper?
-  app_config.orm == 'data_mapper'
-end
+orm = app_config.orm || 'data_mapper'
+ 
+require "mack-#{orm}"
+require "mack-#{orm}_tasks"