middleman-tansu 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b062e5143a8ff3b6f7ea5e0d130acaa7004671a8
-  data.tar.gz: 8182a19a35a914404b08cc375b309077d14618bd
+  metadata.gz: 50411d04e8f3b70aa3e8236bf4b26ac113fa1b13
+  data.tar.gz: eba1e6140f24a1f2e2cb7c2dc774e83d33d1825f
 SHA512:
-  metadata.gz: 3b3d9f1c72320919efbf994e8cf58ec848700c68a11f6b5cb542a3793cedc0681ba412548fc5d0e4aec391a5ff8be01a67cf997bf3178262f2c5b56d16b83198
-  data.tar.gz: 80c017632967da703f8fbf0552dbe217d80eb78a5f537b1fed7ddfb929f05be3bb0dcc3cd0c01a97ceec7b562ea80417c803a345c371263cf3c95373c3658850
+  metadata.gz: 93265575213eb79a2c07390753b14814b5e5e4e5d7fd1d8b221f54870f8f6406f7948d5775920bb34639aae56415f76e0be75b68d14c9693a17e2e95bdc96c43
+  data.tar.gz: 03e7b7ad4c9544950fdaddf88002740e50b0ef73fe729b95efb21f93a89b669564b04595bb52a1a1ce7ca3c0f0febba8cacd57a4c1a4e03713abd371105f12b2

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+sudo: false
 rvm:
 - ruby-head
 - jruby-head
@@ -17,6 +18,7 @@ matrix:
   - rvm: jruby-19mode
   - rvm: jruby-head
 script: bundle exec cucumber
+cache: bundler
 env: TEST=true
 notifications:
   slack:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.1.3
+
+- Fix: URI is not encoded in sitemap.xml. 
+  マルチバイト文字列を含む URI がエンコードされていなかった問題を修正。
+- `-z` option in `tansu` command accepts UPPERCASE or downcase timezone. ex: tokyo, TOKYO
+  tansu コマンドのタイムゾーンのオプションは大文字小文字の値を受け付けるようになりました。
+
 # 0.1.2
 
 - Drop `--current` (alias: `-c`) from `tansu` command.
@@ -5,7 +12,7 @@
 
 # 0.1.1
 
-- Add option `--current` (alias: `-c`) into `tansu` command.
+- Add option `--current` (alias: `-c`) into `tansu` command.(__DROPPED in v0.1.2__)
     - If you use `-c` option, `tansu` command create file with _relative path_ from current directory.
 - Add emoji stylesheet in template.
 

data/features/tansu_cli.feature

@@ -117,3 +117,27 @@ Feature: Tansu Command
     And the file "source/foo.html.md" should contain "author:"
     And the file "source/foo.html.md" should contain "date:"
     And the file "source/foo.html.md" should contain "+0900"
+
+  Scenario: `middleman tansu` create a markdown file with -z option(downcase)
+    Given a fixture app "empty-app"
+    And I set the timezone to "UTC"
+    When I run `middleman tansu foo -z tokyo`
+    Then the exit status should be 0
+    And a file named "source/foo.html.md" should exist
+    And the file "source/foo.html.md" should contain "title: foo"
+    And the file "source/foo.html.md" should not contain "title: foo.html.md"
+    And the file "source/foo.html.md" should contain "author:"
+    And the file "source/foo.html.md" should contain "date:"
+    And the file "source/foo.html.md" should contain "+0900"
+
+  Scenario: `middleman tansu` create a markdown file with -z option(uppercase)
+    Given a fixture app "empty-app"
+    And I set the timezone to "UTC"
+    When I run `middleman tansu foo -z TOKYO`
+    Then the exit status should be 0
+    And a file named "source/foo.html.md" should exist
+    And the file "source/foo.html.md" should contain "title: foo"
+    And the file "source/foo.html.md" should not contain "title: foo.html.md"
+    And the file "source/foo.html.md" should contain "author:"
+    And the file "source/foo.html.md" should contain "date:"
+    And the file "source/foo.html.md" should contain "+0900"

data/features/template_cli.feature

@@ -40,6 +40,17 @@ Feature: Template CLI
       <loc>http://localhost:4567/index.html</loc>
       """
 
+  Scenario: sitemap.xml contains escaped URI
+    Given I run `middleman init MY_PROJECT --template tansu`
+    And I cd to "MY_PROJECT"
+    And I run `middleman tansu マルチバイトページ`
+    When I run `middleman build`
+    Then the exit status should be 0
+    And the following files should exist:
+      | build/マルチバイトページ.html          |
+      | build/sitemap.xml                      |
+    And the file "build/sitemap.xml" should contain "%E3%83%9E%E3%83%AB%E3%83%81%E3%83%90%E3%82%A4%E3%83%88%E3%83%9A%E3%83%BC%E3%82%B8"
+
   Scenario: Build a new project with app.config.sitemap_url
     Given I run `middleman init MY_PROJECT --template tansu`
     And a file named "MY_PROJECT/config.rb" with:

data/lib/middleman-tansu/command.rb

@@ -54,7 +54,8 @@ module Middleman
         paths     = path.split('/')
         title     = paths.pop
         ext       = options[:file]
-        Time.zone = options[:timezone] || ENV['TZ'] || 'UTC'
+        zone      = options[:timezone] || ENV['TZ'] || 'UTC'
+        Time.zone = (zone != 'UTC') ? zone.downcase.capitalize : zone
         date      = options[:date] ? Time.zone.parse(options[:date]) : Time.zone.now
         author    = options[:author] || ENV['USER']
         add_frontmatter = options[:frontmatter]

data/lib/middleman-tansu/template/source/sitemap.xml.builder

@@ -6,7 +6,7 @@ xml.instruct!
 xml.urlset 'xmlns' => "http://www.sitemaps.org/schemas/sitemap/0.9" do
   sitemap.resources.select { |page| page.destination_path =~ /\.html/ }.each do |page|
     xml.url do
-      xml.loc File.join(site_url, page.destination_path)
+      xml.loc URI.escape(File.join(site_url, page.destination_path))
       xml.lastmod Time.now.iso8601
       xml.changefreq page.data.changefreq || "weekly"
       xml.priority page.data.priority || "0.5"

data/lib/middleman-tansu/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Tansu
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-tansu
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Yuya Terajima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman