middleman-blog 3.4.1 → 3.5.0

data/lib/middleman-blog/template.rb

@@ -6,27 +6,29 @@ module Middleman
     # A template that generates a blog-specific config.rb
     # and a set of example templates for index, layout, tags, and calendar.
     class Template < Middleman::Templates::Base
-      class_option "css_dir", 
-        :default => "stylesheets", 
-        :desc    => 'The path to the css files'
-      class_option "js_dir", 
-        :default => "javascripts", 
-        :desc    => 'The path to the javascript files'
-      class_option "images_dir", 
-        :default => "images", 
-        :desc    => 'The path to the image files'
+      class_option "css_dir",
+        default: "stylesheets",
+        desc: 'The path to the css files'
+      class_option "js_dir",
+        default: "javascripts",
+        desc: 'The path to the javascript files'
+      class_option "images_dir",
+        default: "images",
+        desc: 'The path to the image files'
 
       def self.source_root
         File.join(File.dirname(__FILE__), 'template')
       end
-  
+
       def build_scaffold
         template "config.tt", File.join(location, "config.rb")
-        directory "source", File.join(location, "source")
-    
-        empty_directory File.join(location, "source", options[:css_dir])
-        empty_directory File.join(location, "source", options[:js_dir])
-        empty_directory File.join(location, "source", options[:images_dir])
+
+        source = File.join(location, "source")
+        directory "source", source
+
+        [:css_dir, :js_dir, :images_dir].each do |dir|
+          empty_directory File.join(source, options[dir])
+        end
       end
     end
   end

data/lib/middleman-blog/template/config.tt

@@ -5,36 +5,36 @@
 # Time.zone = "UTC"
 
 activate :blog do |blog|
+  # This will add a prefix to all links, template references and source paths
   # blog.prefix = "blog"
-  # blog.permalink = ":year/:month/:day/:title.html"
-  # blog.sources = ":year-:month-:day-:title.html"
-  # blog.taglink = "tags/:tag.html"
+
+  # blog.permalink = "{year}/{month}/{day}/{title}.html"
+  # Matcher for blog source files
+  # blog.sources = "{year}-{month}-{day}-{title}.html"
+  # blog.taglink = "tags/{tag}.html"
   # blog.layout = "layout"
   # blog.summary_separator = /(READMORE)/
   # blog.summary_length = 250
-  # blog.year_link = ":year.html"
-  # blog.month_link = ":year/:month.html"
-  # blog.day_link = ":year/:month/:day.html"
+  # blog.year_link = "{year}.html"
+  # blog.month_link = "{year}/{month}.html"
+  # blog.day_link = "{year}/{month}/{day}.html"
   # blog.default_extension = ".markdown"
 
   blog.tag_template = "tag.html"
   blog.calendar_template = "calendar.html"
 
+  # Enable pagination
   # blog.paginate = true
   # blog.per_page = 10
-  # blog.page_link = "page/:num"
+  # blog.page_link = "page/{num}"
 end
 
-page "/feed.xml", :layout => false
+page "/feed.xml", layout: false
 
-### 
+###
 # Compass
 ###
 
-# Susy grids in Compass
-# First: gem install susy
-# require 'susy'
-
 # Change Compass configuration
 # compass_config do |config|
 #   config.output_style = :compact
@@ -45,22 +45,21 @@ page "/feed.xml", :layout => false
 ###
 
 # Per-page layout changes:
-# 
+#
 # With no layout
-# page "/path/to/file.html", :layout => false
-# 
+# page "/path/to/file.html", layout: false
+#
 # With alternative layout
-# page "/path/to/file.html", :layout => :otherlayout
-# 
+# page "/path/to/file.html", layout: :otherlayout
+#
 # A path which all have the same layout
 # with_layout :admin do
 #   page "/admin/*"
 # end
 
-# Proxy (fake) files
-# page "/this-page-has-no-template.html", :proxy => "/template-file.html" do
-#   @which_fake_page = "Rendering a fake page with a variable"
-# end
+# Proxy pages (http://middlemanapp.com/dynamic-pages/)
+# proxy "/this-page-has-no-template.html", "/template-file.html", locals: {
+#  which_fake_page: "Rendering a fake page with a local variable" }
 
 ###
 # Helpers
@@ -69,6 +68,9 @@ page "/feed.xml", :layout => false
 # Automatic image dimensions on image_tag helper
 # activate :automatic_image_sizes
 
+# Reload the browser automatically whenever files change
+# activate :livereload
+
 # Methods defined in the helpers block are available in templates
 # helpers do
 #   def some_helper
