merb 0.4.2 → 0.5.0

data/SVN_REVISION

@@ -0,0 +1 @@
+1253

data/app_generators/merb/templates/Rakefile

@@ -1,16 +1,19 @@
+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'
-require 'rubygems'
 
-MERB_ENV = ENV['MERB_ENV'] if ENV['MERB_ENV']
+Merb.environment = ENV['Merb.environment'] if ENV['Merb.environment']
 $RAKE_ENV = true
 
 require File.dirname(__FILE__)+'/config/boot.rb'
-require MERB_FRAMEWORK_ROOT+'/tasks'
-MERB_ROOT = File.dirname(__FILE__)
+require Merb::framework_root+'/tasks'
+Merb.root = File.dirname(__FILE__)
 include FileUtils
 
 # Get Merb plugins and dependencies
@@ -97,6 +100,19 @@ task :aok do
   sh %{rake spec}
 end
 
+unless Gem.cache.search("haml").empty?
+  namespace :haml do
+    desc "Compiles all sass files into CSS"
+    task :compile_sass do
+      gem 'haml'
+      require 'sass'
+      puts "*** Updating stylesheets"
+      Sass::Plugin.update_stylesheets
+      puts "*** Done"      
+    end
+  end
+end
+
 ##############################################################################
 # SVN
 ##############################################################################

data/app_generators/merb/templates/app/views/exceptions/internal_server_error.html.erb

@@ -130,7 +130,7 @@
 		
 		<div class="header">
 			<h1><%= @exception.name.humanize %> <sup class="error_<%= @exception.class::STATUS %>"><%= @exception.class::STATUS %></sup></h1>
-			<% if show_details = ::Merb::Server.config[:exception_details] -%>
+			<% if show_details = ::Merb::Config[:exception_details] -%>
 				<h2><%= @exception.message %></h2>
 			<% else -%>
 				<h2>Sorry about that...</h2>

data/app_generators/merb/templates/config/boot.rb

@@ -1,6 +1,6 @@
 frozen_framework_path = File.join(File.dirname(__FILE__), "..", "framework")
 
-unless defined?(MERB_FRAMEWORK_ROOT)
+unless defined?(Merb::framework_root)
   if File.directory?(frozen_framework_path)
     $:.unshift frozen_framework_path
     require File.join(frozen_framework_path, "merb")

data/app_generators/merb/templates/config/dependencies.rb

@@ -1,9 +1,9 @@
 # Make the app's "gems" directory a place where gems are loaded from
 Gem.clear_paths
-Gem.path.unshift(MERB_ROOT / "gems")
+Gem.path.unshift(Merb.root / "gems")
 
 # Make the app's "lib" directory a place where ruby files get "require"d from
-$LOAD_PATH.unshift(MERB_ROOT / "lib")
+$LOAD_PATH.unshift(Merb.root / "lib")
 
 ### Merb doesn't come with database support by default.  You need
 ### an ORM plugin.  Install one, and uncomment one of the following lines,
@@ -34,7 +34,7 @@ use_test :rspec
 # OR
 # dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0"
 
-Merb::Server.after_app_loads do
+Merb::BootLoader.after_app_loads do
   ### Add dependencies here that must load after the application loads:
 
   # dependency "magic_admin" # this gem uses the app's model classes

data/app_generators/merb/templates/config/merb.yml

@@ -32,6 +32,10 @@
 # automatically in production mode.
 #:cache_templates: true
 
+# Uncomment to bundle assets in dev mode. Assets are automatically bundled in
+# production mode.
+#:bundle_assets: true
+
 # this is true if you want mongrel to emulate the X-Sendfile header internally,
 # false if you want it to fall thru to apache or whatever front end server you use.
 # true by default
@@ -39,6 +43,7 @@
 
 # Uncomment and set this if you want to run a drb server for upload progress
 # or other drb services.
+#:start_drb: true
 #:drb_server_port: 32323
 
 # If you want to protect some or all of your app with  HTTP basic auth then

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

@@ -4,13 +4,13 @@ puts "Started merb_init.rb ..."
 
 # Your app's dependencies, including your database layer (if any) are defined
 # in config/dependencies.rb
-require File.join(MERB_ROOT, 'config', 'dependencies')
+require File.join(Merb.root, 'config', 'dependencies')
 
 # Here's where your controllers, helpers, and models, etc. get loaded.  If you
 # need to change the order of things, just move the call to 'load_application'
 # around this file.
 puts "Loading Application..."
