octopress 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ef50919f33ca1251c84f8ac6312a153cc0e15d
-  data.tar.gz: 26afaead4b8f062d3d1dc7f9db9382a110840a45
+  metadata.gz: 6e6b29a3b51423e35fba71f3d0d4fe5778585265
+  data.tar.gz: 7247be37b187c33ce20e4d9591c334c0a1b9b72b
 SHA512:
-  metadata.gz: 7bf544c5b8190e857828290c7c2293f20e09ed68f915915f2c6bf46813fc4e354cef48a08f9a099448d69ba782d8fe8b89877140af23e9c8a59b14cd7cfd33e6
-  data.tar.gz: 6fe594627c736bec1b48ae1eac4a887c1bdb587abab11c0f52cb07045f943d6fbb037a606f5895d5869099c099be653e0001e37fc785da243d022272b08cbfd0
+  metadata.gz: 28d7371b758f4d894575fb3cc87acc3680843830579cc361c790ab8be85eeb545e9cbda60fb38426f8952caca5914bc36c137abab20c04dc0563b135f7f618e6
+  data.tar.gz: 2c391db9477a119d06718345d8ed23fedb55179dc832e8c2a9def22d7259ce79b05fda48f2ebee685c99ea5930655667f2f7edb9d36c1a11b3f68ad02d395b4e

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
+### 3.0.11 (2015-07-15)
+- Fix: filenames and extensions are preserved when publishing drafts and unpublishing posts.
+
 ### 3.0.10 (2015-07-15)
-- Fixed issue where `--force` flag wouldn't work when publishing drafts
+- Fix: `--force` flag works properly when publishing drafts and unpublishing posts.
 
 ### 3.0.9 (2015-06-18)
 - Documentation improvements

data/lib/octopress/draft.rb

@@ -21,7 +21,11 @@ module Octopress
     end
 
     def path
-      name = "#{title_slug}.#{extension}"
+      name = if @options['path']
+        "#{path_slug(@options['path'])}.#{File.extname(@options['path']).sub(/^\./, '')}"
+      else
+        "#{title_slug}.#{extension}"
+      end
       File.join(site.source, '_drafts', name)
     end
 
@@ -35,14 +39,15 @@ module Octopress
       @options['title'] = read_post_yaml('title')
 
       post_options = {
-        'title'   => @options['title'],
-        'date'    => @options['date'],
-        'slug'    => title_slug,
-        'force'   => @options['force'],
-        'content' => read_post_content,
-        'dir'     => @options['dir'],
-        'type'    => "post from draft",
-        'write_message' => "Published: #{relative_path(path)} →"
+        'title'     => @options['title'],
+        'date'      => @options['date'],
+        'slug'      => path_slug(@options['path']),
+        'extension' => File.extname(@options['path']).sub(/^\./, ''),
+        'content'   => read_post_content,
+        'dir'       => @options['dir'],
+        'type'      => "post from draft",
+        'write_message' => "Published: #{relative_path(path)} →",
+        'force'     => @options['force']
       }
 
       # Create a new post file

data/lib/octopress/page.rb

@@ -200,6 +200,12 @@ module Octopress
     def date_slug
       @options['date'].split('T')[0]
     end
+
+    # Returns a slug extracted from a path
+    #
+    def path_slug(path)
+      File.basename(path, '.*').scan(/((\d+-){3})?(\S+)/).flatten[2]
+    end
     
     # Returns a string which is url compatible.
     #

data/lib/octopress/post.rb

@@ -18,6 +18,12 @@ module Octopress
     end
 
     def path
+      name = if @options['path']
+        "#{date_slug}-#{path_slug(@options['path'])}.#{File.extname(@options['path']).sub(/^\./, '')}"
+      else
+        "#{date_slug}-#{title_slug}.#{extension}"
+      end
+      File.join(site.source, '_drafts', name)
       name = "#{date_slug}-#{title_slug}.#{extension}"
       dir = File.join(site.source, '_posts', @options['dir'])
       FileUtils.mkdir_p dir
@@ -33,17 +39,18 @@ module Octopress
       @options['title'] = read_post_yaml('title')
 
       post_options = {
-        'title'   => @options['title'],
-        'date'    => @options['date'],
-        'slug'    => title_slug,
-        'force'   => @options['force'],
-        'content' => read_post_content,
-        'dir'     => @options['dir'],
-        'type'    => "draft from post",
-        'write_message' => "Unpublished: #{relative_path(path)} →"
+        'title'     => @options['title'],
+        'date'      => @options['date'],
+        'slug'      => path_slug(@options['path']),
+        'extension' => File.extname(@options['path']).sub(/^\./, ''),
+        'content'   => read_post_content,
+        'dir'       => @options['dir'],
+        'type'      => "draft from post",
+        'write_message' => "Unpublished: #{relative_path(path)} →",
+        'force'     => @options['force']
       }
 
-      Draft.new(site, post_options).write     
+      Draft.new(site, post_options).write
       
       # Remove the old post file
       #

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.10"
+  VERSION = "3.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Brandon Mathis