middleman 1.2.8 → 2.0.0.beta2

data/lib/middleman/features/automatic_image_sizes.rb

@@ -15,7 +15,7 @@ module Middleman::Features::AutomaticImageSizes
         http_prefix = settings.http_images_path rescue settings.images_dir
 
         begin
-          real_path = File.join(settings.public, settings.images_dir, path)
+          real_path = File.join(settings.views, settings.images_dir, path)
           if File.exists? real_path
             dimensions = ::FastImage.size(real_path, :raise_on_failure => true)
             params[:width]  ||= dimensions[0]

data/lib/middleman/features/blog.rb

@@ -0,0 +1,118 @@
+require "rdiscount"
+
+module Middleman
+  module Features
+    module Blog
+      class << self
+        def registered(app)          
+          # Include helpers
+          app.helpers Middleman::Features::Blog::Helpers
+          
+          app.after_feature_init do
+            if !app.settings.respond_to? :blog_permalink
+              app.set :blog_permalink, "/:year/:month/:day/:title.html"
+            end
+            
+            if !app.settings.respond_to? :blog_layout
+              app.set :blog_layout, "layout"
+            end
+            
+            if !app.settings.respond_to? :blog_summary_separator
+              app.set :blog_summary_separator, /READMORE/
+            end
+            
+            if !app.settings.respond_to? :blog_summary_length
+              app.set :blog_summary_length, 250
+            end
+
+            if !app.settings.respond_to? :blog_layout_engine
+              app.set :blog_layout_engine, "erb"
+            end
+
+            if !app.settings.respond_to? :blog_index_template
+              app.set :blog_index_template, "index_template"
+            end
+            
+            if !app.settings.respond_to? :blog_article_template
+              app.set :blog_article_template, "article_template"
+            end
+            
+            $stderr.puts "== Blog: #{app.settings.blog_permalink}"
+            
+            articles_glob = File.join(app.views, app.settings.blog_permalink.gsub(/(:\w+)/, "*") + ".*")
+            
+            articles = Dir[articles_glob].map do |article|
+              template_content = File.read(article)
+              data, content = parse_front_matter(template_content)
+              data["date"] = Date.parse(data["date"])
+              
+              yaml_regex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
+              data["raw"]  = template_content.split(yaml_regex).last
+              data["url"] = article.gsub(app.views, "").split(".html").first + ".html"
+              
+              all_content = Tilt.new(article).render              
+              data["body"] = all_content.gsub!(app.settings.blog_summary_separator, "")
+              
+              sum = if data["raw"] =~ app.settings.blog_summary_separator
+                data["raw"].split(app.settings.blog_summary_separator).first
+              else                data["raw"].match(/(.{1,#{app.settings.blog_summary_length}}.*?)(\n|\Z)/m).to_s
+              end
+              
+              engine = RDiscount.new(sum)
+              data["summary"] = engine.to_html
+              data
+            end.sort { |a, b| b["date"] <=> a["date"] }  
+            
+            app.data_content("blog", { :articles => articles })
+            
+            app.get(app.settings.blog_permalink) do
+              options = {}
+              options[:layout] = settings.blog_layout
+              options[:layout_engine] = settings.blog_layout_engine
+              
+              extensionless_path, template_engine = resolve_template(request.path)
+
+              full_file_path = "#{extensionless_path}.#{template_engine}"
+              system_path = File.join(settings.views, full_file_path)
+              data, content = self.class.parse_front_matter(File.read(system_path))
+
+              # Forward remaining data to helpers
+              self.class.data_content("page", data)
+              
+              output = render(request.path, options)
+              
+              # No need for separator on permalink page
+              output.gsub!(settings.blog_summary_separator, "")
+              
+              status 200
+              output
+            end
+          end
+          
+        end
+        alias :included :registered
+      end
+      
+      module Helpers
+        def is_blog_article?
+          !current_article_title.blank?
+        end
+        
+        def blog_title
+        end
+        
+        def current_article_date
+          DateTime.parse(current_article_metadata.date)
+        end
+        
+        def current_article_title
+          current_article_metadata.title
+        end
+        
+        def current_article_metadata
+          data.page
+        end
+      end
+    end
+  end
+end

data/lib/middleman/features/cache_buster.rb

@@ -12,7 +12,7 @@ module Middleman::Features::CacheBuster
           rescue
           end
 
-          real_path_static  = File.join(Middleman::Server.public, prefix, path)
+          real_path_static  = File.join(Middleman::Server.views, prefix, path)
 
           if File.readable?(real_path_static)
             http_path << "?" + File.mtime(real_path_static).strftime("%s") 
@@ -29,7 +29,7 @@ module Middleman::Features::CacheBuster
         ::Compass.configuration do |config|
           config.asset_cache_buster do |path, real_path|
             real_path = real_path.path if real_path.is_a? File
-            real_path = real_path.gsub(File.join(Middleman::Server.root, Middleman::Server.build_dir), Middleman::Server.public)
+            real_path = real_path.gsub(File.join(Middleman::Server.root, Middleman::Server.build_dir), Middleman::Server.views)
             if File.readable?(real_path)
               File.mtime(real_path).strftime("%s") 
             else

data/lib/middleman/features/data.rb

@@ -25,14 +25,18 @@ module Middleman::Features::Data
     def method_missing(path)
       response = nil
       
+      @@local_sources ||= {}
       @@remote_sources ||= {}
-      if @@remote_sources.has_key?(path.to_s)
-        response = HTTParty.get(@@remote_sources[path.to_s]).parsed_response
-      end
       
-      file_path = File.join(@app.class.root, "data", "#{path}.yml")      
-      if File.exists? file_path
-        response = YAML.load_file(file_path)
+      if @@local_sources.has_key?(path.to_s)
+        response = @@local_sources[path.to_s]
+      elsif @@remote_sources.has_key?(path.to_s)
+        response = HTTParty.get(@@remote_sources[path.to_s]).parsed_response
+      else
+        file_path = File.join(@app.class.root, "data", "#{path}.yml")      
+        if File.exists? file_path
+          response = YAML.load_file(file_path)
+        end
       end
       
       if response
@@ -44,6 +48,11 @@ module Middleman::Features::Data
       @@remote_sources ||= {}
       @@remote_sources[name.to_s] = json_url
     end
+
+    def self.data_content(name, content)
+      @@local_sources ||= {}
+      @@local_sources[name.to_s] = content
+    end
   
   private
     def recursively_enhance(data)
@@ -75,5 +84,9 @@ module Middleman::Features::Data
     def data_source(name, url)
       Middleman::Features::Data::DataObject.add_source(name, url)
     end
+    
+    def data_content(name, content)
+      Middleman::Features::Data::DataObject.data_content(name, content)
+    end
   end
 end

data/lib/middleman/features/default_helpers.rb

@@ -14,7 +14,7 @@ module Middleman::Features::DefaultHelpers
       path = path.gsub(File.extname(path), '')
       path = path.gsub("/", separator)
 
-      css_file = File.join(self.class.public, self.class.css_dir, "#{path}.css")
+      css_file = File.join(self.class.views, self.class.css_dir, "#{path}.css")
       sass_file = File.join(self.class.views, self.class.css_dir, "#{path}.css.sass")
       scss_file = File.join(self.class.views, self.class.css_dir, "#{path}.css.scss")
       less_file = File.join(self.class.views, self.class.css_dir, "#{path}.css.less")

data/lib/middleman/features/front_matter.rb

@@ -0,0 +1,69 @@
+require "yaml"
+require "tilt"
+
+module Middleman::Features::FrontMatter
+  class << self
+    def registered(app)
+      app.extend ClassMethods
+      
+      ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt::register KramdownTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt::register BlueClothTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt::register RedClothTemplate, 'textile'
+    end
+    alias :included :registered
+  end
+  
+  module ClassMethods
+    def parse_front_matter(content)
+      yaml_regex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
+      if content =~ yaml_regex
+        begin
+          data = YAML.load($1)
+        rescue => e
+          puts "YAML Exception: #{e.message}"
+        end
+        
+        content = content.split(yaml_regex).last
+      end
+
+      data ||= {}
+      [data, content]
+    end
+  end
+  
+  module YamlAware
+    def prepare
+      options, @data = Middleman::Server.parse_front_matter(@data)
+      super
+    end
+  end
+
+  # MARKDOWN
+  class MarukuTemplate < ::Tilt::MarukuTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
+  
+  class KramdownTemplate < ::Tilt::KramdownTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
+  
+  class BlueClothTemplate < ::Tilt::BlueClothTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
+  
+  class RedcarpetTemplate < ::Tilt::RedcarpetTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
+  
+  class RDiscountTemplate < ::Tilt::RDiscountTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
+  
+  # TEXTILE
+  class RedClothTemplate < ::Tilt::RedClothTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
+end

data/lib/middleman/features/live_reload.rb

@@ -10,11 +10,16 @@ module Middleman::Features::LiveReload
       end
 
       new_config = ::LiveReload::Config.new do |config|
-        config.exts = ::Tilt.mappings.keys
+        ::Tilt.mappings.each do |key, v|
+          config.exts << key
+        end
       end
+      
+      pid = fork {      
+        require 'livereload'
+        ::LiveReload.run [Middleman::Server.views], new_config
+      }
 
-      # Middleman::Server.public
-      ::LiveReload.run [Middleman::Server.views], new_config
     end
     alias :included :registered
   end

data/lib/middleman/features/minify_javascript/rack.rb

@@ -3,10 +3,10 @@ begin
 rescue LoadError
   puts "UglifyJS not available. Install it with: gem install uglifier"
 end
-  
+
 module Middleman
   module Rack
-  
+
     class MinifyJavascript
       def initialize(app, options={})
         @app = app
@@ -14,10 +14,10 @@ module Middleman
 
       def call(env)
         status, headers, response = @app.call(env)
-    
+
         if env["PATH_INFO"].match(/\.js$/)
           compressor = ::Uglifier.new
-      
+
           if response.is_a?(::Rack::File) or response.is_a?(Sinatra::Helpers::StaticFile)
             uncompressed_source = File.read(response.path)
           else
@@ -27,10 +27,31 @@ module Middleman
           headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
           response = [minified]
         end
-    
+
+        if env["PATH_INFO"].match(/\.html$/)
+          compressor = ::Uglifier.new
+
+          if response.is_a?(::Rack::File) or response.is_a?(Sinatra::Helpers::StaticFile)
+            uncompressed_source = File.read(response.path)
+          else
+            uncompressed_source = response.join
+          end
+
+          minified = uncompressed_source.gsub(/(<scri.*?\/\/<!\[CDATA\[\n)(.*?)(\/\/\]\].*?<\/script>)/m) do |m|
+            first = $1
+            uncompressed_source = $2
+            last = $3
+            minified_js = compressor.compile(uncompressed_source)
+
+            first << minified_js << "\n" << last
+          end
+          headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
+          response = [minified]
+        end
+
         [status, headers, response]
       end
     end
-    
+
   end
 end

data/lib/middleman/renderers/haml.rb

@@ -1,4 +1,5 @@
 require "haml"
+require "coffee-filter"
 
 module Middleman
   module Renderers

data/lib/middleman/renderers/sass.rb

@@ -1,6 +1,7 @@
 require "sass"
 require "sass/plugin"
 require "compass"
+require "susy"
 
 module Middleman
   module Renderers
@@ -13,9 +14,9 @@ module Middleman
               config.project_path          = self.root
               config.sass_dir              = File.join(File.basename(self.views), self.css_dir)
               config.output_style          = :nested
-              config.fonts_dir             = File.join(File.basename(self.public), self.fonts_dir)
-              config.css_dir               = File.join(File.basename(self.public), self.css_dir)
-              config.images_dir            = File.join(File.basename(self.public), self.images_dir)      
+              config.fonts_dir             = File.join(File.basename(self.views), self.fonts_dir)
+              config.css_dir               = File.join(File.basename(self.views), self.css_dir)
+              config.images_dir            = File.join(File.basename(self.views), self.images_dir)      
               config.http_images_path      = self.http_images_path rescue File.join(self.http_prefix || "/", self.images_dir)
               config.http_stylesheets_path = self.http_css_path rescue File.join(self.http_prefix || "/", self.css_dir)
               config.asset_cache_buster { false }
@@ -43,7 +44,7 @@ class Tilt::SassPlusCSSFilenameTemplate < Tilt::SassTemplate
     
     location_of_sass_file = Middleman::Server.environment == :build ? 
                               File.join(Middleman::Server.root, Middleman::Server.build_dir) : 
-                              Middleman::Server.public
+                              Middleman::Server.views
 
     parts = basename.split('.')
     parts.pop

data/lib/middleman/renderers/slim.rb

@@ -0,0 +1,12 @@
+module Middleman
+  module Renderers
+    module Slim
+      class << self
+        def registered(app)
+          require "slim"
+        end
+        alias :included :registered
+      end
+    end
+  end
+end

data/lib/middleman/server.rb

@@ -15,8 +15,6 @@ module Middleman
     set :logging,     false
     set :environment, (ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development
     
-    # Import padrino helper methods
-    
     # Middleman-specific options
     set :index_file,  "index.html"  # What file responds to folder requests
                                     # Such as the homepage (/) or subfolders (/about/)
@@ -30,9 +28,14 @@ module Middleman
     set :build_dir,   "build"       # Which folder are builds output to
     set :http_prefix, nil           # During build, add a prefix for absolute paths
     
+    set :static, false
+    set :views, "source"
+    
+    # Disable Padrino cache buster until explicitly enabled
+    set :asset_stamp, false
+    
     # Use Padrino Helpers
     register Padrino::Helpers
-    set :asset_stamp, false         # Disable Padrino cache buster until explicitly enabled
     
     # Activate custom features
     register Middleman::Features
@@ -46,6 +49,8 @@ module Middleman
     # Activate Webservices Proxy package
     # register Middleman::Features::Proxy
     
+    register Middleman::Features::FrontMatter
+    
     # Activate Lorem helpers
     register Middleman::Features::Lorem
     
@@ -70,6 +75,7 @@ module Middleman
     end
     
     # Activate custom renderers
+    register Middleman::Renderers::Slim
     register Middleman::Renderers::Haml
     register Middleman::Renderers::Sass
     
@@ -140,11 +146,27 @@ module Middleman
       # Normalize the path and add index if we're looking at a directory
       path = self.class.path_to_index(request.path)
       
-      static_path = File.join(Middleman::Server.public, path)
-      # if File.exists? static_path
-      #   send_file static_path
-      #   return
-      # end
+      extensionless_path, template_engine = resolve_template(path)
+      
+      if !::Tilt.mappings.has_key?(template_engine.to_s)
+        content_type mime_type(File.extname(path)), :charset => 'utf-8'
+        status 200
+        send_file File.join(Middleman::Server.views, path)
+        return
+      end
+      
+      full_file_path = "#{extensionless_path}.#{template_engine}"
+      system_path = File.join(settings.views, full_file_path)
+      data, content = self.class.parse_front_matter(File.read(system_path))
+      
+      %w(layout layout_engine).each do |opt|
+        if data.has_key?(opt)
+          options[opt.to_sym] = data.delete(opt)
+        end
+      end
+      
+      # Forward remaining data to helpers
+      self.class.data_content("page", data)
       
       old_layout = settings.current_layout
       settings.layout(options[:layout]) if !options[:layout].nil?
@@ -182,9 +204,6 @@ class Middleman::Server
       Middleman::Server.class_eval File.read(local_config)
       set :app_file, File.expand_path(local_config)
     end
-      
-    use ::Rack::ConditionalGet
-    use ::Rack::Static, :urls => ["/#{self.images_dir}"], :root => "public"
     
     @@run_after_features.each { |block| class_eval(&block) }