jekyll-migrate-permalink 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a90cd8a179f79d35c4cb92ce235689a3d27f66b5
-  data.tar.gz: bf0d198b1a92a1250f8ef3d351ed975da4007b2b
+  metadata.gz: 73dac4e6c719e1b652d0bba9b4e2d0479f845126
+  data.tar.gz: 49fd29a1c4db9d6cf3cdf2fcdc8a9e229521dc53
 SHA512:
-  metadata.gz: d169b5c1de9ae5e8350dd89d4308781d50eab11821c0f22d8842f26f1262ddbc26c69af7c335cbffece809119b2e76a33c33bbe78199287149e7c2f308224983
-  data.tar.gz: 88d3f4d84b8d81b69cd960e78d4278cbde19d5fc9eb2d89cf136d3a1bf858c4ce276c888ae63b9e29e020c5a7b0e6c971b246a14eacf057fa326fafaf2f072b8
+  metadata.gz: 3bc9486ef3d7c1715847cc4b215a71cbb9942c1e10371b656b57268a12c8771639e4a9845fa6167453edb06a5cdf775f4d230c34ca9ca0800ba95ffb71bd620c
+  data.tar.gz: 520b8f1907ed35fc92eb21c96a6d6feb0302396d2843597c39da031063c1078ee1632352abcf727daf8fb3bce8b9432116de2785442b57ba177bf5fe08f3d653

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/README.md

@@ -41,6 +41,6 @@ The [`jekyll-redirect-from`](https://github.com/jekyll/jekyll-redirect-from) plu
 2. Update your permalink in `_config.yml`
 3. Build your site!
 
-### Caveats
+## Caveats
 
 Note that the plugin loads the front matter as YAML in order to safely manipulate, and then converts it back to a string. This process may result in some slight formatting changes to your front matter.

data/lib/jekyll/commands/migrate_permalink.rb

@@ -26,30 +26,36 @@ module Jekyll
 
           site.posts.docs.each do |post|
             content = File.read(post.path, Utils.merged_file_read_opts(site, options))
-            if content =~ Document::YAML_FRONT_MATTER_REGEXP
-              content = $POSTMATCH
-              frontmatter = SafeYAML.load(Regexp.last_match(1))
-            end
+            output = process_content(content, post.url, opts["stategy"])
+            File.write(post.path, output, :mode => "w")
+          end
+        end
 
-            if frontmatter.nil?
-              frontmatter = frontmatter.to_h
-            end
+        def process_content(content, url, strategy)
+          if content =~ Document::YAML_FRONT_MATTER_REGEXP
+            content = $POSTMATCH
+            frontmatter = SafeYAML.load(Regexp.last_match(1))
+          end
 
-            if opts["strategy"] == "retain"
-              frontmatter["permalink"] = post.url
+          if frontmatter.nil?
+            frontmatter = frontmatter.to_h
+          end
+
+          if strategy == "retain" && !frontmatter["permalink"]
+            frontmatter["permalink"] = url
+          else
+            if frontmatter["redirect_from"].is_a? Array
+              frontmatter["redirect_from"].push(url)
+            elsif frontmatter["redirect_from"].is_a? String
+              frontmatter["redirect_from"] = [frontmatter["redirect_from"], url]
             else
-              if frontmatter["redirect_from"].is_a? Array
-                frontmatter["redirect_from"].push(post.url)
-              else
-                frontmatter["redirect_from"] = [post.url]
-              end
+              frontmatter["redirect_from"] = [url]
             end
-
-            output = "#{frontmatter.to_yaml}---\n\n#{content}"
-            File.write(post.path, output, :mode => "w")
-
           end
 
+          output = "#{frontmatter.to_yaml}---\n\n#{content}"
+
+          output
         end
 
       end

data/lib/jekyll/migrate/permalink/version.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Migrate
     module Permalink
-      VERSION = "0.1.1"
+      VERSION = "0.2.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-migrate-permalink
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Max Chadwick
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - LICENSE.txt