middleman-core 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 837af63ed984f569d289647d76420a3f9822a445
-  data.tar.gz: 8f9f478b36de9fe48b7da84708f29b35923c39a8
+  metadata.gz: a3dc6c4f0306d2699602558b9c5969cb39559b89
+  data.tar.gz: 529578435c9d7de90f8776c1c4820f21174fad59
 SHA512:
-  metadata.gz: 906d9a398687814e4014d80944e91386e85ac6304f1f43dc87c7be98d5642ffac10c205eef861ac496f6912b56eae57385390adf79ca3ac5104548018ec337c0
-  data.tar.gz: 814be4fc092bc47df840c1dcc8daca973ece0233d2f238886ef5578227330c734dfa9e87e2836bc6793305e78166535920febe8cecfe4bcbeac5a6927a8cca46
+  metadata.gz: b4234809f3a048f76e43b64cd61650a512aa87084c516a60e0bda2d984eb96f767a63ac0ffd0975f12f165be88da363c00b2e0bbc3a35b70c0ac2de59e64c844
+  data.tar.gz: 94b55256d747a907562b7334928453f770b4562182b7d042a1e77a2a19dfbe4655fd65482204990383878fda3a06754bd19024892a76d224b1ebd447cb4cd751

data/features/slim.feature

@@ -20,6 +20,14 @@ Feature: Support slim templating language
     When I go to "/slim.html"
     Then I should see "<h1>Welcome to Slim</h1>"
 
+  Scenario: Slim Content For
+    Given the Server is running at "slim-content-for-app"
+    When I go to "/index.html"
+    Then I should not see "Content AContent B"
+    Then I should see "Content for A:Content A"
+    Then I should see "Content for main:Content Main"
+    Then I should see "Content for B:Content B"
+
   Scenario: Rendering Scss in a Slim filter
     Given an empty app
     And a file named "config.rb" with:

data/fixtures/slim-content-for-app/source/index.html.slim

@@ -0,0 +1,7 @@
+- content_for :a do
+  | Content A
+
+| Content Main
+
+- content_for :b do
+  | Content B

data/fixtures/slim-content-for-app/source/layouts/layout.slim

@@ -0,0 +1,15 @@
+doctype html
+html
+  body
+    .test
+    | Content for A:
+    == yield_content :a
+    br
+
+    | Content for main:
+    == yield
+    br
+
+    | Content for B:
+    == yield_content :b
+    br

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.3.4' unless const_defined?(:VERSION)
+  VERSION = '3.3.5' unless const_defined?(:VERSION)
 end

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

@@ -30,7 +30,6 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     app.helpers ::Padrino::Helpers::RenderHelpers
     app.helpers ::Padrino::Helpers::NumberHelpers
     # app.helpers ::Padrino::Helpers::TranslationHelpers
-    app.helpers ::Padrino::Helpers::Breadcrumbs
 
     app.config.define_setting :relative_links, false, 'Whether to generate relative links instead of absolute ones'
   end
@@ -73,7 +72,6 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
     def auto_find_proper_handler(&block)
       engine = block_given? ? File.extname(block.source_location[0])[1..-1].to_sym : current_engine
-      return if engine == :slim && engine == current_engine
       handler_class = ::Padrino::Helpers::OutputHelpers.handlers[engine]
       handler_class && handler_class.new(self)
     end

data/middleman-core.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
 
   # Helpers
   s.add_dependency("activesupport", ["~> 4.1.0"])
-  s.add_dependency("padrino-helpers", ["~> 0.12.1"])
+  s.add_dependency("padrino-helpers", ["~> 0.12.3"])
 
   # Watcher
   s.add_dependency("listen", [">= 2.7.9", "< 3.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.5
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -894,6 +894,9 @@ files:
 - fixtures/scss-app/source/stylesheets/site_scss.css.scss
 - fixtures/sinatra-app/config.rb
 - fixtures/sinatra-app/source/index.html.erb
+- fixtures/slim-content-for-app/config.rb
+- fixtures/slim-content-for-app/source/index.html.slim
+- fixtures/slim-content-for-app/source/layouts/layout.slim
 - fixtures/strip-url-app/config.rb
 - fixtures/strip-url-app/source/index.html.erb
 - fixtures/strip-url-app/source/other.html.erb
@@ -1955,6 +1958,9 @@ test_files:
 - fixtures/scss-app/source/stylesheets/site_scss.css.scss
 - fixtures/sinatra-app/config.rb
 - fixtures/sinatra-app/source/index.html.erb
+- fixtures/slim-content-for-app/config.rb
+- fixtures/slim-content-for-app/source/index.html.slim
+- fixtures/slim-content-for-app/source/layouts/layout.slim
 - fixtures/strip-url-app/config.rb
 - fixtures/strip-url-app/source/index.html.erb
 - fixtures/strip-url-app/source/other.html.erb