@@ -101,21 +103,16 @@ set :images_dir, '<%= options[:images_dir] -%>'
 configure :build do
   # For example, change the Compass output style for deployment
   # activate :minify_css
-  
+
   # Minify Javascript on build
   # activate :minify_javascript
-  
+
   # Enable cache buster
-  # activate :cache_buster
-  
+  # activate :asset_hash
+
   # Use relative URLs
   # activate :relative_assets
-  
-  # Compress PNGs after build
-  # First: gem install middleman-smusher
-  # require "middleman-smusher"
-  # activate :smusher
-  
+
   # Or use a different image path
-  # set :http_path, "/Content/images/"
+  # set :http_prefix, "/Content/images/"
 end

data/lib/middleman-blog/template/source/layout.erb

@@ -4,6 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv='X-UA-Compatible' content='IE=edge;chrome=1' />
     <title>Blog Title<%= ' - ' + current_article.title unless current_article.nil? %></title>
+    <%= feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml"), title: "Atom Feed" %>
   </head>
   <body>
     

data/lib/middleman-blog/uri_templates.rb

@@ -0,0 +1,58 @@
+require 'addressable/template'
+
+module Middleman
+  module Blog
+    # Handy methods for dealing with URI templates. Mix into whatever class.
+    module UriTemplates
+
+      module_function
+
+      # Given a URI template string, make an Addressable::Template
+      # This supports the legacy middleman-blog/Sinatra style :colon
+      # URI templates as well as RFC6470 templates.
+      #
+      # @param [String] tmpl_src URI template source
+      # @return [Addressable::Template] a URI template
+      def uri_template(tmpl_src)
+        # Support the RFC6470 templates directly if people use them
+        if tmpl_src.include?(':')
+          tmpl_src = tmpl_src.gsub(/:([A-Za-z0-9]+)/, '{\1}')
+        end
+
+        Addressable::Template.new ::Middleman::Util.normalize_path(tmpl_src)
+      end
+
+      # Apply a URI template with the given data, producing a normalized
+      # Middleman path.
+      #
+      # @param [Addressable::Template] template
+      # @param [Hash] data
+      # @return [String] normalized path
+      def apply_uri_template(template, data)
+        ::Middleman::Util.normalize_path Addressable::URI.unencode(template.expand(data)).to_s
+      end
+
+      # Parameterize a string only if it does not contain UTF-8 characters
+      def safe_parameterize(str)
+        if str.chars.all? { |c| c.bytes.count == 1 }
+          str.parameterize
+        else
+          # At least change spaces to dashes
+          str.gsub(/\s+/, '-')
+        end
+      end
+
+      # Convert a date into a hash of components to strings
+      # suitable for using in a URL template.
+      # @param [DateTime] date
+      # @return [Hash] parameters
+      def date_to_params(date)
+        return {
+          year: date.year.to_s,
+          month: date.month.to_s.rjust(2,'0'),
+          day: date.day.to_s.rjust(2,'0')
+        }
+      end
+    end
+  end
+end

data/lib/middleman-blog/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Blog
-    VERSION = "3.4.1"
+    VERSION = "3.5.0"
   end
 end

data/middleman-blog.gemspec

