jekyll-shorts 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6953f28017721d99160900b5a80a863ad67169fc9340082a05c93e4ea444f5c9
-  data.tar.gz: f7e0bc60d2d07704eadc19900bc9ae086c7e870021202f01222796f5258fbad0
+  metadata.gz: b0865d5612007eb2f21897da52685a97e6555f305a34546f43541a7710349028
+  data.tar.gz: e0555698b8f494dbd5f8f77bb1d6974aebac77ef91deef65db05ecf53877ea71
 SHA512:
-  metadata.gz: 7489a031c6a40d7697485957914044110b93e21820ad84f59998a3f81edd785858c307e4e30161ab54329a2b65dae3d29b8131eee76ba29aeff397f7dba9a236
-  data.tar.gz: 3b41b144ac540a9ca2930e6b4cb1242c7511c4835b1a0e1714a94db1f940e60e02b9a6134f7f01a6679d71396bebd9b02ddfcf03e70d343df4ed2371eb72b0c8
+  metadata.gz: 99e93ff62eb54a5b88d7ce55dc94f662db5ea3956bd8fdf2d18990e4bb87f498e4a3ef991ab585a5aa08f55c89856d707013f0b2f24489ab5937250788db9116
+  data.tar.gz: ee1717e2a2b55080afd0b6ffba8740bcb5d29aa12e4b5a731b57c59424f6fe356b611d980ba8b6c0de3e9d708d7cda15fd7076de152867a3eecb9fa152d0994a

data/README.md

@@ -25,11 +25,11 @@ shorts:
 Here, every page in the site will get a sibling with the name 
 `:year:month:day.html`, which will redirect to the page itself. You can use:
 
-  * `:Y` - the full year of the post, like `2022` or `1976`
-  * `:y` - the short form of the year of the post, like `23` or `76`
-  * `:m` - the month of the post, like `01` or `12`
-  * `:d` - the day of the post, like `07` or `29`
-  * `:pos` - the unique position of the post in the entire list of them, like `42` or `256`
+  * `:year` - the short form of the year of the post, like `23` or `76`
+  * `:month` - the month of the post, like `01` or `12`
+  * `:day` - the day of the post, like `07` or `29`
+  * `:position` - the unique position of the post in the entire list of them, like `42` or `256`
+  * `:letter` - one English letter inside a month
 
 Be careful with the `:position`, since it may change when you add a new post
 somewhere in the middle of existing flow of posts.

data/features/cli.feature

@@ -8,7 +8,7 @@ Feature: Simple site building
     plugins:
       - jekyll-shorts
     shorts:
-      permalink: :y:m:d.html
+      permalink: :year:month:day.html
     """
     And I have a "_layouts/default.html" file with content:
     """
@@ -25,3 +25,76 @@ Feature: Simple site building
     Then I build Jekyll site
     And Exit code is zero
     And File "_site/230729.html" exists
+    And I build Jekyll site
+    And Exit code is zero
+
+  Scenario: Simple site
+    Given I have a "_config.yml" file with content:
+    """
+    markdown: kramdown
+    plugins:
+      - jekyll-shorts
+    shorts:
+      permalink: :year.html
+    """
+    And I have a "_layouts/default.html" file with content:
+    """
+    {{ content }}
+    """
+    And I have a "_posts/2023-01-01-hello.md" file with content:
+    """
+    ---
+    title: Hello, world!
+    layout: default
+    ---
+    Hello, world!
+    """
+    Then I build Jekyll site
+    And Exit code is zero
+    And File "_site/23.html" exists
+    And I have a "_posts/2023-02-02-hello.md" file with content:
+    """
+    ---
+    title: Hello, world!
+    layout: default
+    ---
+    Hello, world!
+    """
+    And I build Jekyll site
+    And Exit code is not zero
+
+  Scenario: Simple site
+    Given I have a "_config.yml" file with content:
+    """
+    markdown: kramdown
+    plugins:
+      - jekyll-shorts
+    shorts:
+      permalink: :year:month:letter.html
+    """
+    And I have a "_layouts/default.html" file with content:
+    """
+    {{ content }}
+    """
+    And I have a "_posts/2023-01-01-apple.md" file with content:
+    """
+    ---
+    title: Hello, world!
+    layout: default
+    ---
+    Hello, world!
+    """
+    Then I build Jekyll site
+    And Exit code is zero
+    And I have a "_posts/2023-01-02-apple.md" file with content:
+    """
+    ---
+    title: Hello, world!
+    layout: default
+    ---
+    Hello, world!
+    """
+    And I build Jekyll site
+    And Exit code is zero
+    And File "_site/2301a.html" exists
+    And File "_site/2301b.html" exists

