middleman-more 3.0.0.beta.2 → 3.0.0.beta.3

data/lib/middleman-more/renderers/coffee_script.rb

@@ -0,0 +1,22 @@
+module Middleman
+  module Renderers
+    
+    # CoffeeScript Renderer
+    module CoffeeScript
+      
+      # Setup extension
+      class << self
+        # Once registered
+        def registered(app)
+          # Require gem
+          require "coffee_script"
+          
+          app.before_configuration do
+            template_extensions :coffee => :js
+          end
+        end
+        alias :included :registered
+      end
+    end
+  end
+end

data/lib/middleman-more/renderers/haml.rb

@@ -1,25 +1,30 @@
-# Require gem
-require "haml"
-  
-# Haml Renderer
-module Middleman::Renderers::Haml
-  
-  # Setup extension
-  class << self
-    # Once registered
-    def registered(app)
-      # Add haml helpers to context
-      app.send :include, ::Haml::Helpers
+module Middleman
+  module Renderers
+    
+    # Haml Renderer
+    module Haml
       
-      app.before_configuration do
-        template_extensions :haml => :html
-      end
+      # Setup extension
+      class << self
+        # Once registered
+        def registered(app)
+          # Require gem
+          require "haml"
+          
+          app.before_configuration do
+            template_extensions :haml => :html
+          end
+          
+          # Add haml helpers to context
+          app.send :include, ::Haml::Helpers
       
-      # Setup haml helper paths
-      app.ready do
-        init_haml_helpers
+          # Setup haml helper paths
+          app.ready do
+            init_haml_helpers
+          end
+        end
+        alias :included :registered
       end
     end
-    alias :included :registered
   end
 end

data/lib/middleman-more/renderers/liquid.rb

@@ -1,35 +1,40 @@
-# Liquid Renderer
-module Middleman::Renderers::Liquid
+module Middleman
+  module Renderers
+
+    # Liquid Renderer
+    module Liquid
   
-  # Setup extension
-  class << self
+      # Setup extension
+      class << self
     
-    # Once registerd
-    def registered(app)
-      # Liquid is not included in the default gems,
-      # but we'll support it if available.
-      begin
+        # Once registerd
+        def registered(app)
+          # Liquid is not included in the default gems,
+          # but we'll support it if available.
+          begin
+            # Require Gem
+            require "liquid"
         
-        # Require Gem
-        require "liquid"
+            app.before_configuration do
+              template_extensions :liquid => :html
+            end
         
-        app.before_configuration do
-          template_extensions :liquid => :html
-        end
-        
-        # After config, setup liquid partial paths
-        app.after_configuration do
-          Liquid::Template.file_system = Liquid::LocalFileSystem.new(source_dir)
+            # After config, setup liquid partial paths
+            app.after_configuration do
+              ::Liquid::Template.file_system = ::Liquid::LocalFileSystem.new(source_dir)
             
-          # Convert data object into a hash for liquid
-          sitemap.provides_metadata %r{\.liquid$} do |path|
-            { :locals => { :data => data.to_h } }
+              # Convert data object into a hash for liquid
+              sitemap.provides_metadata %r{\.liquid$} do |path|
+                { :locals => { :data => data.to_h } }
+              end
+            end
+          rescue LoadError
           end
         end
-      rescue LoadError
+    
+        alias :included :registered
       end
     end
     
-    alias :included :registered
   end
 end

data/lib/middleman-more/renderers/markdown.rb

@@ -1,50 +1,58 @@
-# Markdown renderer
-module Middleman::Renderers::Markdown
-  
-  # Setup extension
-  class << self
+module Middleman
+  module Renderers
     
-    # Once registered
-    def registered(app)
-      # Require redcarpet gem
-      require "redcarpet"
-      
-      # Forcably disable Redcarpet1 support.
-      # Tilt defaults to this if available, but the compat
-      # layer disables extensions.
-      Object.send(:remove_const, :RedcarpetCompat) if defined? ::RedcarpetCompat
-      
-      # Set our preference for a markdown engine
-      app.set :markdown_engine, :redcarpet
-      app.set :markdown_engine_prefix, ::Tilt
+    # Markdown renderer
+    module Markdown
+
+      # Setup extension
+      class << self
+    
+        # Once registered
+        def registered(app)
+          # Set our preference for a markdown engine
+          # TODO: Find a JRuby-compatible version
+          app.set :markdown_engine, :maruku
+          app.set :markdown_engine_prefix, ::Tilt
       
