hatenablog_publisher 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231280ce0c49b9f23d834a452c76e9c5bf169b0fdd640ff026ba524aa895814f
-  data.tar.gz: e2c5fe2ed437cdead43784d2545bdfc2cb758b446df3552539aa5c3324d2e8a2
+  metadata.gz: b4d7a12f8c90dd7935b75ae3d38c753be5de35c90d04359838c2f7bf287d6240
+  data.tar.gz: 77109bd61c92b19ed09435e935100d40331cb627b8dbaeff95856ba86180d643
 SHA512:
-  metadata.gz: ab35181ae1a811e9620cb9c553d08326c066ed11c2a89dae668ff6f7157b7a38deed4e36327a6489ea67f9f316c0493ce49fcc69479bcfbf999200050fdd9cac
-  data.tar.gz: ef36de5fa409d0ccc2d7c293ed55699993abaece761c4ae566b938abc1a43927c6c2909f282d0455aa96550ac9551f87a95b02c6111e76b9aa9d8972c2832eca
+  metadata.gz: 236522c0ec5b627ce2ccaff7800b06613ef7fdc019dff261a62658a64a9a01179788bac6878af44019f85ec728570b3f55ebf5c8efb14e9dd6ae24ccf12d5582
+  data.tar.gz: aa73000a6526d5b1a5235c270a967f9451c444ca33f8bb664aa64a09aacd21660b78021d2f4fe0e0a5c9b41913b86a41a74b062618506012868da82168f21602

data/Gemfile

@@ -10,7 +10,7 @@ gem 'mime-types'
 gem 'oauth'
 gem 'oga'
 gem 'pry-byebug'
-gem 'rake', '~> 12.0'
+gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.0'
 gem 'rubocop'
 gem 'sanitize'

data/Gemfile.lock

@@ -1,7 +1,14 @@
 PATH
   remote: .
   specs:
-    hatenablog_publisher (0.1.0)
+    hatenablog_publisher (0.1.2)
+      activesupport
+      front_matter_parser
+      mime-types
+      oauth
+      oga
+      sanitize
+      xml-simple
 
 GEM
   remote: https://rubygems.org/
@@ -48,7 +55,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     rainbow (3.0.0)
-    rake (12.3.3)
+    rake (13.0.1)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -92,13 +99,14 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   awesome_print
+  bundler
   front_matter_parser
   hatenablog_publisher!
   mime-types
   oauth
   oga
   pry-byebug
-  rake (~> 12.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop
   sanitize

data/lib/hatenablog_publisher/context.rb

@@ -1,10 +1,11 @@
 require 'yaml'
+require 'time'
 require 'front_matter_parser'
 require 'active_support/core_ext/hash'
 
 module HatenablogPublisher
   class Context
-    attr_reader :title, :categories, :text, :hatena
+    attr_reader :title, :categories, :updated, :text, :hatena
 
     def initialize(io)
       @io = io
@@ -40,19 +41,36 @@ module HatenablogPublisher
     def add_entry_context(entry)
       @hatena ||= {}
       @hatena[:id] = entry['id'].first.split('-').last
+      @updated = time_to_s(entry['updated'].first)
+    end
+
+    def time_to_s(str)
+      Time.parse(str).strftime('%Y-%m-%dT%H:%M:%S')
+    end
+
+    def metadata
+      {
+        title: @title,
+        category: @categories,
+        updated: @updated,
+        hatena: @hatena
+      }
     end
 
     private
 
     def write_context
-      @io.write(title: @title, category: @categories, hatena: @hatena, text: @text)
+      @io.write(metadata, @text)
     end
 
     def read_context
       data, text = @io.read
 
+      updated = data[:updated].to_s.empty? ? '' : time_to_s(data[:updated])
+
       @text = text
       @categories = data[:category]
+      @updated = updated
       @title = data[:title]
       @hatena = data[:hatena] || {}
     end

data/lib/hatenablog_publisher/entry.rb

@@ -55,7 +55,7 @@ module HatenablogPublisher
           <content type="text/plain">
         #{body}
           </content>
-          <updated>#{Time.now.strftime('%Y-%m-%dT%H:%M%S')}</updated>
+          <updated>#{@context.updated}</updated>
           #{categories}
           <app:control>
             <app:draft>#{draft}</app:draft>

data/lib/hatenablog_publisher/io.rb

@@ -12,36 +12,32 @@ module HatenablogPublisher
       @options.data_file
     end
 
-    def write(title:, category:, hatena:, text:)
+    def yaml_loader
+      FrontMatterParser::Loader::Yaml.new(whitelist_classes: [Time])
+    end
+
+    def write(metadata, text)
       if data_file?
-        write_data_file(title: title, category: category, hatena: hatena)
+        write_data_file(metadata)
       else
-        write_file(title: title, category: category, hatena: hatena, text: text)
+        write_file(metadata, text)
       end
     end
 
-    def write_data_file(title:, category:, hatena:)
+    def write_data_file(metadata)
       data = JSON.parse(File.read(@options.data_file))
       data.each do |l|
         next unless l['filepath'] == @options.filename
 
-        l.merge!(
-          title: title,
-          category: category,
-          hatena: hatena
-        )
+        l.deep_symbolize_keys!.merge!(metadata)
       end
       File.write(data_file, JSON.pretty_generate(data, indent: '   ', space_before: ' '))
     end
 
-    def write_file(title:, category:, hatena:, text:)
+    def write_file(metadata, text)
       filename = @options.filename
-      parsed = FrontMatterParser::Parser.parse_file(filename)
-      front_matter = parsed.front_matter.deep_symbolize_keys.merge(
-        title: title,
-        category: category,
-        hatena: hatena
-      )
+      parsed = FrontMatterParser::Parser.parse_file(filename, loader: yaml_loader)
+      front_matter = parsed.front_matter.deep_symbolize_keys.merge(metadata)
       body = YAML.dump(front_matter.deep_stringify_keys) + "\n---\n\n" + text
       File.write(filename, body)
     end
@@ -64,7 +60,7 @@ module HatenablogPublisher
     end
 
     def read_from_file(filename)
-      parsed = FrontMatterParser::Parser.parse_file(filename)
+      parsed = FrontMatterParser::Parser.parse_file(filename, loader: yaml_loader)
 
       [parsed.front_matter.deep_symbolize_keys, parsed.content]
     end

data/lib/hatenablog_publisher/version.rb

@@ -1,3 +1,3 @@
 module HatenablogPublisher
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hatenablog_publisher
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - swfz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,6 +214,7 @@ files:
 - lib/hatenablog_publisher/photolife.rb
 - lib/hatenablog_publisher/request_logger.rb
 - lib/hatenablog_publisher/version.rb
+- renovate.json
 homepage: https://github.com/swfz/hatenablog_publisher
 licenses:
 - MIT