middleman-more 3.0.14 → 3.1.0.beta.1

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.0.14
-  prerelease: 
+  version: 3.1.0.beta.1
+  prerelease: 6
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.14
+        version: 3.1.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.14
+        version: 3.1.0.beta.1
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -108,22 +108,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: coffee-script-source
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -141,13 +125,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,7 +139,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -163,10 +147,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -174,10 +155,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +209,7 @@ files:
 - features/helpers_page_classes.feature
 - features/helpers_url_for.feature
 - features/i18n_builder.feature
+- features/i18n_force_locale.feature
 - features/i18n_preview.feature
 - features/ignore.feature
 - features/ignore_already_minified.feature
@@ -239,10 +218,12 @@ files:
 - features/liquid.feature
 - features/markdown.feature
 - features/markdown_redcarpet.feature
+- features/markdown_redcarpet_in_haml.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/nested_layouts.feature
 - features/partials.feature
+- features/partials_dir.feature
 - features/relative_assets.feature
 - features/sass-assets-paths.feature
 - features/sass_cache_path.feature
@@ -327,6 +308,8 @@ files:
 - fixtures/content-for-app/source/content_for_haml.html.haml
 - fixtures/content-for-app/source/content_for_slim.html.slim
 - fixtures/content-for-app/source/layouts/content_for.erb
+- fixtures/default-partials-dir-app/source/_partial.html.erb
+- fixtures/default-partials-dir-app/source/index.html.erb
 - fixtures/different-engine-partial/config.rb
 - fixtures/different-engine-partial/source/index.html.erb
 - fixtures/different-engine-partial/source/layouts/layout.erb
@@ -354,6 +337,14 @@ files:
 - fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb
 - fixtures/i18n-alt-root-app/source/lang_data/index.html.erb
 - fixtures/i18n-alt-root-app/source/layout.erb
+- fixtures/i18n-default-app/locales/en.yml
+- fixtures/i18n-default-app/locales/es.yml
+- fixtures/i18n-default-app/source/localizable/index.html.erb
+- fixtures/i18n-force-locale/config.rb
+- fixtures/i18n-force-locale/locales/en.yml
+- fixtures/i18n-force-locale/locales/es.yml
+- fixtures/i18n-force-locale/locales/fr.yml
+- fixtures/i18n-force-locale/source/index.haml
 - fixtures/i18n-test-app/locales/en.yml
 - fixtures/i18n-test-app/locales/es.yml
 - fixtures/i18n-test-app/source/layout.erb
@@ -411,6 +402,16 @@ files:
 - fixtures/markdown-app/source/superscript.html.markdown
 - fixtures/markdown-app/source/tables.html.markdown
 - fixtures/markdown-app/source/with_toc_data.html.markdown
+- fixtures/markdown-frontmatter-options-app/config.rb
+- fixtures/markdown-frontmatter-options-app/source/smarty_pants-default.html.markdown
+- fixtures/markdown-frontmatter-options-app/source/smarty_pants-off.html.markdown
+- fixtures/markdown-frontmatter-options-app/source/smarty_pants-on.html.markdown
+- fixtures/markdown-frontmatter-options-app/source/tables-default.html.markdown
+- fixtures/markdown-frontmatter-options-app/source/tables-off.html.markdown
+- fixtures/markdown-frontmatter-options-app/source/tables-on.html.markdown
+- fixtures/markdown-in-haml-app/config.rb
+- fixtures/markdown-in-haml-app/source/images/blank.gif
+- fixtures/markdown-in-haml-app/source/link_target.html.markdown
 - fixtures/minify-css-app/source/inline-css.html.haml
 - fixtures/minify-css-app/source/more-css/site.css
 - fixtures/minify-css-app/source/stylesheets/report.css
@@ -456,6 +457,9 @@ files:
 - fixtures/partials-app/source/sub/_local.erb
 - fixtures/partials-app/source/sub/index.html.erb
 - fixtures/partials-app/source/using_snippet.html.erb