@@ -15,6 +15,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files -z`.split("\0")
   s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
+  s.required_ruby_version = '>= 1.9.3'
+
   s.add_dependency("middleman-core", ["~> 3.2"])
-  s.add_dependency("tzinfo", ["~> 0.3.0"])
+  s.add_dependency("tzinfo", [">= 0.3.0"])
+  s.add_dependency("addressable", ["~> 2.3.5"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-blog
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -29,16 +29,30 @@ dependencies:
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.5
 description: Blog engine for Middleman
 email:
 - me@tdreyno.com
@@ -54,7 +68,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile-3.0
 - LICENSE.md
 - README.md
 - Rakefile
@@ -70,12 +83,14 @@ files:
 - features/directory_indexes.feature
 - features/filename_date.feature
 - features/future_date.feature
+- features/language.feature
 - features/layouts.feature
 - features/multiblog.feature
 - features/next_previous.feature
 - features/no_date.feature
 - features/paginate.feature
 - features/paginate_multiblog.feature
+- features/permalink-data.feature
 - features/preview.feature
 - features/published.feature
 - features/summary.feature
@@ -118,6 +133,10 @@ files:
 - fixtures/calendar-multiblog-app/source/calendar2.html.erb
 - fixtures/calendar-multiblog-app/source/index.html.erb
 - fixtures/calendar-multiblog-app/source/layout.erb
+- fixtures/custom-article-template-app/config.rb
+- fixtures/custom-article-template-app/my_custom_article.tt
+- fixtures/custom-article-template-app/source/index.html.erb
+- fixtures/custom-article-template-app/source/layout.erb
 - fixtures/custom-collections-app/config-blog-prefix.rb
 - fixtures/custom-collections-app/config-directory-indexes.rb
 - fixtures/custom-collections-app/config.rb
@@ -135,6 +154,12 @@ files:
 - fixtures/custom-collections-multiblog-app/source/category2.html.erb
 - fixtures/custom-collections-multiblog-app/source/index.html.erb
 - fixtures/custom-collections-multiblog-app/source/layout.erb
+- fixtures/custom-collections-sources-app/config.rb
+- fixtures/custom-collections-sources-app/source/articles/2011-01-02-another-article.html.markdown
+- fixtures/custom-collections-sources-app/source/category.html.erb
+- fixtures/custom-collections-sources-app/source/index.html.erb
+- fixtures/custom-collections-sources-app/source/layout.erb
+- fixtures/custom-collections-sources-app/source/news/2011-01-01-new-article.html.markdown
 - fixtures/custom-permalinks-app/config-directory-indexes.rb
 - fixtures/custom-permalinks-app/config.rb
 - fixtures/custom-permalinks-app/source/blog/2011-01-01-new-article.html.markdown
@@ -168,6 +193,15 @@ files:
 - fixtures/indexes-app/source/2011/01/01/new-article.html.markdown
 - fixtures/indexes-app/source/index.html.erb
 - fixtures/indexes-app/source/layout.erb
+- fixtures/language-app/config.rb
+- fixtures/language-app/locales/en.yml
+- fixtures/language-app/locales/ru.yml
+- fixtures/language-app/source/2013-09-07-english-article-with-lang-in-frontmatter.html.erb
+- fixtures/language-app/source/2013-09-07-russian-article-with-lang-in-frontmatter.html.erb
+- fixtures/language-app/source/en/2013-09-07-english-article-with-lang-in-path.html.erb
+- fixtures/language-app/source/layouts/layout.erb
+- fixtures/language-app/source/localizable/index.html.erb
+- fixtures/language-app/source/ru/2013-09-07-russian-article-with-lang-in-path.html.erb
 - fixtures/layouts-app/config.rb
 - fixtures/layouts-app/source/2011/01/01/first-article.html.markdown
 - fixtures/layouts-app/source/2011/01/01/second-article.html.markdown
@@ -180,6 +214,7 @@ files:
 - fixtures/layouts-app/source/layouts/third.html.erb
 - fixtures/multiblog-app/config.rb
 - fixtures/multiblog-app/source/blog1/2012-12-12-other-article.html.markdown
+- fixtures/multiblog-app/source/blog1/index.html.erb
 - fixtures/multiblog-app/source/blog2/2011/01/01/new-article.html.markdown
 - fixtures/multiblog-app/source/index.html.erb
 - fixtures/multiblog-app/source/layout.erb
@@ -238,6 +273,10 @@ files:
 - fixtures/paginate-multiblog-app/source/tag1.html.erb
 - fixtures/paginate-multiblog-app/source/tag2.html.erb
 - fixtures/paginate-multiblog-app/source/tag3.html.erb
+- fixtures/permalink-data-app/config.rb
+- fixtures/permalink-data-app/source/index.html.erb
+- fixtures/permalink-data-app/source/layout.erb
+- fixtures/permalink-data-app/source/news/2011-01-01-new-article.html.markdown
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/2011/01/01/new-article.html.markdown
 - fixtures/preview-app/source/index.html.erb
@@ -284,8 +323,8 @@ files:
 - lib/middleman-blog/commands/article.rb
 - lib/middleman-blog/commands/article.tt
 - lib/middleman-blog/custom_pages.rb
-- lib/middleman-blog/extension_3_0.rb
-- lib/middleman-blog/extension_3_1.rb
+- lib/middleman-blog/extension.rb
+- lib/middleman-blog/helpers.rb
 - lib/middleman-blog/paginator.rb
 - lib/middleman-blog/tag_pages.rb
 - lib/middleman-blog/template.rb
@@ -298,6 +337,7 @@ files:
 - lib/middleman-blog/template/source/layout.erb
 - lib/middleman-blog/template/source/tag.html.erb
 - lib/middleman-blog/truncate_html.rb
+- lib/middleman-blog/uri_templates.rb
 - lib/middleman-blog/version.rb
 - lib/middleman_extension.rb
 - middleman-blog.gemspec
@@ -313,7 +353,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -321,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Blog engine for Middleman
@@ -338,12 +378,14 @@ test_files:
 - features/directory_indexes.feature
 - features/filename_date.feature
 - features/future_date.feature
+- features/language.feature
 - features/layouts.feature
 - features/multiblog.feature
 - features/next_previous.feature
 - features/no_date.feature
 - features/paginate.feature
 - features/paginate_multiblog.feature
+- features/permalink-data.feature
 - features/preview.feature
 - features/published.feature
 - features/summary.feature
@@ -386,6 +428,10 @@ test_files:
 - fixtures/calendar-multiblog-app/source/calendar2.html.erb
 - fixtures/calendar-multiblog-app/source/index.html.erb
 - fixtures/calendar-multiblog-app/source/layout.erb
+- fixtures/custom-article-template-app/config.rb
+- fixtures/custom-article-template-app/my_custom_article.tt
+- fixtures/custom-article-template-app/source/index.html.erb
+- fixtures/custom-article-template-app/source/layout.erb
 - fixtures/custom-collections-app/config-blog-prefix.rb
 - fixtures/custom-collections-app/config-directory-indexes.rb
 - fixtures/custom-collections-app/config.rb
@@ -403,6 +449,12 @@ test_files:
 - fixtures/custom-collections-multiblog-app/source/category2.html.erb
 - fixtures/custom-collections-multiblog-app/source/index.html.erb
 - fixtures/custom-collections-multiblog-app/source/layout.erb
+- fixtures/custom-collections-sources-app/config.rb
+- fixtures/custom-collections-sources-app/source/articles/2011-01-02-another-article.html.markdown
+- fixtures/custom-collections-sources-app/source/category.html.erb
+- fixtures/custom-collections-sources-app/source/index.html.erb
+- fixtures/custom-collections-sources-app/source/layout.erb
+- fixtures/custom-collections-sources-app/source/news/2011-01-01-new-article.html.markdown
 - fixtures/custom-permalinks-app/config-directory-indexes.rb
 - fixtures/custom-permalinks-app/config.rb
 - fixtures/custom-permalinks-app/source/blog/2011-01-01-new-article.html.markdown
@@ -436,6 +488,15 @@ test_files:
 - fixtures/indexes-app/source/2011/01/01/new-article.html.markdown
 - fixtures/indexes-app/source/index.html.erb
 - fixtures/indexes-app/source/layout.erb
+- fixtures/language-app/config.rb
+- fixtures/language-app/locales/en.yml
+- fixtures/language-app/locales/ru.yml
+- fixtures/language-app/source/2013-09-07-english-article-with-lang-in-frontmatter.html.erb
+- fixtures/language-app/source/2013-09-07-russian-article-with-lang-in-frontmatter.html.erb
+- fixtures/language-app/source/en/2013-09-07-english-article-with-lang-in-path.html.erb
+- fixtures/language-app/source/layouts/layout.erb
+- fixtures/language-app/source/localizable/index.html.erb
+- fixtures/language-app/source/ru/2013-09-07-russian-article-with-lang-in-path.html.erb
 - fixtures/layouts-app/config.rb
 - fixtures/layouts-app/source/2011/01/01/first-article.html.markdown
 - fixtures/layouts-app/source/2011/01/01/second-article.html.markdown
@@ -448,6 +509,7 @@ test_files:
 - fixtures/layouts-app/source/layouts/third.html.erb
 - fixtures/multiblog-app/config.rb
 - fixtures/multiblog-app/source/blog1/2012-12-12-other-article.html.markdown
+- fixtures/multiblog-app/source/blog1/index.html.erb
 - fixtures/multiblog-app/source/blog2/2011/01/01/new-article.html.markdown
 - fixtures/multiblog-app/source/index.html.erb
 - fixtures/multiblog-app/source/layout.erb
@@ -506,6 +568,10 @@ test_files:
 - fixtures/paginate-multiblog-app/source/tag1.html.erb
 - fixtures/paginate-multiblog-app/source/tag2.html.erb
 - fixtures/paginate-multiblog-app/source/tag3.html.erb
+- fixtures/permalink-data-app/config.rb
+- fixtures/permalink-data-app/source/index.html.erb
+- fixtures/permalink-data-app/source/layout.erb
+- fixtures/permalink-data-app/source/news/2011-01-01-new-article.html.markdown
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/2011/01/01/new-article.html.markdown
 - fixtures/preview-app/source/index.html.erb