middleman-blog-drafts 0.1.0 → 0.2.0

data/.gitignore

@@ -1,3 +1,4 @@
 # Ignore bundler lock file
 /tmp
 /pkg
+/doc

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+0.2.0
+====
+* Middleman 3.2 compatible release, complete overhaul

data/Gemfile

@@ -1,20 +1,22 @@
 source 'https://rubygems.org'
 
+gem "middleman-core", :github => "middleman/middleman", :branch => 'v3-stable'
+
 # Specify your gem's dependencies in middleman-blog-drafts.gemspec
 gemspec
 
+gem "sass"
+gem "compass"
+gem "kramdown"
+
+gem "rake",     "~> 10.1.0"
+gem "cucumber", "~> 1.3.1"
+gem "fivemat"
+gem "aruba",    "~> 0.5.1"
+gem "cane", :platforms => [:mri_19, :mri_20], :require => false
+
 group :development do
-  gem "rdoc",     "~> 3.9"
-  gem "yard",     "~> 0.8.0"
+  gem "rdoc",   "~> 3.9"
+  gem "yard",   "~> 0.8.0"
   gem "guard-cucumber"
 end
-
-group :development, :test do
-  gem "sass"
-  gem "compass"
-  gem "rake",     "~> 0.9.2"
-  gem "cucumber", "~> 1.2.0"
-  gem "fivemat"
-  gem "aruba",    "~> 0.4.11"
-  gem "rspec",    "~> 2.7"
-end

data/Gemfile.lock

@@ -1,41 +1,61 @@
+GIT
+  remote: git://github.com/middleman/middleman.git
+  revision: 049866ee2e74972292687a7d1dff0e69f942f83a
+  branch: v3-stable
+  specs:
+    middleman-core (3.2.2)
+      activesupport (~> 3.2.6)
+      bundler (~> 1.1)
+      hooks (~> 0.3)
+      i18n (~> 0.6.9)
+      listen (~> 1.1)
+      rack (>= 1.4.5)
+      rack-test (~> 0.6.1)
+      thor (>= 0.15.2, < 2.0)
+      tilt (~> 1.4.1)
+
 PATH
   remote: .
   specs:
-    middleman-blog-drafts (0.1.0)
-      middleman-blog
-      middleman-core (>= 3.1.4)
+    middleman-blog-drafts (0.2.0)
+      middleman-blog (~> 3.5.1)
+      middleman-core (~> 3.2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.14)
+    activesupport (3.2.16)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
+    addressable (2.3.5)
+    aruba (0.5.4)
+      childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
+      rspec-expectations (>= 2.7.0)
+    atomic (1.1.14)
     builder (3.2.2)
-    childprocess (0.3.9)
+    cane (2.6.1)
+      parallel
+    childprocess (0.4.0)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.2.8)
+    chunky_png (1.3.0)
     coderay (1.0.9)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    cucumber (1.2.5)
+    cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.7)
-      multi_json (~> 1.3)
-    diff-lcs (1.2.4)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.5)
     ffi (1.9.0)
     fivemat (1.2.1)
     formatador (0.2.4)
     fssm (0.2.10)
-    gherkin (2.11.8)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
     guard (1.8.2)
       formatador (>= 0.2.4)
@@ -46,30 +66,23 @@ GEM
     guard-cucumber (1.4.0)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
-    i18n (0.6.5)
+    hooks (0.3.3)
+    i18n (0.6.9)
     json (1.8.0)
+    kramdown (1.3.1)
     listen (1.2.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     lumberjack (1.0.4)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
     method_source (0.8.2)
-    middleman-blog (3.2.0)
-      maruku (~> 0.6.0)
-      middleman-core (~> 3.0)
-      tzinfo (~> 0.3.0)
-    middleman-core (3.1.4)
-      activesupport (~> 3.2.6)
-      bundler (~> 1.1)
-      i18n (~> 0.6.1)
-      listen (~> 1.2.2)
-      rack (>= 1.4.5)
-      rack-test (~> 0.6.1)
-      thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.3.6)
-    multi_json (1.7.9)
+    middleman-blog (3.5.1)
+      addressable (~> 2.3.5)
+      middleman-core (~> 3.2)
+      tzinfo (>= 0.3.0)
+    multi_json (1.8.4)
+    multi_test (0.0.3)
+    parallel (0.9.2)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -77,7 +90,7 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.6)
+    rake (10.1.1)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.1)
       ffi (>= 0.5.0)
