machined 0.7.1 → 0.8.0

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
-require "rspec/core/rake_task"
+require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 
 task :default => :spec

data/bin/machined

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-ENV["BUNDLE_GEMFILE"] ||= File.join(Dir.pwd, "Gemfile")
-require "bundler/setup" if File.exist? ENV["BUNDLE_GEMFILE"]
+ENV['BUNDLE_GEMFILE'] ||= File.join(Dir.pwd, 'Gemfile')
+require 'bundler/setup' if File.exist? ENV['BUNDLE_GEMFILE']
 
-require "machined"
+require 'machined'
 Machined::CLI.start

data/lib/machined.rb

@@ -1,26 +1,26 @@
-require "machined/version"
+require 'machined/version'
 
 module Machined
-  autoload :CLI,                    "machined/cli"
-  autoload :Context,                "machined/context"
-  autoload :Environment,            "machined/environment"
-  autoload :Index,                  "machined/index"
-  autoload :Initializable,          "machined/initializable"
-  autoload :Server,                 "machined/server"
-  autoload :Sprocket,               "machined/sprocket"
-  autoload :StaticCompiler,         "machined/static_compiler"
-  autoload :Utils,                  "machined/utils"
+  autoload :CLI,                    'machined/cli'
+  autoload :Context,                'machined/context'
+  autoload :Environment,            'machined/environment'
+  autoload :Index,                  'machined/index'
+  autoload :Initializable,          'machined/initializable'
+  autoload :Server,                 'machined/server'
+  autoload :Sprocket,               'machined/sprocket'
+  autoload :StaticCompiler,         'machined/static_compiler'
+  autoload :Utils,                  'machined/utils'
   
   module Helpers
-    autoload :AssetTagHelpers,      "machined/helpers/asset_tag_helpers"
-    autoload :LocalsHelpers,        "machined/helpers/locals_helpers"
-    autoload :OutputHelpers,        "machined/helpers/output_helpers"
-    autoload :PageHelpers,          "machined/helpers/page_helpers"
-    autoload :RenderHelpers,        "machined/helpers/render_helpers"
+    autoload :AssetTagHelpers,      'machined/helpers/asset_tag_helpers'
+    autoload :LocalsHelpers,        'machined/helpers/locals_helpers'
+    autoload :OutputHelpers,        'machined/helpers/output_helpers'
+    autoload :PageHelpers,          'machined/helpers/page_helpers'
+    autoload :RenderHelpers,        'machined/helpers/render_helpers'
   end
   
   module Processors
-    autoload :FrontMatterProcessor, "machined/processors/front_matter_processor"
-    autoload :LayoutProcessor,      "machined/processors/layout_processor"
+    autoload :FrontMatterProcessor, 'machined/processors/front_matter_processor'
+    autoload :LayoutProcessor,      'machined/processors/layout_processor'
   end
 end

data/lib/machined/cli.rb

@@ -1,60 +1,60 @@
-require "active_support/core_ext/hash/keys"
-require "active_support/core_ext/hash/slice"
-require "thor"
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/slice'
+require 'thor'
 
 module Machined
   class CLI < Thor
     include Thor::Actions
     
     default_task :help
-    source_root  File.expand_path("../templates", __FILE__)
+    source_root  File.expand_path('../templates', __FILE__)
     
-    class_option "root", :aliases => "-r",
-      :desc => "Path to the root directory of the project",
-      :default => "."
-    class_option "config_path", :aliases => "-c",
-      :desc => "Path to the config file",
-      :default => "machined.rb"
-    class_option "output_path", :aliases => "-o",
-      :desc => "Path to the output directory of the project",
-      :default => "public"
-    class_option "environment", :aliases => "-e",
-      :desc => "Sets the environment",
-      :default => "development"
+    class_option 'root', :aliases => '-r',
+      :desc => 'Path to the root directory of the project',
+      :default => '.'
+    class_option 'config_path', :aliases => '-c',
+      :desc => 'Path to the config file',
+      :default => 'machined.rb'
+    class_option 'output_path', :aliases => '-o',
+      :desc => 'Path to the output directory of the project',
+      :default => 'public'
+    class_option 'environment', :aliases => '-e',
+      :desc => 'Sets the environment',
+      :default => 'development'
     
