RubyGems - middleman-core - Versions diffs - 3.2.0 → 3.2.1 - Mend

middleman-core 3.2.0 → 3.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (241) hide show

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

@@ -1,6 +1,6 @@
 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'
+  require 'vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/support_lite'
+  require 'vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers'
 end
 module Middleman

data/lib/middleman-core/meta_pages/templates/config.html.erb CHANGED Viewed

@@ -3,18 +3,18 @@
   <head>
     <meta charset="utf-8">
     <title>Middleman Configuration</title>
-    <link type="text/css" rel="stylesheet" href="../assets/meta.css">
-    <link type="text/css" rel="stylesheet" href="../assets/config.css">
+    <link type="text/css" rel="stylesheet" href="/__middleman/assets/meta.css">
+    <link type="text/css" rel="stylesheet" href="/__middleman/assets/config.css">
   </head>
   <body>
     <div class="container">
       <article id="main">
-    <a href="../">&laquo; back</a>
+    <a href="/__middleman/">&laquo; back</a>
     <h1>Middleman Configuration</h1>
     <p>This page shows the current configuration of your Middleman application.</p>
     <p>
       <a href="#core">Core configuration</a>
       | <a href="#extensions">Extensions</a>
@@ -32,10 +32,10 @@
       <% extension_config.each do |ext_name, configs| %>
       <li>
         <% registered_extensions.delete(ext_name) %>
-        <span class="extension active"><%= ext_name.inspect %></span>
+        <span class="extension active">:<%= ext_name %></span>
         <% if configs && !configs.empty? %>
         <ul class="settings">
           <% configs.each do |setting| %>
@@ -55,5 +55,3 @@
     </div>
   </body>
 </html>

data/lib/middleman-core/meta_pages/templates/index.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>Middleman Info</title>
-    <link type="text/css" rel="stylesheet" href="assets/meta.css">
+    <link type="text/css" rel="stylesheet" href="/__middleman/assets/meta.css">
   </head>
   <body>
@@ -11,8 +11,8 @@
       <h1>Middleman Information</h1>
       <ul>
-        <li><a href="sitemap/">Sitemap</a></li>
-        <li><a href="config/">Configuration</a></li>
+        <li><a href="/__middleman/sitemap/">Sitemap</a></li>
+        <li><a href="/__middleman/config/">Configuration</a></li>
         <li><a href="http://middlemanapp.com">Middleman Guides</a></li>
       </ul>
     </div>

data/lib/middleman-core/meta_pages/templates/sitemap.html.erb CHANGED Viewed

@@ -6,17 +6,17 @@
     <title>Middleman Sitemap</title>
-    <link type="text/css" rel="stylesheet" href="../assets/meta.css">
-    <link type="text/css" rel="stylesheet" href="../assets/sitemap.css">
-    <script src="../assets/jquery-1.8.2.min.js"></script>
-    <script src="../assets/jquery.details-1.6.min.js"></script>
-    <script src="../assets/sitemap.js"></script>
+    <link type="text/css" rel="stylesheet" href="/__middleman/assets/meta.css">
+    <link type="text/css" rel="stylesheet" href="/__middleman/assets/sitemap.css">
+    <script src="/__middleman/assets/jquery-1.8.2.min.js"></script>
+    <script src="/__middleman/assets/jquery.details-1.6.min.js"></script>
+    <script src="/__middleman/assets/sitemap.js"></script>
   </head>
   <body>
     <div class="container">
       <article id="main">
-        <a href="../">&laquo; back</a>
+        <a href="/__middleman/">&laquo; back</a>
         <h1>Middleman Sitemap</h1>
         <p>This page shows all of the pages in

data/lib/middleman-core/sitemap/extensions/redirects.rb CHANGED Viewed

@@ -38,8 +38,7 @@ module Middleman
           # Setup a redirect from a path to a target
           # @param [String] path
-          # @param [Hash] The :to value gives a target path
-          # @return [void]
+          # @param [Hash] opts The :to value gives a target path
           def create_redirect(path, opts={}, &block)
             if block_given?
               opts[:template] = block

data/lib/middleman-core/sitemap/extensions/request_endpoints.rb CHANGED Viewed

@@ -38,9 +38,8 @@ module Middleman
           # Setup a proxy from a path to a target
           # @param [String] path
-          # @param [Hash] The :path value gives a request path if it
+          # @param [Hash] opts The :path value gives a request path if it
           # differs from the output path
-          # @return [void]
           def create_endpoint(path, opts={}, &block)
             endpoint = {
               :request_path => path
@@ -84,7 +83,7 @@ module Middleman
           def template?
             true
           end
           def render(*args, &block)
             return self.output.call if self.output
           end

data/lib/middleman-core/sitemap/resource.rb CHANGED Viewed

@@ -23,6 +23,10 @@ module Middleman
       # @return [String]
       attr_reader :path
+      # The output path for this resource
+      # @return [String]
+      attr_accessor :destination_path
       # Set the on-disk source file for this resource
       # @return [String]
       # attr_reader :source_file
@@ -40,8 +44,7 @@ module Middleman
         @app         = @store.app
         @path        = path.gsub(' ', '%20') # handle spaces in filenames
         @source_file = source_file
-        @destination_paths = [@path]
+        @destination_path = @path
         @local_metadata = { :options => {}, :locals => {}, :page => {}, :blocks => [] }
       end
@@ -85,18 +88,9 @@ module Middleman
         @local_metadata[:blocks] += [ block ] if block_given?
       end
-      # Get the output/preview URL for this resource
+      # The output/preview URL for this resource
       # @return [String]
-      def destination_path
-        @destination_paths.last
-      end
-      # Set the output/preview URL for this resource
-      # @param [String] path
-      # @return [void]
-      def destination_path=(path)
-        @destination_paths << path
-      end
+      attr_accessor :destination_path
       # Extension of the path (i.e. '.js')
       # @return [String]

data/lib/middleman-core/util.rb CHANGED Viewed

@@ -139,15 +139,14 @@ module Middleman
     # @param paths Some paths string or Pathname
     # @return [Array] An array of filenames
     def self.all_files_under(*paths)
-      # when we drop 1.8, replace this with flat_map
-      paths.map do |p|
+      paths.flat_map do |p|
         path = Pathname(p)
         if path.directory?
           all_files_under(*path.children)
         elsif path.file?
           path
         end
-      end.flatten.compact
+      end.compact
     end
     # Given a source path (referenced either absolutely or relatively)

data/lib/middleman-core/version.rb CHANGED Viewed

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

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

@@ -1,6 +1,6 @@
 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'
+  require 'vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/support_lite'
+  require 'vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers'
 end
 class Padrino::Helpers::OutputHelpers::ErbHandler
@@ -121,14 +121,18 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # Generate body css classes based on the current path
     #
     # @return [String]
-    def page_classes(options={})
-      path = current_path.dup
+    def page_classes(path = current_path.dup, options={})
+      if path.is_a? Hash
+        options = path
+        path = current_path.dup
+      end
       path << index_file if path.end_with?('/')
       path = ::Middleman::Util.strip_leading_slash(path)
       classes = []
       parts = path.split('.').first.split('/')
-      parts.each_with_index { |path, i| classes << parts.first(i+1).join('_') }
+      parts.each_with_index { |_, i| classes << parts.first(i+1).join('_') }
       prefix = options[:numeric_prefix] || "x"
       classes.map do |c|

data/lib/middleman-more/core_extensions/i18n.rb CHANGED Viewed

@@ -10,6 +10,11 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   def initialize(app, options_hash={}, &block)
     super
+    # TODO
+    # If :directory_indexes is already active,
+    # throw a warning explaining the bug and telling the use
+    # to reverse the order.
     # See https://github.com/svenfuchs/i18n/wiki/Fallbacks
     unless options[:no_fallbacks]
       require "i18n/backend/fallbacks"
@@ -55,7 +60,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   def langs
     @_langs ||= get_known_languages
   end
   # Update the main sitemap resource list
   # @return [void]
   def manipulate_resource_list(resources)
@@ -64,17 +69,19 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     new_resources = []
     resources.each do |resource|
+      # If it uses file extension localization
+      if !parse_locale_extension(resource.path).nil?
+        result = parse_locale_extension(resource.path)
+        lang, path, page_id = result
+        new_resources << build_resource(path, resource.path, page_id, lang)
       # If it's a "localizable template"
-      if File.fnmatch?(File.join(options[:templates_dir], "**"), resource.path)
+      elsif File.fnmatch?(File.join(options[:templates_dir], "**"), resource.path)
         page_id = File.basename(resource.path, File.extname(resource.path))
         langs.each do |lang|
           # Remove folder name
           path = resource.path.sub(options[:templates_dir], "")
           new_resources << build_resource(path, resource.path, page_id, lang)
         end
-      elsif result = parse_locale_extension(resource.path)
-        lang, path, page_id = result
-        new_resources << build_resource(path, resource.path, page_id, lang)
       end
     end
@@ -90,7 +97,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       ::I18n.reload!
     end
   end
   def convert_glob_to_regex(glob)
     # File.fnmatch doesn't support brackets: {rb,yml,yaml}
     regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml,yaml}", "(rb|ya?ml)")