@@ -85,34 +98,32 @@ GEM
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    sass (3.2.9)
+    sass (3.2.14)
     slop (3.4.6)
-    syntax (1.0.0)
     thor (0.18.1)
-    tilt (1.3.7)
-    tzinfo (0.3.37)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
     yard (0.8.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.4.11)
+  aruba (~> 0.5.1)
+  cane
   compass
-  cucumber (~> 1.2.0)
+  cucumber (~> 1.3.1)
   fivemat
   guard-cucumber
+  kramdown
   middleman-blog-drafts!
-  rake (~> 0.9.2)
+  middleman-core!
+  rake (~> 10.1.0)
   rdoc (~> 3.9)
-  rspec (~> 2.7)
   sass
   yard (~> 0.8.0)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Fabio Rehm
+Copyright (c) 2013-2014 Fabio Rehm, Serge Gebhardt
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -35,7 +35,7 @@ middleman publish source/drafts/my-awesome-new-blog-post.markdown
 ## Listing drafts on a page
 
 ```erb
-<% if settings[:environment] == :development %>
+<% if drafts.any? %>
   <ul>
     <% drafts.each do |draft| %>
       <li><%= link_to draft.title, draft.path %></li>
@@ -44,9 +44,25 @@ middleman publish source/drafts/my-awesome-new-blog-post.markdown
 <% end %>
 ```
 
+As drafts won't be be available in the generated page by default, checking whether there are any is enough to decide whether to render the listing or not.
+
+## Configuration options
+
+`build`: when `true`, the drafts will be available unconditionally. If not given, the drafts will be available in middlemans development mode and unavailable in `middleman build`.
+
+This allows you to control the behaviour, for example if you have a preview instance of your blog. One way to do so would be to set it based on an environment variable:
+
+```ruby
+activate :drafts do |drafts|
+  drafts.build = true if ENV["SHOW_DRAFTS"]
+end
+```
+
+This activates drafts in any environment where `SHOW_DRAFTS` is given and uses the default otherwise.
+
 ## Learn More
 