-    desc "compile", "Compiles the site from the source files"
+    desc 'compile', 'Compiles the site from the source files'
     def compile
       machined.compile
     end
     map %w(c build b) => :compile
     
-    desc "new SITE_NAME", "Generates a new site with the give name"
+    desc 'new SITE_NAME', 'Generates a new site with the give name'
     def new(site_name)
-      directory "site", site_name
+      directory 'site', site_name
     end
     map %w(n generate g) => :new
     
-    desc "server", "Runs a local Rack based web server"
-    method_option :port, :aliases => "-p",
-      :desc => "Serve at the given port",
+    desc 'server', 'Runs a local Rack based web server'
+    method_option :port, :aliases => '-p',
+      :desc => 'Serve at the given port',
       :type => :numeric, :default => 3000
-    method_option :host, :aliases => "-h",
-      :desc => "Listen on the given given host",
-      :default => "0.0.0.0"
-    method_option :server, :aliases => "-s",
-      :desc => "Serve with the given handler"
-    method_option :daemonize, :aliases => "-D",
-      :desc => "Run daemonized in the background",
+    method_option :host, :aliases => '-h',
+      :desc => 'Listen on the given given host',
+      :default => '0.0.0.0'
+    method_option :server, :aliases => '-s',
+      :desc => 'Serve with the given handler'
+    method_option :daemonize, :aliases => '-D',
+      :desc => 'Run daemonized in the background',
       :type => :boolean
-    method_option :pid, :aliases => "-P",
-      :desc => "File to store PID"
+    method_option :pid, :aliases => '-P',
+      :desc => 'File to store PID'
     def server
-      require "rack"
+      require 'rack'
       Rack::Server.start rack_options
     end
     map %w(s rackup r) => :server
     
-    desc "version", "Prints out the version"
+    desc 'version', 'Prints out the version'
     def version
       say VERSION
     end
@@ -66,10 +66,10 @@ module Machined
       @machined ||= Environment.new machined_options
     end
     
-    # Returns the current environment, using the "RACK_ENV" variable
+    # Returns the current environment, using the 'RACK_ENV' variable
     # if set.
     def environment # :nodoc
-      ENV["RACK_ENV"] || options["environment"]
+      ENV['RACK_ENV'] || options['environment']
     end
     
     # Returns the options needed for setting up

data/lib/machined/context.rb

@@ -1,7 +1,7 @@
-require "padrino-helpers"
-require "rack"
-require "sprockets"
-require "sprockets-helpers"
+require 'padrino-helpers'
+require 'rack'
+require 'sprockets'
+require 'sprockets-helpers'
 
 module Machined
   class Context < Sprockets::Context

data/lib/machined/environment.rb

@@ -1,8 +1,9 @@
-require "ostruct"
-require "pathname"
-require "active_support/core_ext/hash/reverse_merge"
-require "crush"
-require "tilt"
+require 'ostruct'
+require 'pathname'
+require 'active_support/cache'
+require 'active_support/core_ext/hash/reverse_merge'
+require 'crush'
+require 'tilt'
 
 module Machined
   class Environment
