machined 1.0.0 → 1.0.1

data/lib/machined/utils.rb

@@ -18,7 +18,7 @@ module Machined
         end
       end
     end
-    
+
     # Returns an `Array` of the child directories that
     # exist within the given +path+. If the path itself
     # does not exist, an emtpy array is returned.

data/lib/machined/version.rb

@@ -1,3 +1,3 @@
 module Machined
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/machined/context_spec.rb

@@ -6,7 +6,7 @@ describe Machined::Context do
       build_context.machined.should be(machined)
     end
   end
-  
+
   describe '#config' do
     it "returns a reference to the Machined environment's configuration" do
       machined.config.layout = 'application'

data/spec/machined/environment_spec.rb

@@ -13,24 +13,24 @@ describe Machined::Environment do
       end
     end
   end
-  
+
   describe '#append_sprocket' do
     it 'creates a new Sprockets environment' do
       sprocket = machined.append_sprocket :updates
       sprocket.should be_a(Sprockets::Environment)
     end
-    
+
     it 'appends the sprocket to #sprockets' do
       sprocket = machined.append_sprocket :updates
       machined.sprockets.last.should be(sprocket)
     end
-    
+
     it 'adds a method with the given name which returns the sprocket' do
       sprocket = machined.append_sprocket :updates
       machined.updates.should be(sprocket)
       Machined::Environment.method_defined?(:updates).should be_false
     end
-    
+
     it 'yields the sprocket for configuration' do
       yielded_sprocket = nil
       sprocket = machined.append_sprocket :updates do |updates|
@@ -38,43 +38,43 @@ describe Machined::Environment do
       end
       yielded_sprocket.should be(sprocket)
     end
-    
+
     it 'initializes the sprocket with a reference to the Machined environment' do
       sprocket = machined.append_sprocket :updates
       sprocket.machined.should be(machined)
     end
-    
+
     it 'initializes the sprocket with configuration' do
       sprocket = machined.append_sprocket :updates, :root => 'spec/machined'
       sprocket.root.should == File.expand_path('spec/machined')
     end
   end
-  
+
   describe '#prepend_sprocket' do
     it 'creates a new Sprockets environment' do
       sprocket = machined.prepend_sprocket :updates
       sprocket.should be_a(Sprockets::Environment)
     end
-    
+
     it 'prepends the sprocket to #sprockets' do
       sprocket = machined.prepend_sprocket :updates
       machined.sprockets.first.should be(sprocket)
     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
@@ -82,10 +82,10 @@ describe Machined::Environment do
           'world'
         end
       end
-      
+
       build_context.hello.should == 'world'
     end
-    
+
     it 'adds methods defined in the given module to the Context' do
       helper = Module.new do
         def hello
@@ -96,81 +96,81 @@ describe Machined::Environment do
       build_context.hello.should == 'world'
     end
   end
-  
+
   describe '#reload' do
     it 'knows when helpers are changed' do
       within_construct do |c|
         c.file 'machined.rb', 'helpers do; def hello; "hello"; end; end'
         build_context.hello.should == 'hello'
-      
+
         modify 'machined.rb', 'helpers do; def hello; "world"; end; end'
         machined.reload
         build_context.hello.should == 'world'
       end
     end
-  
+
     it 'knows when configuration is changed' do
       within_construct do |c|
         c.file 'machined.rb'
         machined.output_path.should == c.join('public')
-      
+
         modify 'machined.rb', 'config.output_path = "output"'
         machined.reload
         machined.output_path.should == c.join('output')
       end
     end
-  
+
     it 'does not re-append sprockets' do
       within_construct do |c|
         c.file 'machined.rb'
         machined.sprockets.length.should == 3
-      
+
         modify 'machined.rb', 'config.output_path = "output"'
         machined.reload
         machined.sprockets.length.should == 3
       end
     end
-  
+
     it 're-evaluates assets when configuration changes' do
       within_construct do |c|
         c.file 'machined.rb', 'helpers do; def hello; "hello"; end; end'
         c.file 'pages/index.html.erb', '<%= hello %>'
         machined.pages['index.html'].to_s.should == 'hello'
