lib/massimo.rb in massimo-0.4.1 vs lib/massimo.rb in massimo-0.4.2

@@ -3,24 +3,24 @@
 
 # External
 require "pathname"
 require "fileutils"
 require "singleton"
-require "active_support"
+require "active_support/inflector"
+require "active_support/core_ext/hash/keys"
 require "sinatra_more"
 require "sprockets"
 require "jsmin"
 require "tilt"
 
 # Internal
-lib_dir = File.dirname(__FILE__)
-require File.join(lib_dir, "massimo", "helpers")
-require File.join(lib_dir, "massimo", "templates")
-require File.join(lib_dir, "massimo", "site")
+require "massimo/helpers"
+require "massimo/templates"
+require "massimo/site"
 
 module Massimo
-  VERSION = File.read(File.join(File.dirname(__FILE__), "..", "VERSION")) # :nodoc:
+  VERSION = File.read(File.expand_path("../../VERSION", __FILE__)) # :nodoc:
   
   MissingResource = Class.new(StandardError) # :nodoc:
   InvalidResource = Class.new(StandardError) # :nodoc:
   
   # This will create an instance of Massimo::Site the first time it is called.
@@ -40,10 +40,10 @@
   def self.processable_resources
     resources.select { |resource| resource.processable? }
   end
 end
 
-require File.join(lib_dir, "massimo", "resource", "base")
-require File.join(lib_dir, "massimo", "view")
-require File.join(lib_dir, "massimo", "page")
-require File.join(lib_dir, "massimo", "stylesheet")
-require File.join(lib_dir, "massimo", "javascript")
+require "massimo/resource/base"
+require "massimo/view"
+require "massimo/page"
+require "massimo/stylesheet"
+require "massimo/javascript"