Merge pull request #4 from xrl/master

Rubinius and Bundler compatibility fixes

merb-action-args/lib/merb-action-args/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  module ActionArgs
+  class ActionArgs
     VERSION = '1.2.0'.freeze
   end
 end

merb-assets/lib/merb-assets/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  module Assets
+  class Assets
     VERSION = '1.2.0'.freeze
   end
 end

merb-cache/lib/merb-cache/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  module Cache
+  class Cache
     VERSION = '1.2.0'.freeze
   end
 end

merb-core/lib/merb-core/bootloader.rb

@@ -112,7 +112,7 @@ def default_framework
         %w[view model helper controller mailer part].each do |component|
           Merb.push_path(component.to_sym, Merb.root("app", component.pluralize))
         end
-        Merb.push_path :application,  Merb.root("app", "controllers", "application.rb")
+        Merb.push_path :application,  Merb.root("app", "controllers"), "application.rb"
         Merb.push_path :config,       Merb.root("config"), nil
         Merb.push_path :router,       Merb.dir_for(:config), (Merb::Config[:router_file] || "router.rb")
         Merb.push_path :lib,          Merb.root("lib"), nil

merb-exceptions/lib/merb-exceptions/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  module Exceptions
+  class Exceptions
     VERSION = '1.2.0'.freeze
   end
 end

merb-gen/lib/merb-gen/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  module Generators
+  class Generators
 
     VERSION = '1.2.0'.freeze
 

merb-haml/lib/merb-haml/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  module Haml
+  class Haml
     VERSION = '1.2.0'.freeze
   end
 end

merb-helpers/lib/merb-helpers/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  module Helpers
+  class Helpers
     VERSION = '1.2.0'.freeze
   end
 end

merb-mailer/lib/merb-mailer/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  module Mailer
+  class Mailer
     VERSION = '1.2.0'.freeze
   end
 end

merb-param-protection/lib/merb-param-protection/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  module ParamProtection
+  class ParamProtection
     VERSION = '1.2.0'.freeze
   end
 end

merb-slices/lib/merb-slices/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  module Slices
+  class Slices
     VERSION = '1.2.0'.freeze
   end
 end