machined 1.0.0 → 1.0.1

data/spec/machined/helpers/locals_helper_spec.rb

@@ -2,25 +2,25 @@ require 'spec_helper'
 
 describe Machined::Helpers::LocalsHelpers do
   let(:context) { build_context }
-  
+
   describe '#locals=' do
     it 'sets psuedo local variables' do
       context.locals = { :text => 'Hello World', :body => nil }
       context.text.should == 'Hello World'
       context.body.should be_nil
     end
-    
+
     it 'responds_to the local variable name' do
       context.locals = { :text => 'Hello World', :body => nil }
       context.respond_to?(:text).should be_true
       context.respond_to?(:body).should be_true
     end
-    
+
     it "still raises errors if the method doesn't exist" do
       expect { context.not_a_local }.to raise_error(NoMethodError)
       context.respond_to?(:not_a_local).should be_false
     end
-    
+
     it 'clears local variables when set to nil' do
       context.locals = { :text => 'Hello World' }
       context.locals = nil
@@ -28,7 +28,7 @@ describe Machined::Helpers::LocalsHelpers do
       context.respond_to?(:text).should be_false
     end
   end
-  
+
   describe '#with_locals' do
     it 'temporarily changes the local variables' do
       context.locals = { :text => 'Hello World', :layout => 'main' }

data/spec/machined/helpers/page_helpers_spec.rb

@@ -5,43 +5,43 @@ describe Machined::Helpers::PageHelpers do
     it 'defaults to the default layout' do
       within_construct do |c|
         c.file 'pages/index.html.erb', '<%= layout %>'
-        
+
         machined :layout => 'application'
         machined.pages['index.html'].to_s.should == 'application'
       end
     end
-    
+
     it 'returns the layout set in the front matter' do
       within_construct do |c|
         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 == 'main'
         machined.pages['about.html'].to_s.should == 'false'
       end
     end
   end
-  
+
   describe '#title' do
     it 'returns a titleized version of the filename' do
       within_construct do |c|
         c.file 'pages/about-us.html.erb', '<%= title %>'
         c.file 'pages/about/our-team.html.erb', '<%= title %>'
-        
+
         machined.pages['about-us'].to_s.should == 'About Us'
         machined.pages['about/our-team'].to_s.should == 'Our Team'
       end
     end
-    
+
     it 'returns the local set in the front matter' do
       within_construct do |c|
         c.file 'pages/index.html.erb', "---\ntitle: Homepage\n---\n<%= title %>"
-        
+
         machined.pages['index'].to_s.should == 'Homepage'
       end
     end
   end
-  
+
   describe '#url' do
     it 'returns the URL for the current page or asset' do
       within_construct do |c|
@@ -50,7 +50,7 @@ describe Machined::Helpers::PageHelpers do
         c.file 'pages/index.html.erb', '<%= url %>'
         c.file 'pages/about.html.erb', '<%= url %>'
         c.file 'pages/about/team.html.erb', '<%= url %>'
-        
+
         machined.assets['main.js'].to_s.should == "/assets/main.js;\n"
         machined.assets['main.css'].to_s.should == '/assets/main.css'
         machined.pages['index.html'].to_s.should == '/'

data/spec/machined/helpers/render_helpers_spec.rb

@@ -12,7 +12,7 @@ describe Machined::Helpers::RenderHelpers do
         c.file 'views/partial1.md', '# Hello World'
         c.file 'views/_partial2.haml', "%p Here's some Content..."
         c.file 'views/partials/_partial3.html', "<p>And some more</p>\n"
-        
+
         machined.pages['index.html'].to_s.should == <<-CONTENT.unindent
           <h1>Hello World</h1>
           <p>Here's some Content...</p>
@@ -20,16 +20,16 @@ describe Machined::Helpers::RenderHelpers do
         CONTENT
       end
     end
-    
+
     it 'renders partials with locals' do
       within_construct do |c|
         c.file 'pages/index.html.erb', %(<%= render 'partial', :text => 'Hello World' %>)
         c.file 'views/partial.haml', '%h1= text'
-        
+
         machined.pages['index.html'].to_s.should == "<h1>Hello World</h1>\n"
       end
     end
-    
+
     it 'returns the original locals state once rendered' do
       within_construct do |c|
         c.file 'pages/index.html.erb', <<-CONTENT.unindent
@@ -41,7 +41,7 @@ describe Machined::Helpers::RenderHelpers do
           text: <%= respond_to?(:text) %>
         CONTENT
         c.file 'views/partial.html.erb', "title: <%= title %>\ntext: <%= text %>\n"
-        
+
         machined.pages['index.html'].to_s.should == <<-CONTENT.unindent
           title: Title...
           text: Text...
@@ -50,56 +50,56 @@ describe Machined::Helpers::RenderHelpers do
         CONTENT
       end
     end
