middleman 2.0.16.1 → 3.0.0.alpha.2

data/lib/middleman/renderers/markdown.rb

@@ -1,34 +1,35 @@
-require "tilt"
-
 module Middleman::Renderers::Markdown
   class << self
     def registered(app)
-      app.extend ClassMethods
-      
-      app.set :markdown_engine, :maruku
+      app.send :include, InstanceMethods
       
-      if !app.respond_to? :markdown_engine_prefix
-        app.set :markdown_engine_prefix, ::Tilt
+      begin
+        require "maruku"
+        app.set :markdown_engine, :maruku
+      rescue LoadError
+        app.set :markdown_engine, nil
       end
+
+      app.set :markdown_engine_prefix, ::Tilt
       
       app.after_configuration do
-        engine = app.settings.markdown_engine
+        unless markdown_engine.nil?
+          if markdown_engine.is_a? Symbol
+            markdown_engine = markdown_tilt_template_from_symbol(markdown_engine)
+          end
         
-        if engine.is_a? Symbol
-          engine = app.tilt_template_from_symbol(engine)
+          ::Tilt.prefer(markdown_engine)
         end
-        
-        ::Tilt.prefer(engine)
       end
     end
     alias :included :registered
   end
   
-  module ClassMethods
-    def tilt_template_from_symbol(engine)
+  module InstanceMethods
+    def markdown_tilt_template_from_symbol(engine)
       engine = engine.to_s
       engine = engine == "rdiscount" ? "RDiscount" : engine.camelize
-      settings.markdown_engine_prefix.const_get("#{engine}Template")
+      markdown_engine_prefix.const_get("#{engine}Template")
     end
   end
 end

data/lib/middleman/renderers/sass.rb

@@ -1,5 +1,6 @@
+require "sprockets"
+require "sprockets-sass"
 require "sass"
-require "sass/plugin"
 
 module Middleman::Renderers::Sass
   class << self
@@ -9,55 +10,50 @@ module Middleman::Renderers::Sass
     end
     alias :included :registered
   end
-  
-  class SassPlusCSSFilenameTemplate < ::Tilt::SassTemplate
-    def sass_options_with_scope(scope)
-      return sass_options if basename.nil?
-    
-      location_of_sass_file = if scope.build?
-        File.join(scope.root, scope.build_dir)
-      else
-        scope.views
-      end
-    
-      parts = basename.split('.')
-      parts.pop
-      css_filename = File.join(location_of_sass_file, scope.css_dir, parts.join("."))
-      sass_options.merge(scope.settings.sass).merge(:css_filename => css_filename)
-    end
 
-    def evaluate(scope, locals, &block)
-      @engine = ::Sass::Engine.new(data, sass_options_with_scope(scope.class))
-        
+  class SassPlusCSSFilenameTemplate < ::Sprockets::Sass::SassTemplate
+    self.default_mime_type = "text/css"
+    
+    # Add exception messaging
+    def evaluate(context, locals, &block)
       begin
         super
       rescue Sass::SyntaxError => e
         Sass::SyntaxError.exception_to_css(e, :full_exception => true)
       end
     end
+  
+  protected
+    def sass_options
+      location_of_sass_file = if @context.build?
+        File.expand_path(@context.build_dir, @context.root)
+      else
+        File.expand_path(@context.views, @context.root)
+      end
+      
+      parts = basename.split('.')
+      parts.pop
+      css_filename = File.join(location_of_sass_file, @context.css_dir, parts.join("."))
+      
+      super.merge(
+        :css_filename => css_filename
+      )
+    end
   end
+  ::Sprockets.register_engine ".sass", SassPlusCSSFilenameTemplate
   ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
   ::Tilt.prefer(SassPlusCSSFilenameTemplate)
-
+  
   class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
-    def sass_options_with_scope(scope)
-      super.merge(:syntax => :scss)
+    self.default_mime_type = "text/css"
+    
+    # Define the expected syntax for the template
+    def syntax
+      :scss
     end
   end
+  
+  ::Sprockets.register_engine ".scss", ScssPlusCSSFilenameTemplate
   ::Tilt.register 'scss', ScssPlusCSSFilenameTemplate
   ::Tilt.prefer(ScssPlusCSSFilenameTemplate)
-end
-
-# Use sass settings in Haml filters
-# Other, tilt-based filters (like those used in Slim) will
-# work automatically.
-# module Middleman::Renderers::Haml
-#   module Sass
-#     include ::Haml::Filters::Base
-# 
-#     def render(text)
-#       sass_options = scope.settings.sass
-#       ::Sass::Engine.new(text, sass_options).render
-#     end
-#   end
-# end
+end

