middleman-core 3.0.14 → 3.1.0.beta.1

data/features/clean_build.feature

@@ -2,14 +2,14 @@ Feature: Build Clean
   Scenario: Build and Clean an app
     Given a fixture app "clean-app"
     And app "clean-app" is using config "empty"
-    And a successfully built app at "clean-app"
+    And a successfully built app at "clean-app" with flags "--no-clean"
     Then the following files should exist:
       | build/index.html              |
       | build/should_be_ignored.html  |
       | build/should_be_ignored2.html |
       | build/should_be_ignored3.html |
     And app "clean-app" is using config "complications"
-    Given a successfully built app at "clean-app" with flags "--clean"
+    Given a successfully built app at "clean-app"
     Then the following files should not exist:
       | build/should_be_ignored.html  |
       | build/should_be_ignored2.html |
@@ -17,12 +17,11 @@ Feature: Build Clean
     And the file "build/index.html" should contain "Comment in layout"
 
   Scenario: Clean build an app with newly ignored files and a nested output directory
-    Given a built app at "clean-nested-app"
+    Given a built app at "clean-nested-app" with flags "--no-clean"
     Then a directory named "sub/dir" should exist
     Then the following files should exist:
       | sub/dir/about.html        |
     When I append to "config.rb" with "ignore 'about.html'"
-    Given a built app at "clean-nested-app" with flags "--clean"
+    Given a built app at "clean-nested-app"
     Then the following files should not exist:
       | sub/dir/about.html        |
-      

data/features/content_type.feature

@@ -0,0 +1,43 @@
+Feature: Setting the right content type for files
+
+  Scenario: The right content type gets automatically determined
+    Given the Server is running at "content-type-app"
+    When I go to "/index.html"
+    Then the content type should be "text/html"
+    When I go to "/images/blank.gif"
+    Then the content type should be "image/gif"
+    When I go to "/javascripts/app.js"
+    Then the content type should be "application/javascript"
+    When I go to "/stylesheets/site.css"
+    Then the content type should be "text/css"
+    When I go to "/README"
+    Then the content type should be "text/plain"
+
+  Scenario: Content type can be set explicitly via page or proxy or frontmatter
+    Given a fixture app "content-type-app"
+    And a file named "config.rb" with:
+    """
+    page "README", :content_type => 'text/awesome'
+    proxy "bar", "index.html", :content_type => 'text/custom'
+    proxy "foo", "README" # auto-delegate to target content type
+    """
+    And the Server is running at "content-type-app"
+    When I go to "/README"
+    Then the content type should be "text/awesome"
+    When I go to "/bar"
+    Then the content type should be "text/custom"
+    When I go to "/foo"
+    Then the content type should be "text/awesome"
+    When I go to "/override.html"
+    Then the content type should be "text/neato"
+
+  Scenario: Content types can be overridden with mime_type
+    Given a fixture app "content-type-app"
+    And a file named "config.rb" with:
+    """
+    mime_type('.js', 'application/x-javascript')
+    """
+    And the Server is running at "content-type-app"
+    When I go to "/javascripts/app.js"
+    Then the content type should be "application/x-javascript"
+

data/features/data.feature

@@ -5,18 +5,23 @@ Feature: Local Data API
     Given the Server is running at "basic-data-app"
     When I go to "/data.html"
     Then I should see "One:Two"
-  
+
   Scenario: Rendering json
     Given the Server is running at "basic-data-app"
     When I go to "/data3.html"
     Then I should see "One:Two"
-    
+
   Scenario: Using data in config.rb
     Given the Server is running at "data-app"
     When I go to "/test1.html"
     Then I should see "Welcome"
-    
+
   Scenario: Using data2 in config.rb
     Given the Server is running at "data-app"
     When I go to "/test2.html"
-    Then I should see "Welcome"
+    Then I should see "Welcome"
+
+  Scenario: Using nested data
+    Given the Server is running at "nested-data-app"
+    When I go to "/test.html"
+    Then I should see "test:Hello"

data/features/front-matter-neighbor.feature

