hatenablog_publisher 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9da819e22994f68f8d47fb2af66cb776ab74866d09d0c6cc3970fbf8cb447ac6
-  data.tar.gz: 7fe584284a46990d727add2316a6c72920787ec4b48d6ccffa7ab8330e2a888f
+  metadata.gz: ae5520e6363ca01a3e404687252372c0d3e3cca100ddbc3fcd6adc1ea940a70a
+  data.tar.gz: b4489a0d2245d0efb130a589d6f1eefe2430af44469fe0b6112987b357e1c31f
 SHA512:
-  metadata.gz: fc1c23cb700e7e4c2612dd185ec387266ed5736a590221afe0ecfd8ae91010dade2ebc0131f109b7401b083bebafd796419ad53d484b7e521b9d43ca4e94e1ca
-  data.tar.gz: '008ba7e176554d139f89a481b7ee2d8e4a9a175935b59284ec7d71c14d29d4ef27928594b562829166c7d5d8b7cdfa46833a0225722bc43f64be930a6e4c12f8'
+  metadata.gz: e6fdb7227d35882af116414d1a858bcb5821e16bdaa96feb98db03c994e88db51af52e6b9302b97a067340a60d43b0707e1c72c33a6f7631dd5887c5c7a5455a
+  data.tar.gz: 5e071ae5bf18dba02a26840a0b822f804237005178e510a7a4843e2001a6612a03e94d644923a687945388c552dcacd1003143a1aaaec300453a49d3e4f2c06b

data/.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - dependabot
+    open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.6
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2.1.3
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('./Gemfile.lock') }}
@@ -28,6 +28,8 @@ jobs:
           HATENABLOG_CONSUMER_SECRET: dummy
           HATENABLOG_ACCESS_TOKEN_SECRET: dummy
           HATENABLOG_ACCESS_TOKEN: dummy
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          CI: true
         run: |
           bundle exec rspec
 
@@ -52,3 +54,14 @@ jobs:
       #   with:
       #     github_token: ${{ secrets.GITHUB_TOKEN }}
       #     reporter: github-pr-check
+
+  slack-notify:
+    if: always()
+    needs: [test, rubocop]
+    name: post slack
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Gamesight/slack-workflow-status@master
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}

data/Gemfile

@@ -10,8 +10,9 @@ 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'
 gem 'xml-simple'
+gem 'codecov', :require => false, :group => :test

data/Gemfile.lock

@@ -1,12 +1,19 @@
 PATH
   remote: .
   specs:
-    hatenablog_publisher (0.1.0)
+    hatenablog_publisher (0.2.0)
+      activesupport
+      front_matter_parser
+      mime-types
+      oauth
+      oga
+      sanitize
+      xml-simple
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -16,20 +23,25 @@ GEM
     ast (2.4.0)
     awesome_print (1.8.0)
     byebug (11.1.3)
+    codecov (0.2.11)
+      json
+      simplecov
     coderay (1.1.2)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
     diff-lcs (1.3)
+    docile (1.3.2)
     front_matter_parser (0.2.1)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
+    json (2.3.1)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0425)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
@@ -48,7 +60,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)
@@ -75,10 +87,14 @@ GEM
       ansi
       ast
     ruby-progressbar (1.10.1)
-    sanitize (5.1.0)
+    sanitize (5.2.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
+    simplecov (0.19.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
@@ -92,13 +108,15 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   awesome_print
+  bundler
+  codecov
   front_matter_parser
   hatenablog_publisher!
   mime-types
   oauth
   oga
   pry-byebug
-  rake (~> 12.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop
   sanitize

data/README.md

@@ -1,5 +1,9 @@
 # HatenablogPublisher
 
+![ci](https://github.com/swfz/hatenablog_publisher/workflows/ci/badge.svg)
+
+[![codecov](https://codecov.io/gh/swfz/hatenablog_publisher/branch/master/graph/badge.svg)](https://codecov.io/gh/swfz/hatenablog_publisher)
+
 Module to manage local markdown and images using Hatena Blog API and PhotoLife API.
 
 ## Installation

data/hatenablog_publisher.gemspec

@@ -23,4 +23,16 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'front_matter_parser'
+  spec.add_dependency 'oauth'
+  spec.add_dependency 'mime-types'
+  spec.add_dependency 'oga'
+  spec.add_dependency 'sanitize'
+  spec.add_dependency 'xml-simple'
 end

data/lib/hatenablog_publisher/client.rb

@@ -15,7 +15,6 @@ module HatenablogPublisher
     end
 
     def publish
-      image_tags = @context.text.scan(IMAGE_PATTERN).flatten
       photolife = HatenablogPublisher::Photolife.new
       dirname = File.dirname(@options.filename)
 
@@ -36,6 +35,10 @@ module HatenablogPublisher
       @context.reload_context
     end
 
+    def image_tags
+      @context.text.scan(IMAGE_PATTERN).flatten.reject { |tag| tag.match('^http') }
+    end
+
     def generate_body
       generator = HatenablogPublisher::Generator::Body.new(@context, @options)
       body = generator.generate

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
@@ -18,7 +19,8 @@ module HatenablogPublisher
     end
 
     def add_image_context(image, tag)
-      syntax = "[#{image['syntax'].first}]"
+      # APIのレスポンスをそのまま使用すると記事上でフォトライフへのリンクになってしまうため、管理画面から画像投稿した結果と合わせた(image -> plain)
+      syntax = "[#{image['syntax'].first}]".gsub(/:image\]/,':plain]')
 
       @hatena ||= {}
       @hatena[:image] ||= {}
@@ -40,19 +42,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

@@ -31,7 +31,6 @@ module HatenablogPublisher
 
     def api_url
       id = @context.hatena.dig(:id) ? '/' + @context.hatena[:id] : ''
-      ap @options
       "#{ENDPOINT}/#{@options.user}/#{@options.site}/atom/entry#{id}"
     end
 
@@ -56,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/generator/body.rb

@@ -13,14 +13,24 @@ module HatenablogPublisher
       def generate
         markdown = @context.text.dup
 
-        replaced_markdown = replace_image(markdown)
+        replaced_markdown = remove_textlint_comment(replace_image(markdown))
 
         CGI.escapeHTML(replaced_markdown)
       end
 
+      def remove_textlint_comment(markdown)
+        markdown.gsub(/^<!--\s+textlint-(enable|disable).*-->\n/, '')
+      end
+
       def replace_image(markdown)
-        markdown.gsub(IMAGE_PATTERN) do
-          "\n\n" + @context.image_syntax(Regexp.last_match(1))
+        markdown.gsub(IMAGE_PATTERN) do |s|
+          image_name = Regexp.last_match(1)
+
+          if image_name.match('^http')
+            s
+          else
+            "\n\n" + @context.image_syntax(image_name)
+          end
         end
       end
     end

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.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/renovate.json

@@ -0,0 +1,8 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "minor": {
+    "groupName": "all dependencies"
+  }
+}

metadata

@@ -1,15 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: hatenablog_publisher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - swfz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
-dependencies: []
+date: 2020-12-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: front_matter_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oga
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sanitize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - sawafuji.09@gmail.com
@@ -18,6 +186,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -46,6 +215,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