+- fixtures/partials-dir-app/source/index.html.erb
+- fixtures/partials-dir-app/source/nested/partials/_partial.html.erb
+- fixtures/partials-dir-app/source/partials/_partial.html.erb
 - fixtures/passthrough-app/source/.htaccess
 - fixtures/passthrough-app/source/inline-coffeescript.html.haml
 - fixtures/passthrough-app/source/inline-css.html.haml
@@ -479,7 +483,7 @@ files:
 - fixtures/relative-assets-app/source/img/blank.gif
 - fixtures/relative-assets-app/source/relative_image.html.erb
 - fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass
-- fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.sass
+- fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass
 - fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss
 - fixtures/sass-assets-path-app/config.rb
 - fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass
@@ -606,7 +610,6 @@ files:
 - fixtures/wildcard-directory-index-app/source/layouts/admin.erb
 - fixtures/wildcard-directory-index-app/source/layouts/layout.erb
 - lib/middleman-more.rb
-- lib/middleman-more/core_extensions/assets.rb
 - lib/middleman-more/core_extensions/compass.rb
 - lib/middleman-more/core_extensions/default_helpers.rb
 - lib/middleman-more/core_extensions/i18n.rb
@@ -619,19 +622,18 @@ files:
 - lib/middleman-more/extensions/gzip.rb
 - lib/middleman-more/extensions/lorem.rb
 - lib/middleman-more/extensions/minify_css.rb
-- lib/middleman-more/extensions/minify_css/rainpress.rb
 - lib/middleman-more/extensions/minify_javascript.rb
 - lib/middleman-more/extensions/relative_assets.rb
 - lib/middleman-more/templates/smacss.rb
 - lib/middleman-more/templates/smacss/source/_footer.haml
 - lib/middleman-more/templates/smacss/source/index.html.haml
 - lib/middleman-more/templates/smacss/source/layouts/layout.haml
-- lib/middleman-more/templates/smacss/source/stylesheets/_0.site-settings.scss
-- lib/middleman-more/templates/smacss/source/stylesheets/_1.base.scss
-- lib/middleman-more/templates/smacss/source/stylesheets/_2.layout.scss
-- lib/middleman-more/templates/smacss/source/stylesheets/_3.states.scss
-- lib/middleman-more/templates/smacss/source/stylesheets/_4.themes.scss
-- lib/middleman-more/templates/smacss/source/stylesheets/modules/_btn.scss
+- lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown
+- lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss
+- lib/middleman-more/templates/smacss/source/stylesheets/base/normalize.scss
+- lib/middleman-more/templates/smacss/source/stylesheets/layout/README.markdown
+- lib/middleman-more/templates/smacss/source/stylesheets/modules/README.markdown
+- lib/middleman-more/templates/smacss/source/stylesheets/states/README.markdown
 - lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss
 - lib/middleman_extension.rb
 - middleman-more.gemspec
@@ -652,16 +654,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4507811237131658787
+      hash: -1915495170693894069
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 4507811237131658787
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -692,6 +691,7 @@ test_files:
 - features/helpers_page_classes.feature
 - features/helpers_url_for.feature
 - features/i18n_builder.feature
+- features/i18n_force_locale.feature
 - features/i18n_preview.feature
 - features/ignore.feature
 - features/ignore_already_minified.feature
@@ -700,10 +700,12 @@ test_files:
 - features/liquid.feature
 - features/markdown.feature
 - features/markdown_redcarpet.feature
+- features/markdown_redcarpet_in_haml.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/nested_layouts.feature
 - features/partials.feature
+- features/partials_dir.feature
 - features/relative_assets.feature
 - features/sass-assets-paths.feature
 - features/sass_cache_path.feature
@@ -788,6 +790,8 @@ test_files:
 - fixtures/content-for-app/source/content_for_haml.html.haml
 - fixtures/content-for-app/source/content_for_slim.html.slim
 - fixtures/content-for-app/source/layouts/content_for.erb
