RubyGems - middleman-core - Versions diffs - 4.0.0.alpha.2 → 4.0.0.alpha.3 - Mend

middleman-core 4.0.0.alpha.2 → 4.0.0.alpha.3

Files changed (79) hide show

data/features/partials.feature CHANGED Viewed

@@ -11,11 +11,6 @@ Feature: Provide Sane Defaults for Partial Behavior
     When I go to "/sub/index.html"
     Then I should see "Header"
     And I should see "Footer"
-  Scenario: Finds shared partials without _ prefix
-    Given the Server is running at "partials-app"
-    When I go to "/using_snippet.html"
-    Then I should see "Snippet"
   Scenario: Prefers partials of the same engine type
     Given the Server is running at "partials-app"

data/features/slim.feature CHANGED Viewed

@@ -78,4 +78,4 @@ Feature: Support slim templating language
     When I go to "/sass.html"
     Then I should see "html,body,div"
     When I go to "/error.html"
-    Then I should see "Syntax error"
+    Then I should see "Error: Invalid"

data/features/working_directory.feature ADDED Viewed

@@ -0,0 +1,33 @@
+Feature: Honour working directory
+  Honour the working directory during testing
+  In order to support helpers which work with the current directories
+  Scenario: Set working directory for helpers in tests
+    Given a fixture app "empty-app"
+    And a file named "source/index.html.erb" with:
+    """
+    <%= Dir.getwd %>
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see:
+    """
+    aruba
+    """
+  Scenario: Set working directory for config.rb in tests
+    Given a fixture app "empty-app"
+    And a file named "config.rb" with:
+    """
+    set :my_working_directory, Dir.getwd
+    """
+    And a file named "source/index.html.erb" with:
+    """
+    <%= config[:my_working_directory] %>
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see:
+    """
+    aruba
+    """

data/fixtures/asset-hash-app/source/api.json.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ <%= {gif: image_path('100px.gif'), jpg: image_path('100px.jpg'), png: image_path('100px.png')}.to_json %>

data/fixtures/asset-hash-app/source/images/200px.jpg ADDED Viewed

Binary file

data/fixtures/asset-hash-app/source/images/300px.jpg ADDED Viewed

Binary file

data/fixtures/asset-hash-app/source/index.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
 <% end %>
 <h2>Image url:</h2>
-<img src="<%= image_path('100px.jpg') %>">
+<img src="<%= image_path('100px.jpg') %>" srcset="<%= image_path('100px.jpg') %> 1x, <%= image_path('200px.jpg') %> 2x, <%= image_path('300px.jpg') %> 3x">
 <h2>Ignored path:</h2>
 <link rel="apple-touch-icon" href="apple-touch-icon.png">

data/fixtures/asset-hash-app/source/subdir/api.json.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ <%= {gif: image_path('100px.gif'), jpg: image_path('100px.jpg'), png: image_path('100px.png')}.to_json %>

data/fixtures/collections-app/config.rb ADDED Viewed

@@ -0,0 +1,16 @@
+collection :articles,
+  where: proc { |resource|
+    uri_match resource.url, 'blog/{year}-{month}-{day}-{title}.html'
+  }
+collection :tags,
+  where: proc { |resource|
+    resource.data.tags
+  },
+  group_by: proc { |resource|
+    if resource.data.tags.is_a? String
+      resource.data.tags.split(',').map(&:strip)
+    else
+      resource.data.tags
+    end
+  }

data/fixtures/collections-app/source/blog1/2011-01-01-new-article.html.markdown ADDED Viewed

@@ -0,0 +1,7 @@
+---
+title: "Blog1 Newer Article"
+date: 2011-01-01
+tags: foo, bar
+---
+Newer Article Content

data/fixtures/collections-app/source/blog1/2011-01-02-another-article.html.markdown ADDED Viewed

@@ -0,0 +1,9 @@
+---
+title: "Blog1 Another Article"
+date: 2011-01-02
+tags:
+  - foo
+  - 120
+---
+Another Article Content

data/fixtures/collections-app/source/blog2/2011-01-01-new-article.html.markdown ADDED Viewed

@@ -0,0 +1,7 @@
+---
+title: "Blog2 Newer Article"
+date: 2011-01-01
+tags: foo, bar
+---
+Newer Article Content

data/fixtures/collections-app/source/blog2/2011-01-02-another-article.html.markdown ADDED Viewed

@@ -0,0 +1,8 @@
+---
+title: "Blog2 Another Article"
+date: 2011-01-02
+tags:
+  - foo
+---
+Another Article Content

data/fixtures/collections-app/source/index.html.erb ADDED Viewed