-Merb::Server.load_application
+Merb::BootLoader.load_application
 
 # Load environment-specific configuration
-require File.join(MERB_ROOT, 'config', 'environments', MERB_ENV)
+require File.join(Merb.root, 'config', 'environments', Merb.environment)

data/app_generators/merb/templates/script/destroy

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 APP_ROOT = File.join(File.dirname(__FILE__), '..')
 
+def at_exit
+end
+
 begin
   require 'rubigen'
 rescue LoadError

data/app_generators/merb/templates/script/generate

@@ -9,7 +9,7 @@ rescue LoadError
 end
 
 require File.join(File.dirname(__FILE__), "..", 'config', 'boot')
-require (APP_ROOT / "config" / "merb_init" )
+require File.join(Merb.root, 'config', 'dependencies')
 module Kernel
   undef dependency if defined?(Kernel.dependency)
 end

data/app_generators/merb/templates/spec/spec_helper.rb

@@ -1,7 +1,7 @@
-MERB_ENV="test"
+Merb.environment="test"
 $TESTING=true
 require File.join(File.dirname(__FILE__), "..", 'config', 'boot')
-require File.join(MERB_ROOT, 'config', 'merb_init')
+require File.join(Merb.root, 'config', 'merb_init')
 
 require 'merb/test/helper'
 require 'merb/test/rspec'

data/app_generators/merb/templates/test/test_helper.rb

@@ -4,7 +4,7 @@ $TESTING=true
 
 require 'rubygems'
 require 'test/unit'
-require File.join(MERB_ROOT, 'config', 'merb_init')
+require File.join(Merb.root, 'config', 'merb_init')
 
 require 'merb/test/helper'
 

data/app_generators/merb_plugin/merb_plugin_generator.rb

@@ -4,6 +4,8 @@ class MerbPluginGenerator < RubiGen::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
   
+  default_options   :shebang => DEFAULT_SHEBANG
+  
   
   def initialize(args, runtime_options = {})
     super
@@ -31,6 +33,8 @@ class MerbPluginGenerator < RubiGen::Base
       m.template "sampleplugin_spec.rb", "spec/#{name}_spec.rb", :assigns => {:name => name}
       m.template "sampleplugin.rb", "lib/#{name}.rb", :assigns => {:name => name}
       m.template "merbtasks.rb", "lib/#{name}/merbtasks.rb", :assigns => {:name => name}
+      
+      m.dependency "install_rubigen_scripts", [destination_root, "rubygems"], :shebang => options[:shebang]
     end
   end
   

data/bin/merb

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-
 require 'rubygems'
 require 'merb/server'
-
-Merb::Server.run
+Merb::Server.run

data/lib/merb.rb

@@ -26,100 +26,163 @@ elsif ENV['PACKET']
 else
  require 'mongrel'
 end
+require 'set'
 require 'fileutils'
 require 'merb/erubis_ext'
 require 'merb/logger'
+require 'merb/version'
+require 'merb/config'
 
-require 'set'
 autoload :MerbUploadHandler, 'merb/upload_handler'
 autoload :MerbHandler, 'merb/mongrel_handler'
 
-require 'merb/version'
-
 module Merb
-  autoload :Authentication, 'merb/mixins/basic_authentication'
-  autoload :ControllerMixin, 'merb/mixins/controller'
-  autoload :ErubisCaptureMixin, 'merb/mixins/erubis_capture'
-  autoload :FormControls, 'merb/mixins/form_control'
-  autoload :RenderMixin, 'merb/mixins/render'
-  autoload :ResponderMixin, 'merb/mixins/responder'
-  autoload :ViewContextMixin, 'merb/mixins/view_context'
-  autoload :WebControllerMixin, 'merb/mixins/web_controller'
+  autoload :AbstractController,     'merb/abstract_controller'
+  autoload :Assets,                 'merb/assets'
+  autoload :Authentication,         'merb/mixins/basic_authentication'
+  autoload :Caching,                'merb/caching'
+  autoload :Const,                  'merb/constants'
+  autoload :Controller,             'merb/controller'
+  autoload :ControllerExceptions,   'merb/exceptions'
+  autoload :ControllerMixin,        'merb/mixins/controller'
+  autoload :Dispatcher,             'merb/dispatcher'
+  autoload :DrbServiceProvider,     'drb_server'
+  autoload :ErubisCaptureMixin,     'merb/mixins/erubis_capture'
   autoload :GeneralControllerMixin, 'merb/mixins/general_controller'
