middleman-core 3.1.0.rc.2 → 3.1.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0268514dc3abe13da04e0bfd4bb14b5817ba45a
-  data.tar.gz: 7727d4051f853d8ef84b2212c6092e6ad5e71991
+  metadata.gz: d409fa4b4685ed3179880f7ec5f6b3d738b02cb5
+  data.tar.gz: 85297e96e43c14c1cdc4f08acb9c909f5eef6e04
 SHA512:
-  metadata.gz: 2668ab06a6cad5a214691da0310e7ad6fb0329753c8f8f5b7fcb6150d256c3cdfd5a952e15d1fe5ddb1d90d3397a15c00683975fe97bbbb386b2d6d1fc6b3baf
-  data.tar.gz: f4b5d70c1e7507abe9f4fbecea9de575609697f611fd0e907edeb912b539ef09e87c419d247464fcb2c61e9fb3aa3a085e1534e32ba47dd12ae9a621f977aa52
+  metadata.gz: eb1fc2f29f119b5972c274f85bad7601e981aeba564a33ea0ec97fe3be68e84da70e5db0e08e6120f73e4c9c4f740b2f38c78aeb87b971c0cfa3e715a66de476
+  data.tar.gz: d5487e80ecd0b193602ab72ea0de5764685998a1838c8bfca0f3fd1a320c21e542dd568abd660085aa5acc33d32fd74f50d61f16f17edc272fd878f20f1f88bc

data/.simplecov

@@ -1,6 +1,7 @@
 SimpleCov.start do
+  add_filter '/fixtures/'
   add_filter '/features/'
   add_filter '/spec/'
-  add_filter '/vendor'
   add_filter '/step_definitions/'
+  add_filter '/lib/vendored-middleman-deps/'
 end

data/features/capture_html.feature

@@ -0,0 +1,18 @@
+@wip
+
+Feature: Support capture_html and yield_content helpers
+
+  Scenario: content_for works as expected in erb
+    Given the Server is running at "capture-html-app"
+    When I go to "/capture_html_erb.html"
+    Then I should see "In Layout: <h1>I am the yielded content erb</h1>"
+    
+  Scenario: content_for works as expected in haml
+    Given the Server is running at "capture-html-app"
+    When I go to "/capture_html_haml.html"
+    Then I should see "In Layout: <h1>I am the yielded content haml</h1>"
+    
+  Scenario: content_for works as expected in slim
+    Given the Server is running at "capture-html-app"
+    When I go to "/capture_html_slim.html"
+    Then I should see "In Layout: <h1>I am the yielded content slim</h1>"

data/features/content_for.feature

@@ -3,14 +3,14 @@ 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"
+    Then I should see "In Layout: I am the yielded content erb <s>with html tags</s>"
     
   Scenario: content_for works as expected in haml
     Given the Server is running at "content-for-app"
     When I go to "/content_for_haml.html"
-    Then I should see "In Layout: I am the yielded content haml"
+    Then I should see "In Layout: I am the yielded content haml <s>with html tags</s>"
     
   Scenario: content_for works as expected in slim
     Given the Server is running at "content-for-app"
     When I go to "/content_for_slim.html"
-    Then I should see "In Layout: I am the yielded content slim"
+    Then I should see "In Layout: I am the yielded content slim <s>with html tags</s>"

data/features/v4_extension_callbacks.feature

@@ -0,0 +1,8 @@
+Feature: v4 Extensions should have after_activated hooks
+
+  Scenario: Hello Helper
+    Given the Server is running at "v4-extension-callbacks"
+    Then going to "/index.html" should not raise an exception
+    And I should see "Extension One: true"
+    And I should see "Extension Two: true"
+    

data/fixtures/capture-html-app/config.rb

@@ -0,0 +1,7 @@
+require "slim"
+
+with_layout :capture_html do
+  page "/capture_html_erb.html"
+  page "/capture_html_haml.html"
+  page "/capture_html_slim.html"
+end

data/fixtures/capture-html-app/source/capture_html_erb.html.erb

@@ -0,0 +1,5 @@
+<% capture_html :from_template do %>
+  <h1>I am the yielded content erb</h1>
+<% end %>
+
+I am in the template

data/fixtures/capture-html-app/source/capture_html_haml.html.haml

@@ -0,0 +1,4 @@
+- capture_html :from_template do
+  %h1= "I am the yielded content haml"
+
+%p I am in the template

