machined 0.7.1 → 0.8.0

data/lib/machined/helpers/page_helpers.rb

@@ -1,4 +1,4 @@
-require "active_support/core_ext/string/inflections"
+require 'active_support/core_ext/string/inflections'
 
 module Machined
   module Helpers

data/lib/machined/helpers/render_helpers.rb

@@ -1,4 +1,4 @@
-require "pathname"
+require 'pathname'
 
 module Machined
   module Helpers
@@ -7,9 +7,9 @@ module Machined
       # It works exactly like #render_partial, except if you pass the
       # +:collection+ option:
       #
-      #   <%= render "ad", :collection => advertisements %>
+      #   <%= render 'ad', :collection => advertisements %>
       #   # is the same as:
-      #   <%= render_collection advertisements, "ad" %>
+      #   <%= render_collection advertisements, 'ad' %>
       # 
       def render(partial, options = {})
         if collection = options.delete(:collection)
@@ -24,9 +24,9 @@ module Machined
       # of Rails' partial rendering, where the individual objects
       # will be set as local variables based on the name of the partial:
       #
-      #   <%= render_collection advertisements, "ad" %>
+      #   <%= render_collection advertisements, 'ad' %>
       #
-      # This will render the "ad" template and pass the local variable
+      # This will render the 'ad' template and pass the local variable
       # +ad+ to the template for display. An iteration counter will automatically
       # be made available to the template with a name of the form
       # +partial_name_counter+. In the case of the example above, the
@@ -51,21 +51,21 @@ module Machined
       #
       # == Some Examples
       #
-      #   <%= render_partial "account" %>
+      #   <%= render_partial 'account' %>
       #
       # This will look for a template in the views paths with the name
-      # "account" or "_account". The files can be any processable Tilt
-      # template files, like ".erb", ".md", or ".haml" - or just plain ".html".
+      # 'account' or '_account'. The files can be any processable Tilt
+      # template files, like '.erb', '.md', or '.haml' - or just plain '.html'.
       #
-      #   <%= render_partial "account", :locals => { :account => buyer } %>
+      #   <%= render_partial 'account', :locals => { :account => buyer } %>
       #
-      # This will set `buyer` as a local variable named "account". This can
+      # This will set `buyer` as a local variable named 'account'. This can
       # actually be written a few different ways:
       #
-      #   <%= render_partial "account", :account => buyer %>
+      #   <%= render_partial 'account', :account => buyer %>
       #   # Leftover options are assumed to be locals.
-      #   <%= render_partial "account", :object => buyer %>
-      #   # The local variable name "account" is inferred.
+      #   <%= render_partial 'account', :object => buyer %>
+      #   # The local variable name 'account' is inferred.
       #
       # As mentioned above, any options that are not used by #render_partial
       # are assumed to be locals when the +:locals+ option is not set.
@@ -74,11 +74,11 @@ module Machined
       # where the local variable name will be inferred from the partial name.
       # This can be overridden with the +:as+ option:
       #
-      #   <%= render_partial "account", :object => buyer, :as => "user" %>
+      #   <%= render_partial 'account', :object => buyer, :as => 'user' %>
       #
       # This is equivalent to:
       #
-      #   <%= render_partial "account", :locals => { :user => buyer } %>
+      #   <%= render_partial 'account', :locals => { :user => buyer } %>
       #
       def render_partial(partial, options = {})
         template = resolve_partial partial
@@ -110,7 +110,7 @@ module Machined
       
       # Attempts to find a view with the given path,
       # while also looking for a version with a partial-style
-      # name (prefixed with an "_").
+      # name (prefixed with an '_').
       def resolve_partial(path) # :nodoc:
         path = Pathname.new path
         path.absolute? and return path

data/lib/machined/index.rb

@@ -1,4 +1,4 @@
-require "sprockets"
+require 'sprockets'
 
 module Machined
   # We need to add accessors for the Machined

data/lib/machined/initializable.rb

@@ -1,4 +1,4 @@
-require "active_support/concern"
+require 'active_support/concern'
 
 module Machined
   # Initializable is a minimal version of
@@ -9,7 +9,7 @@ module Machined
   #
   # If they move Rails::Initializable into ActiveSupport
   # I'll remove this module and use theirs. Right now,
-  # I don't want to `require "rails"` if I don't have to.
+  # I don't want to `require 'rails'` if I don't have to.
   module Initializable
     extend ActiveSupport::Concern
     
@@ -57,16 +57,14 @@ module Machined
       end
     end
     
-    module InstanceMethods
-      # Run each initializer with the given args
-      # yielded to each initializer's block.
-      def run_initializers(*args)
-        return if @initializers_run
-        self.class.initializers.each do |initializer|
-          initializer.run self, *args
-        end
-        @initializers_run = true
+    # Run each initializer with the given args
+    # yielded to each initializer's block.
+    def run_initializers(*args)
+      return if @initializers_run
+      self.class.initializers.each do |initializer|
+        initializer.run self, *args
       end