data/lib/middleman/vendor/hooks-0.2.0/CHANGES.textile

@@ -0,0 +1,9 @@
+h2. 0.2.0
+
+h3. Changes
+  * Callback blocks are now executed on the instance using @instance_exec@. If you need to access the class (former context) use @self.class@.
+
+h2. 0.1.4
+
+h3. Bugfixes
+  * An uninitialized @inheritable_attr@ doesn't crash since it is not cloned anymore. Note that an uncloneable attribute value still causes an exception.

data/lib/middleman/vendor/hooks-0.2.0/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/lib/middleman/vendor/hooks-0.2.0/README.rdoc

@@ -0,0 +1,107 @@
+= Hooks
+
+<em>Generic hooks with callbacks for Ruby.</em>
+
+
+== Introduction
+
+_Hooks_ lets you define hooks declaratively in your ruby class. You can add callbacks to your hook, which will be run as soon as _you_ run the hook!
+
+It's almost like ActiveSupport::Callbacks but 76,6% less complex. Instead, it is not more than 60 lines of code, one method compilation, no +method_missing+ and no magic.
+
+Also, you may pass additional arguments to your callbacks when invoking a hook.
+
+== Example
+
+Let's take... a cat.
+  
+  require 'hooks'
+
+  class Cat
+    include Hooks
+
+    define_hook :after_dinner
+
+Now you can add callbacks to your hook declaratively in your class.
+
+    after_dinner do
+      puts "Ice cream for #{self}!"
+    end
+
+    after_dinner :have_a_desert   # => refers to Cat#have_a_desert
+
+    def have_a_desert
+      puts "Hell, yeah!"
+    end
+
+This will run the block and <tt>#have_a_desert</tt> from above.
+
+  cat.run_hook :after_dinner
+  # => Ice cream for #<Cat:0x8df9d84>!
+       Hell, yeah!
+
+Callback blocks and methods will be executed with instance context. Note how +self+ in the block refers to the Cat instance.
+
+
+== Inheritance
+
+Hooks are inherited, here's a complete example to put it all together.
+  
+  class Garfield < Cat
+    
+    after_dinner :want_some_more
+
+    def want_some_more
+      puts "Is that all?"
+    end
+  end
+
+
+  Garfield.new.run_hook :after_dinner
+  # => Ice cream for #<Cat:0x8df9d84>!
+       Hell, yeah!
+       Is that all?
+  
+Note how the callbacks are invoked in the order they were inherited.
+
+
+== Options for Callbacks
+
+You're free to pass any number of arguments to #run_callback, those will be passed to the callbacks.
+
+  cat.run_hook :before_dinner, cat, Time.now
+
+The callbacks should be ready for receiving parameters.
+
+  before_dinner :wash_pawns
+  before_dinner do |who, when|
+    ...
+  end
+
+  def wash_pawns(who, when)
+
+
+Not sure why a cat should have ice cream for dinner. Beside that, I was tempted naming this gem _hooker_.
+
+
+== Installation
+
+  gem install hooks
+
+
+== Anybody using it?
+
+* Hooks is already used in [Apotomo:http://github.com/apotonick/apotomo], a hot widget framework for Rails. Look at +lib/apotomo/widget.rb+ for examples and into +lib/apotomo/tree_node.rb+ to learn how modules-driven code might benefit from hooks.
+
+== Similar libraries
+
+* http://github.com/nakajima/aspectory
+* http://github.com/auser/backcall
+* http://github.com/mmcgrana/simple_callbacks
+
+
+== License
+
+Copyright (c) 2010, Nick Sutterer
+
+Released under the MIT License.

data/lib/middleman/vendor/hooks-0.2.0/Rakefile

@@ -0,0 +1,12 @@
+require 'rake'
+require 'rake/testtask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the hooks plugin.'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'test'
+  test.test_files = FileList['test/*_test.rb']
+  test.verbose = true
+end

data/lib/middleman/vendor/hooks-0.2.0/hooks.gemspec

@@ -0,0 +1,22 @@
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require 'hooks'
+
+Gem::Specification.new do |s|
+  s.name        = "hooks"
+  s.version     = Hooks::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Nick Sutterer"]
+  s.email       = ["apotonick@gmail.com"]
+  s.homepage    = "http://nicksda.apotomo.de/tag/hooks"
+  s.summary     = %q{Generic hooks with callbacks for Ruby.}
+  s.description = %q{Declaratively define hooks, add callbacks and run them with the options you like.}
+  
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+  
+  s.add_development_dependency "shoulda"
+  s.add_development_dependency "rake"
+end

data/lib/middleman/vendor/hooks-0.2.0/lib/hooks.rb

@@ -0,0 +1,109 @@
+require File.join(File.dirname(__FILE__), "hooks/inheritable_attribute")
+
+# Almost like ActiveSupport::Callbacks but 76,6% less complex.
+#
+# Example:
+#
+#   class CatWidget < Apotomo::Widget
+#     define_hook :after_dinner
+#
+# Now you can add callbacks to your hook declaratively in your class.
+#
+#     after_dinner do puts "Ice cream!" end
+#     after_dinner :have_a_desert   # => refers to CatWidget#have_a_desert
+# 
+# Running the callbacks happens on instances. It will run the block and #have_a_desert from above.
+#
+#   cat.run_hook :after_dinner
+module Hooks
+  VERSION = "0.2.0"
+  
+  def self.included(base)
+    base.extend InheritableAttribute
+    base.extend ClassMethods
+  end
+  
+  module ClassMethods
+    def define_hook(name)
+      accessor_name = "_#{name}_callbacks"
+      
+      setup_hook_accessors(accessor_name)
+      define_hook_writer(name, accessor_name)
+    end
+    
+    # Like Hooks#run_hook but for the class. Note that +:callbacks+ must be class methods.
+    #
+    # Example:
+    #
+    # class Cat
+    #   after_eight :grab_a_beer
+    #   
+    #   def self.grab_a_beer(*) # and so on...
+    # 
+    # where <tt>Cat.run_hook :after_eight</tt> will call the class method +grab_a_beer+.
+    def run_hook(name, *args)
+      run_hook_for(name, self, *args)
+    end    
+    
+    def run_hook_for(name, scope, *args)
+      callbacks_for_hook(name).each do |callback|
+        if callback.kind_of? Symbol
+          scope.send(callback, *args)
+        else
+          scope.instance_exec(*args, &callback)
+        end 
+      end
+    end
+    
+    # Returns the callbacks for +name+. Handy if you want to run the callbacks yourself, say when
+    # they should be executed in another context.
+    #
+    # Example:
+    #
+    #   def initialize
+    #     self.class.callbacks_for_hook(:after_eight).each do |callback|
+    #       instance_exec(self, &callback)
+    #     end
+    #
+    # would run callbacks in the object _instance_ context, passing +self+ as block parameter.
+    def callbacks_for_hook(name)
+      send("_#{name}_callbacks")
+    end
+    
+  private
+    
+    def define_hook_writer(hook, accessor_name)
+      self.send(:define_method, hook.to_sym) do |&block|
+        if self.class.respond_to?(hook)
+          self.class.send(hook.to_sym, &block)
+        end
+      end
+    
+      instance_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+        def #{hook}(method=nil, &block)
+          #{accessor_name} << (block || method)
+        end
+      RUBY_EVAL
+    end
+    
+    def setup_hook_accessors(accessor_name)
+      inheritable_attr(accessor_name)
+      send("#{accessor_name}=", [])  # initialize ivar.
+    end  
+  end
+  
+  # Runs the callbacks (method/block) for the specified hook +name+. Additional arguments will 
+  # be passed to the callback.
+  #
+  # Example:
+  #
+  #   cat.run_hook :after_dinner, "i want ice cream!"
+  #
+  # will invoke the callbacks like
+  # 
+  #   desert("i want ice cream!")
+  #   block.call("i want ice cream!")
+  def run_hook(name, *args)
+    self.class.run_hook_for(name, self, *args)
+  end
+end

data/lib/middleman/vendor/hooks-0.2.0/lib/hooks/inheritable_attribute.rb

@@ -0,0 +1,33 @@
+module Hooks
+  module InheritableAttribute
+    # Creates an inheritable attribute with accessors in the singleton class. Derived classes inherit the
+    # attributes. This is especially helpful with arrays or hashes that are extended in the inheritance
+    # chain. Note that you have to initialize the inheritable attribute.
+    #
+    # Example:
+    #
+    #   class Cat
+    #     inheritable_attr :drinks
+    #     self.drinks = ["Becks"]
+    #
+    #   class Garfield < Cat
+    #     self.drinks << "Fireman's 4"
+    #
+    # and then, later
+    #
+    #   Cat.drinks      #=> ["Becks"]
+    #   Garfield.drinks #=> ["Becks", "Fireman's 4"]
+    def inheritable_attr(name)
+      instance_eval %Q{
+        def #{name}=(v)
+          @#{name} = v
+        end
+        
+        def #{name}
+          return @#{name} unless superclass.respond_to?(:#{name}) and value = superclass.#{name}
+          @#{name} ||= value.clone # only do this once.
+        end
+      }
+    end
+  end  
+end