machined 0.6.0 → 0.7.0

data/lib/machined/environment.rb

@@ -16,6 +16,7 @@ module Machined
       :output_path    => "public",
       :environment    => "development",
       :skip_bundle    => false,
+      :assets_only    => false,
       :digest_assets  => false,
       :gzip_assets    => false,
       :layout         => "application",
@@ -131,6 +132,8 @@ module Machined
     # and includes processors for wrapping pages in layouts and
     # reading YAML front matter.
     initializer :create_pages_sprocket do
+      next if config.assets_only
+      
       append_sprocket :pages do |pages|
         pages.register_mime_type     "text/html", ".html"
         pages.register_preprocessor  "text/html", Processors::FrontMatterProcessor
@@ -158,6 +161,7 @@ module Machined
       
       # This could be changed in the config file
       @output_path = root.join config.output_path
+      remove_sprocket(:pages) if config.assets_only && @pages
     end
     
     # Register all available Tilt templates to every
@@ -171,12 +175,17 @@ module Machined
     # Do any configuration to the assets sprockets necessary
     # after the config file has been evaled.
     initializer :configure_assets_sprocket do
+      next unless @assets
+      
       # Append the directories within the configured paths
       append_paths assets, Utils.existent_directories(root.join(config.assets_path))
       config.assets_paths.each do |asset_path|
         append_paths assets, Utils.existent_directories(root.join(asset_path))
       end
       
+      # Append paths from Sprockets-plugin
+      assets.append_plugin_paths if assets.respond_to?(:append_plugin_paths)
+      
       # Search for Rails Engines with assets and append those
       if defined? Rails::Engine
         Rails::Engine.subclasses.each do |engine|
@@ -193,6 +202,8 @@ module Machined
     # Do any configuration to the pages sprockets necessary
     # after the config file has been evaled.
     initializer :configure_pages_sprocket do
+      next unless @pages
+      
       # Append the configured pages paths
       append_path  pages, config.pages_path
       append_paths pages, config.pages_paths
@@ -204,6 +215,8 @@ module Machined
     # Do any configuration to the views sprockets necessary
     # after the config file has been evaled.
     initializer :configure_views_sprocket do
+      next unless @views
+      
       # Append the configured views paths
       append_path  views, config.views_path
       append_paths views, config.views_paths
@@ -212,6 +225,8 @@ module Machined
     # Setup the JavaScript and CSS compressors
     # for the assets based on the configuration.
     initializer :configure_assets_compression do
+      next unless @assets
+      
       if config.compress
         config.compress_js  = true
         config.compress_css = true
@@ -226,6 +241,8 @@ module Machined
     # Finally, configure Sprockets::Helpers to
     # match curernt configuration.
     initializer :configure_sprockets_helpers do
+      next unless @assets
+      
       Sprockets::Helpers.configure do |helpers|
         helpers.environment = assets
         helpers.digest      = config.digest_assets
@@ -276,6 +293,16 @@ module Machined
       end
     end
     
+    # Removes the sprocket with the given name. This is useful if
+    # you don't need one of the default Sprockets.
+    def remove_sprocket(name)
+      if sprocket = get_sprocket(name)
+        sprockets.delete sprocket
+        set_sprocket(name, nil)
+        server and server.remap
+      end
+    end
+    
     # Adds helpers that can be used within asset files.
     # There's two supported ways to add helpers, the first of
     # which is similar to how the `#helpers` DSL works in Sinatra:
@@ -312,12 +339,23 @@ module Machined
     
     protected
     
+    # Returns the sprocket registered with the given name.
+    def get_sprocket(name)
+      instance_variable_get "@#{name}"
+    end
+    
+    # Sets the sprocket with the give name.
+    def set_sprocket(name, sprocket)
+      instance_variable_set "@#{name}", sprocket
+    end
+    
     # Factory method for creating a `Machined::Sprocket` instance.
     # This is used in both `#append_sprocket` and `#prepend_sprocket`.
     def create_sprocket(name, options = {}, &block) # :nodoc:
       options.reverse_merge! :root => root
       Sprocket.new(self, options).tap do |sprocket|
-        define_singleton_method(name) { sprocket }
+        define_singleton_method(name) { get_sprocket(name) }
+        set_sprocket(name, sprocket)
         yield sprocket if block_given?
       end
     end