@@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+  <head>
+  </head>
+  <body>
+<!-- ARTICLES -->
+<% collected.articles.each do |article| %>
+  <li>
+    <a href="<%= article.url %>">Article: <%= article.data.title %></a>
+    <time><%= article.data.date.strftime('%b %e') %></time>
+  </li>
+<% end %>
+<!-- TAGS -->
+<% collected[:tags].each do |k, items| %>
+  <li>
+    <%= k %>
+    <% items.each do |article| %>
+      <%= article.data.title %>
+    <% end %>
+  </li>
+<% end %>
+  </body>
+</html>

data/fixtures/frontmatter-app/source/front-matter-pandoc.html.md.erb ADDED Viewed

@@ -0,0 +1,13 @@
+---
+layout: false
+title: Pandoc likes trailing dots...
+dotty_string: "..."
+famous_quote: To be or not to be
+popular_number: 42
+...
+# This is a document
+<%= current_page.data.famous_quote %>
+The meaning of life is <%= current_page.data.popular_number %>.

data/fixtures/generator-test/config.rb CHANGED Viewed

@@ -51,12 +51,12 @@
 # Change the images directory
 # set :images_dir, "alternative_image_directory"
-# Production build configuration
+# Production configuration
 configure :production do
   # For example, change the Compass output style for deployment
   # activate :minify_css
-  # Minify Javascript on build
+  # Minify Javascript
   # activate :minify_javascript
   # Enable cache buster
@@ -65,11 +65,6 @@ configure :production do
   # Use relative URLs
   # activate :relative_assets
-  # Compress PNGs after build
-  # First: gem install middleman-smusher
-  # require "middleman-smusher"
-  # activate :smusher
   # Or use a different image path
   # set :http_prefix, "/Content/images/"
 end

data/fixtures/multiple-data-sources-app/source/index.html.erb CHANGED Viewed

@@ -1,10 +1,5 @@
 Default: <%= data.data.title %>
 Data 1: <%= data.data1.title %>
 Data 2: <%= data.data2.title %>
-<<<<<<< HEAD
 Override in Two: <%= data.two.title %>
 Override in One: <%= data.one.title %>
-=======
-Override in One: <%= data.one.title %>
-Override in Two: <%= data.two.title %>
->>>>>>> Add external command support

data/fixtures/{more-instance-vars-app → paginate-app}/config.rb RENAMED Viewed

File without changes

data/fixtures/paginate-app/source/archive/2011/index.html.erb ADDED Viewed

@@ -0,0 +1,20 @@
+Year: '<%#= year %>'
+Paginate: <%= !!pagination %>
+Article Count: <%= items.length %>
+<% if pagination %>
+Page Num: <%= pagination.page_number %>
+Num Pages: <%= pagination.num_pages %>
+Per Page: <%= pagination.per_page %>
+Page Start: <%= pagination.page_start %>
+Page End: <%= pagination.page_end %>
+Next Page: '<%= sitemap.find_resource_by_destination_path(next_page).url if next_page %>'
+Prev Page: '<%= sitemap.find_resource_by_destination_path(prev_page).url if prev_page %>'
+<% end %>
+<% items.each do |article| %>
+  <article>
+    <%= article.data.title %>
+    <%= article.url %>
+  </article>
+<% end %>

data/fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown ADDED Viewed

@@ -0,0 +1,6 @@
+---
+title: "Test Article"
+date: 2011-01-01
+tags: foo
+---
+Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-02-test-article.html.markdown ADDED Viewed

@@ -0,0 +1,6 @@
+---
+title: "Test Article"
+date: 2011-01-02
+tags: foo
+---
+Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-03-test-article.html.markdown ADDED Viewed

@@ -0,0 +1,6 @@
+---
+title: "Test Article"
+date: 2011-01-03
+tags: bar
+---
+Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-04-test-article.html.markdown ADDED Viewed

@@ -0,0 +1,6 @@
+---
+title: "Test Article"
+date: 2011-01-04
+tags: bar
+---
+Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-05-test-article.html.markdown ADDED Viewed

@@ -0,0 +1,6 @@
+---
+title: "Test Article"
+date: 2011-01-05
+tags: bar
+---
+Test Article Content

data/fixtures/paginate-app/source/blog/2011-02-01-test-article.html.markdown ADDED Viewed

@@ -0,0 +1,6 @@
+---
+title: "Test Article"
+date: 2011-02-01
+tags: bar
+---
+Test Article Content

data/fixtures/paginate-app/source/blog/2011-02-02-test-article.html.markdown ADDED Viewed

@@ -0,0 +1,6 @@
+---
+title: "Test Article"
+date: 2011-02-02
+tags: bar
+---
+Test Article Content

data/fixtures/paginate-app/source/index.html.erb ADDED Viewed

