usmu 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 278fdf99bee6cdcc7e63997b7a3e10f2e85cdc0b
-  data.tar.gz: 24d4beb2f6fd199d8dcc76eb92dd49bf5b17244c
+  metadata.gz: 1c604445bb1362ae82eee81874dcac8f1554508b
+  data.tar.gz: 9f4631b23e2cc31dd6a417d56b9f785c96ac1c46
 SHA512:
-  metadata.gz: 007ceabd71a6c5d26677a08e5d2a2ece75d5a7e909fdea8ad2710febfc31e2acaa12ded407fc89a5b118e70781b428e1c2b7082c3eabf75ac6f126e7cd3ce2e2
-  data.tar.gz: 707ac6fcb658f88810ad7f8f1b3c0b897ad155578e3b58be403b7d8190eb02e5ecfea4d0b17b4d718d78d2068b17cd057adfc316734d1242a2e64680fe336680
+  metadata.gz: c7e79ad4f57f09adb78f65d8e81913595e784d2adbb2e96d7ab916f4ca420ba818557acb26b023a74a9f8f5d9ae6c5d4ac56c7e0640a206a55df1714034bab5a
+  data.tar.gz: 89a628f5f9dd4ec35b34e681430c7bbf1e2f57e376f7b8cd2c03133eda48114aa6d94bb5d961039f8d08ad5e4373f48242631724d5b5f889a25a43487873e003

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Usmu Change Log
 
+## 1.4.0
+
+Matthew Scharley <matt.scharley@gmail.com>
+
+* Fix minorly broken test (7071fbe4cc46be437154a441483bfad522e7d565)
+* Permalink should include extension if wanted. (9a2cde9f2337243d7cc1965f9f08b5ee82ae6ce9)
+
 ## 1.3.0
 
 Matthew Scharley <matt.scharley@gmail.com>

data/lib/usmu/template/page.rb

@@ -68,11 +68,8 @@ module Usmu
 
         date = self.date
 
-        extension = output_extension
-        extension = '.' + extension if extension
-
         link_tr = link.gsub('%f', File.basename(@name[0..(@name.rindex('.') - 1)]))
-        date.strftime(link_tr) + extension
+        date.strftime(link_tr)
       end
     end
   end

data/lib/usmu/version.rb

@@ -1,5 +1,5 @@
 
 module Usmu
   # The current version string for the gem
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/spec/usmu/plugin/core_spec.rb

@@ -8,6 +8,7 @@ require 'usmu/ui/rack_server'
 RSpec.describe Usmu::Plugin::Core do
   let (:plugin) { described_class.new }
   let (:configuration) { Usmu::Configuration.from_hash({}) }
+  let (:generator) { Usmu::SiteGenerator.new(configuration) }
   let (:ui) { OpenStruct.new configuration: configuration }
   let (:commander) { Usmu::MockCommander.new }
   let (:options) { Commander::Command::Options.new }
@@ -49,6 +50,10 @@ RSpec.describe Usmu::Plugin::Core do
   end
 
   context '#command_generate' do
+    before do
+      allow(configuration).to receive(:generator).and_return(generator)
+    end
+
     it 'raises an error when arguments are specified' do
       expect { plugin.command_generate(['foo'], options) }.to raise_error('This command does not take arguments')
     end
@@ -58,7 +63,7 @@ RSpec.describe Usmu::Plugin::Core do
     end
 
     it 'should generate a site' do
-      expect(configuration.generator).to receive(:generate)
+      expect(generator).to receive(:generate)
 
       plugin.send :ui=, ui
       plugin.command_generate [], options

data/test-site/content/posts/meta.yml

@@ -1,4 +1,4 @@
 ---
-permalink: '%Y/%m/%f'
+permalink: '%Y/%m/%f.html'
 collection: posts
 layout: post

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Matthew Scharley