0
@@ -17,7 +17,7 @@ include FileUtils
0
 
0
 NAME = "merb"
0
 
0
-require "lib/merb/version"
0
+require "lib/merb_core/version"
0
 
0
 ##############################################################################
0
 # Packaging & Installation
0
@@ -47,7 +47,7 @@ spec = Gem::Specification.new do |s|
0
   s.description  = s.summary
0
   s.executables  = %w( merb )
0
   s.require_path = "lib"
0
-  s.files        = %w( LICENSE README Rakefile TODO ) + [Merb.svn_revision_filename] + Dir["{bin,spec,lib,examples,app_generators,merb_generators,merb_default_generators,rspec_generators,test_unit_generators,script}/**/*"]
0
+  s.files        = %w( LICENSE README Rakefile TODO ) + Dir["{bin,spec,lib,examples,app_generators,merb_generators,merb_default_generators,rspec_generators,test_unit_generators,script}/**/*"]
0
 
0
   # rdoc
0
   s.has_rdoc         = true
0
@@ -174,6 +174,15 @@ task :release => :package do
0
 end
0
 
0
 ##############################################################################
0
+# SYNTAX CHECKING
0
+##############################################################################
0
+
0
+task :check_syntax do
0
+  `find . -name "*.rb" |xargs -n1 ruby -c |grep -v "Syntax OK"`
0
+  puts "* Done"
0
+end
0
+
0
+##############################################################################
0
 # SVN
0
 ##############################################################################
0
 namespace :repo do

0
@@ -7,14 +7,15 @@ module Merb
0
   class BootLoader
0
     
0
     cattr_accessor :subclasses
0
-    class_inheritable_accessor :after, :before
0
+    self.subclasses = []
0
+    class_inheritable_accessor :_after, :_before
0
     
0
     class << self
0
       
0
       def inherited(klass)
0
-        unless klass.before || klass.after
0
-          subclasses << klass.to_s
0
-        elsif klass.before
0
+        if !klass._before && !klass._after
0
+          subclasses << klass
0
+        elsif klass._before
0
           subclasses.insert(subclasses.index(klass.before), klass)
0
         else
0
           subclasses.insert(subclasses.index(klass.before) + 1, klass)          
0
@@ -23,15 +24,15 @@ module Merb
0
       end
0
       
0
       def run
0
-        subclasses.each {|klass| klass.new.run! }
0
+        subclasses.each {|klass| klass.new.run }
0
       end
0
       
0
       def after(klass)
0
-        after = klass
0
+        self.after = klass
0
       end
0
       
0
       def before(klass)
0
-        before = klass
0
+        self.before = klass
0
       end
0
       
0
     end
0
@@ -49,11 +50,11 @@ class Merb::BootLoader::BuildFramework < Merb::BootLoader
0
   # framework structure
0
   def build_framework
0
     %[view model controller helper mailer part].each do |component|
0
-      Merb.push_path(component.to_sym, Merb.root_path "app/#{component}s")
0
+      Merb.push_path(component.to_sym, Merb.root_path("app/#{component}s"))
0
     end
0
-    Merb.push_path(:app_controller, Merb.root_path "app/controllers", "application_controller.rb")
0
-    Merb.push_path(:config,         Merb.root_path "config", "router.rb")
0
-    Merb.push_path(:lib,            Merb.root_path "lib")    
0
+    Merb.push_path(:app_controller, Merb.root_path("app/controllers", "application_controller.rb"))
0
+    Merb.push_path(:config,         Merb.root_path("config", "router.rb"))
0
+    Merb.push_path(:lib,            Merb.root_path("lib"))    
0
   end
0
 end
0
 

0
@@ -166,6 +166,8 @@ class Merb::AbstractController
0
         case filter
0
         when Symbol, String then send(filter)
0
         when Proc           then self.instance_eval(&filter)
0
+        end
0
+      end
0
     end
0
     return :filter_chain_completed
0
   end

0
@@ -33,7 +33,7 @@ class Merb::Controller < AbstractController
0
     # ==== Parameters
0
     # *names<~to-s>:: Actions that should be added to the list 
0
     def hide_action(*names)
0
-      _hidden_actions = _hidden_actions | names.collect { |n| n.to_s })
0
+      _hidden_actions = _hidden_actions | names.collect { |n| n.to_s }
0
     end
0
     
0
     # Build a new controller.

0
@@ -1 +1,3 @@
0
-Merb::VERSION = '0.9' unless defined?(Merb::VERSION)
0
+module Merb
0
+  VERSION = '0.9' unless defined?(Merb::VERSION)
0
+end