-    
+
     it 'renders partial collections' do
       within_construct do |c|
         c.file 'pages/index.html.erb', %(<%= render 'number', :collection => [1,2,3] %>)
         c.file 'views/number.haml', "= number\n= number_counter"
-        
+
         machined.pages['index.html'].to_s.should == "1\n1\n2\n2\n3\n3\n"
       end
     end
-    
+
     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/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>'
       end
     end
-    
+
     it 'optionally wraps the partial in a layout' do
       within_construct do |c|
         c.file 'pages/index.html.erb', %(<%= render 'partial', :layout => 'partial' %>)
         c.file 'views/layouts/partial.html.erb', '<h1><%= yield %></h1>'
         c.file 'views/partial.html.erb', 'Hello World'
-        
+
         machined.pages['index.html'].to_s.should == '<h1>Hello World</h1>'
       end
     end
-    
+
     it 'adds the partial as a dependency' do
       within_construct do |c|
         c.file 'pages/index.html.erb', %(<%= render 'partial' %>)
         dep = c.file 'views/partial.haml', 'Hello World'
-        
+
         asset = machined.pages['index.html']
         asset.should be_fresh(machined.pages)
-          
+
         dep.open('w') { |f| f.write('%h1 Hello World') }
         mtime = Time.now + 600
         dep.utime mtime, mtime
-        
+
         asset.should_not be_fresh(machined.pages)
       end
     end
-    
+
     it 'raises a Sprockets::FileNotFound error if the partial is missing' do
       within_construct do |c|
         c.file 'pages/index.html.erb', %(<%= render 'partial' %>)
-        
+
         expect {
           machined.pages['index.html'].to_s
         }.to raise_error(Sprockets::FileNotFound)

data/spec/machined/initializable_spec.rb

@@ -5,11 +5,11 @@ describe Machined::Initializable do
     include Machined::Initializable
     attr_accessor :count
   end
-  
+
   after(:each) do
     BasicInitializer.instance_variable_set :@initializers, nil
   end
-  
+
   it 'runs initializers in order' do
     array = []
     BasicInitializer.initializer(:one) { array << 1 }
@@ -18,7 +18,7 @@ describe Machined::Initializable do
     BasicInitializer.new.run_initializers
     array.should == [ 1, 2, 3 ]
   end
-  
+
   # it 'runs initializers only once' do
   #   count = 0
   #   BasicInitializer.initializer(:count) { count += 1 }
@@ -27,7 +27,7 @@ describe Machined::Initializable do
   #   basic.run_initializers
   #   count.should == 1
   # end
-  
+
   it 'executes in the instance scope' do
     BasicInitializer.initializer(:init_count) { @count = 0 }
     BasicInitializer.initializer(:one) { @count += 1 }
@@ -36,14 +36,14 @@ describe Machined::Initializable do
     basic.run_initializers
     basic.count.should == 2
   end
-  
+
   it 'runs the initializers with the given args' do
     BasicInitializer.initializer(:sum) { |*args| @count = args.inject(&:+) }
     basic = BasicInitializer.new
     basic.run_initializers 1, 2, 3
     basic.count.should == 6
   end
-  
+
   it 'adds initializers after specific initializers' do
     array = []
     BasicInitializer.initializer(:one) { array << 1 }
@@ -52,7 +52,7 @@ describe Machined::Initializable do
     BasicInitializer.new.run_initializers
     array.should == [ 1, 3, 2 ]
   end
-  
+
   it 'adds initializers before specific initializers' do
     array = []
     BasicInitializer.initializer(:one) { array << 1 }
@@ -61,12 +61,12 @@ describe Machined::Initializable do
     BasicInitializer.new.run_initializers
     array.should == [ 1, 3, 2 ]
   end
-  
+
   it "raises an error if the specified initializer doesn't exist" do
     expect {
       BasicInitializer.initializer(:wtf, :after => :omg) { }
     }.to raise_error('The specified initializer, :omg, does not exist')
-    
+
     expect {
       BasicInitializer.initializer(:omg, :before => :wtf) { }
     }.to raise_error('The specified initializer, :wtf, does not exist')

data/spec/machined/processors/front_matter_processor_spec.rb

@@ -13,14 +13,14 @@ describe Machined::Processors::FrontMatterProcessor do
         = title.inspect
         = tags.inspect
       CONTENT
-      
+
       machined.pages['index.html'].to_s.should == <<-CONTENT.unindent
         "Hello"
         [1, 2]
       CONTENT
     end
   end
-  
+
   it 'ignores pages without front matter' do
     within_construct do |c|
       c.file 'pages/index.html.md', <<-CONTENT.unindent