+- fixtures/default-partials-dir-app/source/_partial.html.erb
+- fixtures/default-partials-dir-app/source/index.html.erb
 - fixtures/different-engine-partial/config.rb
 - fixtures/different-engine-partial/source/index.html.erb
 - fixtures/different-engine-partial/source/layouts/layout.erb
@@ -815,6 +819,14 @@ test_files:
 - fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb
 - fixtures/i18n-alt-root-app/source/lang_data/index.html.erb
 - fixtures/i18n-alt-root-app/source/layout.erb
+- fixtures/i18n-default-app/locales/en.yml
+- fixtures/i18n-default-app/locales/es.yml
+- fixtures/i18n-default-app/source/localizable/index.html.erb
+- fixtures/i18n-force-locale/config.rb
+- fixtures/i18n-force-locale/locales/en.yml
+- fixtures/i18n-force-locale/locales/es.yml
+- fixtures/i18n-force-locale/locales/fr.yml
+- fixtures/i18n-force-locale/source/index.haml
 - fixtures/i18n-test-app/locales/en.yml
 - fixtures/i18n-test-app/locales/es.yml
 - fixtures/i18n-test-app/source/layout.erb
@@ -872,6 +884,16 @@ test_files:
 - fixtures/markdown-app/source/superscript.html.markdown
 - fixtures/markdown-app/source/tables.html.markdown
 - fixtures/markdown-app/source/with_toc_data.html.markdown
+- fixtures/markdown-frontmatter-options-app/config.rb
+- fixtures/markdown-frontmatter-options-app/source/smarty_pants-default.html.markdown
+- fixtures/markdown-frontmatter-options-app/source/smarty_pants-off.html.markdown
+- fixtures/markdown-frontmatter-options-app/source/smarty_pants-on.html.markdown
+- fixtures/markdown-frontmatter-options-app/source/tables-default.html.markdown
+- fixtures/markdown-frontmatter-options-app/source/tables-off.html.markdown
+- fixtures/markdown-frontmatter-options-app/source/tables-on.html.markdown
+- fixtures/markdown-in-haml-app/config.rb
+- fixtures/markdown-in-haml-app/source/images/blank.gif
+- fixtures/markdown-in-haml-app/source/link_target.html.markdown
 - fixtures/minify-css-app/source/inline-css.html.haml
 - fixtures/minify-css-app/source/more-css/site.css
 - fixtures/minify-css-app/source/stylesheets/report.css
@@ -917,6 +939,9 @@ test_files:
 - fixtures/partials-app/source/sub/_local.erb
 - fixtures/partials-app/source/sub/index.html.erb
 - fixtures/partials-app/source/using_snippet.html.erb
+- fixtures/partials-dir-app/source/index.html.erb
+- fixtures/partials-dir-app/source/nested/partials/_partial.html.erb
+- fixtures/partials-dir-app/source/partials/_partial.html.erb
 - fixtures/passthrough-app/source/.htaccess
 - fixtures/passthrough-app/source/inline-coffeescript.html.haml
 - fixtures/passthrough-app/source/inline-css.html.haml
@@ -940,7 +965,7 @@ test_files:
 - fixtures/relative-assets-app/source/img/blank.gif
 - fixtures/relative-assets-app/source/relative_image.html.erb
 - fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass
-- fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.sass
+- fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass
 - fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss
 - fixtures/sass-assets-path-app/config.rb
 - fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass

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

