merb 0.5.0 → 0.5.1

data/Rakefile

@@ -28,7 +28,7 @@ windows = (PLATFORM =~ /win32|cygwin/)
 
 SUDO = windows ? "" : "sudo"
 
-setup_clean [ "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "log"]
+setup_clean ["pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache"]
 
 desc "Packages up Merb."
 task :default => :package

data/SVN_REVISION

@@ -1 +1 @@
-1253
+1274

data/app_generators/merb/templates/Rakefile

@@ -8,14 +8,15 @@ require 'rake/testtask'
 require 'spec/rake/spectask'
 require 'fileutils'
 
-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__)
 include FileUtils
 
+# Set these before any dependencies load
+# otherwise the ORM may connect to the wrong env
+Merb.root = File.dirname(__FILE__)
+Merb.environment = ENV['MERB_ENV'] if ENV['MERB_ENV']
+
 # Get Merb plugins and dependencies
 require File.dirname(__FILE__)+'/config/dependencies.rb'
 Merb::Plugins.rakefiles.each {|r| require r } 
@@ -25,9 +26,9 @@ Merb::Plugins.rakefiles.each {|r| require r }
 
 desc "load merb_init.rb"
 task :merb_init do
-  require 'merb'
-  require File.dirname(__FILE__)+'/config/merb_init.rb'
-end  
+  # deprecated - here for BC
+  Rake::Task['merb_env'].invoke
+end
 
 task :uninstall => [:clean] do
   sh %{sudo gem uninstall #{NAME}}

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

@@ -13,4 +13,5 @@ puts "Loading Application..."
 Merb::BootLoader.load_application
 
 # Load environment-specific configuration
-require File.join(Merb.root, 'config', 'environments', Merb.environment)
+environment_config = File.join(Merb.root, 'config', 'environments', Merb.environment)
+require environment_config if File.exist?(environment_config)

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

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

data/lib/merb.rb

@@ -69,12 +69,13 @@ module Merb
   
   # This is where Merb-global variables are set and held
   class << self
+    
 		def environment
 			@environment
 		end
 		
 		def environment=(value)
-			@environment ||= value
+			@environment = value
 		end
 		
 		def load_paths
@@ -133,7 +134,6 @@ module Merb
 			@root ||= value
 		end
 		
-		
 		# Logger settings
 		attr :logger, true
 		
@@ -181,18 +181,6 @@ Merb.environment =  Merb::Config[:environment] || ($TESTING ? 'test' : 'developm
 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::Config[:disable_json_gem]
-  Merb::Request::parse_json_params = false
-else
-  begin
-    require 'json/ext'
-  rescue LoadError
-    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 }

data/lib/merb/boot_loader.rb

@@ -148,8 +148,26 @@ module Merb
         load_controller_template_path_cache
         load_inline_helpers
         @app_loaded = true
+        load_libraries
         (@after_app_blocks || []).each { |b| b.call }
-        require "sass/plugin" if File.directory?(Merb.root / "public" / "stylesheets" / "sass")        
+      end
+      
+      def load_libraries
+        # Load the Sass plugin of /public/stylesheets/sass exists
+        begin
+          require "sass/plugin" if File.directory?(Merb.root / "public" / "stylesheets" / "sass")  
+        rescue LoadError
+        end
+        # If you don't use the JSON gem, disable auto-parsing of json params too
+        if Merb::Config[:disable_json_gem]
+          Merb::Request::parse_json_params = false
+        else
+          begin
+            require 'json/ext'
+          rescue LoadError
+            require 'json/pure'
+          end
+        end
       end
       
       def remove_constant(const)
@@ -162,10 +180,10 @@ module Merb
       end
       
       def reload
-        return if !Merb::Config[:reloader] || !Object.const_defined?(:MERB_PATHS)
+        return if !Merb::Config[:reloader]
         
         # First we collect all files in the project (this will also grab newly added files)
-        project_files = MERB_PATHS.map { |path| Dir[Merb.root + path] }.flatten.uniq
+        project_files = Merb.load_paths.map { |path| Dir[Merb.root + path] }.flatten.uniq
         partials = template_paths("_*.*").map { |path| Dir[path] }.flatten.uniq
         project_mtime = max_mtime(project_files + partials) # Latest changed time of all project files
       

data/lib/merb/config.rb

@@ -20,7 +20,7 @@ module Merb
       end
       
       def [](key)
-        (@configuration||{})[key]
+        (@configuration||={})[key]
       end
       
       def []=(key,val)

data/lib/merb/mixins/inline_partial.rb

@@ -8,9 +8,9 @@ module Merb::InlinePartialMixin
     found_template = @web_controller._cached_partials["#{template}.#{@_template_format}"] ||=
       @web_controller.send(:find_partial, template, opts)
 
-    template_method = found_template.gsub(/[^\.a-zA-Z0-9]/, "__").gsub(/\./, "_")
+    template_method = found_template && found_template.gsub(/[^\.a-zA-Z0-9]/, "__").gsub(/\./, "_")
 
-    unless self.respond_to?(template_method)
+    unless template_method && self.respond_to?(template_method)
       return super
     end
 

data/lib/merb/version.rb

@@ -1,10 +1,10 @@
 module Merb
-  VERSION = '0.5.0' unless defined?(::Merb::VERSION)
+  VERSION = '0.5.1' unless defined?(::Merb::VERSION)
   
   class << self
     def svn_revision
       rev = if File.directory?('.git')
-        `git log -1`[/git-svn-id.+@(\d+)/, 1]
+        `git svn log --limit 1`[/r(\d+)/, 1]
       elsif File.directory?('.svn')
         `svn info`[/Revision: (\d+)/, 1]
       end

data/lib/tasks/merb.rake

@@ -48,7 +48,7 @@ desc "Setup the Merb Environment by requiring merb and loading your merb_init.rb
 task :merb_env do 
   require 'rubygems' 
   require 'merb' 
-  Merb::Config[:environment] = ENV['Merb.environment'] if ENV['Merb.environment'] 
-  Merb.environment  = Merb::Config[:environment].nil? ? 'development' : Merb::Config[:environment] 
+  Merb::Config[:environment] = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
+  Merb.environment = Merb::Config[:environment].nil? ? 'development' : Merb::Config[:environment] 
   load Merb.root+'/config/merb_init.rb' 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2008-01-09 00:00:00 -08:00
+  version: 0.5.1
+date: 2008-01-10 00:00:00 -08:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib