middleman-core 3.0.0.beta.1 → 3.0.0.beta.2

data/lib/middleman-core/vendor/{padrino-core-0.10.5 → padrino-core-0.10.6}/lib/padrino-core/application/routing.rb

@@ -519,24 +519,24 @@ module Padrino
         # Rewrite default routes.
         #
         # @example
-        #   get :index                                    # => "/"
-        #   get :index, "/"                               # => "/"
-        #   get :index, :map => "/"                       # => "/"
-        #   get :show, "/show-me"                         # => "/show-me"
-        #   get :show,  :map => "/show-me"                # => "/show-me"
-        #   get "/foo/bar"                                # => "/show"
-        #   get :index, :parent => :user                  # => "/user/:user_id/index"
-        #   get :show, :with => :id, :parent => :user     # => "/user/:user_id/show/:id"
-        #   get :show, :with => :id                       # => "/show/:id"
-        #   get [:show, :id]                              # => "/show/:id"
-        #   get :show, :with => [:id, :name]              # => "/show/:id/:name"
-        #   get [:show, :id, :name]                       # => "/show/:id/:name"
-        #   get :list, :provides => :js                   # => "/list.{:format,js)"
-        #   get :list, :provides => :any                  # => "/list(.:format)"
-        #   get :list, :provides => [:js, :json]          # => "/list.{!format,js|json}"
-        #   get :list, :provides => [:html, :js, :json]   # => "/list(.{!format,js|json})"
-        #   get :list, :priority => :low                  # Defers route to be last
-        #
+        #   get :index                                             # => "/"
+        #   get :index, "/"                                        # => "/"
+        #   get :index, :map => "/"                                # => "/"
+        #   get :show, "/show-me"                                  # => "/show-me"
+        #   get :show,  :map => "/show-me"                         # => "/show-me"
+        #   get "/foo/bar"                                         # => "/show"
+        #   get :index, :parent => :user                           # => "/user/:user_id/index"
+        #   get :show, :with => :id, :parent => :user              # => "/user/:user_id/show/:id"
+        #   get :show, :with => :id                                # => "/show/:id"
+        #   get [:show, :id]                                       # => "/show/:id"
+        #   get :show, :with => [:id, :name]                       # => "/show/:id/:name"
+        #   get [:show, :id, :name]                                # => "/show/:id/:name"
+        #   get :list, :provides => :js                            # => "/list.{:format,js)"
+        #   get :list, :provides => :any                           # => "/list(.:format)"
+        #   get :list, :provides => [:js, :json]                   # => "/list.{!format,js|json}"
+        #   get :list, :provides => [:html, :js, :json]            # => "/list(.{!format,js|json})"
+        #   get :list, :priority => :low                           # Defers route to be last
+        #   get /pattern/, :name => :foo, :generate_with => '/foo' # Generates :foo as /foo
         def route(verb, path, *args, &block)
           options = case args.size
             when 2
@@ -557,7 +557,7 @@ module Padrino
           route_options = options.dup
           route_options[:provides] = @_provides if @_provides
           path, *route_options[:with] = path if path.is_a?(Array)
-          path, name, options = *parse_route(path, route_options, verb)
+          path, name, options, route_options = *parse_route(path, route_options, verb)
           options.reverse_merge!(@_conditions) if @_conditions
 
           # Sinatra defaults
@@ -571,7 +571,7 @@ module Padrino
           invoke_hook(:route_added, verb, path, block)
 
           # HTTPRouter route construction
-          route = router.add(path)
+          route = router.add(path, route_options)
           route.name(name) if name
           priority_name = options.delete(:priority) || :normal
           priority = ROUTE_PRIORITY[priority_name] or raise("Priority #{priority_name} not recognized, try #{ROUTE_PRIORITY.keys.join(', ')}")
@@ -620,6 +620,9 @@ module Padrino
           # We need save our originals path/options so we can perform correctly cache.
           original = [path, options.dup]
 
+          # options for the route directly
+          route_options = {}
+
           # We need check if path is a symbol, if that it's a named route
           map = options.delete(:map)
 
@@ -628,7 +631,11 @@ module Padrino
             path = map ? map.dup : (path == :index ? '/' : path.to_s)  # The route path
           end
 
-          if path.kind_of?(String) # path i.e "/index" or "/show"
+          # Build our controller
+          controller = Array(@_controller).map { |c| c.to_s }
+
+          case path
+          when String # path i.e "/index" or "/show"
             # Now we need to parse our 'with' params
             if with_params = options.delete(:with)
               path = process_path_for_with_params(path, with_params)
@@ -643,9 +650,6 @@ module Padrino
               options[:matching][:format] = /[^\.]+/
             end
 
-            # Build our controller
-            controller = Array(@_controller).map { |c| c.to_s }
-
             absolute_map = map && map[0] == ?/
 
             unless controller.empty?
@@ -656,10 +660,6 @@ module Padrino
                 path = File.join(controller_path, path)
               end
               # Here we build the correct name route
-              if name
-                controller_name = controller.join("_")
-                name = "#{controller_name}_#{name}".to_sym unless controller_name.blank?
-              end
             end
 
             # Now we need to parse our 'parent' params and parent scope
@@ -678,12 +678,21 @@ module Padrino
             path.sub!(%r{/(\))?$}, '\\1') if path != "/" # Remove latest trailing delimiter
             path.gsub!(/\/(\(\.|$)/, '\\1')              # Remove trailing slashes
             path.squeeze!('/')
+          when Regexp
+            route_options[:path_for_generation] = options.delete(:generate_with) if options.key?(:generate_with)
+          end
+
+          name = options.delete(:route_name) if name.nil? && options.key?(:route_name)
+          name = options.delete(:name) if name.nil? && options.key?(:name)
+          if name
+            controller_name = controller.join("_")
+            name = "#{controller_name}_#{name}".to_sym unless controller_name.blank?
           end
 
           # Merge in option defaults
           options.reverse_merge!(:default_values => @_defaults)
 
-          [path, name, options]
+          [path, name, options, route_options]
         end
 
         ##

data/lib/middleman-core/vendor/padrino-core-0.10.6/lib/padrino-core/application.rb

@@ -0,0 +1,269 @@
+module Padrino
+  class ApplicationSetupError < RuntimeError # @private
+  end
+
+  ##
+  # Subclasses of this become independent Padrino applications (stemming from Sinatra::Application)
+  # These subclassed applications can be easily mounted into other Padrino applications as well.
+  #
+  class Application < Sinatra::Base
+    # Support for advanced routing, controllers, url_for
+    register Padrino::Routing
+
+    ##
+    # Returns the logger for this application.
+    #
+    # @return [Padrino::Logger] Logger associated with this app.
+    #
+    def logger
+      Padrino.logger
+    end
+
+    class << self
+
+      def inherited(base) # @private
+        begun_at = Time.now
+        CALLERS_TO_IGNORE.concat(PADRINO_IGNORE_CALLERS)
+        base.default_configuration!
+        base.prerequisites.concat([
+          File.join(base.root, '/models.rb'),
+          File.join(base.root, '/models/**/*.rb'),
+          File.join(base.root, '/lib.rb'),
+          File.join(base.root, '/lib/**/*.rb')
+        ]).uniq!
+        Padrino.require_dependencies(base.prerequisites)
+        logger.devel :setup, begun_at, base
+        super(base) # Loading the subclass inherited method
+      end
+
+      ##
+      # Reloads the application files from all defined load paths
+      #
+      # This method is used from our Padrino Reloader during development mode
+      # in order to reload the source files.
+      #
+      # @return [TrueClass]
+      #
+      # @example
+      #   MyApp.reload!
+      #
+      def reload!
+        logger.devel "Reloading #{settings}"
+        reset! # Reset sinatra app
+        reset_router! # Reset all routes
+        Padrino.require_dependencies(settings.app_file, :force => true) # Reload the app file
+        require_dependencies # Reload dependencies
+        default_filters!     # Reload filters
+        default_routes!      # Reload default routes
+        default_errors!      # Reload our errors
+        I18n.reload! if defined?(I18n) # Reload also our translations
+        true
+      end
+
+      ##
+      # Resets application routes to only routes not defined by the user
+      #
+      # @return [TrueClass]
+      #
+      # @example
+      #   MyApp.reset_routes!
+      #
+      def reset_routes!
+        reset_router!
+        default_routes!
+        true
+      end
+
+      ##
+      # Returns the routes of our app.
+      #
+      # @example
+      #   MyApp.routes
+      #
+      def routes
+        router.routes
+      end
+
+      ##
+      # Setup the application by registering initializers, load paths and logger
+      # Invoked automatically when an application is first instantiated
+      #
+      # @return [TrueClass]
+      #
+      def setup_application!
+        return if @_configured
+        settings.require_dependencies
+        settings.default_filters!
+        settings.default_routes!
+        settings.default_errors!
+        if defined?(I18n)
+          I18n.load_path << settings.locale_path
+          I18n.reload!
+        end
+        @_configured = true
+        @_configured
+      end
+
+      ##
+      # Run the Padrino app as a self-hosted server using
+      # Thin, Mongrel or WEBrick (in that order)
+      #
+      # @see Padrino::Server#start
+      #
+      def run!(options={})
+        return unless Padrino.load!
+        Padrino.mount(settings.to_s).to('/')
+        Padrino.run!(options)
+      end
+
+      ##
+      # @return [Array]
+      #   directory that need to be added to +$LOAD_PATHS+ from this application
+      #
+      def load_paths
+        @_load_paths ||= %w[models lib mailers controllers helpers].map { |path| File.join(settings.root, path) }
+      end
+
+      ##
+      # Returns default list of path globs to load as dependencies
+      # Appends custom dependency patterns to the be loaded for your Application
+      #
+      # @return [Array]
+      #   list of path globs to load as dependencies
+      #
+      # @example
+      #   MyApp.dependencies << "#{Padrino.root}/uploaders/**/*.rb"
+      #   MyApp.dependencies << Padrino.root('other_app', 'controllers.rb')
+      #
+      def dependencies
+        [
+          'urls.rb', 'config/urls.rb', 'mailers/*.rb', 'mailers.rb',
+          'controllers/**/*.rb', 'controllers.rb', 'helpers/**/*.rb', 'helpers.rb'
+        ].map { |file| Dir[File.join(settings.root, file)] }.flatten
+      end
+
+      ##
+      # An array of file to load before your app.rb, basically are files wich our app depends on.
+      #
+      # By default we look for files:
+      #
+      #   # List of default files that we are looking for:
+      #   yourapp/models.rb
+      #   yourapp/models/**/*.rb
+      #   yourapp/lib.rb
+      #   yourapp/lib/**/*.rb
+      #
+      # @example Adding a custom perequisite
+      #   MyApp.prerequisites << Padrino.root('my_app', 'custom_model.rb')
+      #
+      def prerequisites
+        @_prerequisites ||= []
+      end
+
+      protected
+      ##
+      # Defines default settings for Padrino application
+      #
+      def default_configuration!
+        # Overwriting Sinatra defaults
+        set :app_file, File.expand_path(caller_files.first || $0) # Assume app file is first caller
+        set :environment, Padrino.env
+        set :reload, Proc.new { development? }
+        set :logging, Proc.new { development? }
+        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
+        # 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}')] }
+        # Load the Global Configurations
+        class_eval(&Padrino.apps_configuration) if Padrino.apps_configuration
+      end
+
+      ##
+      # We need to add almost __sinatra__ images.
+      #
+      def default_routes!
+        configure :development do
+          get '*__sinatra__/:image.png' do
+            content_type :png
+            filename = File.dirname(__FILE__) + "/images/#{params[:image]}.png"
+            send_file filename
+          end
+        end
+      end
+
+      ##
+      # This filter it's used for know the format of the request, and automatically set the content type.
+      #
+      def default_filters!
+        before do
+          unless @_content_type
+            @_content_type = :html
+            response['Content-Type'] = 'text/html;charset=utf-8'
+          end
+        end
+      end
+
+      ##
+      # This log errors for production environments
+      #
+      def default_errors!
+        configure :production do
+          error ::Exception do
+            boom = env['sinatra.error']
+            logger.error ["#{boom.class} - #{boom.message}:", *boom.backtrace].join("\n ")
+            response.status = 500
+            content_type 'text/html'
+            '<h1>Internal Server Error</h1>'
+          end unless errors.has_key?(::Exception)
+        end
+      end
+
+      ##
+      # Requires all files within the application load paths
+      #
+      def require_dependencies
+        Padrino.set_load_paths(*load_paths)
+        Padrino.require_dependencies(dependencies, :force => true)
+      end
+
+      private
+      # Overrides the default middleware for Sinatra based on Padrino conventions
+      # 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
+        setup_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?
+        end
+      end
+    end # self
+  end # Application
+end # Padrino

data/lib/middleman-core/vendor/{padrino-core-0.10.5 → padrino-core-0.10.6}/lib/padrino-core/cli/base.rb

@@ -41,7 +41,6 @@ module Padrino
       method_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development
       method_option :list,        :type => :string,  :aliases => "-T", :desc => "Display the tasks (matching optional PATTERN) with descriptions, then exit."
       method_option :trace,       :type => :boolean, :aliases => "-t", :desc => "Turn on invoke/execute tracing, enable full backtrace."
-      method_option :verbose,     :type => :boolean, :aliases => "-v", :desc => "Log message to standard output."
       def rake(*args)
         prepare :rake
         args << "-T" if options[:list]
@@ -51,9 +50,8 @@ module Padrino
         ARGV.clear
         ARGV.concat(args)
         puts "=> Executing Rake #{ARGV.join(' ')} ..."
-        ENV['PADRINO_LOG_LEVEL'] ||= "test"
         load File.expand_path('../rake.rb', __FILE__)
-        silence(:stdout) { require File.expand_path('config/boot.rb') }
+        require File.expand_path('config/boot.rb')
         PadrinoTasks.init(true)
       end
 
@@ -62,10 +60,10 @@ module Padrino
         prepare :console
         require File.expand_path("../../version", __FILE__)
         ARGV.clear
-        puts "=> Loading #{options.environment} console (Padrino v.#{Padrino.version})"
         require 'irb'
         require "irb/completion"
         require File.expand_path('config/boot.rb')
+        puts "=> Loading #{Padrino.env} console (Padrino v.#{Padrino.version})"
         require File.expand_path('../console', __FILE__)
         IRB.start
       end
@@ -80,7 +78,8 @@ module Padrino
           require 'padrino-core/command'
           require 'padrino-gen/command'
           ARGV.shift
-          Padrino.bin_gen(ARGV)
+          ARGV << 'help' if ARGV.empty?
+          Padrino.bin_gen(*ARGV)
         rescue
           puts "<= You need padrino-gen! Run: gem install padrino-gen"
         end

data/lib/middleman-core/vendor/{padrino-core-0.10.5 → padrino-core-0.10.6}/lib/padrino-core/loader.rb

@@ -94,6 +94,7 @@ module Padrino
     # Method for reloading required applications and their files.
     #
     def reload!
+      return unless Padrino::Reloader.changed?
       Padrino.before_load.each(&:call) # Run before hooks
       Padrino::Reloader.reload! # detects the modified files
       Padrino.after_load.each(&:call) # Run after hooks

data/lib/middleman-core/vendor/{padrino-core-0.10.5 → padrino-core-0.10.6}/lib/padrino-core/locale/it.yml

@@ -13,7 +13,7 @@ it:
     abbr_day_names: [Dom, Lun, Mar, Mer, Gio, Ven, Sab]
     month_names: [~, Gennaio, Febbraio, Marzo, Aprile, Maggio, Giugno, Luglio, Agosto, Settembre, Ottobre, Novembre, Dicembre]
     abbr_month_names: [~, Gen, Feb, Mar, Apr, Mag, Giu, Lug, Ago, Set, Ott, Nov, Dic]
-    order: 
+    order:
       - day
       - month
       - year

data/lib/middleman-core/vendor/{padrino-core-0.10.5 → padrino-core-0.10.6}/lib/padrino-core/locale/lv.yml

@@ -4,7 +4,7 @@ lv:
       # Use the strftime parameters for formats.
       # When no format has been given, it uses default.
       # You can provide other formats here if you like!
-      default: "%d.%m.%Y."
+      default: "%d.%m.%Y"
       short: "%e. %B"
       long: "%Y. gada %e. %B"
       only_day: "%e"
@@ -21,7 +21,7 @@ lv:
   time:
     formats:
       default: "%Y. gada %e. %B, %H:%M"
-      short: "%d.%m.%Y., %H:%M"
+      short: "%d.%m.%Y, %H:%M"
       long: "%Y. gada %e. %B, %H:%M:%S"
     am: "priekšpusdiena"
     pm: "pēcpusdiena"