diff --git a/middleman-core/features/content_for.feature b/middleman-core/features/content_for.feature
deleted file mode 100644
index 06207e94..00000000
--- a/middleman-core/features/content_for.feature
+++ /dev/null
@@ -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"
\ No newline at end of file
diff --git a/middleman-core/features/helpers_relative_link_to.feature b/middleman-core/features/helpers_relative_link_to.feature
deleted file mode 100644
index 75abf62d..00000000
--- a/middleman-core/features/helpers_relative_link_to.feature
+++ /dev/null
@@ -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: Needs Index'
- Then I should see 'relative: Relative'
- When I go to "/link_to/sub.html"
- Then I should see 'absolute: Needs Index'
- Then I should see 'relative: Relative'
-
- 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: Needs Index'
- Then I should see 'relative: Relative'
- Then I should see 'unknown: Unknown'
- When I go to "/link_to/sub.html"
- Then I should see 'absolute: Needs Index'
- Then I should see 'relative: Relative'
\ No newline at end of file
diff --git a/middleman-core/fixtures/content-for-app/config.rb b/middleman-core/fixtures/content-for-app/config.rb
deleted file mode 100644
index e925ac92..00000000
--- a/middleman-core/fixtures/content-for-app/config.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-with_layout :content_for do
- page "/content_for_erb.html"
-end
\ No newline at end of file
diff --git a/middleman-core/fixtures/content-for-app/source/layouts/content_for.erb b/middleman-core/fixtures/content-for-app/source/layouts/content_for.erb
deleted file mode 100644
index 30a09340..00000000
--- a/middleman-core/fixtures/content-for-app/source/layouts/content_for.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-In Layout: <%= yield_content(:from_template).chomp.strip %>
-
-In Template:
-<%= yield %>
\ No newline at end of file
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 99afa35c..11a1b8fc 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/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.
diff --git a/middleman-core/lib/middleman-core/core_extensions.rb b/middleman-core/lib/middleman-core/core_extensions.rb
index cd792d75..0b5f5ecb 100644
--- a/middleman-core/lib/middleman-core/core_extensions.rb
+++ b/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"
-
-# i18n
-require "middleman-core/core_extensions/i18n"
\ No newline at end of file
+require "middleman-core/core_extensions/show_exceptions"
\ No newline at end of file
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 942ebda0..41ecb97e 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/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
diff --git a/middleman-more/features/content_for.feature b/middleman-more/features/content_for.feature
index bc7cfb58..4dc806c9 100644
--- a/middleman-more/features/content_for.feature
+++ b/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"
diff --git a/middleman-core/features/former_padrino_helpers.feature b/middleman-more/features/former_padrino_helpers.feature
similarity index 100%
rename from middleman-core/features/former_padrino_helpers.feature
rename to middleman-more/features/former_padrino_helpers.feature
diff --git a/middleman-core/features/helpers_auto_javascript_include_tag.feature b/middleman-more/features/helpers_auto_javascript_include_tag.feature
similarity index 100%
rename from middleman-core/features/helpers_auto_javascript_include_tag.feature
rename to middleman-more/features/helpers_auto_javascript_include_tag.feature
diff --git a/middleman-core/features/helpers_auto_stylesheet_link_tag.feature b/middleman-more/features/helpers_auto_stylesheet_link_tag.feature
similarity index 100%
rename from middleman-core/features/helpers_auto_stylesheet_link_tag.feature
rename to middleman-more/features/helpers_auto_stylesheet_link_tag.feature
diff --git a/middleman-core/features/helpers_page_classes.feature b/middleman-more/features/helpers_page_classes.feature
similarity index 100%
rename from middleman-core/features/helpers_page_classes.feature
rename to middleman-more/features/helpers_page_classes.feature
diff --git a/middleman-more/features/helpers_relative_link_to.feature b/middleman-more/features/helpers_relative_link_to.feature
index dde87d3a..6fd8fdb4 100644
--- a/middleman-more/features/helpers_relative_link_to.feature
+++ b/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: Needs Index'
+ Then I should see 'relative: Relative'
+ When I go to "/link_to/sub.html"
+ Then I should see 'absolute: Needs Index'
+ Then I should see 'relative: Relative'
+
+ 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: Needs Index'
+ Then I should see 'relative: Relative'
+ Then I should see 'unknown: Unknown'
+ When I go to "/link_to/sub.html"
+ Then I should see 'absolute: Needs Index'
+ Then I should see 'relative: Relative'
+
Scenario: relative_link_to knows about directory indexes
Given a fixture app "indexable-app"
And a file named "source/link_to.html.erb" with:
diff --git a/middleman-core/features/i18n_builder.feature b/middleman-more/features/i18n_builder.feature
similarity index 100%
rename from middleman-core/features/i18n_builder.feature
rename to middleman-more/features/i18n_builder.feature
diff --git a/middleman-core/features/i18n_preview.feature b/middleman-more/features/i18n_preview.feature
similarity index 100%
rename from middleman-core/features/i18n_preview.feature
rename to middleman-more/features/i18n_preview.feature
diff --git a/middleman-core/features/instance_vars.feature b/middleman-more/features/instance_vars.feature
similarity index 100%
rename from middleman-core/features/instance_vars.feature
rename to middleman-more/features/instance_vars.feature
diff --git a/middleman-core/features/nested_layouts.feature b/middleman-more/features/nested_layouts.feature
similarity index 100%
rename from middleman-core/features/nested_layouts.feature
rename to middleman-more/features/nested_layouts.feature
diff --git a/middleman-core/features/partials.feature b/middleman-more/features/partials.feature
similarity index 100%
rename from middleman-core/features/partials.feature
rename to middleman-more/features/partials.feature
diff --git a/middleman-core/fixtures/auto-css-app/config.rb b/middleman-more/fixtures/auto-css-app/config.rb
similarity index 100%
rename from middleman-core/fixtures/auto-css-app/config.rb
rename to middleman-more/fixtures/auto-css-app/config.rb
diff --git a/middleman-core/fixtures/auto-css-app/source/auto-css.html.erb b/middleman-more/fixtures/auto-css-app/source/auto-css.html.erb
similarity index 100%
rename from middleman-core/fixtures/auto-css-app/source/auto-css.html.erb
rename to middleman-more/fixtures/auto-css-app/source/auto-css.html.erb
diff --git a/middleman-core/fixtures/auto-css-app/source/auto-css/auto-css.html.erb b/middleman-more/fixtures/auto-css-app/source/auto-css/auto-css.html.erb
similarity index 100%
rename from middleman-core/fixtures/auto-css-app/source/auto-css/auto-css.html.erb
rename to middleman-more/fixtures/auto-css-app/source/auto-css/auto-css.html.erb
diff --git a/middleman-core/fixtures/auto-css-app/source/auto-css/index.html.erb b/middleman-more/fixtures/auto-css-app/source/auto-css/index.html.erb
similarity index 100%
rename from middleman-core/fixtures/auto-css-app/source/auto-css/index.html.erb
rename to middleman-more/fixtures/auto-css-app/source/auto-css/index.html.erb
diff --git a/middleman-core/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb b/middleman-more/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb
similarity index 100%
rename from middleman-core/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb
rename to middleman-more/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb
diff --git a/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css.css b/middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css.css
similarity index 100%
rename from middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css.css
rename to middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css.css
diff --git a/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css b/middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css
similarity index 100%
rename from middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css
rename to middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css
diff --git a/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/index.css b/middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/index.css
similarity index 100%
rename from middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/index.css
rename to middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/index.css
diff --git a/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css b/middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css
similarity index 100%
rename from middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css
rename to middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css
diff --git a/middleman-core/fixtures/auto-js-app/config.rb b/middleman-more/fixtures/auto-js-app/config.rb
similarity index 100%
rename from middleman-core/fixtures/auto-js-app/config.rb
rename to middleman-more/fixtures/auto-js-app/config.rb
diff --git a/middleman-core/fixtures/auto-js-app/source/auto-js.html.erb b/middleman-more/fixtures/auto-js-app/source/auto-js.html.erb
similarity index 100%
rename from middleman-core/fixtures/auto-js-app/source/auto-js.html.erb
rename to middleman-more/fixtures/auto-js-app/source/auto-js.html.erb
diff --git a/middleman-core/fixtures/auto-js-app/source/auto-js/auto-js.html.erb b/middleman-more/fixtures/auto-js-app/source/auto-js/auto-js.html.erb
similarity index 100%
rename from middleman-core/fixtures/auto-js-app/source/auto-js/auto-js.html.erb
rename to middleman-more/fixtures/auto-js-app/source/auto-js/auto-js.html.erb
diff --git a/middleman-core/fixtures/auto-js-app/source/auto-js/index.html.erb b/middleman-more/fixtures/auto-js-app/source/auto-js/index.html.erb
similarity index 100%
rename from middleman-core/fixtures/auto-js-app/source/auto-js/index.html.erb
rename to middleman-more/fixtures/auto-js-app/source/auto-js/index.html.erb
diff --git a/middleman-core/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb b/middleman-more/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb
similarity index 100%
rename from middleman-core/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb
rename to middleman-more/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb
diff --git a/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js.js b/middleman-more/fixtures/auto-js-app/source/javascripts/auto-js.js
similarity index 100%
rename from middleman-core/fixtures/auto-js-app/source/javascripts/auto-js.js
rename to middleman-more/fixtures/auto-js-app/source/javascripts/auto-js.js
diff --git a/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js b/middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js
similarity index 100%
rename from middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js
rename to middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js
diff --git a/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/index.js b/middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/index.js
similarity index 100%
rename from middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/index.js
rename to middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/index.js
diff --git a/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js b/middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js
similarity index 100%
rename from middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js
rename to middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js
diff --git a/middleman-more/fixtures/content-for-app/config.rb b/middleman-more/fixtures/content-for-app/config.rb
index dc3c517c..76e251dc 100644
--- a/middleman-more/fixtures/content-for-app/config.rb
+++ b/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
\ No newline at end of file
diff --git a/middleman-core/fixtures/content-for-app/source/content_for_erb.html.erb b/middleman-more/fixtures/content-for-app/source/content_for_erb.html.erb
similarity index 100%
rename from middleman-core/fixtures/content-for-app/source/content_for_erb.html.erb
rename to middleman-more/fixtures/content-for-app/source/content_for_erb.html.erb
diff --git a/middleman-core/fixtures/different-engine-partial/config.rb b/middleman-more/fixtures/different-engine-partial/config.rb
similarity index 100%
rename from middleman-core/fixtures/different-engine-partial/config.rb
rename to middleman-more/fixtures/different-engine-partial/config.rb
diff --git a/middleman-core/fixtures/different-engine-partial/source/index.html.erb b/middleman-more/fixtures/different-engine-partial/source/index.html.erb
similarity index 100%
rename from middleman-core/fixtures/different-engine-partial/source/index.html.erb
rename to middleman-more/fixtures/different-engine-partial/source/index.html.erb
diff --git a/middleman-core/fixtures/different-engine-partial/source/layouts/layout.erb b/middleman-more/fixtures/different-engine-partial/source/layouts/layout.erb
similarity index 100%
rename from middleman-core/fixtures/different-engine-partial/source/layouts/layout.erb
rename to middleman-more/fixtures/different-engine-partial/source/layouts/layout.erb
diff --git a/middleman-core/fixtures/different-engine-partial/source/shared/_footer.str b/middleman-more/fixtures/different-engine-partial/source/shared/_footer.str
similarity index 100%
rename from middleman-core/fixtures/different-engine-partial/source/shared/_footer.str
rename to middleman-more/fixtures/different-engine-partial/source/shared/_footer.str
diff --git a/middleman-core/fixtures/different-engine-partial/source/shared/_header.erb b/middleman-more/fixtures/different-engine-partial/source/shared/_header.erb
similarity index 100%
rename from middleman-core/fixtures/different-engine-partial/source/shared/_header.erb
rename to middleman-more/fixtures/different-engine-partial/source/shared/_header.erb
diff --git a/middleman-core/fixtures/i18n-alt-root-app/locales/en.yml b/middleman-more/fixtures/i18n-alt-root-app/locales/en.yml
similarity index 100%
rename from middleman-core/fixtures/i18n-alt-root-app/locales/en.yml
rename to middleman-more/fixtures/i18n-alt-root-app/locales/en.yml
diff --git a/middleman-core/fixtures/i18n-alt-root-app/locales/es.yml b/middleman-more/fixtures/i18n-alt-root-app/locales/es.yml
similarity index 100%
rename from middleman-core/fixtures/i18n-alt-root-app/locales/es.yml
rename to middleman-more/fixtures/i18n-alt-root-app/locales/es.yml
diff --git a/middleman-core/fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb b/middleman-more/fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb
similarity index 100%
rename from middleman-core/fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb
rename to middleman-more/fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb
diff --git a/middleman-core/fixtures/i18n-alt-root-app/source/lang_data/index.html.erb b/middleman-more/fixtures/i18n-alt-root-app/source/lang_data/index.html.erb
similarity index 100%
rename from middleman-core/fixtures/i18n-alt-root-app/source/lang_data/index.html.erb
rename to middleman-more/fixtures/i18n-alt-root-app/source/lang_data/index.html.erb
diff --git a/middleman-core/fixtures/i18n-alt-root-app/source/layout.erb b/middleman-more/fixtures/i18n-alt-root-app/source/layout.erb
similarity index 100%
rename from middleman-core/fixtures/i18n-alt-root-app/source/layout.erb
rename to middleman-more/fixtures/i18n-alt-root-app/source/layout.erb
diff --git a/middleman-core/fixtures/i18n-test-app/locales/en.yml b/middleman-more/fixtures/i18n-test-app/locales/en.yml
similarity index 100%
rename from middleman-core/fixtures/i18n-test-app/locales/en.yml
rename to middleman-more/fixtures/i18n-test-app/locales/en.yml
diff --git a/middleman-core/fixtures/i18n-test-app/locales/es.yml b/middleman-more/fixtures/i18n-test-app/locales/es.yml
similarity index 100%
rename from middleman-core/fixtures/i18n-test-app/locales/es.yml
rename to middleman-more/fixtures/i18n-test-app/locales/es.yml
diff --git a/middleman-core/fixtures/i18n-test-app/source/layout.erb b/middleman-more/fixtures/i18n-test-app/source/layout.erb
similarity index 100%
rename from middleman-core/fixtures/i18n-test-app/source/layout.erb
rename to middleman-more/fixtures/i18n-test-app/source/layout.erb
diff --git a/middleman-core/fixtures/i18n-test-app/source/localizable/hello.html.erb b/middleman-more/fixtures/i18n-test-app/source/localizable/hello.html.erb
similarity index 100%
rename from middleman-core/fixtures/i18n-test-app/source/localizable/hello.html.erb
rename to middleman-more/fixtures/i18n-test-app/source/localizable/hello.html.erb
diff --git a/middleman-core/fixtures/i18n-test-app/source/localizable/index.html.erb b/middleman-more/fixtures/i18n-test-app/source/localizable/index.html.erb
similarity index 100%
rename from middleman-core/fixtures/i18n-test-app/source/localizable/index.html.erb
rename to middleman-more/fixtures/i18n-test-app/source/localizable/index.html.erb
diff --git a/middleman-core/fixtures/instance-vars-app/config.rb b/middleman-more/fixtures/instance-vars-app/config.rb
similarity index 100%
rename from middleman-core/fixtures/instance-vars-app/config.rb
rename to middleman-more/fixtures/instance-vars-app/config.rb
diff --git a/middleman-core/fixtures/instance-vars-app/source/_vartial.erb b/middleman-more/fixtures/instance-vars-app/source/_vartial.erb
similarity index 100%
rename from middleman-core/fixtures/instance-vars-app/source/_vartial.erb
rename to middleman-more/fixtures/instance-vars-app/source/_vartial.erb
diff --git a/middleman-core/fixtures/instance-vars-app/source/instance-var-set.html.erb b/middleman-more/fixtures/instance-vars-app/source/instance-var-set.html.erb
similarity index 100%
rename from middleman-core/fixtures/instance-vars-app/source/instance-var-set.html.erb
rename to middleman-more/fixtures/instance-vars-app/source/instance-var-set.html.erb
diff --git a/middleman-core/fixtures/instance-vars-app/source/layout.erb b/middleman-more/fixtures/instance-vars-app/source/layout.erb
similarity index 100%
rename from middleman-core/fixtures/instance-vars-app/source/layout.erb
rename to middleman-more/fixtures/instance-vars-app/source/layout.erb
diff --git a/middleman-core/fixtures/instance-vars-app/source/no-instance-var.html.erb b/middleman-more/fixtures/instance-vars-app/source/no-instance-var.html.erb
similarity index 100%
rename from middleman-core/fixtures/instance-vars-app/source/no-instance-var.html.erb
rename to middleman-more/fixtures/instance-vars-app/source/no-instance-var.html.erb
diff --git a/middleman-core/fixtures/nested-layout-app/config.rb b/middleman-more/fixtures/nested-layout-app/config.rb
similarity index 100%
rename from middleman-core/fixtures/nested-layout-app/config.rb
rename to middleman-more/fixtures/nested-layout-app/config.rb
diff --git a/middleman-core/fixtures/nested-layout-app/source/data-one.html.erb b/middleman-more/fixtures/nested-layout-app/source/data-one.html.erb
similarity index 100%
rename from middleman-core/fixtures/nested-layout-app/source/data-one.html.erb
rename to middleman-more/fixtures/nested-layout-app/source/data-one.html.erb
diff --git a/middleman-core/fixtures/nested-layout-app/source/data-two.html.erb b/middleman-more/fixtures/nested-layout-app/source/data-two.html.erb
similarity index 100%
rename from middleman-core/fixtures/nested-layout-app/source/data-two.html.erb
rename to middleman-more/fixtures/nested-layout-app/source/data-two.html.erb
diff --git a/middleman-core/fixtures/nested-layout-app/source/index.html.erb b/middleman-more/fixtures/nested-layout-app/source/index.html.erb
similarity index 100%
rename from middleman-core/fixtures/nested-layout-app/source/index.html.erb
rename to middleman-more/fixtures/nested-layout-app/source/index.html.erb
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb b/middleman-more/fixtures/nested-layout-app/source/layouts/inner.erb
similarity index 100%
rename from middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb
rename to middleman-more/fixtures/nested-layout-app/source/layouts/inner.erb
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/master.erb b/middleman-more/fixtures/nested-layout-app/source/layouts/master.erb
similarity index 100%
rename from middleman-core/fixtures/nested-layout-app/source/layouts/master.erb
rename to middleman-more/fixtures/nested-layout-app/source/layouts/master.erb
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb b/middleman-more/fixtures/nested-layout-app/source/layouts/outer.erb
similarity index 100%
rename from middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb
rename to middleman-more/fixtures/nested-layout-app/source/layouts/outer.erb
diff --git a/middleman-core/fixtures/padrino-helpers-app/config.rb b/middleman-more/fixtures/padrino-helpers-app/config.rb
similarity index 100%
rename from middleman-core/fixtures/padrino-helpers-app/config.rb
rename to middleman-more/fixtures/padrino-helpers-app/config.rb
diff --git a/middleman-core/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb b/middleman-more/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb
similarity index 100%
rename from middleman-core/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb
rename to middleman-more/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb
diff --git a/middleman-core/fixtures/page-classes-app/config.rb b/middleman-more/fixtures/page-classes-app/config.rb
similarity index 100%
rename from middleman-core/fixtures/page-classes-app/config.rb
rename to middleman-more/fixtures/page-classes-app/config.rb
diff --git a/middleman-core/fixtures/page-classes-app/source/page-classes.html.erb b/middleman-more/fixtures/page-classes-app/source/page-classes.html.erb
similarity index 100%
rename from middleman-core/fixtures/page-classes-app/source/page-classes.html.erb
rename to middleman-more/fixtures/page-classes-app/source/page-classes.html.erb
diff --git a/middleman-core/fixtures/page-classes-app/source/sub1/page-classes.html.erb b/middleman-more/fixtures/page-classes-app/source/sub1/page-classes.html.erb
similarity index 100%
rename from middleman-core/fixtures/page-classes-app/source/sub1/page-classes.html.erb
rename to middleman-more/fixtures/page-classes-app/source/sub1/page-classes.html.erb
diff --git a/middleman-core/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb b/middleman-more/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb
similarity index 100%
rename from middleman-core/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb
rename to middleman-more/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb
diff --git a/middleman-core/fixtures/partials-app/config.rb b/middleman-more/fixtures/partials-app/config.rb
similarity index 100%
rename from middleman-core/fixtures/partials-app/config.rb
rename to middleman-more/fixtures/partials-app/config.rb
diff --git a/middleman-core/fixtures/partials-app/source/_locals.erb b/middleman-more/fixtures/partials-app/source/_locals.erb
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/_locals.erb
rename to middleman-more/fixtures/partials-app/source/_locals.erb
diff --git a/middleman-core/fixtures/partials-app/source/_main.erb b/middleman-more/fixtures/partials-app/source/_main.erb
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/_main.erb
rename to middleman-more/fixtures/partials-app/source/_main.erb
diff --git a/middleman-core/fixtures/partials-app/source/_main.str b/middleman-more/fixtures/partials-app/source/_main.str
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/_main.str
rename to middleman-more/fixtures/partials-app/source/_main.str
diff --git a/middleman-core/fixtures/partials-app/source/index.html.erb b/middleman-more/fixtures/partials-app/source/index.html.erb
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/index.html.erb
rename to middleman-more/fixtures/partials-app/source/index.html.erb
diff --git a/middleman-core/fixtures/partials-app/source/locals.html.erb b/middleman-more/fixtures/partials-app/source/locals.html.erb
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/locals.html.erb
rename to middleman-more/fixtures/partials-app/source/locals.html.erb
diff --git a/middleman-core/fixtures/partials-app/source/second.html.str b/middleman-more/fixtures/partials-app/source/second.html.str
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/second.html.str
rename to middleman-more/fixtures/partials-app/source/second.html.str
diff --git a/middleman-core/fixtures/partials-app/source/shared/_footer.erb b/middleman-more/fixtures/partials-app/source/shared/_footer.erb
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/shared/_footer.erb
rename to middleman-more/fixtures/partials-app/source/shared/_footer.erb
diff --git a/middleman-core/fixtures/partials-app/source/shared/_header.erb b/middleman-more/fixtures/partials-app/source/shared/_header.erb
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/shared/_header.erb
rename to middleman-more/fixtures/partials-app/source/shared/_header.erb
diff --git a/middleman-core/fixtures/partials-app/source/shared/snippet.erb b/middleman-more/fixtures/partials-app/source/shared/snippet.erb
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/shared/snippet.erb
rename to middleman-more/fixtures/partials-app/source/shared/snippet.erb
diff --git a/middleman-core/fixtures/partials-app/source/sub/_local.erb b/middleman-more/fixtures/partials-app/source/sub/_local.erb
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/sub/_local.erb
rename to middleman-more/fixtures/partials-app/source/sub/_local.erb
diff --git a/middleman-core/fixtures/partials-app/source/sub/index.html.erb b/middleman-more/fixtures/partials-app/source/sub/index.html.erb
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/sub/index.html.erb
rename to middleman-more/fixtures/partials-app/source/sub/index.html.erb
diff --git a/middleman-core/fixtures/partials-app/source/using_snippet.html.erb b/middleman-more/fixtures/partials-app/source/using_snippet.html.erb
similarity index 100%
rename from middleman-core/fixtures/partials-app/source/using_snippet.html.erb
rename to middleman-more/fixtures/partials-app/source/using_snippet.html.erb
diff --git a/middleman-more/lib/middleman-more.rb b/middleman-more/lib/middleman-more.rb
index 18fe42f5..a95f21cb 100644
--- a/middleman-more/lib/middleman-more.rb
+++ b/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
diff --git a/middleman-core/lib/middleman-core/core_extensions/assets.rb b/middleman-more/lib/middleman-more/core_extensions/assets.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/core_extensions/assets.rb
rename to middleman-more/lib/middleman-more/core_extensions/assets.rb
diff --git a/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb b/middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
similarity index 98%
rename from middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
rename to middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
index 23c5d306..70800c08 100644
--- a/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
+++ b/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
diff --git a/middleman-core/lib/middleman-core/core_extensions/i18n.rb b/middleman-more/lib/middleman-more/core_extensions/i18n.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/core_extensions/i18n.rb
rename to middleman-more/lib/middleman-more/core_extensions/i18n.rb
diff --git a/middleman-more/middleman-more.gemspec b/middleman-more/middleman-more.gemspec
index 55003da4..9e7e6eb0 100644
--- a/middleman-more/middleman-more.gemspec
+++ b/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
\ No newline at end of file