@@ -327,7 +365,7 @@ module Machined
     # or an absolute path pointing somewhere else. It also
     # checks if it exists before appending it.
     def append_path(sprocket, path) # :nodoc:
-      path = root.join(path)
+      path = Pathname.new(path).expand_path(root)
       sprocket.append_path(path) if path.exist?
     end
     

data/lib/machined/helpers/page_helpers.rb

@@ -28,13 +28,6 @@ module Machined
       def url
         File.join(environment.config.url, @logical_path).sub /(index)?\.html$/, ''
       end
-      
-      protected
-      
-      # Returns a hash where we store found contexts.
-      def contexts_cache # :nodoc:
-        @contexts_cache ||= {}
-      end
     end
   end
 end

data/lib/machined/version.rb

@@ -1,3 +1,3 @@
 module Machined
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/machined.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
   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.5.0"
+  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"

data/spec/machined/cli_spec.rb

@@ -51,14 +51,14 @@ 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/main.html.erb").should == <<-CONTENT.unindent
+        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 "main" %>
-              <%= javascript_include_tag "main" %>
+              <%= stylesheet_link_tag "application" %>
+              <%= javascript_include_tag "application" %>
             </head>
             <body>
               <%= yield %>
@@ -71,14 +71,14 @@ describe Machined::CLI do
     it "creates a default javascript file" do
       within_construct do |c|
         machined_cli "new my_site"
-        File.exist?("my_site/assets/javascripts/main.js.coffee").should be_true
+        File.exist?("my_site/assets/javascripts/application.js.coffee").should be_true
       end
     end
     
     it "creates a default stylesheet file" do
       within_construct do |c|
         machined_cli "new my_site"
-        File.exist?("my_site/assets/stylesheets/main.css.scss").should be_true
+        File.exist?("my_site/assets/stylesheets/application.css.scss").should be_true
       end
     end
     

data/spec/machined/environment_spec.rb

@@ -62,6 +62,19 @@ describe Machined::Environment do
     end
   end
   
+  describe "#remove_sprocket" do
+    it "sets the accessor method to return nil" do
+      machined.remove_sprocket :pages
+      machined.pages.should be_nil
+    end
+    
+    it "removes the sprockets from the sprockets list" do
+      views = machined.views
+      machined.remove_sprocket :views
+      machined.sprockets.should_not include(views)
+    end
+  end
+  
   describe "#helpers" do
     it "adds methods defined in the given block to the Context" do
       machined.helpers do
@@ -128,6 +141,27 @@ describe Machined::Environment do
       Rails::Engine.subclasses.delete Jquery::Rails::Engine
     end
     
+    it "appends Sprockets::Plugin paths" do
+      require "sprockets-plugin"
+      
+      within_construct do |c|
+        plugin_dir = c.directory "plugin/assets"
+        plugin_dir.directory "images"
+        plugin_dir.directory "javascripts"
+        plugin_dir.directory "stylesheets"
+        
+        plugin = Class.new(Sprockets::Plugin)
+        plugin.append_paths_in plugin_dir
+        
+        machined.assets.paths.should match_paths(%w(
+          plugin/assets/images
+          plugin/assets/javascripts
+          plugin/assets/stylesheets
+        )).with_root(c)
+        Sprockets::Plugin.plugins.delete plugin
+      end
+    end
+    
     it "compiles web assets" do
       within_construct do |c|
         c.file "assets/javascripts/main.js",       "//= require dep"
@@ -155,6 +189,27 @@ describe Machined::Environment do
         machined.pages["index.html"].to_s.should == "<h1>Hello World</h1>\n"
       end
     end
+    
+    context "when :assets_only is set in constructor" do
+      it "is never created" do
+        machined :assets_only => true
+        machined.respond_to?(:pages).should be_false
+        machined.sprockets.should == [ machined.assets, machined.views ]
+      end
+      
+    end
+    
+    context "when :assets_only is set in the config file" do
+      it "is removed" do
+        within_construct do |c|
+          c.file "machined.rb", "config.assets_only = true"
+          
+          machined
+          machined.pages.should be_nil
+          machined.sprockets.should == [ machined.assets, machined.views ]
+        end
+      end
+    end
   end
   
   describe "default views sprocket" do

data/spec/machined/helpers/page_helpers_spec.rb