@@ -1,43 +0,0 @@
-module Middleman
-  module CoreExtensions
-
-    # Base helper to manipulate asset paths
-    module Assets
-
-      # Extension registered
-      class << self
-        def registered(app)
-          # Disable Padrino cache buster
-          app.set :asset_stamp, false
-
-          # Include helpers
-          app.send :include, InstanceMethod
-        end
-        alias :included :registered
-      end
-
-      # Methods to be mixed-in to Middleman::Application
-      module InstanceMethod
-
-        # Get the URL of an asset given a type/prefix
-        #
-        # @param [String] path The path (such as "photo.jpg")
-        # @param [String] prefix The type prefix (such as "images")
-        # @return [String] The fully qualified asset url
-        def asset_url(path, prefix="")
-          # Don't touch assets which already have a full path
-          if path.include?("//")
-            path
-          else # rewrite paths to use their destination path
-            path = File.join(prefix, path)
-            if resource = sitemap.find_resource_by_path(path)
-              resource.url
-            else
-              File.join(http_prefix, path)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/middleman-more/extensions/minify_css/rainpress.rb

@@ -1,168 +0,0 @@
-# == Information
-#
-# This is the main class of Rainpress, create an instance of it to compress
-# your CSS-styles.
-#
-# Author:: Uwe L. Korn <uwelk@xhochy.org>
-#
-# <b>Options:</b>
-#
-# * <tt>:comments</tt> - if set to false, comments will not be removed
-# * <tt>:newlines</tt> - if set to false, newlines will not be removed
-# * <tt>:spaces</tt> - if set to false, spaces will not be removed
-# * <tt>:colors</tt> - if set to false, colors will not be modified
-# * <tt>:misc</tt> - if set to false, miscellaneous compression parts will be skipped
-class Rainpress
-  # Quick-compress the styles.
-  # This eliminates the need to create an instance of the class
-  def self.compress(style, options = {})
-    self.new(style, options).compress!
-  end
-
-  def initialize(style, opts = {})
-    @style = style
-    @opts = {
-      :comments => true,
-      :newlines => true,
-      :spaces   => true,
-      :colors   => false,
-      :misc     => true
-    }
-    @opts.merge! opts
-  end
-
-  # Run the compressions and return the newly compressed text
-  def compress!
-    remove_comments!  if @opts[:comments]
-    remove_newlines!  if @opts[:newlines]
-    remove_spaces!    if @opts[:spaces]
-    shorten_colors!   if @opts[:colors]
-    do_misc!          if @opts[:misc]
-    @style
-  end
-
-  # Remove all comments out of the CSS-Document
-  #
-  # Only /* text */ comments are supported.
-  # Attention: If you are doing css hacks for IE using the comment tricks,
-  # they will be removed using this function. Please consider for IE css style
-  # corrections the usage of conditionals comments in your (X)HTML document.
-	def remove_comments!
-    input = @style
-    @style = ''
-
-    while input.length > 0 do
-      pos = input.index("/*");
-
-      # No more comments
-      if pos == nil
-        @style += input
-        input = '';
-      else # Comment beginning at pos
-        @style += input[0..(pos-1)] if pos > 0 # only append text if there is some
-        input = input[(pos+2)..-1]
-        # Comment ending at pos
-        pos = input.index("*/")
-        input = input[(pos+2)..-1]
-      end
-    end
-	end
-
-  # Remove all newline characters
-  #
-  # We take care of Windows(\r\n), Unix(\n) and Mac(\r) newlines.
-	def remove_newlines!
-		@style.gsub! /\n|\r/, ''
-	end
-
-	# Remove unneeded spaces
-	#
-  # 1. Turn mutiple spaces into a single
-  # 2. Remove spaces around ;:{},
-  # 3. Remove tabs
-  def remove_spaces!
-    @style.gsub! /\s*(\s|;|:|\}|\{|,)\s*/, '\1'
-    @style.gsub! "\t", ''
-	end
-
-	# Replace color values with their shorter equivalent
-	#
-	# 1. Turn rgb(,,)-colors into #-values
-	# 2. Shorten #AABBCC down to #ABC
-	# 3. Replace names with their shorter hex-equivalent
-	#    * white -> #fff
- 	#    * black -> #000
-	# 4. Replace #-values with their shorter name
-	#    * #f00 -> red
-	def shorten_colors!
-	  # rgb(50,101,152) to #326598
-    @style.gsub! /rgb\s*\(\s*([0-9,\s]+)\s*\)/ do |match|
-      out = '#'
-      $1.split(',').each do |num|
-        out += '0' if num.to_i < 16
-        out += num.to_i.to_s(16) # convert to hex
-      end
-      out
-    end
-    # Convert #AABBCC to #ABC, keep if preceed by a '='
-    @style.gsub! /([^\"'=\s])(\s*)#([\da-f])\3([\da-f])\4([\da-f])\5/i, '\1#\3\4\5'
-
-    # At the moment we assume that colours only appear before ';' or '}' and
-    # after a ':', if there could be an occurence of a color before or after
-    # an other character, submit either a bug report or, better, a patch that
-    # enables Rainpress to take care of this.
-
-    # shorten several names to numbers
-    ## shorten white -> #fff
-    @style.gsub! /:\s*white\s*(;|\})/, ':#fff\1'
-
-    ## shorten black -> #000
-    @style.gsub! /:\s*black\s*(;|\})/, ':#000\1'
-
-    # shotern several numbers to names
-    ## shorten #f00 or #ff0000 -> red
-    @style.gsub! /:\s*#f{1,2}0{2,4}(;|\})/i, ':red\1'
-  end
-
-  # Do miscellaneous compression methods on the style.
-  def do_misc!
-    # Replace 0(pt,px,em,%) with 0 but only when preceded by : or a white-space
-    @style.gsub! /([\s:]+)(0)(px|em|%|in|cm|mm|pc|pt|ex)/i, '\1\2'
-
-    # Replace :0 0 0 0(;|}) with :0(;|})
-    @style.gsub! /:0 0 0 0(;|\})/, ':0\1'
-
-    # Replace :0 0 0(;|}) with :0(;|})
-    @style.gsub! /:0 0 0(;|\})/, ':0\1'
-
-    # Replace :0 0(;|}) with :0(;|})
-    @style.gsub! /:0 0(;|\})/, ':0\1'
-
-    # Replace background-position:0; with background-position:0 0;
-    @style.gsub! 'background-position:0;', 'background-position:0 0;'
-
-    # Replace 0.6 to .6, but only when preceded by : or a white-space
-    @style.gsub! /[:\s]0+\.(\d+)/ do |match|
-      match.sub '0', '' # only first '0' !!
-    end
-
-    # Replace multiple ';' with a single ';'
-    @style.gsub! /[;]+/, ';'
-
-    # Replace ;} with }
-    @style.gsub! ';}', '}'
-
-    # Replace font-weight:normal; with 400
-    @style.gsub! /font-weight[\s]*:[\s]*normal[\s]*(;|\})/i,'font-weight:400\1'
-    @style.gsub! /font[\s]*:[\s]*normal[\s;\}]*/ do |match|
-      match.sub 'normal', '400'
-    end
-
-    # Replace font-weight:bold; with 700
-    @style.gsub! /font-weight[\s]*:[\s]*bold[\s]*(;|\})/,'font-weight:700\1'
-    @style.gsub! /font[\s]*:[\s]*bold[\s;\}]*/ do |match|
-      match.sub 'bold', '700'
-    end
-  end
-
-end

data/lib/middleman-more/templates/smacss/source/stylesheets/_1.base.scss

@@ -1,2 +0,0 @@
-/* Base
-================================================== */

data/lib/middleman-more/templates/smacss/source/stylesheets/_2.layout.scss

@@ -1,2 +0,0 @@
-/* Layout
-================================================== */

data/lib/middleman-more/templates/smacss/source/stylesheets/_3.states.scss

@@ -1,2 +0,0 @@
-/* States
-================================================== */

data/lib/middleman-more/templates/smacss/source/stylesheets/_4.themes.scss

@@ -1,2 +0,0 @@
-/* Themes
-================================================== */

data/lib/middleman-more/templates/smacss/source/stylesheets/modules/_btn.scss

@@ -1,2 +0,0 @@
-/* Buttons
-================================================== */