@@ -0,0 +1,151 @@
+Feature: Neighboring YAML Front Matter
+
+  Scenario: Rendering html (yaml)
+    Given the Server is running at "frontmatter-neighbor-app"
+    When I go to "/front-matter-auto.html"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should not see "---"
+    When I go to "/front-matter-auto.erb.frontmatter"
+    Then I should see "File Not Found"
+    When I go to "/front-matter-2.php"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should see "<?php"
+    Then I should not see "---"
+    When I go to "/front-matter-2.php.erb.frontmatter"
+    Then I should see "File Not Found"
+
+  Scenario: Rendering raw (template-less) (yaml)
+    Given the Server is running at "frontmatter-neighbor-app"
+    When I go to "/raw-front-matter.html"
+    Then I should see "<h1><%= data.page.title %></h1>"
+    Then I should not see "---"
+    When I go to "/raw-front-matter.html.frontmatter"
+    Then I should see "File Not Found"
+    When I go to "/raw-front-matter.php"
+    Then I should see '<?php echo "sup"; ?>'
+    Then I should see "<?php"
+    Then I should not see "---"
+    When I go to "/raw-front-matter.php.frontmatter"
+    Then I should see "File Not Found"
+    
+  Scenario: YAML not on first line, with encoding
+    Given the Server is running at "frontmatter-neighbor-app"
+    When I go to "/front-matter-encoding.html"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should not see "---"
+    When I go to "/front-matter-encoding.html.erb.frontmatter"
+    Then I should see "File Not Found"
+    
+  Scenario: Rendering html (json)
+    Given the Server is running at "frontmatter-neighbor-app"
+    When I go to "/json-front-matter-auto.html"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should not see ";;;"
+    When I go to "/json-front-matter-auto.erb.frontmatter"
+    Then I should see "File Not Found"
+    When I go to "/json-front-matter.html"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should not see ";;;"
+    When I go to "/json-front-matter.html.erb.frontmatter"
+    Then I should see "File Not Found"
+    When I go to "/json-front-matter-2.php"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should see "<?php"
+    Then I should not see ";;;"
+    When I go to "/json-front-matter-2.php.erb.frontmatter"
+    Then I should see "File Not Found"
+
+  Scenario: A template changes frontmatter during preview
+    Given the Server is running at "frontmatter-neighbor-app"
+    And the file "source/front-matter-change.html.erb" has the contents
+      """
+      <%= data.page.title %>
+      """
+    And the file "source/front-matter-change.html.erb.frontmatter" has the contents
+      """
+      ---
+      title: Hello World
+      layout: false
+      ---
+      """
+    When I go to "/front-matter-change.html"
+    Then I should see "Hello World"
+    And the file "source/front-matter-change.html.erb.frontmatter" has the contents
+      """
+      ---
+      title: Hola Mundo
+      layout: false
+      ---
+      """
+    When I go to "/front-matter-change.html"
+    Then I should see "Hola Mundo"
+    When I go to "/front-matter-change.html.erb.frontmatter"
+    Then I should see "File Not Found"
+
+  Scenario: A template should handle an empty YAML feed
+    Given the Server is running at "frontmatter-neighbor-app"
+    And the file "source/front-matter-change.html.erb.frontmatter" has the contents
+    """
+    ---
+    ---
+    """
+    When I go to "/front-matter-change.html"
+    Then I should not see "Hello World"
+    Then I should not see "Hola Mundo"
+    When I go to "/front-matter-change.html.erb.frontmatter"
+    Then I should see "File Not Found"
+
+  Scenario: Setting layout, ignoring, and disabling directory indexes through frontmatter (build)
+    Given a successfully built app at "frontmatter-settings-neighbor-app"
+    Then the following files should exist:
+      | build/proxied.html  |
+    And the file "build/alternate_layout.html" should contain "Alternate layout"
+    And the following files should not exist:
+      | build/ignored.html  |
+      | build/alternate_layout.html.erb.frontmatter  |
+      | build/ignored.html.erb.frontmatter  |
+      | build/override_layout.html.erb.frontmatter  |
+      | build/page_mentioned.html.erb.frontmatter  |
+
+  Scenario: Setting layout, ignoring, and disabling directory indexes through frontmatter (preview)
+    Given the Server is running at "frontmatter-settings-neighbor-app"
+    When I go to "/alternate_layout.html"
+    Then I should not see "File Not Found"
+    And I should see "Alternate layout"
+    When I go to "/alternate_layout.html.erb.frontmatter"
+    Then I should see "File Not Found"
+    When I go to "/ignored.html"
+    Then I should see "File Not Found"
+    When I go to "/ignored.html.erb.frontmatter"
+    Then I should see "File Not Found"
+    When I go to "/ignored/index.html"
+    Then I should see "File Not Found"
+
+  Scenario: Changing frontmatter in preview server
+    Given the Server is running at "frontmatter-settings-neighbor-app"
+    When I go to "/ignored.html"
+    Then I should see "File Not Found"
+    And the file "source/ignored.html.erb.frontmatter" has the contents
+      """
+      ---
+      ignored: false
+      ---
+      """
+    When I go to "/ignored.html"
+    Then I should see "This file ignores itself! But it can still be proxied."
+    When I go to "/ignored.html.erb.frontmatter"
+    Then I should see "File Not Found"
+
+  Scenario: Overriding layout through frontmatter
+    Given the Server is running at "frontmatter-settings-neighbor-app"
+    When I go to "/override_layout.html"
+    Then I should see "Layout in use: Override"
+    When I go to "/override_layout.html.erb.frontmatter"
+    Then I should see "File Not Found"
+
+  Scenario: Setting layout through frontmatter even if page is mentioned in config
+    Given the Server is running at "frontmatter-settings-neighbor-app"
+    When I go to "/page_mentioned.html"
+    Then I should see "Layout in use: Override"
+    When I go to "/page_mentioned.html.erb.frontmatter"
+    Then I should see "File Not Found"