@@ -163,34 +170,34 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     path = path_bits.join('.')
     basename = File.basename(path_bits[0..-2].join('.'))
     [lang, path, basename]
   end
   def build_resource(path, source_path, page_id, lang)
     old_locale = ::I18n.locale
     ::I18n.locale = lang
     localized_page_id = ::I18n.t("paths.#{page_id}", :default => page_id, :fallback => [])
-    prefix = if @mount_at_root == lang
+    prefix = if (options[:mount_at_root] == lang) || (options[:mount_at_root] == nil && langs[0] == lang)
       "/"
     else
       replacement = options[:lang_map].fetch(lang, lang)
       options[:path].sub(":locale", replacement.to_s)
     end
+    # path needs to be changed if file has a localizable extension. (options[mount_at_root] == lang)
     path = ::Middleman::Util.normalize_path(
       File.join(prefix, path.sub(page_id, localized_page_id))
     )
+    path.gsub!(options[:templates_dir]+"/", "")
     @_localization_data[path] = [lang, path, localized_page_id]
     p = ::Middleman::Sitemap::Resource.new(app.sitemap, path)
     p.proxy_to(source_path)
     ::I18n.locale = old_locale
     p
   end

data/lib/middleman-more/extensions/{automatic-alt-tags.rb → automatic_alt_tags.rb} RENAMED Viewed

File without changes

data/lib/middleman-more/extensions/gzip.rb CHANGED Viewed

@@ -18,28 +18,51 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
     require 'zlib'
     require 'stringio'
     require 'find'
+    require 'thread'
   end
   def after_build(builder)
+    num_threads = 4
     paths = ::Middleman::Util.all_files_under(app.build_dir)
     total_savings = 0
+    # Fill a queue with inputs
+    in_queue = Queue.new
     paths.each do |path|
-      next unless options.exts.include? path.extname
+      in_queue << path if options.exts.include?(path.extname)
+    end
+    num_paths = in_queue.size
+    # Farm out gzip tasks to threads and put the results in in_queue
+    out_queue = Queue.new
+    threads = num_threads.times.map do
+      Thread.new do
+        while path = in_queue.pop
+          out_queue << gzip_file(path.to_s)
+        end
+      end
+    end
+    # Insert a nil for each thread to stop it
+    num_threads.times do
+      in_queue << nil
+    end
+    old_locale = I18n.locale
+    I18n.locale = :en # use the english localizations for printing out file sizes to make sure the localizations exist
-      output_filename, old_size, new_size = gzip_file(path.to_s)
+    num_paths.times do
+      output_filename, old_size, new_size = out_queue.pop
       if output_filename
         total_savings += (old_size - new_size)
         size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
-        old_locale = I18n.locale
-        I18n.locale = :en # use the english localizations for printing out file sizes to make sure the localizations exist
         builder.say_status :gzip, "#{output_filename} (#{app.number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
-        I18n.locale = old_locale
       end
     end
     builder.say_status :gzip, "Total gzip savings: #{app.number_to_human_size(total_savings)}", :blue
+    I18n.locale = old_locale
   end
   def gzip_file(path)
@@ -49,7 +72,7 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
     # Check if the right file's already there
     if File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