@@ -13,10 +13,10 @@ describe Machined::Helpers::PageHelpers do
     
     it "returns the layout set in the front matter" do
       within_construct do |c|
-        c.file "pages/index.html.erb", "---\nlayout: application\n---\n<%= layout %>"
+        c.file "pages/index.html.erb", "---\nlayout: main\n---\n<%= layout %>"
         c.file "pages/about.html.erb", "---\nlayout: false\n---\n<%= layout %>"
         
-        machined.pages["index.html"].to_s.should == "application"
+        machined.pages["index.html"].to_s.should == "main"
         machined.pages["about.html"].to_s.should == "false"
       end
     end

data/spec/machined/helpers/render_helpers_spec.rb

@@ -63,7 +63,7 @@ describe Machined::Helpers::RenderHelpers do
     it "does not wrap the partial in a layout" do
       within_construct do |c|
         c.file "pages/index.html.erb", %(<%= render "partial" %>)
-        c.file "views/layouts/main.html.erb", "<h1><%= yield %></h1>"
+        c.file "views/layouts/application.html.erb", "<h1><%= yield %></h1>"
         c.file "views/partial.html.erb", "Hello World"
         
         machined.pages["index.html"].to_s.should == "<h1>Hello World</h1>"

data/spec/machined/processors/layout_processor_spec.rb

@@ -4,7 +4,7 @@ describe Machined::Processors::LayoutProcessor do
   it "wraps the content with a layout" do
     within_construct do |c|
       c.file "pages/index.html", "<h1>Hello World</h1>"
-      c.file "views/layouts/main.html.haml", "#layout= yield"
+      c.file "views/layouts/application.html.haml", "#layout= yield"
       
       machined.pages["index.html"].to_s.should == "<div id='layout'><h1>Hello World</h1></div>\n"
     end
@@ -13,9 +13,9 @@ describe Machined::Processors::LayoutProcessor do
   it "uses the default layout set in the configuration" do
     within_construct do |c|
       c.file "pages/index.html", "<h1>Hello World</h1>"
-      c.file "views/layouts/application.html.haml", "#layout= yield"
+      c.file "views/layouts/main.html.haml", "#layout= yield"
       
-      machined :layout => "application"
+      machined :layout => "main"
       machined.pages["index.html"].to_s.should == "<div id='layout'><h1>Hello World</h1></div>\n"
     end
   end
@@ -33,7 +33,7 @@ describe Machined::Processors::LayoutProcessor do
   it "adds the layout file as a dependency" do
     within_construct do |c|
       c.file "pages/index.html", "<h1>Hello World</h1>"
-      dep = c.file "views/layouts/main.html.haml", "= yield"
+      dep = c.file "views/layouts/application.html.haml", "= yield"
       
       asset = machined.pages["index.html"]
       asset.should be_fresh(machined.pages)

data/spec/machined/static_compiler_spec.rb

@@ -3,10 +3,10 @@ require "spec_helper"
 describe Machined::StaticCompiler do
   it "generates all of the static files" do
     within_construct do |c|
-      c.file "assets/javascripts/main.js",       "//= require _dep"
-      c.file "assets/javascripts/_dep.js",       "var app = {};"
-      c.file "assets/stylesheets/main.css.scss", %(@import "dep";\nbody { color: $color; })
-      c.file "assets/stylesheets/_dep.scss",     "$color: red;"
+      c.file "assets/javascripts/application.js",       "//= require _dep"
+      c.file "assets/javascripts/_dep.js",              "var app = {};"
+      c.file "assets/stylesheets/application.css.scss", %(@import "dep";\nbody { color: $color; })
+      c.file "assets/stylesheets/_dep.scss",            "$color: red;"
       c.file "assets/images/logo.jpg"
       c.file "pages/index.html.md.erb", <<-CONTENT.unindent
         ---
@@ -16,7 +16,7 @@ describe Machined::StaticCompiler do
         
         Here's some *content*.
       CONTENT
-      c.file "views/layouts/main.html.haml", <<-CONTENT.unindent
+      c.file "views/layouts/application.html.haml", <<-CONTENT.unindent
         !!! 5
         %html
           %head
@@ -27,8 +27,8 @@ describe Machined::StaticCompiler do
     
       machined.compile
       