-  autoload :Caching, 'merb/caching'
-  autoload :AbstractController, 'merb/abstract_controller'
-  autoload :Const, 'merb/constants'
-  autoload :Controller, 'merb/controller'
-  autoload :Dispatcher, 'merb/dispatcher'
-  autoload :DrbServiceProvider, 'drb_server'
-  autoload :ControllerExceptions, 'merb/exceptions'
-  autoload :MailController, 'merb/mail_controller'
-  autoload :Mailer, 'merb/mailer'
-  autoload :PartController, 'merb/part_controller'
-  autoload :Request, 'merb/request'
-  autoload :Router, 'merb/router'
-  autoload :Server, 'merb/server'
-  autoload :UploadProgress, 'merb/upload_progress'
-  autoload :ViewContext, 'merb/view_context'
-  autoload :SessionMixin, 'merb/session'
-  autoload :Template, 'merb/template'
-  autoload :Plugins, 'merb/plugins'
-  autoload :Rack,'merb/rack_adapter'
-
-  # Set up Merb::Server.config[] as an accessor for @@merb_opts
-  class Server
-    class << self
-      def config() @@merb_opts ||= {} end
-    end  
-  end
+  autoload :InlinePartialMixin,     'merb/mixins/inline_partial'
+  autoload :MailController,         'merb/mail_controller'
+  autoload :Mailer,                 'merb/mailer'
+  autoload :PartController,         'merb/part_controller'
+  autoload :Plugins,                'merb/plugins'
+  autoload :Rack,                   'merb/rack_adapter'
+  autoload :RenderMixin,            'merb/mixins/render'
+  autoload :Request,                'merb/request'
+  autoload :ResponderMixin,         'merb/mixins/responder'
+  autoload :Router,                 'merb/router'
+  autoload :Server,                 'merb/server'
+  autoload :SessionMixin,           'merb/session'
+  autoload :Template,               'merb/template'
+  autoload :UploadProgress,         'merb/upload_progress'
+  autoload :ViewContext,            'merb/view_context'
+  autoload :ViewContextMixin,       'merb/mixins/view_context'
+  autoload :WebControllerMixin,     'merb/mixins/web_controller'
   
+  # This is where Merb-global variables are set and held
+  class << self
+		def environment
+			@environment
+		end
+		
+		def environment=(value)
+			@environment ||= value
+		end
+		
+		def load_paths
+			[ "/app/models/**/*.rb",
+				"/app/controllers/application.rb",
+				"/app/controllers/**/*.rb",
+				"/app/helpers/**/*.rb",
+				"/app/mailers/**/*.rb",
+				"/app/parts/**/*.rb",
+				"/config/router.rb"
+			]
+		end
+		
+		# Application paths
+		def root
+		  @root || Merb::Config[:merb_root] || Dir.pwd
+		end
+		
+		def root_path(*path)
+			File.join(root, *path)
+		end
+		
+		def view_path
+			root_path 'app/views'
+		end
+		
+		def model_path
+			root_path 'app/models'
+		end
+		
+		def application_controller_path
+			root_path 'app/controllers/application.rb'
+		end
+		
+		def controller_path
+			root_path 'app/controllers'
+		end
+		
+		def helper_path
+			root_path 'app/helpers'
+		end
+		
+		def mailer_path
+			root_path 'app/mailers'
+		end
+		
+		def part_path
+		  root_path 'app/parts'
+		end
+		
+		def router_path
+			root_path '/config/router.rb'
+		end
+		
+		def root=(value)
+			@root ||= value
+		end
+		
+		
+		# Logger settings
+		attr :logger, true
+		
+		def log_path
+		  if $TESTING
+        "#{Merb.root}/log/merb_test.log"
+      elsif !(Merb::Config[:daemonize] || Merb::Config[:cluster] )
+        STDOUT
+      else
+        "#{Merb.root}/log/merb.#{Merb::Config[:port]}.log"
+		  end
+		end
+		
+		# Framework paths
+		
+		def framework_root
+			@framework_root ||= File.dirname(__FILE__)
+		end
+		
+		def framework_path(path)
+			File.join(framework_root, path)
+		end
+		
+		def lib_path
+			framework_path 'merb'
+		end
+		
+		def skeleton_path
+			framework_path '../app_generators/merb/templates'
+		end
+  end
+
   # Set up default generator scope
   GENERATOR_SCOPE = [:merb_default, :merb, :rspec]
 end
 