-      return
+      return [nil, nil, nil]
     end
     File.open(output_filename, 'wb') do |f|

data/lib/vendored-middleman-deps/{padrino-core-0.11.2 → padrino-core-0.11.4}/.document RENAMED Viewed

File without changes

data/lib/vendored-middleman-deps/{padrino-core-0.11.2 → padrino-core-0.11.4}/.gitignore RENAMED Viewed

File without changes

data/lib/vendored-middleman-deps/{padrino-core-0.11.2 → padrino-core-0.11.4}/.yardopts RENAMED Viewed

File without changes

data/lib/vendored-middleman-deps/{padrino-core-0.11.2 → padrino-core-0.11.4}/LICENSE.txt RENAMED Viewed

File without changes

data/lib/vendored-middleman-deps/{padrino-core-0.11.2 → padrino-core-0.11.4}/README.rdoc RENAMED Viewed

@@ -22,7 +22,7 @@ Here is a brief overview of functionality provided by the Padrino framework:
 Agnostic:: Full support for many popular testing, templating, mocking, and data storage choices.
 Generators:: Create Padrino applications, models, controllers i.e: padrino-gen project.
 Mountable:: Unlike other ruby frameworks, principally designed for mounting multiple apps.
-Routing:: Full url named routes, named params, respond_to support, before/after filter support.
+Routing:: Full url named routes, named params, before/after filter support.
 Tag Helpers:: View helpers such as: tag, content_tag, input_tag.
 Asset Helpers:: View helpers such as: link_to, image_tag, javascript_include_tag.
 Form Helpers:: Builder support such as: form_tag, form_for, field_set_tag, text_field.
@@ -146,7 +146,7 @@ as well as mapping the route aliases to an explicit url:
     end
   end
-and even configure the respond_to for each route:
+and even configure the +provides+ for each route:
   # app/controllers/example.rb
   SimpleApp.controllers :admin do
@@ -154,7 +154,7 @@ and even configure the respond_to for each route:
       "Url is /admin/show/#{params[:id]}.#{params[:format]}"
     end
-    get :other, with => [:id, :name], respond_to => [:html, :json] do
+    get :other, :with => [:id, :name], :provides => [:html, :json] do
       case content_type
         when :js    then ... end
         when :json  then ... end
@@ -166,7 +166,7 @@ or auto lookup for current locale or content_type
   # app/controllers/example.rb
   SimpleApp.controllers :admin do
-    get :show, :with => :id, :provides => [html, :js] do
+    get :show, :with => :id, :provides => [:html, :js] do
       render "admin/show"
     end
   end
@@ -291,4 +291,4 @@ For a complete overview of Padrino terminal commands, check out the
 == Copyright
-Copyright (c) 2011 Padrino. See LICENSE for details.
+Copyright (c) 2011-2013 Padrino. See LICENSE for details.

data/lib/vendored-middleman-deps/{padrino-core-0.11.2 → padrino-core-0.11.4}/Rakefile RENAMED Viewed

File without changes

data/lib/vendored-middleman-deps/{padrino-core-0.11.2 → padrino-core-0.11.4}/bin/padrino RENAMED Viewed

File without changes

data/lib/vendored-middleman-deps/{padrino-core-0.11.2 → padrino-core-0.11.4}/lib/padrino-core.rb RENAMED Viewed

@@ -15,9 +15,7 @@ require 'padrino-core/tasks'
 require 'padrino-core/module'
-# 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)
-# The Padrino project root path (falls back to the first caller)
 PADRINO_ROOT = ENV["PADRINO_ROOT"] ||= File.dirname(Padrino.first_caller) unless defined?(PADRINO_ROOT)
 module Padrino
@@ -169,7 +167,7 @@ module Padrino
     ##
     # 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.
+    # loadpaths by itself 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.
     #
@@ -181,26 +179,22 @@ module Padrino
     #
     # @returns The root path of the loaded gem
     def gem(name, main_module)
-      _,spec = Gem.loaded_specs.find { |spec_name, spec| spec_name == name }
+      _, spec = Gem.loaded_specs.find{|spec_pair| spec_pair[0] == 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
+  end
+end