data/jekyll-shorts.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>= 2.6'
   s.name = 'jekyll-shorts'
-  s.version = '0.0.4'
+  s.version = '0.0.6'
   s.license = 'MIT'
   s.summary = 'Automatically generates short links for Jekyll website'
   s.description = [

data/lib/jekyll-shorts/generator.rb

@@ -45,20 +45,24 @@ class JekyllShorts::Generator < Jekyll::Generator
     permalink ||= config['permalink'] || ':year:month:day'
     start = Time.now
     total = 0
+    months = {}
     site.posts.docs.sort_by(&:url).each_with_index do |doc, pos|
       long = doc.url
+      month = doc.date.strftime('%Y%m')
+      months[month] = 0 if months[month].nil?
       short = Jekyll::URL.new(
         template: permalink,
         placeholders: {
-          'Y' => doc.date.year.to_s,
-          'y' => doc.date.year.to_s[2..],
-          'm' => doc.date.month.to_s.rjust(2, '0'),
-          'd' => doc.date.day.to_s.rjust(2, '0'),
-          'pos' => pos.to_s
+          'year' => doc.date.year.to_s[2..],
+          'month' => doc.date.month.to_s.rjust(2, '0'),
+          'day' => doc.date.day.to_s.rjust(2, '0'),
+          'letter' => (months[month] + 'a'.ord).chr,
+          'position' => pos.to_s
         }
       ).to_s
       site.static_files << ShortFile.new(site, short, long)
       doc.data['short-url'] = short
+      months[month] += 1
       total += 1
     end
     Jekyll.logger.info("jekyll-shorts #{JekyllShorts::VERSION}: \
@@ -82,7 +86,7 @@ class JekyllShorts::Generator < Jekyll::Generator
         if before != html
           raise "It's impossible to generate a short link at #{path.inspect}, \
 because the file already exists and the content \
-of the it differs from what we are going to write into it now (#{long}). This most \
+of the it differs from what we are going to write into it now (#{@long}). This most \
 probably means that previously generated short link will point to a different location \
 than before. Try to run 'jekyll clean', it will help, if you know what you are doing."
         end

data/lib/jekyll-shorts/version.rb

@@ -23,5 +23,5 @@
 # SOFTWARE.
 
 module JekyllShorts
-  VERSION = '0.0.4'
+  VERSION = '0.0.6'
 end

data/test/test_generator.rb

@@ -49,4 +49,24 @@ class JekyllShorts::GeneratorTest < Minitest::Test
       gen.generate(site)
     end
   end
+
+  def test_two_similar_posts
+    Dir.mktmpdir do |home|
+      first = File.join(home, '2023-01-01-first.md')
+      File.write(first, "---\ntitle: Hello\n---\n\nHello, world!")
+      second = File.join(home, '2023-01-01-second.md')
+      File.write(second, "---\ntitle: Hello\n---\n\nHello, world!")
+      site = JekyllShorts::FakeSite.new(
+        {
+          'url' => 'https://www.yegor256.com/',
+          'shorts' => {
+            'permalink' => ':y:m:letter.html'
+          }
+        },
+        [first, second]
+      )
+      gen = JekyllShorts::Generator.new
+      gen.generate(site)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-shorts
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Yegor Bugayenko