data/fixtures/capture-html-app/source/capture_html_slim.html.slim

@@ -0,0 +1,4 @@
+- capture_html :from_template do
+  h1 I am the yielded content slim
+
+| I am in the template

data/fixtures/capture-html-app/source/layouts/capture_html.erb

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

data/fixtures/content-for-app/source/content_for_erb.html.erb

@@ -1,5 +1,5 @@
 <% content_for :from_template do %>
-  I am the yielded content erb
+  I am the yielded content erb <s>with html tags</s>
 <% end %>
 
 I am in the template

data/fixtures/content-for-app/source/content_for_haml.html.haml

@@ -1,4 +1,4 @@
 - content_for :from_template do
-  = "I am the yielded content haml"
+  = "I am the yielded content haml <s>with html tags</s>"
 
 %p I am in the template

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

@@ -1,4 +1,5 @@
 - content_for :from_template do
-  | I am the yielded content slim
+  | I am the yielded content slim 
+  s with html tags
 
 | I am in the template

data/fixtures/v4-extension-callbacks/config.rb

@@ -0,0 +1,26 @@
+class ExtensionOne < ::Middleman::Extension
+  def initialize(app, options_hash={})
+    super
+
+    after_extension_activated :extension_two do
+      app.set :extension_two_was_activated, true
+    end
+  end
+end
+
+ExtensionOne.register
+
+class ExtensionTwo < ::Middleman::Extension
+  def initialize(app, options_hash={})
+    super
+
+    after_extension_activated :extension_one do
+      app.set :extension_one_was_activated, true
+    end
+  end
+end
+
+ExtensionTwo.register
+
+activate :extension_one
+activate :extension_two

data/fixtures/v4-extension-callbacks/source/index.html.erb

@@ -0,0 +1,2 @@
+Extension One: <%= extension_one_was_activated.inspect %>
+Extension Two: <%= extension_two_was_activated.inspect %>

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

@@ -142,6 +142,7 @@ module Middleman
           # Search the root of the project for required files
           $LOAD_PATH.unshift(root)
 
+          ::Middleman::Extension.clear_after_extension_callbacks
           run_hook :initialized
 
           if config[:autoload_sprockets]
@@ -178,7 +179,7 @@ module Middleman
           run_hook :after_configuration
 
           logger.debug "Loaded extensions:"
-          self.extensions.each do |ext,_|
+          self.extensions.each do |ext, klass|
             if ext.is_a?(Hash)
               ext.each do |k,_|
                 logger.debug "== Extension: #{k}"
@@ -186,6 +187,10 @@ module Middleman
             else
               logger.debug "== Extension: #{ext}"
             end
+
+            if klass.is_a?(::Middleman::Extension)
+              ::Middleman::Extension.activated_extension(klass)
+            end
           end
         end
       end

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