@@ -32,9 +32,9 @@ describe Machined::Processors::FrontMatterProcessor do
       CONTENT
       machined.pages['index.html'].to_s.should == <<-CONTENT.unindent
         <h2>Title</h2>
-        
+
         <h2>Another Title</h2>
-        
+
         <p>Content...</p>
       CONTENT
     end

data/spec/machined/processors/layout_processor_spec.rb

@@ -5,43 +5,43 @@ describe Machined::Processors::LayoutProcessor do
     within_construct do |c|
       c.file 'pages/index.html', '<h1>Hello World</h1>'
       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
   end
-  
+
   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/main.html.haml', '#layout= yield'
-      
+
       machined :layout => 'main'
       machined.pages['index.html'].to_s.should == "<div id='layout'><h1>Hello World</h1></div>\n"
     end
   end
-  
+
   it 'does not wrap the content with a layout when layout is false' do
     within_construct do |c|
       c.file 'pages/index.html', '<h1>Hello World</h1>'
       c.file 'views/layouts/application.html.haml', '#layout= yield'
-      
+
       machined :layout => false
       machined.pages['index.html'].to_s.should == '<h1>Hello World</h1>'
     end
   end
-  
+
   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/application.html.haml', '= yield'
-      
+
       asset = machined.pages['index.html']
       asset.should be_fresh(machined.pages)
-      
+
       dep.open('w') { |f| f.write('#layout= yield') }
       mtime = Time.now + 600
       dep.utime mtime, mtime
-      
+
       asset.should_not be_fresh(machined.pages)
     end
   end

data/spec/machined/sprocket_spec.rb

@@ -6,7 +6,7 @@ describe Machined::Sprocket do
       sprocket = create_sprocket
       sprocket.machined.should be(machined)
     end
-    
+
     it 'sets the root path' do
       sprocket = create_sprocket
       sprocket.root.should == Pathname.new('.').expand_path.to_s
@@ -14,7 +14,7 @@ describe Machined::Sprocket do
       sprocket.root.should == Pathname.new('spec/machined').expand_path.to_s
     end
   end
-  
+
   describe '#context_class' do
     it 'subclasses Machined::Context' do
       sprocket = create_sprocket
@@ -22,7 +22,7 @@ describe Machined::Sprocket do
       sprocket.context_class.should < Machined::Context
     end
   end
-  
+
   describe '#use_all_templates' do
     it 'registers available templates as engines' do
       sprocket = create_sprocket :assets => true

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/application.js',       '//= require _dep'
-      c.file 'assets/javascripts/_dep.js',              'var app = {};'
+      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/stylesheets/_dep.scss', '$color: red;'
       c.file 'assets/images/logo.jpg'
       c.file 'pages/index.html.md.erb', <<-CONTENT.unindent
         ---
@@ -42,6 +42,28 @@ describe Machined::StaticCompiler do
     end
   end
 
+  it 'generates the files into the correct output path' do
+    within_construct do |c|
+      c.file 'app/assets/javascripts/application.js', '//= require _dep'
+      c.file 'app/assets/javascripts/_dep.js', 'var app = {};'
+      c.file 'app/assets/stylesheets/application.css.scss', %(@import "dep";\nbody { color: $color; })
+      c.file 'app/assets/stylesheets/_dep.scss', '$color: red;'
+      c.file 'app/assets/images/logo.jpg'
+
+      machined(:root => 'app', :output_path => '../output/site').compile
+
+      File.read('output/site/assets/application.js').should == "var app = {};\n"
+      File.read('output/site/assets/application.css').should == "body {\n  color: red; }\n"
+      File.exist?('output/site/assets/logo.jpg').should be_true
+      File.exist?('public/assets/application.js').should be_false
+      File.exist?('public/assets/application.js').should be_false
+      File.exist?('public/assets/logo.jpg').should be_false
+      File.exist?('output/site/application.js').should be_false
+      File.exist?('output/site/application.js').should be_false
+      File.exist?('output/site/logo.jpg').should be_false
+    end
+  end
+
   it 'generates digests when configured' do
     within_construct do |c|
       c.file '_/js/application.js', 'var app = {};'

data/spec/machined/utils_spec.rb

@@ -10,18 +10,18 @@ describe Machined::Utils do
       available_templates['.haml'].should be(Tilt::HamlTemplate)
     end
   end
-  
+
   describe '.existent_directories' do
     it 'returns directories that exist in the given path' do
       within_construct do |c|
         c.directory 'dir1'
         c.directory 'dir2'
         c.directory 'dir3'
-        
+
         Machined::Utils.existent_directories(c).should match_paths(%w(dir1 dir2 dir3)).with_root(c)
       end
     end
-    
+
     it 'returns an empty array when the path is not a directory' do
       within_construct do |c|
         Machined::Utils.existent_directories(c.join('blank')).should == []