asset urls, padrino helpers and i18n belong in more

middleman-core/features/content_for.feature

@@ -1,6 +0,0 @@
-Feature: Support content_for and yield_content helpers
-
-  Scenario: content_for works as expected in erb
-    Given the Server is running at "content-for-app"
-    When I go to "/content_for_erb.html"
-    Then I should see "In Layout: I am the yielded content erb"

middleman-core/features/helpers_relative_link_to.feature

@@ -1,48 +0,0 @@
-Feature: relative_link_to helper
-
-  Scenario: relative_link_to produces relative links
-    Given a fixture app "indexable-app"
-    And an empty file named "config.rb"
-    And a file named "source/link_to.html.erb" with:
-    """
-    absolute: <%= link_to "Needs Index", "/needs_index.html", :relative => true %>
-    relative: <%= link_to "Relative", "needs_index.html", :relative => true %>
-    """
-    And a file named "source/link_to/sub.html.erb" with:
-    """
-    absolute: <%= link_to "Needs Index", "/needs_index.html", :relative => true %>
-    relative: <%= link_to "Relative", "../needs_index.html", :relative => true %>
-    """
-    And the Server is running at "indexable-app"
-    When I go to "/link_to.html"
-    Then I should see 'absolute: <a href="needs_index.html">Needs Index</a>'
-    Then I should see 'relative: <a href="needs_index.html">Relative</a>'
-    When I go to "/link_to/sub.html"
-    Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
-    Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
-
-  Scenario: relative_link_to produces relative links when :relative_links is set to true
-    Given a fixture app "indexable-app"
-    And a file named "config.rb" with:
-    """
-    set :relative_links, true
-    """
-    And a file named "source/link_to.html.erb" with:
-    """
-    absolute: <%= link_to "Needs Index", "/needs_index.html" %>
-    relative: <%= link_to "Relative", "needs_index.html", :relative => false %>
-    unknown: <%= link_to "Unknown", "foo.html" %>
-    """
-    And a file named "source/link_to/sub.html.erb" with:
-    """
-    absolute: <%= link_to "Needs Index", "/needs_index.html" %>
-    relative: <%= link_to "Relative", "../needs_index.html" %>
-    """
-    And the Server is running at "indexable-app"
-    When I go to "/link_to.html"
-    Then I should see 'absolute: <a href="needs_index.html">Needs Index</a>'
-    Then I should see 'relative: <a href="/needs_index.html">Relative</a>'
-    Then I should see 'unknown: <a href="foo.html">Unknown</a>'
-    When I go to "/link_to/sub.html"
-    Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
-    Then I should see 'relative: <a href="../needs_index.html">Relative</a>'

middleman-core/fixtures/content-for-app/config.rb

@@ -1,3 +0,0 @@
-with_layout :content_for do
-  page "/content_for_erb.html"
-end

middleman-core/fixtures/content-for-app/source/layouts/content_for.erb

@@ -1,4 +0,0 @@
-In Layout: <%= yield_content(:from_template).chomp.strip %>
-
-In Template:
-<%= yield %>

middleman-core/lib/middleman-core/application.rb

@@ -3,6 +3,7 @@ require "tilt"
 
 # Use ActiveSupport JSON
 require "active_support/json"
+require "active_support/core_ext/integer/inflections"
 
 # Simple callback library
 require "middleman-core/vendor/hooks-0.2.0/lib/hooks"
@@ -146,18 +147,9 @@ module Middleman
     # Setup external helpers
     register Middleman::CoreExtensions::ExternalHelpers
   
-    # Setup default helpers
-    register Middleman::CoreExtensions::DefaultHelpers
-  
-    # Setup asset path pipeline
-    register Middleman::CoreExtensions::Assets
-  
     # with_layout and page routing
     register Middleman::CoreExtensions::Routing
   
-    # i18n
-    register Middleman::CoreExtensions::I18n
-  
     # Initialize the Middleman project
     def initialize(&block)
       # Current path defaults to nil, used in views.

middleman-core/lib/middleman-core/core_extensions.rb

@@ -10,9 +10,6 @@ require "middleman-core/core_extensions/builder"
 # Custom Feature API
 require "middleman-core/core_extensions/extensions"
 
-# Asset Path Pipeline
-require "middleman-core/core_extensions/assets"
-
 # Data looks at the data/ folder for YAML files and makes them available
 # to dynamic requests.
 require "middleman-core/core_extensions/data"
@@ -23,9 +20,6 @@ require "middleman-core/core_extensions/front_matter"
 # External helpers looks in the helpers/ folder for helper modules
 require "middleman-core/core_extensions/external_helpers"
 
-# DefaultHelpers are the built-in dynamic template helpers.
-require "middleman-core/core_extensions/default_helpers"
-
 # Extended version of Padrino's rendering
 require "middleman-core/core_extensions/rendering"
 
@@ -33,7 +27,4 @@ require "middleman-core/core_extensions/rendering"
 require "middleman-core/core_extensions/routing"
 
 # Catch and show exceptions at the Rack level
