usmu 1.3.0-java → 1.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed56dab312c4190e87f0c5c28cebde56d1986fd
-  data.tar.gz: 6ded928f4f5522c3ff363a9dc8de57ed1b7b188a
+  metadata.gz: 80f2c84d036c02e8fdfda78021f3ddbd30981ddf
+  data.tar.gz: be3303ad8bbe4a5695cf99159407c7640bc2a2a6
 SHA512:
-  metadata.gz: 373631f4b9c360036533ea7b30353770bac15599e0a3f541db2d4100799a50081ad2d366063e5e7f2329a038588de86887b221f55ba9ca4fd9b501a8a6c73988
-  data.tar.gz: 05fd2add95c462bb991681ea183f3769b7c98320b90a42b97efc3a59f613ae792998cd122b01e935a0d3222fc3ead9ad6fb485ce612377b5530c702599870d26
+  metadata.gz: 685e36705370fb2060c0c6d58d9dd8c3704eea62d01327d85287247e1d927c51d6b9bb913994e20c63e8b830bb00dd99b53b3f4f74cb852f602a2236af4ca1e3
+  data.tar.gz: 0562b7eb37e38bffcf035bfb4e48c5c3c47e34bf168c6f31793968d27e78af396a1744b906b061b1debdcf83bd3bb3c72141a376aff14ca703836120ccb396d9

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: java
 authors:
 - Matthew Scharley