@@ -8,6 +8,7 @@ module Middleman
 
       IGNORE_LIST = [
         /^\.bundle\//,
+        /^vendor\//,
         /^\.sass-cache\//,
         /^\.git\//,
         /^\.gitignore$/,

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

@@ -413,8 +413,7 @@ module Middleman
             @_out_buf = _buf_was
           end
 
-          # concat_safe_content
-          concat_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
+          concat_safe_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
         ensure
           @current_engine = engine_was
         end

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

@@ -130,7 +130,7 @@ module Middleman
         def server(&block)
           @@servercounter ||= 0
           @@servercounter += 1
-          const_set("MiddlemanApplication#{@@servercounter}", Class.new(Middleman::Application))
+          const_set("MiddlemanApplication#{@@servercounter}", Class.new(Middleman::Application, &block))
         end
       end
 
@@ -142,7 +142,7 @@ module Middleman
         #
         # @return [Class]
         def server(&block)
-          ::Middleman::Application.server
+          ::Middleman::Application.server(&block)
         end
       end
 

data/lib/middleman-core/extensions.rb

@@ -1,4 +1,5 @@
 require "active_support/core_ext/class/attribute"
+require "active_support/core_ext/module/delegation"
 
 module Middleman
 
@@ -131,11 +132,31 @@ module Middleman
       def activate
         new(::Middleman::Application)
       end
+
+      def clear_after_extension_callbacks
+        @_extension_activation_callbacks = {}
+      end
+
+      def after_extension_activated(name, &block)
+        @_extension_activation_callbacks ||= {}
+        @_extension_activation_callbacks[name] ||= []
+        @_extension_activation_callbacks[name] << block if block_given?
+      end
+
+      def activated_extension(instance)
+        name = instance.class.extension_name
+        return unless @_extension_activation_callbacks && @_extension_activation_callbacks[name]
+        @_extension_activation_callbacks[name].each do |block|
+          block.arity == 1 ? block.call(instance) : block.call()
+        end
+      end
     end
 
     attr_accessor :options
     attr_reader :app
 
+    delegate :after_extension_activated, :to => :"::Middleman::Extension"
+
     def initialize(klass, options_hash={}, &block)
       @_helpers = []
       @klass = klass

data/lib/middleman-core/meta_pages/sitemap_resource.rb

@@ -1,4 +1,7 @@
-require 'padrino-helpers'
+if !defined?(::Padrino::Helpers)
+  require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
+  require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'
+end
 
 module Middleman
   module MetaPages

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.1.0.rc.2' unless const_defined?(:VERSION)
+  VERSION = '3.1.0.rc.3' unless const_defined?(:VERSION)
 end

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

@@ -1,11 +1,25 @@
+if !defined?(::Padrino::Helpers)
+  require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
+  require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'
+end
+    
+class Padrino::Helpers::OutputHelpers::ErbHandler
+  # Force Erb capture not to use safebuffer
+  def capture_from_template(*args, &block)
+    self.output_buffer, _buf_was = "", self.output_buffer
+    captured_block = block.call(*args)
+    ret = eval("@_out_buf", block.binding)
+    self.output_buffer = _buf_was
+    [ ret, captured_block ]
+  end
+end
+
 class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
   def initialize(app, options_hash={}, &block)
     super
 
     require 'active_support/core_ext/object/to_query'
-    require 'vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite'
-    require 'vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers'
 
     app.helpers ::Padrino::Helpers::OutputHelpers
     app.helpers ::Padrino::Helpers::TagHelpers
@@ -15,7 +29,7 @@ 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.helpers ::Padrino::Helpers::Breadcrumbs
 
     app.config.define_setting :relative_links, false, 'Whether to generate relative links instead of absolute ones'
   end

data/lib/vendored-middleman-deps/{padrino-core-0.10.7 → padrino-core-0.11.2}/lib/padrino-core.rb

@@ -1,8 +1,19 @@
 require 'sinatra/base'
-require 'padrino-core/support_lite' unless defined?(SupportLite)
+require 'padrino-core/version'
+require 'padrino-core/support_lite'
+require 'padrino-core/application'
+
+require 'padrino-core/caller'
+require 'padrino-core/command'
+require 'padrino-core/loader'
+require 'padrino-core/logger'
+require 'padrino-core/mounter'
+require 'padrino-core/reloader'
+require 'padrino-core/router'
+require 'padrino-core/server'
+require 'padrino-core/tasks'
+require 'padrino-core/module'
 
-FileSet.glob_require('padrino-core/application/*.rb', __FILE__)
-FileSet.glob_require('padrino-core/*.rb', __FILE__)
 
 # The Padrino environment (falls back to the rack env or finally develop)
 PADRINO_ENV  = ENV["PADRINO_ENV"]  ||= ENV["RACK_ENV"] ||= "development"  unless defined?(PADRINO_ENV)
@@ -80,7 +91,14 @@ module Padrino
     #   end
     #
     def configure_apps(&block)
-      @_global_configuration = block if block_given?
+      return  unless block_given?
+      @@_global_configurations ||= []
+      @@_global_configurations << block
+      @_global_configuration = lambda do |app|
+        @@_global_configurations.each do |configuration|
+          app.class_eval(&configuration)
+        end
+      end
     end
 
     ##
@@ -148,5 +166,41 @@ module Padrino
     def use(m, *args, &block)
       middleware << [m, args, block]
     end
+
+    ##
+    # Registers a gem with padrino. This relieves the caller from setting up
+    # loadpaths by himself and enables Padrino to look up apps in gem folder.
+    #
+    # The name given has to be the proper gem name as given in the gemspec.
+    #
+    # @param [String] name
+    #   The name of the gem being registered.
+    #
+    # @param [Module] main_module
+    #   The main module of the gem.
+    #
+    # @returns The root path of the loaded gem
+    def gem(name, main_module)
+      _,spec = Gem.loaded_specs.find { |spec_name, spec| spec_name == name }
+      gems << spec
+      modules << main_module
+      spec.full_gem_path
+    end
+
+    ##
+    # Returns all currently known padrino gems.
+    #
+    # @returns [Gem::Specification]
+    def gems
+      @gems ||= []
+    end
+
+    ##
+    # All loaded Padrino modules.
+    #
+    # @returns [<Padrino::Module>]
+    def modules
+      @modules ||= []
+    end
   end # self
 end # Padrino

data/lib/vendored-middleman-deps/{padrino-core-0.10.7 → padrino-core-0.11.2}/lib/padrino-core/application.rb

@@ -1,3 +1,8 @@
+require 'padrino-core/application/rendering'
+require 'padrino-core/application/routing'
+require 'padrino-core/application/flash'
+require 'padrino-core/application/showexceptions'
+
 module Padrino
   class ApplicationSetupError < RuntimeError # @private
   end
@@ -173,17 +178,21 @@ module Padrino
         set :method_override, true
         set :sessions, false
         set :public_folder, Proc.new { Padrino.root('public', uri_root) }
-        set :views, Proc.new { File.join(root,   "views") }
-        set :images_path, Proc.new { File.join(public, "images") }
-        set :protection, false
+        set :views, Proc.new { File.join(root, 'views') }
+        set :images_path, Proc.new { File.join(public_folder, 'images') }
+        set :protection, true
+        # Haml specific
+        set :haml, { :ugly => (Padrino.env == :production) } if defined?(Haml)
         # Padrino specific
         set :uri_root, '/'
         set :app_name, settings.to_s.underscore.to_sym
         set :default_builder, 'StandardFormBuilder'
-        set :flash, defined?(Sinatra::Flash) || defined?(Rack::Flash)
         set :authentication, false
         # Padrino locale
         set :locale_path, Proc.new { Dir[File.join(settings.root, '/locale/**/*.{rb,yml}')] }
+        # Authenticity token
+        set :protect_from_csrf, false
+        set :allow_disabled_csrf, false
         # Load the Global Configurations
         class_eval(&Padrino.apps_configuration) if Padrino.apps_configuration
       end
@@ -241,27 +250,42 @@ module Padrino
       # Also initializes the application after setting up the middleware
       def setup_default_middleware(builder)
         setup_sessions builder
-        setup_flash builder
         builder.use Padrino::ShowExceptions         if show_exceptions?
         builder.use Padrino::Logger::Rack, uri_root if Padrino.logger && logging?
         builder.use Padrino::Reloader::Rack         if reload?
         builder.use Rack::MethodOverride            if method_override?
         builder.use Rack::Head
+        register    Padrino::Flash
         setup_protection builder
+        setup_csrf_protection builder
         setup_application!
       end
 
-       # TODO Remove this in a few versions (rack-flash deprecation)
-       # Move register Sinatra::Flash into setup_default_middleware
-       # Initializes flash using sinatra-flash or rack-flash
-      def setup_flash(builder)
-        register Sinatra::Flash if flash? && defined?(Sinatra::Flash)
-        if defined?(Rack::Flash) && !defined?(Sinatra::Flash)
-          logger.warn %Q{
-            [Deprecation] In Gemfile, 'rack-flash' should be replaced with 'sinatra-flash'!
-            Rack-Flash is not compatible with later versions of Rack and should be replaced.
-          }
-          builder.use Rack::Flash, :sweep => true if flash?
+      # sets up csrf protection for the app
+      def setup_csrf_protection(builder)
+        if protect_from_csrf? && !sessions?
+          raise(<<-ERROR)
+`protect_from_csrf` is activated, but `sessions` are not. To enable csrf
+protection, use:
+
+    enable :sessions
+
+or deactivate protect_from_csrf:
+
+    disable :protect_from_csrf
+ERROR
+        end
+
+        if protect_from_csrf?
+          if allow_disabled_csrf?
+            builder.use Rack::Protection::AuthenticityToken,
+                        :reaction => :report,
+                        :report_key => 'protection.csrf.failed',
+                        :logger => logger
+          else
+            builder.use Rack::Protection::AuthenticityToken,
+                        :logger => logger
+          end
         end
       end
     end # self