-require "middleman-core/core_extensions/show_exceptions"
+require "middleman-core/core_extensions/show_exceptions"
-
-# i18n
-require "middleman-core/core_extensions/i18n"

middleman-core/middleman-core.gemspec

@@ -31,12 +31,8 @@ Gem::Specification.new do |s|
   
   # Helpers
   s.add_dependency("activesupport", ["~> 3.2.0"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.6"])
   
   # Watcher
   s.add_dependency("listen", ["~> 0.4.2"])
-  
-  # i18n
-  s.add_dependency("i18n", ["~> 0.6.0"])
 end
 

middleman-more/features/content_for.feature

@@ -1,4 +1,9 @@
 Feature: Support content_for and yield_content helpers
+
+  Scenario: content_for works as expected in erb
+    Given the Server is running at "content-for-app"
+    When I go to "/content_for_erb.html"
+    Then I should see "In Layout: I am the yielded content erb"
     
   Scenario: content_for works as expected in haml
     Given the Server is running at "content-for-app"

middleman-more/features/helpers_relative_link_to.feature

@@ -1,5 +1,52 @@
 Feature: relative_link_to helper
 
+  Scenario: relative_link_to produces relative links
+    Given a fixture app "indexable-app"
+    And an empty file named "config.rb"
+    And a file named "source/link_to.html.erb" with:
+    """
+    absolute: <%= link_to "Needs Index", "/needs_index.html", :relative => true %>
+    relative: <%= link_to "Relative", "needs_index.html", :relative => true %>
+    """
+    And a file named "source/link_to/sub.html.erb" with:
+    """
+    absolute: <%= link_to "Needs Index", "/needs_index.html", :relative => true %>
+    relative: <%= link_to "Relative", "../needs_index.html", :relative => true %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/link_to.html"
+    Then I should see 'absolute: <a href="needs_index.html">Needs Index</a>'
+    Then I should see 'relative: <a href="needs_index.html">Relative</a>'
+    When I go to "/link_to/sub.html"
+    Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
+    Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
+
+  Scenario: relative_link_to produces relative links when :relative_links is set to true
+    Given a fixture app "indexable-app"
+    And a file named "config.rb" with:
+    """
+    set :relative_links, true
+    """
+    And a file named "source/link_to.html.erb" with:
+    """
+    absolute: <%= link_to "Needs Index", "/needs_index.html" %>
+    relative: <%= link_to "Relative", "needs_index.html", :relative => false %>
+    unknown: <%= link_to "Unknown", "foo.html" %>
+    """
+    And a file named "source/link_to/sub.html.erb" with:
+    """
+    absolute: <%= link_to "Needs Index", "/needs_index.html" %>
+    relative: <%= link_to "Relative", "../needs_index.html" %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/link_to.html"
+    Then I should see 'absolute: <a href="needs_index.html">Needs Index</a>'
+    Then I should see 'relative: <a href="/needs_index.html">Relative</a>'
+    Then I should see 'unknown: <a href="foo.html">Unknown</a>'
+    When I go to "/link_to/sub.html"
+    Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
+    Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
+  
   Scenario: relative_link_to knows about directory indexes
     Given a fixture app "indexable-app"
     And a file named "source/link_to.html.erb" with:

middleman-more/fixtures/content-for-app/config.rb

@@ -1,6 +1,7 @@
 require "slim"
 
 with_layout :content_for do
+  page "/content_for_erb.html"
   page "/content_for_haml.html"
   page "/content_for_slim.html"
 end

middleman-more/lib/middleman-more.rb

@@ -43,6 +43,18 @@ module Middleman::More
       # Setup Core Extensions
       ###
 
+      # Setup default helpers
+      require "middleman-more/core_extensions/default_helpers"
+      Middleman::Application.register Middleman::CoreExtensions::DefaultHelpers
+
+      # Setup asset path pipeline
+      require "middleman-more/core_extensions/assets"
+      Middleman::Application.register Middleman::CoreExtensions::Assets
+
+      # i18n
+      require "middleman-more/core_extensions/i18n"
+      Middleman::Application.register Middleman::CoreExtensions::I18n
+      
       # Compass framework
       require "middleman-more/core_extensions/compass"
       Middleman::Application.register Middleman::CoreExtensions::Compass

middleman-more/lib/middleman-more/core_extensions/default_helpers.rb

@@ -7,7 +7,6 @@ module Middleman
       class << self
         # @private
         def registered(app)
-          require "active_support/core_ext/integer/inflections"
           require 'padrino-helpers'
       
           app.helpers ::Padrino::Helpers::OutputHelpers

middleman-more/middleman-more.gemspec

@@ -27,4 +27,8 @@ Gem::Specification.new do |s|
   s.add_dependency("sprockets", ["~> 2.1"])
   s.add_dependency("sprockets-sass", ["~> 0.8.0"])
   s.add_dependency("maruku", ["~> 0.6.0"])
+  
+  # i18n
+  s.add_dependency("i18n", ["~> 0.6.0"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.6"])
 end