+      @initializers_run = true
     end
   end
 end

data/lib/machined/processors/front_matter_processor.rb

@@ -1,5 +1,5 @@
-require "yaml"
-require "tilt"
+require 'yaml'
+require 'tilt'
 
 module Machined
   module Processors

data/lib/machined/processors/layout_processor.rb

@@ -1,4 +1,4 @@
-require "tilt"
+require 'tilt'
 
 module Machined
   module Processors

data/lib/machined/server.rb

@@ -1,4 +1,4 @@
-require "rack"
+require 'rack'
 
 module Machined
   class Server
@@ -18,7 +18,7 @@ module Machined
     # should handle the request and then...let it
     # handle it.
     def call(env)
-      refresh if machined.config.environment == "development"
+      refresh if machined.config.environment == 'development'
       response = @url_map.call(env)
       response = @files.call(env) if response.first == 404
       response

data/lib/machined/sprocket.rb

@@ -1,12 +1,12 @@
-require "ostruct"
-require "sprockets"
-require "sprockets-sass"
+require 'ostruct'
+require 'sprockets'
+require 'sprockets-sass'
 
 module Machined
   class Sprocket < Sprockets::Environment
     # Default options for a Machined sprocket.
     DEFAULT_OPTIONS = {
-      :root    => ".",
+      :root    => '.',
       :assets  => false,
       :compile => true
     }.freeze

data/lib/machined/static_compiler.rb

@@ -1,4 +1,4 @@
-require "fileutils"
+require 'fileutils'
 
 module Machined
   class StaticCompiler
@@ -32,7 +32,7 @@ module Machined
     
     # Determines if we should precompile the asset
     # with the given url. By default, we skip over any
-    # files that begin with "_", like partials.
+    # files that begin with '_', like partials.
     def compile?(url)
       File.basename(url) !~ /^_/
     end

data/lib/machined/templates/site/Gemfile.tt

@@ -1,10 +1,10 @@
 source :rubygems
 
-gem "machined", "<%= Machined::VERSION %>"
+gem 'machined', '<%= Machined::VERSION %>'
 
-gem "sass", "~> 3.1"
-gem "coffee-script", "~> 2.2"
+gem 'sass', '~> 3.1'
+gem 'coffee-script', '~> 2.2'
 
 group :production do
-  gem "uglifier", "~> 1.0"
+  gem 'uglifier', '~> 1.0'
 end

data/lib/machined/templates/site/config.ru

@@ -1,2 +1,2 @@
-require "machined"
+require 'machined'
 run Machined::Environment.new

data/lib/machined/templates/site/machined.rb

@@ -1,7 +1,7 @@
-require "bundler"
+require 'bundler'
 Bundler.require :default, config.environment.to_sym
 
-if config.environment == "production"
+if config.environment == 'production'
   # Compress javascripts and stylesheets
   config.compress = true
   

data/lib/machined/templates/site/views/layouts/application.html.erb

@@ -3,8 +3,8 @@
   <head lang="en">
     <meta charset="utf-8">
     <title><%= title %></title>
-    <%= stylesheet_link_tag "application" %>
-    <%= javascript_include_tag "application" %>
+    <%= stylesheet_link_tag 'application' %>
+    <%= javascript_include_tag 'application' %>
   </head>
   <body>
     <%= yield %>

data/lib/machined/utils.rb

@@ -1,6 +1,6 @@
-require "pathname"
-require "sprockets"
-require "tilt"
+require 'pathname'
+require 'sprockets'
+require 'tilt'
 
 module Machined
   module Utils

data/lib/machined/version.rb

@@ -1,3 +1,3 @@
 module Machined
-  VERSION = "0.7.1"
+  VERSION = '0.8.0'
 end

data/machined.gemspec

@@ -1,43 +1,41 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "machined/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'machined/version'
 
 Gem::Specification.new do |s|
-  s.name        = "machined"
+  s.name        = 'machined'
   s.version     = Machined::VERSION
-  s.authors     = ["Pete Browne"]
-  s.email       = ["me@petebrowne.com"]
-  s.homepage    = "https://github.com/petebrowne/machined"
-  s.summary     = "A static site generator and Rack server built using Sprockets 2.0"
+  s.authors     = ['Pete Browne']
+  s.email       = ['me@petebrowne.com']
+  s.homepage    = 'https://github.com/petebrowne/machined'
+  s.summary     = 'A static site generator and Rack server built using Sprockets 2.0'
   s.description = "Why another static site generator? Machined is for the developers who know and love the asset pipeline of Rails 3.1 and want to develop blazingly fast static websites. It's built from the ground up using Sprockets 2.0."
 