data/features/queryable.feature

@@ -0,0 +1,31 @@
+Feature: Queryable Selector
+  Scenario: Basic Selector Tests
+    Then should initialize with an attribute and an operator
+    Then should raise an exception if the operator is not supported
+  Scenario: Using offset and limit
+    Given the Server is running at "queryable-app"
+    Then should limit the documents to the number specified
+    Then should offset the documents by the number specified
+    Then should support offset and limit at the same time
+    Then should not freak out about an offset higher than the document count
+  Scenario: Using where queries with an equal operator
+    Given the Server is running at "queryable-app"
+    Then should return the right documents
+    Then should be chainable
+    Then should not be confused by attributes not present in all documents
+  Scenario: Using where queries with a complex operator
+    Given the Server is running at "queryable-app"
+    Then with a gt operator should return the right documents
+    Then with a gte operator should return the right documents
+    Then with an in operator should return the right documents
+    Then with an lt operator should return the right documents
+    Then with an lte operator should return the right documents
+    Then with an include operator include should return the right documents
+    Then with mixed operators should return the right documents
+    Then using multiple constrains in one where should return the right documents
+  Scenario: Sorting documents
+    Given the Server is running at "queryable-app"
+    Then should support ordering by attribute ascending
+    Then should support ordering by attribute descending
+    Then should order by attribute ascending by default
+    Then should exclude documents that do not own the attribute

data/features/step_definitions/queryable_steps.rb