-      
+
         modify 'machined.rb', 'helpers do; def hello; "world"; end; end'
         machined.reload
         machined.pages['index.html'].to_s.should == 'world'
       end
     end
-    
+
     it 'knows when a lib file changes' do
       within_construct do |c|
         c.file 'lib/hello.rb', 'module Hello; def hello; "hello"; end; end'
         c.file 'machined.rb', 'helpers Hello'
         machined :skip_autoloading => false
         build_context.hello.should == 'hello'
-        
+
         modify 'lib/hello.rb', 'module Hello; def hello; "world"; end; end'
         machined.reload
         build_context.hello.should == 'world'
       end
     end
   end
-  
+
   describe '#environment' do
     it 'is wrapped in String inquirer' do
       machined :environment => 'development'
       machined.environment.development?.should be_true
       machined.environment.production?.should be_false
       machined.environment.test?.should be_false
-      
+
       machined :environment => 'production', :reload => true
       machined.environment.development?.should be_false
       machined.environment.production?.should be_true
       machined.environment.test?.should be_false
     end
   end
-  
+
   describe 'default assets sprocket' do
     it 'appends the standard asset paths' do
       within_construct do |c|
@@ -180,7 +180,7 @@ describe Machined::Environment do
         c.directory 'vendor/assets/images'
         c.directory 'vendor/assets/javascripts'
         c.directory 'vendor/assets/stylesheets'
-        
+
         machined.assets.paths.should match_paths(%w(
           assets/images
           assets/javascripts
@@ -191,14 +191,14 @@ describe Machined::Environment do
         )).with_root(c)
       end
     end
-    
+
     it 'appends the available asset paths' do
       within_construct do |c|
         c.directory 'assets/css'
         c.directory 'assets/img'
         c.directory 'assets/js'
         c.directory 'assets/plugins'
-        
+
         machined.assets.paths.should match_paths(%w(
           assets/css
           assets/img
@@ -207,26 +207,26 @@ describe Machined::Environment do
         )).with_root(c)
       end
     end
-    
+
     # it 'appends Rails::Engine paths' do
     #   require 'rails'
     #   require 'jquery-rails'
     #   machined.assets.paths.first.should =~ %r(/jquery-rails-[\d\.]+/vendor/assets/javascripts)
     #   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
@@ -235,49 +235,64 @@ describe Machined::Environment do
         Sprockets::Plugin.plugins.delete plugin
       end
     end
-    
+
     it 'compiles web assets' do
       within_construct do |c|
-        c.file 'assets/javascripts/main.js',       '//= require dep'
-        c.file 'assets/javascripts/dep.js',        'var app = {};'
+        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/stylesheets/_dep.scss', '$color: red;'
+
         machined.assets['main.js'].to_s.should == "var app = {};\n"
         machined.assets['main.css'].to_s.should == "body {\n  color: red; }\n"
       end
     end
   end
-  
+
   describe 'default pages sprocket' do
+    after { Sprockets.clear_paths }
+
     it 'appends the pages path' do
       within_construct do |c|
         c.directory 'pages'
         machined.pages.paths.should match_paths(%w(pages)).with_root(c)
       end
     end
-    
+
     it 'compiles html pages' do
       within_construct do |c|
         c.file 'pages/index.html.haml', '%h1 Hello World'
         machined.pages['index.html'].to_s.should == "<h1>Hello World</h1>\n"
       end
     end
-    
+
+    it 'does not compile other assets from additiontal paths' do
+      within_construct do |c|
+        vendor_path = c.directory 'vendor-assets'
+        vendor_path.file 'main.js', '//= require dep'
+        vendor_path.file 'dep.js', 'var app = {};'
+        vendor_path.file 'main.css.scss', "@import 'dep';\nbody { color: $color; }"
+        vendor_path.file '_dep.scss', '$color: red;'
+        Sprockets.append_path vendor_path
+
+        machined.pages['main.js'].to_s.should_not == "var app = {};\n"
+        machined.pages['main.css'].to_s.should_not == "body {\n  color: red; }\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 ]
@@ -285,7 +300,7 @@ describe Machined::Environment do
       end
     end
   end
-  
+
   describe 'default views sprocket' do
     it 'appends the views path' do
       within_construct do |c|