-  s.rubyforge_project = "machined"
+  s.rubyforge_project = 'machined'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_dependency             "sprockets",         "~> 2.0.0"
-  s.add_dependency             "sprockets-plugin",  "~> 0.2.0"
-  s.add_dependency             "sprockets-helpers", "~> 0.2.1"
-  s.add_dependency             "sprockets-sass",    "~> 0.6.0"
-  s.add_dependency             "padrino-helpers",   "~> 0.10.5"
-  s.add_dependency             "activesupport",     "~> 3.1.3"
-  s.add_dependency             "i18n",              "~> 0.6.0"
-  s.add_dependency             "thor",              "~> 0.14.6"
-  s.add_dependency             "crush",             "~> 0.3.3"
-  s.add_development_dependency "rspec",             "~> 2.7.0"
-  s.add_development_dependency "rack-test",         "~> 0.6.1"
-  s.add_development_dependency "test-construct",    "~> 1.2.0"
-  s.add_development_dependency "unindent",          "~> 1.0"
-  s.add_development_dependency "railties",          "~> 3.1.3"
-  s.add_development_dependency "haml"
-  s.add_development_dependency "sass"
-  s.add_development_dependency "slim"
-  s.add_development_dependency "erubis"
-  s.add_development_dependency "rdiscount"
-  s.add_development_dependency "uglifier"
-  s.add_development_dependency "jquery-rails"
-  s.add_development_dependency "rake"
+  s.add_dependency             'sprockets',         '~> 2.4.0'
+  s.add_dependency             'sprockets-helpers', '~> 0.4.0'
+  s.add_dependency             'sprockets-sass',    '~> 0.8.0'
+  s.add_dependency             'padrino-helpers',   '~> 0.10.5'
+  s.add_dependency             'activesupport',     '~> 3.2.3'
+  s.add_dependency             'i18n',              '~> 0.6.0'
+  s.add_dependency             'thor',              '~> 0.14.6'
+  s.add_dependency             'crush',             '~> 0.3.3'
+  s.add_development_dependency 'rspec',             '~> 2.9.0'
+  s.add_development_dependency 'rack-test',         '~> 0.6.1'
+  s.add_development_dependency 'test-construct',    '~> 1.2.0'
+  s.add_development_dependency 'unindent',          '~> 1.0'
+  s.add_development_dependency 'sprockets-plugin',  '~> 0.2.1'
+  s.add_development_dependency 'haml'
+  s.add_development_dependency 'sass'
+  s.add_development_dependency 'slim'
+  s.add_development_dependency 'erubis'
+  s.add_development_dependency 'rdiscount'
+  s.add_development_dependency 'uglifier'
+  s.add_development_dependency 'rake'
 end

data/spec/machined/cli_spec.rb

@@ -1,44 +1,44 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Machined::CLI do
-  describe "#compile" do
-    it "compiles the site" do
+  describe '#compile' do
+    it 'compiles the site' do
       machined.should_receive(:compile)
-      Machined::Environment.should_receive(:new).with(:root => ".", :output_path => "public", :environment => "production", :config_path => "machined.rb").and_return(machined)
-      machined_cli "compile -e production"
+      Machined::Environment.should_receive(:new).with(:root => '.', :output_path => 'public', :environment => 'production', :config_path => 'machined.rb').and_return(machined)
+      machined_cli 'compile -e production'
     end
   end
   
-  describe "#new" do
-    it "creates a machined site directory" do
+  describe '#new' do
+    it 'creates a machined site directory' do
       within_construct do |c|
-        machined_cli "new my_site"
-        File.directory?("my_site").should be_true
+        machined_cli 'new my_site'
+        File.directory?('my_site').should be_true
       end
     end
     
-    it "creates source directories" do
+    it 'creates source directories' do
       within_construct do |c|
-        machined_cli "new my_site"
-        File.directory?("my_site/pages").should be_true
-        File.directory?("my_site/views").should be_true
-        File.directory?("my_site/assets/images").should be_true
-        File.directory?("my_site/assets/javascripts").should be_true
-        File.directory?("my_site/assets/stylesheets").should be_true
+        machined_cli 'new my_site'
+        File.directory?('my_site/pages').should be_true
+        File.directory?('my_site/views').should be_true
+        File.directory?('my_site/assets/images').should be_true
+        File.directory?('my_site/assets/javascripts').should be_true
+        File.directory?('my_site/assets/stylesheets').should be_true
       end
     end
     
-    it "creates an output path" do
+    it 'creates an output path' do
       within_construct do |c|
-        machined_cli "new my_site"
-        File.directory?("my_site/public").should be_true
+        machined_cli 'new my_site'
+        File.directory?('my_site/public').should be_true
       end
     end
     
-    it "creates an default index page" do
+    it 'creates an default index page' do
       within_construct do |c|