@@ -11,24 +12,25 @@ module Machined
     # Default options for a Machined environment.
     DEFAULT_OPTIONS = {
       # Global configuration
-      :root           => ".",
-      :config_path    => "machined.rb",
-      :output_path    => "public",
-      :environment    => "development",
+      :root           => '.',
+      :config_path    => 'machined.rb',
+      :output_path    => 'public',
+      :environment    => 'development',
+      :cache          => nil,
       :skip_bundle    => false,
       :assets_only    => false,
       :digest_assets  => false,
       :gzip_assets    => false,
-      :layout         => "application",
+      :layout         => 'application',
       
       # Sprocket paths and URLs
-      :assets_path    => "assets",
+      :assets_path    => 'assets',
       :assets_paths   => %w(app/assets lib/assets vendor/assets),
-      :assets_url     => "/assets",
-      :pages_path     => "pages",
+      :assets_url     => '/assets',
+      :pages_path     => 'pages',
       :pages_paths    => %w(app/pages),
-      :pages_url      => "/",
-      :views_path     => "views",
+      :pages_url      => '/',
+      :views_path     => 'views',
       :views_paths    => %w(app/views),
       
       # Compression configuration
@@ -114,9 +116,10 @@ module Machined
     initializer :require_bundle do
       next if config.skip_bundle
       
-      ENV["BUNDLE_GEMFILE"] ||= root.join("Gemfile").to_s
-      if File.exist? ENV["BUNDLE_GEMFILE"]
-        require "bundler"
+      ENV['BUNDLE_GEMFILE'] ||= root.join('Gemfile').to_s
+      if File.exist? ENV['BUNDLE_GEMFILE']
+        require 'bundler/setup'
+        require 'sprockets'
         Bundler.require :default, config.environment.to_sym
       end
     end
@@ -135,9 +138,9 @@ module Machined
       next if config.assets_only
       
       append_sprocket :pages do |pages|
-        pages.register_mime_type     "text/html", ".html"
-        pages.register_preprocessor  "text/html", Processors::FrontMatterProcessor
-        pages.register_postprocessor "text/html", Processors::LayoutProcessor
+        pages.register_mime_type     'text/html', '.html'
+        pages.register_preprocessor  'text/html', Processors::FrontMatterProcessor
+        pages.register_postprocessor 'text/html', Processors::LayoutProcessor
       end
     end
     
@@ -147,7 +150,7 @@ module Machined
     # the layouts for the `pages` sprocket will be located here.
     initializer :create_views_sprocket do
       append_sprocket :views, :compile => false do |views|
-        views.register_mime_type "text/html", ".html"
+        views.register_mime_type 'text/html', '.html'
       end
     end
     
@@ -172,6 +175,20 @@ module Machined
       end
     end
     
+    # Setup the global cache. Defaults to an in memory
+    # caching for development, and a file based cache for production.
+    initializer :configure_cache do
+      if config.cache.nil?
+        if config.environment == 'production'
+          config.cache = :file_store, 'tmp/cache'
+        else
+          config.cache = :memory_store
+        end
+      end
+      
+      config.cache = ActiveSupport::Cache.lookup_store(*config.cache)
+    end
+    
     # Do any configuration to the assets sprockets necessary
     # after the config file has been evaled.
     initializer :configure_assets_sprocket do
@@ -189,14 +206,17 @@ module Machined
       # Search for Rails Engines with assets and append those
       if defined? Rails::Engine
         Rails::Engine.subclasses.each do |engine|
-          append_paths assets, engine.paths["app/assets"].existent_directories
-          append_paths assets, engine.paths["lib/assets"].existent_directories
-          append_paths assets, engine.paths["vendor/assets"].existent_directories
+          append_paths assets, engine.paths['app/assets'].existent_directories
+          append_paths assets, engine.paths['lib/assets'].existent_directories
+          append_paths assets, engine.paths['vendor/assets'].existent_directories
         end
       end
       
       # Setup the base URL for the assets (like the Rails asset_prefix)
       assets.config.url = config.assets_url
+      
+      # Use the global cache store
+      assets.cache = config.cache
     end
     
     # Do any configuration to the pages sprockets necessary
@@ -210,6 +230,9 @@ module Machined
       
       # Setup the base URL for the pages
       pages.config.url = config.pages_url
+      
+      # Use the global cache store
+      pages.cache = config.cache
     end
     
     # Do any configuration to the views sprockets necessary
@@ -220,6 +243,9 @@ module Machined
       # Append the configured views paths
       append_path  views, config.views_path
       append_paths views, config.views_paths
+      
+      # Use the global cache store
+      views.cache = config.cache
     end
     
     # Setup the JavaScript and CSS compressors
@@ -269,13 +295,13 @@ module Machined
     # and appends it to the #sprockets list. This will also create
     # an accessor with the given name that references the created sprocket.
     #
-    #   machined.append_sprocket :updates, :url => "/news" do |updates|
-    #     updates.append_path "updates"
+    #   machined.append_sprocket :updates, :url => '/news' do |updates|
+    #     updates.append_path 'updates'
     #   end
     #   
     #   machined.updates            # => #<Machined::Sprocket...>
-    #   machined.updates.config.url # => "/news"
-    #   machined.updates.paths      # => [ ".../updates" ]
+    #   machined.updates.config.url # => '/news'
+    #   machined.updates.paths      # => [ '.../updates' ]
     #
     def append_sprocket(name, options = {}, &block)
       create_sprocket(name, options, &block).tap do |sprocket|
@@ -388,7 +414,7 @@ module Machined
         JS_COMPRESSORS[config.js_compressor.to_sym]
       else
         Crush.register_js
-        Tilt["js"]
+        Tilt['js']
       end
     end
     
@@ -403,7 +429,7 @@ module Machined
         CSS_COMPRESSORS[config.css_compressor.to_sym]
       else
         Crush.register_css
-        Tilt["css"]
+        Tilt['css']
       end
     end
   end

data/lib/machined/helpers/asset_tag_helpers.rb

@@ -6,11 +6,11 @@ module Machined
       def asset_path(source, options = {})
         case source
         when :css
-          path_to_asset options, :dir => "stylesheets", :ext => "css"
+          path_to_asset options, :dir => 'stylesheets', :ext => 'css'
         when :images
-          path_to_asset options, :dir => "images"
+          path_to_asset options, :dir => 'images'
         when :js
-          path_to_asset options, :dir => "javascripts", :ext => "js"
+          path_to_asset options, :dir => 'javascripts', :ext => 'js'
         else
           path_to_asset source, options
         end
@@ -18,7 +18,7 @@ module Machined
       
       # Redefine image_path to work with Sprockets::Helpers.
       def image_path(source, options = {})
-        asset_path source, { :dir => "images" }.merge(options)
+        asset_path source, { :dir => 'images' }.merge(options)
       end
     end
   end

data/lib/machined/helpers/locals_helpers.rb

@@ -1,4 +1,4 @@
-require "active_support/hash_with_indifferent_access"
+require 'active_support/hash_with_indifferent_access'
 
 module Machined
   module Helpers

data/lib/machined/helpers/output_helpers.rb

@@ -1,23 +1,20 @@
-require "active_support/memoizable"
-require "tilt"
+require 'tilt'
 
 # We need to ensure that Tilt's ERB template uses
 # the same output variable that Padrino's helpers expect.
-Tilt::ERBTemplate.default_output_variable = "@_out_buf"
+Tilt::ERBTemplate.default_output_variable = '@_out_buf'
 
 module Machined
   module Helpers
     module OutputHelpers
-      extend ActiveSupport::Memoizable
-      
       # A hash of Tilt templates that support
       # capture blocks where the key is the name
       # of the template.
       CAPTURE_ENGINES = {
-        "Tilt::HamlTemplate"   => :haml,
-        "Tilt::ERBTemplate"    => :erb,
-        "Tilt::ErubisTemplate" => :erubis,
-        "Slim::Template"       => :slim
+        'Tilt::HamlTemplate'   => :haml,
+        'Tilt::ERBTemplate'    => :erb,
+        'Tilt::ErubisTemplate' => :erubis,
+        'Slim::Template'       => :slim
       }
       
       protected
@@ -27,15 +24,18 @@ module Machined
       # Padrino's helpers to determine which type of template
       # engine to use when capturing blocks.
       def current_engine
-        processors = environment.attributes_for(self.pathname).processors
-        processors or return
-        processors.each do |processor|
-          engine = CAPTURE_ENGINES[processor.to_s] and return engine
+        unless defined?(@current_engine)
+          processors = environment.attributes_for(self.pathname).processors
+          processors.each do |processor|
+            if engine = CAPTURE_ENGINES[processor.to_s]
+              @current_engine = engine
+              break
+            end
+          end
         end
         
-        nil
+        @current_engine
       end
-      memoize :current_engine
     end
   end
 end