give sprockets access to middleman environment scope (variables, data, etc)

lib/middleman/core_extensions/data.rb

@@ -13,7 +13,7 @@ module Middleman::CoreExtensions::Data
   
   module Helpers
     def data
-      @@data ||= DataObject.new(self)
+      self.class.data
     end
   end
   
@@ -33,7 +33,7 @@ module Middleman::CoreExtensions::Data
       elsif @@callback_sources.has_key?(path.to_s)
         response = @@callback_sources[path.to_s].call()
       else
-        file_path = File.join(@app.class.root, @app.class.data_dir, "#{path}.yml")
+        file_path = File.join(@app.root, @app.data_dir, "#{path}.yml")
         if File.exists? file_path
           response = YAML.load_file(file_path)
         end
@@ -74,6 +74,10 @@ module Middleman::CoreExtensions::Data
   end
   
   module ClassMethods
+    def data
+      @data ||= DataObject.new(self)
+    end
+    
     # Makes a hash available on the data var with a given name
     def data_content(name, content)
       DataObject.data_content(name, content)

lib/middleman/core_extensions/front_matter.rb

@@ -6,23 +6,23 @@ module Middleman::CoreExtensions::FrontMatter
     def registered(app)
       app.extend ClassMethods
       
-      Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
-      Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
-      Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
-      Tilt::register KramdownTemplate, 'markdown', 'mkd', 'md'
-      app.set :markdown_engine_prefix, Middleman::CoreExtensions::FrontMatter
+      ::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt::register KramdownTemplate, 'markdown', 'mkd', 'md'
+      app.set :markdown_engine_prefix, ::Middleman::CoreExtensions::FrontMatter
       
-      Tilt::register RedClothTemplate,  'textile'
-      Tilt.prefer(RedClothTemplate)
+      ::Tilt::register RedClothTemplate,  'textile'
+      ::Tilt.prefer(RedClothTemplate)
       
-      Tilt::register ERBTemplate,       'erb', 'rhtml'
-      Tilt.prefer(ERBTemplate)
+      ::Tilt::register ERBTemplate,       'erb', 'rhtml'
+      ::Tilt.prefer(ERBTemplate)
       
-      Tilt::register SlimTemplate,      'slim'
-      Tilt.prefer(SlimTemplate)
+      ::Tilt::register SlimTemplate,      'slim'
+      ::Tilt.prefer(SlimTemplate)
       
-      Tilt::register HamlTemplate,      'haml'
-      Tilt.prefer(HamlTemplate)
+      ::Tilt::register HamlTemplate,      'haml'
+      ::Tilt.prefer(HamlTemplate)
       
       app.after_configuration do
         app.before_processing do
@@ -82,27 +82,27 @@ module Middleman::CoreExtensions::FrontMatter
     end
   end
 
-  class RDiscountTemplate < Tilt::RDiscountTemplate
+  class RDiscountTemplate < ::Tilt::RDiscountTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
-  class RedcarpetTemplate < Tilt::RedcarpetTemplate
+  class RedcarpetTemplate < ::Tilt::RedcarpetTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
-  class MarukuTemplate < Tilt::MarukuTemplate
+  class MarukuTemplate < ::Tilt::MarukuTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
-  class RedClothTemplate < Tilt::RedClothTemplate
+  class RedClothTemplate < ::Tilt::RedClothTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
-  class KramdownTemplate < Tilt::KramdownTemplate
+  class KramdownTemplate < ::Tilt::KramdownTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
  
-  class ERBTemplate < Tilt::ERBTemplate
+  class ERBTemplate < ::Tilt::ERBTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
 
-  class HamlTemplate < Tilt::HamlTemplate
+  class HamlTemplate < ::Tilt::HamlTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
   

lib/middleman/core_extensions/sprockets.rb

@@ -36,6 +36,18 @@ module Middleman::CoreExtensions::Sprockets
       full_path = File.join(app.root, app.views) unless app.views.include?(app.root)
       
       super File.expand_path(full_path)
+      
+      # Make the app context available to Sprockets
+      context_class.send(:define_method, :app) { app }
+      context_class.class_eval do
+        def method_missing(name)
+          if app.respond_to?(name)
+            app.send(name)
+          else
+            super
+          end
+        end
+      end
     end
   end