@@ -293,7 +308,7 @@ describe Machined::Environment do
         machined.views.paths.should match_paths(%w(views)).with_root(c)
       end
     end
-    
+
     it 'compiles html pages' do
       within_construct do |c|
         c.file 'views/layouts/main.html.haml', '%h1 Hello World'
@@ -301,7 +316,7 @@ describe Machined::Environment do
       end
     end
   end
-  
+
   describe 'compression' do
     context 'with compress set to true' do
       it 'compresses javascripts and stylesheets' do
@@ -310,17 +325,17 @@ describe Machined::Environment do
           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;'
-          
+
           Crush::Uglifier.should_receive(:compress).with("var app = {};\n").and_return('compressed')
           Crush::Sass::Engine.should_receive(:compress).with("body {\n  color: red; }\n").and_return('compressed')
-          
+
           machined :compress => true
           machined.assets['main.js'].to_s.should == 'compressed'
           machined.assets['main.css'].to_s.should == 'compressed'
         end
       end
     end
-    
+
     context 'with a js_compressor set' do
       it 'compresses using that compressor' do
         within_construct do |c|
@@ -332,7 +347,7 @@ describe Machined::Environment do
       end
     end
   end
-  
+
   it 'autoloads files from the lib directory' do
     within_construct do |c|
       c.file 'lib/hello.rb', 'module Hello; def hello; "hello"; end; end'

data/spec/machined/helpers/asset_tag_helpers_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Machined::Helpers::AssetTagHelpers do
   let(:context) { build_context }
-  
+
   describe '#asset_path' do
     context 'with URIs' do
       it 'returns URIs untouched' do
@@ -14,65 +14,65 @@ describe Machined::Helpers::AssetTagHelpers do
           '//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js'
       end
     end
-    
+
     context 'with regular files' do
       it 'returns absolute paths' do
         context.asset_path(:js, '/path/to/file.js').should == '/path/to/file.js'
         context.asset_path(:images, '/path/to/file.jpg').should == '/path/to/file.jpg'
       end
-      
+
       it 'appends the extension for javascripts and stylesheets' do
         context.asset_path(:js, '/path/to/file').should == '/path/to/file.js'
         context.asset_path(:css, '/path/to/file').should == '/path/to/file.css'
         context.asset_path(:images, '/path/to/file').should_not == '/path/to/file.jpg'
       end
-      
+
       it 'prepends a base URL if missing' do
         context.asset_path(:css, 'main').should == '/stylesheets/main.css'
         context.asset_path(:js, 'main').should == '/javascripts/main.js'
         context.asset_path(:images, 'logo.jpg').should == '/images/logo.jpg'
       end
-      
+
       it 'appends a timestamp if the file exists in the output path' do
         within_construct do |c|
           c.file 'public/javascripts/main.js'
           c.file 'public/favicon.ico'
-          
+
           context.asset_path(:js, 'main').should =~ %r(/javascripts/main.js\?\d+)
           context.asset_path(:images, '/favicon.ico').should =~ %r(/favicon.ico\?\d+)
         end
       end
     end
-    
+
     context 'with assets' do
       it 'prepends a base URL if missing' do
         within_construct do |c|
           c.file 'assets/images/logo.jpg'
           c.file 'assets/javascripts/main.js'
           c.file 'assets/stylesheets/main.css'
-          
+
           context.asset_path(:css, 'main').should == '/assets/main.css'
           context.asset_path(:js, 'main').should == '/assets/main.js'
           context.asset_path(:images, 'logo.jpg').should == '/assets/logo.jpg'
         end
       end
-      
+
       it 'uses the digest path if configured' do
         within_construct do |c|
           c.file 'assets/javascrtips/main.js'
-          
+
           machined :digest_assets => true
           context.asset_path(:js, 'main').should =~ %r(/assets/main-[0-9a-f]+.js)
         end
       end
     end
   end
-  
+
   describe '#asset_path' do
     it 'is compatible with the Sprockets::Helpers API' do
       within_construct do |c|
         c.file 'assets/images/logo.jpg'
-        
+
         context.image_path('logo.jpg', :digest => true).should =~ %r(/assets/logo-[0-9a-f]+.jpg)
       end
     end