-        machined_cli "new my_site"
-        File.read("my_site/pages/index.html.erb").should == <<-CONTENT.unindent
+        machined_cli 'new my_site'
+        File.read('my_site/pages/index.html.erb').should == <<-CONTENT.unindent
           ---
           title: Home Page
           ---
@@ -50,15 +50,15 @@ describe Machined::CLI do
     
     it 'creates a default layout' do
       within_construct do |c|
-        machined_cli "new my_site"
-        File.read("my_site/views/layouts/application.html.erb").should == <<-CONTENT.unindent
+        machined_cli 'new my_site'
+        File.read('my_site/views/layouts/application.html.erb').should == <<-CONTENT.unindent
           <!doctype html>
           <html>
             <head lang="en">
               <meta charset="utf-8">
               <title><%= title %></title>
-              <%= stylesheet_link_tag "application" %>
-              <%= javascript_include_tag "application" %>
+              <%= stylesheet_link_tag 'application' %>
+              <%= javascript_include_tag 'application' %>
             </head>
             <body>
               <%= yield %>
@@ -68,46 +68,46 @@ describe Machined::CLI do
       end
     end
     
-    it "creates a default javascript file" do
+    it 'creates a default javascript file' do
       within_construct do |c|
-        machined_cli "new my_site"
-        File.exist?("my_site/assets/javascripts/application.js.coffee").should be_true
+        machined_cli 'new my_site'
+        File.exist?('my_site/assets/javascripts/application.js.coffee').should be_true
       end
     end
     
-    it "creates a default stylesheet file" do
+    it 'creates a default stylesheet file' do
       within_construct do |c|
-        machined_cli "new my_site"
-        File.exist?("my_site/assets/stylesheets/application.css.scss").should be_true
+        machined_cli 'new my_site'
+        File.exist?('my_site/assets/stylesheets/application.css.scss').should be_true
       end
     end
     
-    it "creates a default Gemfile" do
+    it 'creates a default Gemfile' do
       within_construct do |c|
-        machined_cli "new my_site"
-        File.read("my_site/Gemfile").should == <<-CONTENT.unindent
+        machined_cli 'new my_site'
+        File.read('my_site/Gemfile').should == <<-CONTENT.unindent
           source :rubygems
           
-          gem "machined", "#{Machined::VERSION}"
+          gem 'machined', '#{Machined::VERSION}'
           
-          gem "sass", "~> 3.1"
-          gem "coffee-script", "~> 2.2"
+          gem 'sass', '~> 3.1'
+          gem 'coffee-script', '~> 2.2'
           
           group :production do
-            gem "uglifier", "~> 1.0"
+            gem 'uglifier', '~> 1.0'
           end
         CONTENT
       end
     end
     
-    it "creates a default config file" do
+    it 'creates a default config file' do
       within_construct do |c|
-        machined_cli "new my_site"
-        File.read("my_site/machined.rb").should == <<-CONTENT.unindent
-          require "bundler"
+        machined_cli 'new my_site'
+        File.read('my_site/machined.rb').should == <<-CONTENT.unindent
+          require 'bundler'
           Bundler.require :default, config.environment.to_sym
           
-          if config.environment == "production"
+          if config.environment == 'production'
             # Compress javascripts and stylesheets
             config.compress = true
             
@@ -125,29 +125,29 @@ describe Machined::CLI do
       end
     end
     
-    it "creates a default rackup file" do
+    it 'creates a default rackup file' do
       within_construct do |c|
-        machined_cli "new my_site"
-        File.read("my_site/config.ru").should == <<-CONTENT.unindent
-          require "machined"
+        machined_cli 'new my_site'
+        File.read('my_site/config.ru').should == <<-CONTENT.unindent
+          require 'machined'
           run Machined::Environment.new
         CONTENT
       end
     end
   end
   
-  describe "#server" do
-    it "should start a Rack server" do
+  describe '#server' do
+    it 'should start a Rack server' do
       app = machined
-      Machined::Environment.should_receive(:new).with(:root => ".", :output_path => "site", :environment => "production", :config_path => "machined.rb").and_return(app)
-      Rack::Server.should_receive(:start).with(hash_including(:app => app, :environment => "production", :Port => 5000))
-      machined_cli "server -o site -e production -p 5000"
+      Machined::Environment.should_receive(:new).with(:root => '.', :output_path => 'site', :environment => 'production', :config_path => 'machined.rb').and_return(app)
+      Rack::Server.should_receive(:start).with(hash_including(:app => app, :environment => 'production', :Port => 5000))
+      machined_cli 'server -o site -e production -p 5000'
     end
   end
   
-  describe "#version" do
-    it "prints out the current version number" do
-      output = machined_cli "version"
+  describe '#version' do
+    it 'prints out the current version number' do
+      output = machined_cli 'version'
       output.strip.should == Machined::VERSION
     end
   end