-def __DIR__; File.dirname(__FILE__); end
-lib = File.join(__DIR__, 'merb')
-require File.join(__DIR__, 'merb/core_ext')
+# Load up the core extensions
+require Merb.framework_path('merb/core_ext')
+require Merb.framework_path('merb/version')
 
-unless Object.const_defined?('MERB_ENV')
-  MERB_ENV = Merb::Server.config[:environment].nil? ? ($TESTING ? 'test' : 'development') : Merb::Server.config[:environment]
-end
+# Set the environment
+Merb.environment =  Merb::Config[:environment] || ($TESTING ? 'test' : 'development')
 
-MERB_FRAMEWORK_ROOT = __DIR__
-MERB_ROOT = Merb::Server.config[:merb_root] || Dir.pwd
-MERB_VIEW_ROOT = MERB_ROOT / "app/views"
-MERB_SKELETON_DIR = File.join(MERB_FRAMEWORK_ROOT, '../app_generators/merb/templates')
-logpath = if $TESTING
-           "#{MERB_ROOT}/log/merb_test.log"
-          elsif !(Merb::Server.config[:daemonize] || Merb::Server.config[:cluster] )
-            STDOUT
-          else
-            "#{MERB_ROOT}/log/merb.#{Merb::Server.config[:port]}.log"
-          end
-FileUtils.mkdir_p(File.dirname(logpath)) if logpath.is_a?(String)
-MERB_LOGGER = Merb::Logger.new(logpath)
-MERB_LOGGER.level = Merb::Logger.const_get(Merb::Server.config[:log_level].upcase) rescue Merb::Logger::INFO
-MERB_PATHS = [ 
-  "/app/models/**/*.rb",
-  "/app/controllers/application.rb",
-  "/app/controllers/**/*.rb",
-  "/app/helpers/**/*.rb",
-  "/app/mailers/**/*.rb",
-  "/app/parts/**/*.rb",
-  "/config/router.rb"
-  ]
-
-if $TESTING
-  test_files = File.join(lib, 'test', '*.rb')
-  Dir[test_files].each { |file| require file }
-end
-
-# If we're in the TEST environment or if running from Rake make sure to load 
-# config/merb.yml - which is normally done by Merb::Server.run
-Merb::Server.load_config if $TESTING || $RAKE_ENV
+# Create and setup the logger
+Merb.logger = Merb::Logger.new(Merb.log_path)
+Merb.logger.level = Merb::Logger.const_get(Merb::Config[:log_level].upcase) rescue Merb::Logger::INFO
 
 # If you don't use the JSON gem, disable auto-parsing of json params too
-if Merb::Server.config[:disable_json_gem]
+if Merb::Config[:disable_json_gem]
   Merb::Request::parse_json_params = false
 else
   begin
@@ -128,4 +191,9 @@ else
     puts "Using pure ruby JSON lib"
     require 'json/pure'
   end
+end
+
+if $TESTING
+  test_files = File.join(Merb.lib_path, 'test', '*.rb')
+  Dir[test_files].each { |file| require file }
 end

data/lib/merb/abstract_controller.rb

@@ -80,10 +80,11 @@ module Merb
     
     def call_action(action)
       # [[:id], [:foo, 7]]
-      args = self.class.action_argument_list[action.to_sym].map do |arg, default|
-        raise BadRequest unless params[arg.to_sym] || default
-        params[arg.to_sym] || default
-      end
+      args = self.class.action_argument_list[action.to_sym].map do |arg_default|
+        arg = arg_default[0]
+        raise BadRequest unless params.key?(arg.to_sym) || (arg_default.size == 2)
+        params.key?(arg.to_sym) ? params[arg.to_sym] : arg_default[1]
+      end rescue []
       send(action, *args)
     end
     
@@ -262,7 +263,7 @@ module Merb
         'You can only skip filters that have a String or Symbol name.'
       ) unless [Symbol, String].include? filter.class
 
-      MERB_LOGGER.warn("Filter #{filter} was not found in your filter chain."
+      Merb.logger.warn("Filter #{filter} was not found in your filter chain."
       ) unless filters.reject! {|f| f.first.to_s[filter.to_s] }
     end