@@ -0,0 +1,15 @@
+Paginate: <%= paginate %>
+Article Count: <%= page_articles.size %>
+<% if paginate %>
+Page Num: <%= page_number %>
+Num Pages: <%= num_pages %>
+Per Page: <%= per_page %>
+Page Start: <%= page_start %>
+Page End: <%= page_end %>
+Next Page: '<%= next_page.url if next_page %>'
+Prev Page: '<%= prev_page.url if prev_page %>'
+<% end %>
+<% page_articles.each do |article| %>
+  <li><a href="<%= article.url %>"><%= article.title %></a> <time><%= article.date.strftime('%b %e') %></time></li>
+<% end %>

data/fixtures/paginate-app/source/tag.html.erb ADDED Viewed

@@ -0,0 +1,23 @@
+---
+pageable: true
+per_page: 2
+---
+Tag: <%= tagname %>
+Paginate: <%= paginate %>
+Article Count: <%= page_articles.size %>
+<% if paginate %>
+Page Num: <%= page_number %>
+Num Pages: <%= num_pages %>
+Per Page: <%= per_page %>
+Page Start: <%= page_start %>
+Page End: <%= page_end %>
+Next Page: '<%= next_page.url if next_page %>'
+Prev Page: '<%= prev_page.url if prev_page %>'
+<% end %>
+<% if page_articles %>
+  <% page_articles.each do |article| %>
+    <li><a href="<%= article.url %>"><%= article.title %></a> <time><%= article.date.strftime('%b %e') %></time></li>
+  <% end %>
+<% end %>

data/fixtures/partial-chained_templates-app/config.rb ADDED Viewed

File without changes

data/lib/middleman-core/application.rb CHANGED Viewed

@@ -163,7 +163,7 @@ module Middleman
       layout: proc { |file, _sitemap_app|
         file[:relative_path].to_s.start_with?('layout.') ||
-        file[:relative_path].to_s.start_with?('layouts/')
+          file[:relative_path].to_s.start_with?('layouts/')
       }
     }, 'Callbacks that can exclude paths from the sitemap'
@@ -286,7 +286,11 @@ module Middleman
         config_context.instance_eval File.read(env_config), env_config, 1
       end
+      # Run any `configure` blocks for the current environment.
       config_context.execute_configure_callbacks(config[:environment])
+      # Run any `configure` blocks for the current mode.
+      config_context.execute_configure_callbacks(config[:mode])
     end
     def add_to_instance(name, &func)
@@ -315,6 +319,29 @@ module Middleman
       config[:environment] == key
     end
+    # Backwards compatible helper. What the current environment is.
+    # @return [Symbol]
+    def environment
+      config[:environment]
+    end
+    # Backwards compatible helper. Whether we're in dev mode.
+    # @return [Boolean]
+    def development?
+      environment?(:development)
+    end
+    # Backwards compatible helper. Whether we're in production mode.
+    # @return [Boolean]
+    def production?
+      environment?(:production)
+    end
+    # Backwards compatible helper. The full path to the default source dir.
+    def source_dir
+      Pathname(File.join(root, config[:source]))
+    end
     MiddlewareDescriptor = Struct.new(:class, :options, :block)
     # Use Rack middleware

data/lib/middleman-core/builder.rb CHANGED Viewed

@@ -50,7 +50,9 @@ module Middleman
       queue_current_paths if @cleaning
       prerender_css
       output_files
       clean if @cleaning
       ::Middleman::Profiling.report('build')

data/lib/middleman-core/contracts.rb CHANGED Viewed

@@ -23,7 +23,7 @@ if ENV['TEST'] || ENV['CONTRACTS'] == 'true'
       end
       def valid?(val)
-        (val.frozen? || val.nil?) && Contract.valid?(val, @contract)
+        (val.frozen? || val.nil? || [::TrueClass, ::FalseClass, ::Fixnum].include?(val.class)) && Contract.valid?(val, @contract)
       end
     end
@@ -59,6 +59,21 @@ if ENV['TEST'] || ENV['CONTRACTS'] == 'true'
       end
     end
+    # class MethodDefined
+    #   def self.[](val)
+    #     @lookup ||= {}
+    #     @lookup[val] ||= new(val)
+    #   end
+    #   def initialize(val)
+    #     @val = val
+    #   end
+    #   def valid?(val)
+    #     val.method_defined? @val
+    #   end
+    # end
     ResourceList = Contracts::ArrayOf[IsA['Middleman::Sitemap::Resource']]
   end
 else
@@ -141,6 +156,9 @@ else
     class Frozen < Callable
     end
+    # class MethodDefined < Callable
+    # end
   end
 end