-See the [blog extension guide](http://middlemanapp.com/blogging/) for detailed
+See the [blog extension guide](http://middlemanapp.com/basics/blogging/) for detailed
 information on configuring and using the blog extension.
 
 ## Credits

data/Rakefile

@@ -7,8 +7,34 @@ Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
   t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
 end
 
+Cucumber::Rake::Task.new(:cucumber_wip, 'Run only WIP features') do |t|
+  t.cucumber_opts = "--color --tags @wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+end
+
+task :test => :cucumber
+task :wip => :cucumber_wip
+task :default => [:test]
+
 require 'rake/clean'
 
-task :test => ["cucumber"]
+begin
+  require 'cane/rake_task'
+
+  desc "Run cane to check quality metrics"
+  Cane::RakeTask.new(:quality) do |cane|
+    cane.no_style = true
+    cane.no_doc = true
+    cane.abc_glob = "lib/middleman-blog-drafts/**/*.rb"
+    cane.style_glob = "lib/middleman-blog-drafts/**/*.rb"
+  end
+
+  task :default => [:quality]
+rescue LoadError
+  warn "cane not available, quality task not provided."
+end
+
+desc "Build HTML documentation"
+task :doc do
+  sh 'bundle exec yard'
+end
 
-task :default => :test

data/features/publish_cli.feature

@@ -1,17 +1,17 @@
 Feature: Publish draft CLI command
- Scenario: Publish a new blog draft article with the CLI
-   Given a fixture app "drafts-app"
-   And I run `middleman draft "My New Article"`
-   And I run `middleman publish source/drafts/my-new-article.html.markdown --date 2012-03-07`
-   Then the exit status should be 0
-   And the following files should exist:
-     | source/blog/2012-03-07-my-new-article.html.markdown |
-   And the following files should not exist:
-     | source/drafts/my-new-article.html.markdown |
+  Scenario: Publish a new blog draft article with the CLI
+    Given a fixture app "drafts-app"
+    And I run `middleman draft "My New Article"`
+    And I run `middleman publish source/drafts/my-new-article.html.markdown --date 2012-03-07`
+    Then the exit status should be 0
+    And the following files should exist:
+      | source/blog/2012-03-07-my-new-article.html.markdown |
+    And the following files should not exist:
+      | source/drafts/my-new-article.html.markdown |
 
   Scenario: Viewing a published article
-   Given a fixture app "drafts-app"
-   And I run `middleman publish source/drafts/new-draft.html.erb --date 2012-03-07`
-   When the Server is running at "drafts-app"
-   And I go to "/blog/2012/03/07/new-draft.html"
-   Then I should see '2012-03-07'
+    Given a fixture app "drafts-app"
+    And I run `middleman publish source/drafts/new-draft.html.erb --date 2012-03-07`
+    When the Server is running at "drafts-app"
+    And I go to "/blog/2012/03/07/new-draft.html"
+    Then I should see '2012-03-07'

data/fixtures/drafts-app/config.rb

@@ -1,5 +1,5 @@
 require 'middleman-blog'
-activate :blog do |c|
-  c.prefix = 'blog'
+activate :blog do |b|
+  b.prefix = 'blog'
 end
 activate :drafts

data/fixtures/drafts-app/source/layout.erb

@@ -3,6 +3,6 @@
   <head>
   </head>
   <body>
-    <%= yield%>
+    <%= yield %>
   </body>
 </html>

data/lib/middleman-blog-drafts.rb

@@ -6,5 +6,5 @@ require "middleman-blog-drafts/version"
 
 ::Middleman::Extensions.register(:drafts) do
   require 'middleman-blog-drafts/extension'
-  ::Middleman::Blog::Drafts
+  ::Middleman::Blog::DraftsExtension
 end

data/lib/middleman-blog-drafts/blog_data_extensions.rb

@@ -1,3 +1,6 @@
+require 'middleman-blog/uri_templates'
+require 'middleman-blog-drafts/draft_article'
+
 module Middleman
   module Blog
     module Drafts
@@ -20,55 +23,52 @@ module Middleman
         end
       end
 
-      # A store of all the draft articles in the site. Accessed via "blog.drafts" in
-      # templates.
+      # A store of all the draft articles in the site. Accessed via
+      # {blog.drafts} in templates.
       class Data
-        attr_reader :options, :path_matcher, :matcher_indexes
+        include UriTemplates
+
+        # A URITemplate for the source file path relative to blog's :source_dir
+        # @return [URITemplate]
+        attr_reader :source_template
+
+        # The configured options for this blog
+        # @return [Thor::CoreExt::HashWithIndifferentAccess]
+        attr_reader :options
 
         # @private
         def initialize(blog_data, app, options)
           @blog_data = blog_data
-          @options   = options
           @app       = app
+          @options   = options
 
           # A list of resources corresponding to draft articles
           @_drafts = []
 
-          matcher = Regexp.escape(options.sources).
-              sub(/^\//, "").
-              sub(":title", "([^/]+)")
-
-          @path_matcher = /^#{matcher}/
+          @source_template = uri_template options.sources
+          @permalink_template = uri_template options.permalink
+        end
 
-          # Build a hash of part name to capture index, e.g. {"year" => 0}
-          @matcher_indexes = {}
-          options.sources.scan(/:title/).
-            each_with_index do |key, i|
-              @matcher_indexes[key[1..-1]] = i
-            end
-          # The path always appears at the end.
-          @matcher_indexes["path"] = @matcher_indexes.size
+        # A list of all draft articles.
+        # @return [Array<Middleman::Sitemap::Resource>]
+        def articles
+          @_drafts.sort_by(&:title)
         end
 
-        # Updates' blog draft articles destination paths to be the
-        # permalink.
+        # Update blog draft articles destination paths to be the permalink.
         # @return [void]
         def manipulate_resource_list(resources)
           @_drafts = []
           used_resources = []
 
           resources.each do |resource|
-            if resource.path =~ @path_matcher
-              resource.extend BlogArticle
-              resource.extend DraftArticle
+            if (params = extract_params(@source_template, resource.path))
+              draft = convert_to_draft(resource)
+              next unless build?(draft)
 
-              next unless @app.environment == :development || @options.build
-
-              # compute output path:
-              resource.destination_path = options.permalink.
-                sub(':title', resource.slug)
-
-              resource.destination_path = Middleman::Util.normalize_path(resource.destination_path)
+              # compute output path
+              draft.destination_path =
+                apply_uri_template @permalink_template, title: draft.slug
 
               @_drafts << resource
             end
@@ -79,10 +79,26 @@ module Middleman
           used_resources
         end
 
-        # A list of all draft articles.
-        # @return [Array<Middleman::Sitemap::Resource>]
-        def articles
-          @_drafts
+        # Whether or not a given draft should be included in the sitemap.
+        # @param [DraftArticle] draft A draft article
+        # @return [Boolean] Whether it should be built
+        def build?(draft)
+          @app.environment == :development || @options.build
+        end
+
+        private
+
+        # Convert the resource into a DraftArticle.
+        # @param [Sitemap::Resource] resource The resource to convert
+        # @return [Sitemap::Resource] The converted resource
+        def convert_to_draft(resource)
+          return resource if resource.is_a? DraftArticle
+
+          resource.extend BlogArticle
+          resource.extend DraftArticle
+          resource.blog_controller = @blog_data.controller
+
+          resource
         end
       end
     end

data/lib/middleman-blog-drafts/commands/draft.rb

@@ -1,10 +1,12 @@
 require 'middleman-core/cli'
+require 'middleman-blog/uri_templates'
 
 module Middleman
   module Cli
     # This class provides a "draft" command for the middleman CLI.
     class Draft < Thor
       include Thor::Actions
+      include Blog::UriTemplates
 
       check_unknown_options!
 
@@ -26,17 +28,18 @@ module Middleman
         shared_instance = ::Middleman::Application.server.inst
 
         # This only exists when the config.rb sets it!
-        if shared_instance.blog.respond_to? :drafts
-          @title = title
-          @slug = title.parameterize
-
-          draft_path = shared_instance.blog.drafts.options.sources.
-            sub(':title', @slug)
-
-          template "draft.tt", File.join(shared_instance.source_dir, draft_path + shared_instance.blog.options.default_extension)
-        else
+        unless shared_instance.blog.respond_to? :drafts
           raise Thor::Error.new "You need to activate the drafts extension in config.rb before you can create an article"
         end
+
+        @title = title
+        @slug = safe_parameterize title
+
+        path_template = shared_instance.blog.drafts.source_template
+        draft_path = apply_uri_template path_template, title: @slug
+        draft_path << shared_instance.blog.options.default_extension
+
+        template "draft.tt", File.join(shared_instance.source_dir, draft_path)
       end
     end
   end

data/lib/middleman-blog-drafts/commands/publish.rb

@@ -1,10 +1,13 @@
 require 'middleman-core/cli'
+require 'date'
+require 'middleman-blog/uri_templates'
 
 module Middleman
   module Cli
     # This class provides a "publish" command for the middleman CLI.
     class Publish < Thor
       include Thor::Actions
+      include Blog::UriTemplates
 
       check_unknown_options!
 
@@ -26,31 +29,36 @@ module Middleman
         :aliases => "-d",
         :desc => "The date to create the post with (defaults to now)"
       def publish(draft_path)
-        shared_instance = ::Middleman::Application.server.inst
+        @shared_instance = ::Middleman::Application.server.inst
 
         # This only exists when the config.rb sets it!
-        if shared_instance.blog.respond_to? :drafts
-          @slug = draft_path.split('/').last.split('.').first.parameterize
-          @date = options[:date] ? DateTime.parse(options[:date]) : DateTime.now
-
-          draft_path    = File.expand_path draft_path
-          extension     = File.extname draft_path
-
-          article_path = shared_instance.blog.options.sources.
-            sub(':year', @date.year.to_s).
-            sub(':month', @date.month.to_s.rjust(2,'0')).
-            sub(':day', @date.day.to_s.rjust(2,'0')).
-            sub(':title', @slug)
-          article_path = File.join(shared_instance.source_dir, article_path + extension)
-
-          data, content = shared_instance.extensions[:frontmatter].data(draft_path)
-          data = data.dup.tap { |d| d[:date] = Date.parse @date.strftime('%F') }
-
-          create_file article_path, "#{YAML::dump(data).sub(/^--- !ruby.*$/, '---')}---\n#{content}"
-          remove_file draft_path
-        else
+        unless @shared_instance.blog.respond_to? :drafts
           raise Thor::Error.new "You need to activate the drafts extension in config.rb before you can publish an article"
         end
+
+        @slug = safe_parameterize draft_path.split('/').last.split('.').first
+        @date = options[:date] ? Time.zone.parse(options[:date]) : Time.zone.now
+        @draft_path = File.expand_path draft_path
+
+        create_file article_path, article_content
+        remove_file draft_path
+      end
+
+      private
+
+      def article_path
+        extension  = File.extname @draft_path
+        path_template = @shared_instance.blog.source_template
+        params = date_to_params(@date).merge(title: @slug)
+        article_path = apply_uri_template path_template, params
+        article_path = File.join(@shared_instance.source_dir, article_path + extension)
+      end
+
+      def article_content
+        data, content = @shared_instance.extensions[:frontmatter].data(@draft_path)
+        data = data.dup.tap { |d| d[:date] = Date.parse @date.strftime('%F') }
+
+        "#{YAML::dump(data).sub(/^--- !ruby.*$/, '---')}---\n#{content}"
       end
     end
   end

data/lib/middleman-blog-drafts/draft_article.rb

@@ -1,6 +1,10 @@
 module Middleman
   module Blog
     module Drafts
+      # A module that adds draft-article-specific methods to Resources.
+      # A {DraftArticle} can be retrieved via {Blog::Drafts::Helpers#current_article} or
+      # methods on {Blog::Drafts::Data} (accessible through BlogData#drafts).
+      # @see http://rdoc.info/github/middleman/middleman/Middleman/Sitemap/Resource Middleman::Sitemap::Resource
       module DraftArticle
         # The "slug" of the draft article that shows up in its URL.
         # @return [String]
@@ -12,13 +16,12 @@ module Middleman
         # @param [String] The part of the path, e.g. "title"
         # @return [String]
         def path_part(part)
-          @_path_parts ||= app.blog.drafts.path_matcher.match(path).captures
-
-          @_path_parts[app.blog.drafts.matcher_indexes[part]]
+          @_path_parts ||= blog_data.drafts.source_template.extract(path)
+          @_path_parts[part.to_s]
         end
 
-        # Returns current date as we can't guess when the article will be published
-        #
+        # Returns current date as we can't guess when the article will be
+        # published
         # We need this in place or the layout used for blog posts might blow up
         #
         # @return [TimeWithZone]

data/lib/middleman-blog-drafts/extension.rb

@@ -1,61 +1,29 @@
+require 'middleman-blog-drafts/helpers'
+
 module Middleman
   module Blog
-    module Drafts
-      class Options
-        attr_accessor :sources, :layout, :permalink, :build
-
-        def initialize(options={})
-          options.each do |k,v|
-            self.send(:"#{k}=", v)
-          end
-        end
-      end
-
-      class << self
-        # Called when user `activate`s your extension
-        def registered(app, options_hash={}, &block)
-          require 'middleman-blog/extension'
-          require 'middleman-blog/blog_data'
-          require 'middleman-blog-drafts/draft_article'
-          require 'middleman-blog-drafts/blog_data_extensions'
+    class DraftsExtension < ::Middleman::Extension
+      self.supports_multiple_instances = false
 
-          options = Options.new(options_hash)
-          yield options if block_given?
+      option :sources,   'drafts/{title}.html',  'Pattern for matching draft articles (no template extensions)'
+      option :permalink, '/drafts/{title}.html', 'Path draft are served from'
+      option :build,     false,                  'Whether to include drafts when building the site'
 
-          options.sources   ||= "drafts/:title.html"
-          options.permalink ||= "/drafts/:title.html"
+      self.defined_helpers = [ ::Middleman::Blog::Drafts::Helpers ]
 
-          ::Middleman::Blog::BlogData.send :include, BlogDataExtensions
-          app.send :include, Helpers
-
-          app.after_configuration do
-            options.layout = blog.options.layout
-            blog.drafts(self, options)
-
-            sitemap.register_resource_list_manipulator(
-                                                     :blog_drafts,
-                                                     blog.drafts,
-                                                     false
-                                                     )
-          end
-        end
-        alias :included :registered
+      def initialize(app, options_hash={}, &block)
+        super
       end
 
-      module Helpers
-        # Get a {Resource} with mixed in {BlogArticle} methods representing the current article.
-        # @return [Middleman::Sitemap::Resource]
-        def current_article
-          super || blog.draft(current_resource.path)
-        end
-
+      def after_configuration
+        require 'middleman-blog/blog_data'
+        require 'middleman-blog-drafts/blog_data_extensions'
 
-        # Returns the list of drafts on the site.
-        # @return [Array<Middleman::Sitemap::Resource>]
-        def drafts
-          blog.drafts.articles
-        end
+        ::Middleman::Blog::BlogData.send :include, Drafts::BlogDataExtensions
+        app.blog.drafts(app, options)
+        app.sitemap.register_resource_list_manipulator(:blog_drafts,
+          app.blog.drafts, false)
       end
     end
   end
-end
+end

data/lib/middleman-blog-drafts/helpers.rb

@@ -0,0 +1,21 @@
+module Middleman
+  module Blog
+    module Drafts
+      # Drafts-related helpers that are available to the Middleman application in +config.rb+ and in templates.
+      module Helpers
+        # Get a {Resource} with mixed in {BlogArticle} methods representing the
+        # current article.
+        # @return [Middleman::Sitemap::Resource]
+        def current_article
+          blog.draft(current_resource.path)
+        end
+
+        # Returns the list of drafts on the site.
+        # @return [Array<Middleman::Sitemap::Resource>]
+        def drafts
+          blog.drafts.articles
+        end
+      end
+    end
+  end
+end

data/lib/middleman-blog-drafts/version.rb

@@ -1,7 +1,7 @@
 module Middleman
   module Blog
     module Drafts
-      VERSION = "0.1.0"
+      VERSION = "0.2.0"
     end
   end
 end

data/middleman-blog-drafts.gemspec

@@ -5,17 +5,21 @@ require "middleman-blog-drafts/version"
 Gem::Specification.new do |s|
   s.name        = "middleman-blog-drafts"
   s.version     = Middleman::Blog::Drafts::VERSION
-  s.authors     = ["Fabio Rehm"]
-  s.email     = ["fgrehm@gmail.com"]
-  s.description = %q{middleman-blog extension for working with draft articles}
-  s.summary     = s.description
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Fabio Rehm", "Serge Gebhardt"]
+  s.email       = ["fgrehm@gmail.com", "serge.gebhardt@gmail.com"]
   s.homepage    = "https://github.com/fgrehm/middleman-draft-articles"
+  s.summary     = %q{middleman-blog extension adding draft articles}
+  s.description = s.summary
+  s.license     = "MIT"
 
-  s.files         = `git ls-files`.split($/)
+  s.files         = `git ls-files -z`.split("\0")
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.test_files    = s.files.grep(%r{^(test|spec|features|fixtures)/})
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("middleman-core", [">= 3.1.4"])
-  s.add_runtime_dependency("middleman-blog")
+  s.required_ruby_version = '>= 1.9.3'
+
+  s.add_runtime_dependency("middleman-core", ["~> 3.2.2"])
+  s.add_runtime_dependency("middleman-blog", ["~> 3.5.1"])
 end

metadata

@@ -1,52 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: middleman-blog-drafts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Fabio Rehm
+- Serge Gebhardt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: middleman-blog
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-description: middleman-blog extension for working with draft articles
+        version: 3.5.1
+description: middleman-blog extension adding draft articles
 email:
 - fgrehm@gmail.com
+- serge.gebhardt@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -72,32 +80,38 @@ files:
 - lib/middleman-blog-drafts/commands/publish.rb
 - lib/middleman-blog-drafts/draft_article.rb
 - lib/middleman-blog-drafts/extension.rb
+- lib/middleman-blog-drafts/helpers.rb
 - lib/middleman-blog-drafts/version.rb
 - lib/middleman_extension.rb
 - middleman-blog-drafts.gemspec
 homepage: https://github.com/fgrehm/middleman-draft-articles
-licenses: []
-metadata: {}
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4520017841201487203
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
-summary: middleman-blog extension for working with draft articles
+specification_version: 3
+summary: middleman-blog extension adding draft articles
 test_files:
 - features/build.feature
 - features/draft_cli.feature
@@ -106,4 +120,9 @@ test_files:
 - features/publish_cli.feature
 - features/step_definitions/drafts_steps.rb
 - features/support/env.rb
+- fixtures/drafts-app/config.rb
+- fixtures/drafts-app/source/drafts/listing_drafts.html.erb
+- fixtures/drafts-app/source/drafts/new-draft.html.erb
+- fixtures/drafts-app/source/drafts/other-draft.html.erb
+- fixtures/drafts-app/source/layout.erb
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5411e1cced547a8c93ce28423232d05a205fe8dc
-  data.tar.gz: 896813a71b38c3ebc709555aea36ff34598c09a3
-SHA512:
-  metadata.gz: 0d85dd8d6e96b5d55216c2be0400bf441edc4c8c033bccefdea145bac4eda233159629e54fd22759efbe9fa12ef97205800f59c45812059d4cf016c3b76427c8
-  data.tar.gz: 90bdcdcafcf524652955ec0f9ae9e8b027271e6edc0350b17f746fda1033a2130e87c912e052add0130e41c4b10c10bb6a77cb739abc3d21b4e7ecc3277bd966