-      app.before_configuration do
-        template_extensions :markdown => :html,
-                            :mdown    => :html,
-                            :md       => :html,
-                            :mkd      => :html,
-                            :mkdn     => :html
-      end
+          app.before_configuration do
+            template_extensions :markdown => :html,
+                                :mdown    => :html,
+                                :md       => :html,
+                                :mkd      => :html,
+                                :mkdn     => :html
+          end
       
-      # Once configuration is parsed
-      app.after_configuration do
-        
-        # Look for the user's preferred engine
-        unless markdown_engine.nil?
-          
-          # Map symbols to classes
-          if markdown_engine.is_a? Symbol
-            engine = markdown_engine.to_s
-            engine = engine == "rdiscount" ? "RDiscount" : engine.camelize
-            markdown_engine = markdown_engine_prefix.const_get("#{engine}Template")
+          # Once configuration is parsed
+          app.after_configuration do
+
+            # Look for the user's preferred engine
+            unless markdown_engine.nil?
+              
+              # Map symbols to classes
+              markdown_engine_klass = if markdown_engine.is_a? Symbol
+                engine = markdown_engine.to_s
+                engine = engine == "rdiscount" ? "RDiscount" : engine.camelize
+                markdown_engine_prefix.const_get("#{engine}Template")
+              else 
+                markdown_engine_prefix
+              end
+              
+              if markdown_engine == :redcarpet
+                # Forcably disable Redcarpet1 support.
+                # Tilt defaults to this if available, but the compat
+                # layer disables extensions.
+                require "redcarpet"
+                Object.send(:remove_const, :RedcarpetCompat) if defined? ::RedcarpetCompat
+              end
+         
+              # Tell tilt to use that engine
+              ::Tilt.prefer(markdown_engine_klass)
+            end
           end
-        
-          # Tell tilt to use that engine
-          ::Tilt.prefer(markdown_engine)
         end
+    
+        alias :included :registered
       end
     end
-    
-    alias :included :registered
   end
-end
+end

data/lib/middleman-more/renderers/sass.rb

@@ -1,81 +1,88 @@
 # Pull in gems
 require "sprockets"
 require "sprockets-sass"
-require "sass"
 
-# Stick with Compass' asset functions
-Sprockets::Sass.add_sass_functions = false
-
-# Sass renderer
-module Middleman::Renderers::Sass
+module Middleman
+  module Renderers
+    
+    # Sass renderer
+    module Sass
   
-  # Setup extension
-  class << self
+      # Setup extension
+      class << self
     
-    # Once registered
-    def registered(app)
-      # Default sass options
-      app.set :sass, {}
+        # Once registered
+        def registered(app)
+          require "sass"
+
+          # Stick with Compass' asset functions
+          ::Sprockets::Sass.add_sass_functions = false
+
+          # Default sass options
+          app.set :sass, {}
       
-      app.before_configuration do
-        template_extensions :scss => :css,
-                            :sass => :css
-      end
-    end
+          app.before_configuration do
+            template_extensions :scss => :css,
+                                :sass => :css
+          end
+          
+          # Tell Sprockets to use our custom Sass template
+          ::Sprockets.register_engine ".sass", SassPlusCSSFilenameTemplate
+
+          # Tell Tilt to use it as well (for inline sass blocks)
+          ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
+          ::Tilt.prefer(SassPlusCSSFilenameTemplate)
+
+          # Tell Sprockets to use our custom Scss template
+          ::Sprockets.register_engine ".scss", ScssPlusCSSFilenameTemplate
+
+          # Tell Tilt to use it as well (for inline scss blocks)
+          ::Tilt.register 'scss', ScssPlusCSSFilenameTemplate
+          ::Tilt.prefer(ScssPlusCSSFilenameTemplate)
+        end
     
-    alias :included :registered
-  end
+        alias :included :registered
+      end
   
-  # A SassTemplate for Sprockets/Tilt which outputs debug messages
-  class SassPlusCSSFilenameTemplate < ::Sprockets::Sass::SassTemplate
+      # A SassTemplate for Sprockets/Tilt which outputs debug messages
+      class SassPlusCSSFilenameTemplate < ::Sprockets::Sass::SassTemplate
     
-    # Add exception messaging
-    # @param [Class] context
-    # @param [Hash] locals
-    # @return [String]
-    def evaluate(context, locals, &block)
-      begin
-        super
-      rescue Sass::SyntaxError => e
-        Sass::SyntaxError.exception_to_css(e, :full_exception => true)
-      end
-    end
+        # Add exception messaging
+        # @param [Class] context
+        # @param [Hash] locals
+        # @return [String]
+        def evaluate(context, locals, &block)
+          begin
+            super
+          rescue Sass::SyntaxError => e
+            Sass::SyntaxError.exception_to_css(e, :full_exception => true)
+          end
+        end
   