@@ -0,0 +1,123 @@
+Then /^should initialize with an attribute and an operator$/ do
+  selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :author, :operator => 'equal'
+  :author.should == selector.attribute
+  'equal'.should == selector.operator
+end
+
+Then /^should raise an exception if the operator is not supported$/ do
+  expect {
+    selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :author, :operator => 'zomg'
+  }.to raise_error(::Middleman::Sitemap::Queryable::OperatorNotSupportedError)
+end
+
+Then /^should limit the documents to the number specified$/ do
+  @server_inst.sitemap.order_by(:id).limit(2).all.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
+end
+
+Then /^should offset the documents by the number specified$/ do
+  @server_inst.sitemap.order_by(:id).offset(2).all.map { |r| r.raw_data[:id] }.sort.should == [3,4,5].sort
+end
+
+Then /^should support offset and limit at the same time$/ do
+  @server_inst.sitemap.order_by(:id).offset(1).limit(2).all.map { |r| r.raw_data[:id] }.sort.should == [2,3].sort
+end
+
+Then /^should not freak out about an offset higher than the document count$/ do
+  @server_inst.sitemap.order_by(:id).offset(5).all.should == []
+end
+
+Then /^should return the right documents$/ do
+  documents = @server_inst.sitemap.resources.select { |r| !r.raw_data.empty? }
+  document_1 = documents[0]
+  document_2 = documents[1]
+
+  found_document = @server_inst.sitemap.where(:title => document_1.raw_data[:title]).first
+  document_1.should == found_document
+  
+  found_document = @server_inst.sitemap.where(:title => document_2.raw_data[:title]).first
+  document_2.should == found_document
+end
+
+Then /^should be chainable$/ do
+  documents = @server_inst.sitemap.resources.select { |r| !r.raw_data.empty? }
+  document_1 = documents[0]
+
+  document_proxy = @server_inst.sitemap.where(:title => document_1.raw_data[:title])
+  document_proxy.where(:id => document_1.raw_data[:id])
+  document_1.should == document_proxy.first
+end
+
+Then /^should not be confused by attributes not present in all documents$/ do
+  result = @server_inst.sitemap.where(:seldom_attribute => 'is seldom').all
+  result.map { |r| r.raw_data[:id] }.should == [4]
+end
+
+Then /^with a gt operator should return the right documents$/ do
+  selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'gt'
+  found_documents = @server_inst.sitemap.where(selector => 2).all
+  found_documents.map { |r| r.raw_data[:id] }.sort.should == [5,3,4].sort
+end
+
+Then /^with a gte operator should return the right documents$/ do
+  selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'gte'
+  found_documents = @server_inst.sitemap.where(selector => 2).all
+  found_documents.map { |r| r.raw_data[:id] }.sort.should == [2,5,3,4].sort
+end
+
+Then /^with an in operator should return the right documents$/ do
+  selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'in'
+  found_documents = @server_inst.sitemap.where(selector => [2,3]).all
+  found_documents.map { |r| r.raw_data[:id] }.sort.should == [2,3].sort
+end
+
+Then /^with an lt operator should return the right documents$/ do
+  selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'lt'
+  found_documents = @server_inst.sitemap.where(selector => 2).all
+  found_documents.map { |r| r.raw_data[:id] }.should == [1]
+end
+
+Then /^with an lte operator should return the right documents$/ do
+  selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'lte'
+  found_documents = @server_inst.sitemap.where(selector => 2).all
+  found_documents.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
+end
+
+Then /^with an include operator include should return the right documents$/ do
+  selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :tags, :operator => 'include'
+  found_documents = @server_inst.sitemap.where(selector => 'ruby').all
+  found_documents.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
+end
+
+Then /^with mixed operators should return the right documents$/ do
+  in_selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'in'
+  gt_selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'gt'
+  documents_proxy = @server_inst.sitemap.where(in_selector => [2,3])
+  found_documents = documents_proxy.where(gt_selector => 2).all
+  found_documents.map { |r| r.raw_data[:id] }.should == [3]
+end
+
+Then /^using multiple constrains in one where should return the right documents$/ do
+  selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'lte'
+  found_documents = @server_inst.sitemap.where(selector => 2, :status => :published).all
+  found_documents.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
+end
+
+Then /^should support ordering by attribute ascending$/ do
+  found_documents = @server_inst.sitemap.order_by(:title => :asc).all
+  found_documents.map { |r| r.raw_data[:id] }.should == [2,3,1,5,4]
+end
+
+Then /^should support ordering by attribute descending$/ do
+  found_documents = @server_inst.sitemap.order_by(:title => :desc).all
+  found_documents.map { |r| r.raw_data[:id] }.should == [4,5,1,3,2]
+end
+
+Then /^should order by attribute ascending by default$/ do
+  found_documents = @server_inst.sitemap.order_by(:title).all
+  found_documents.map { |r| r.raw_data[:id] }.should == [2,3,1,5,4]
+end
+
+Then /^should exclude documents that do not own the attribute$/ do
+  found_documents = @server_inst.sitemap.order_by(:status).all
+  found_documents.map { |r| r.raw_data[:id] }.to_set.should == [1,2].to_set
+end

data/fixtures/content-type-app/config.rb

@@ -0,0 +1 @@
+

data/fixtures/content-type-app/source/.htaccess

@@ -0,0 +1 @@
+# I'm an htaccess file!

data/fixtures/content-type-app/source/README

@@ -0,0 +1 @@
+I have no file extension.

data/fixtures/content-type-app/source/index.html

@@ -0,0 +1 @@
+I'm an HTML file!

data/fixtures/content-type-app/source/javascripts/app.js

@@ -0,0 +1 @@
+// This is JavaScript

data/fixtures/content-type-app/source/override.html

@@ -0,0 +1,5 @@
+---
+content_type: 'text/neato'
+---
+
+I'm awesome!

data/fixtures/content-type-app/source/stylesheets/site.css

@@ -0,0 +1 @@
+/* This is CSS */

data/fixtures/frontmatter-neighbor-app/source/front-matter-2.php.erb

@@ -0,0 +1,2 @@
+<h1><%= data.page.title %></h1>
+<?php echo "sup"; ?>