-      File.read("public/assets/main.js").should == "var app = {};\n"
-      File.read("public/assets/main.css").should == "body {\n  color: red; }\n"
+      File.read("public/assets/application.js").should == "var app = {};\n"
+      File.read("public/assets/application.css").should == "body {\n  color: red; }\n"
       File.exist?("public/assets/logo.jpg").should be_true
       File.read("public/index.html").should == <<-CONTENT.unindent
         <!DOCTYPE html>
@@ -48,17 +48,17 @@ describe Machined::StaticCompiler do
   
   it "generates digests when configured" do
     within_construct do |c|
-      c.file "_/js/main.js", "var app = {};"
-      c.file "_/css/main.css", "body { color: red; }"
+      c.file "_/js/application.js", "var app = {};"
+      c.file "_/css/application.css", "body { color: red; }"
       c.file "_/img/logo.jpg"
       c.file "pages/index.html"
       
       machined(:digest_assets => true, :assets_url => "/_", :assets_path => "_").compile
       
-      asset = machined.assets["main.js"]
-      File.read("public/_/main-#{asset.digest}.js").should == "var app = {};\n"
-      asset = machined.assets["main.css"]
-      File.read("public/_/main-#{asset.digest}.css").should == "body { color: red; }\n"
+      asset = machined.assets["application.js"]
+      File.read("public/_/application-#{asset.digest}.js").should == "var app = {};\n"
+      asset = machined.assets["application.css"]
+      File.read("public/_/application-#{asset.digest}.css").should == "body { color: red; }\n"
       asset = machined.assets["logo.jpg"]
       File.exist?("public/_/logo-#{asset.digest}.jpg").should be_true
       asset = machined.pages["index.html"]
@@ -69,15 +69,15 @@ describe Machined::StaticCompiler do
   
   it "generates gzipped files when configured" do
     within_construct do |c|
-      c.file "assets/javascripts/main.js"
-      c.file "assets/stylesheets/main.css"
+      c.file "assets/javascripts/application.js"
+      c.file "assets/stylesheets/application.css"
       c.file "assets/images/logo.jpg"
       c.file "pages/index.html"
       
       machined(:gzip_assets => true).compile
       
-      File.exist?("public/assets/main.js.gz").should be_true
-      File.exist?("public/assets/main.css.gz").should be_true
+      File.exist?("public/assets/application.js.gz").should be_true
+      File.exist?("public/assets/application.css.gz").should be_true
       File.exist?("public/assets/logo.jpg.gz").should_not be_true
       File.exist?("public/index.html.gz").should_not be_true
     end

metadata

@@ -2,7 +2,7 @@
 name: machined
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Pete Browne
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-17 00:00:00 Z
+date: 2012-01-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sprockets
@@ -24,150 +24,150 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sprockets-helpers
+  name: sprockets-plugin
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sprockets-sass
+  name: sprockets-helpers
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: padrino-helpers
+  name: sprockets-sass
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.5
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: padrino-helpers
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.3
+        version: 0.10.5
   type: :runtime
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: activesupport
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: i18n
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.14.6
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: crush
+  name: thor
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.3
+        version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: crush
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.7.0
-  type: :development
+        version: 0.3.3
+  type: :runtime
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rspec
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: test-construct
+  name: rack-test
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: unindent
+  name: test-construct
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.0"
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: railties
+  name: unindent
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.3
+        version: "1.0"
   type: :development
   prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: railties
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 3.1.3
   type: :development
   prerelease: false
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: sass
+  name: haml
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -178,7 +178,7 @@ dependencies:
   prerelease: false
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: slim
+  name: sass
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -189,7 +189,7 @@ dependencies:
   prerelease: false
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: erubis
+  name: slim
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -200,7 +200,7 @@ dependencies:
   prerelease: false
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: erubis
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -211,7 +211,7 @@ dependencies:
   prerelease: false
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: uglifier
+  name: rdiscount
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -222,7 +222,7 @@ dependencies:
   prerelease: false
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: jquery-rails
+  name: uglifier
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -233,7 +233,7 @@ dependencies:
   prerelease: false
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: jquery-rails
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -243,6 +243,17 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id022
 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.
 email: 
 - me@petebrowne.com
@@ -319,7 +330,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4282035788662597022
+      hash: 3788551970724196159
       segments: 
       - 0
       version: "0"
@@ -328,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4282035788662597022
+      hash: 3788551970724196159
       segments: 
       - 0
       version: "0"