-  protected
-    # Change Sass path, for url functions, to the build folder if we're building
-    # @return [Hash]
-    def sass_options
-      location_of_sass_file = File.expand_path(@context.source, @context.root)
+      protected
+        # Change Sass path, for url functions, to the build folder if we're building
+        # @return [Hash]
+        def sass_options
+          location_of_sass_file = File.expand_path(@context.source, @context.root)
       
-      parts = basename.split('.')
-      parts.pop
-      css_filename = File.join(location_of_sass_file, @context.css_dir, parts.join("."))
+          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
-  
-  # Tell Sprockets to use our custom Sass template
-  ::Sprockets.register_engine ".sass", SassPlusCSSFilenameTemplate
-  
-  # Tell Tilt to use it as well (for inline sass blocks)
-  ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
-  ::Tilt.prefer(SassPlusCSSFilenameTemplate)
+          super.merge(:css_filename => css_filename)
+        end
+      end
   
-  # SCSS version of the above template
-  class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
+      # SCSS version of the above template
+      class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
     
-    # Define the expected syntax for the template
-    # @return [Symbol]
-    def syntax
-      :scss
+        # Define the expected syntax for the template
+        # @return [Symbol]
+        def syntax
+          :scss
+        end
+      end
+  
     end
   end
-  
-  # Tell Sprockets to use our custom Scss template
-  ::Sprockets.register_engine ".scss", ScssPlusCSSFilenameTemplate
-  
-  # Tell Tilt to use it as well (for inline scss blocks)
-  ::Tilt.register 'scss', ScssPlusCSSFilenameTemplate
-  ::Tilt.prefer(ScssPlusCSSFilenameTemplate)
 end

data/lib/middleman-more/renderers/slim.rb

@@ -1,27 +1,35 @@
-# Slim renderer
-module Middleman::Renderers::Slim
+module Middleman
+  module Renderers
+    
+    # Slim renderer
+    module Slim
   
-  # Setup extension
-  class << self
+      # Setup extension
+      class << self
     
-    # Once registered
-    def registered(app)
-      # Slim is not included in the default gems,
-      # but we'll support it if available.
-      begin
-        # Load gem
-        require "slim"
+        # Once registered
+        def registered(app)
+          # Slim is not included in the default gems,
+          # but we'll support it if available.
+          begin
+            # Load gem
+            require "slim"
         
-        app.before_configuration do
-          template_extensions :slim => :html
-        end
+            app.before_configuration do
+              template_extensions :slim => :html
+            end
         
-        # Setup Slim options to work with partials
-        Slim::Engine.set_default_options(:buffer => '@_out_buf', :generator => Temple::Generators::StringBuffer) if defined?(Slim)
-      rescue LoadError
+            # Setup Slim options to work with partials
+            ::Slim::Engine.set_default_options(
+              :buffer    => '@_out_buf', 
+              :generator => ::Temple::Generators::StringBuffer
+            )
+          rescue LoadError
+          end
+        end
+    
+        alias :included :registered
       end
     end
-    
-    alias :included :registered
   end
 end

data/middleman-more.gemspec

@@ -13,20 +13,19 @@ Gem::Specification.new do |s|
   s.summary     = "Hand-crafted frontend development"
   s.description = "A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle."
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {fixtures,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = `git ls-files -z`.split("\0")
+  s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
 
   s.add_dependency("middleman-core", Middleman::VERSION)
   s.add_dependency("uglifier", ["~> 1.2.0"])
-  s.add_dependency("haml", ["~> 3.1.0"])
+  s.add_dependency("haml", [">= 3.1.0"])
   s.add_dependency("sass", [">= 3.1.7"])
-  s.add_dependency("compass", ["~> 0.12.1"])
+  s.add_dependency("compass", [">= 0.12.1"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
-  s.add_dependency("execjs", ["~> 1.2"])
+  s.add_dependency("execjs", ["~> 1.3.2"])
   s.add_dependency("sprockets", ["~> 2.1"])
   s.add_dependency("sprockets-sass", ["~> 0.8.0"])
-  s.add_dependency("redcarpet", ["~> 2.1.0"])
+  s.add_dependency("maruku", ["~> 0.6.0"])
 end