hatenablog_publisher 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4d7a12f8c90dd7935b75ae3d38c753be5de35c90d04359838c2f7bf287d6240
-  data.tar.gz: 77109bd61c92b19ed09435e935100d40331cb627b8dbaeff95856ba86180d643
+  metadata.gz: 1c3040d39a5be46c7a7e2dcf5fd7ee32b0b598e6b784924f455260173b8d4743
+  data.tar.gz: 30370641aa5797c6f77b4a63e12a68fea0fdd4083dad15ae20a5a90cc0ffbfba
 SHA512:
-  metadata.gz: 236522c0ec5b627ce2ccaff7800b06613ef7fdc019dff261a62658a64a9a01179788bac6878af44019f85ec728570b3f55ebf5c8efb14e9dd6ae24ccf12d5582
-  data.tar.gz: aa73000a6526d5b1a5235c270a967f9451c444ca33f8bb664aa64a09aacd21660b78021d2f4fe0e0a5c9b41913b86a41a74b062618506012868da82168f21602
+  metadata.gz: 99bd3e7df86ca28647270467861be3b61899a45c16abdc537e638618482b38c8938493ee8eb4845ddfae1a5efca130f626938f12ea195cc19638f716a04805a4
+  data.tar.gz: 18f8e3f072782ed1df829261378bfa3499873bbb6a373fe4387f226e7a81e0e7808151a32fb5d7f0613f4fb0b3062e1d5d3ed4c4948d2ff9c273ab8174edc9e4

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

@@ -7,12 +7,16 @@ jobs:
   test:
     runs-on: ubuntu-latest
     name: 'test'
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.0.2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
-      - uses: actions/cache@v1
+          ruby-version: ${{ matrix.ruby-version }}
+      - uses: actions/cache@v3.0.2
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('./Gemfile.lock') }}
@@ -28,6 +32,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
 
@@ -35,10 +41,14 @@ jobs:
     runs-on: ubuntu-latest
     name: 'rubocop'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.0.2
+      - name: Read Ruby version from .ruby-version
+        run: echo ::set-output name=ruby_version::$(cat .ruby-version)
+        id: ruby-version
+
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: ${{ steps.ruby-version.outputs.ruby_version }}
       - run: |
           gem install rubocop
 
@@ -48,7 +58,14 @@ jobs:
         run: |
           curl -sfL https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s
           rubocop | ./bin/reviewdog -f=rubocop -reporter=github-pr-review
-      # - uses: reviewdog/action-rubocop@v1
-      #   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@v1.1.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}

data/.ruby-version

@@ -0,0 +1 @@
+2.7.6

data/Gemfile

@@ -3,15 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in hatenablog_publisher.gemspec
 gemspec
 
-gem 'activesupport'
-gem 'awesome_print'
-gem 'front_matter_parser'
-gem 'mime-types'
-gem 'oauth'
-gem 'oga'
-gem 'pry-byebug'
-gem 'rake', '~> 13.0'
-gem 'rspec', '~> 3.0'
-gem 'rubocop'
-gem 'sanitize'
-gem 'xml-simple'
+group :test do
+  gem 'codecov', require: false
+end

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/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,6 +1,7 @@
 require 'yaml'
 require 'time'
 require 'front_matter_parser'
+require 'active_support'
 require 'active_support/core_ext/hash'
 
 module HatenablogPublisher
@@ -19,7 +20,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] ||= {}

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

@@ -13,7 +13,7 @@ module HatenablogPublisher
     end
 
     def yaml_loader
-      FrontMatterParser::Loader::Yaml.new(whitelist_classes: [Time])
+      FrontMatterParser::Loader::Yaml.new(allowlist_classes: [Time])
     end
 
     def write(metadata, text)

data/lib/hatenablog_publisher/version.rb

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

data/renovate.json

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hatenablog_publisher
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - swfz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,14 +186,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -237,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Gem that posts to the Hatena Blog API and PhotoLife API

data/Gemfile.lock

@@ -1,116 +0,0 @@
-PATH
-  remote: .
-  specs:
-    hatenablog_publisher (0.1.2)
-      activesupport
-      front_matter_parser
-      mime-types
-      oauth
-      oga
-      sanitize
-      xml-simple
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.0.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ansi (1.5.0)
-    ast (2.4.0)
-    awesome_print (1.8.0)
-    byebug (11.1.3)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    crass (1.0.6)
-    diff-lcs (1.3)
-    front_matter_parser (0.2.1)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    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)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.2)
-      nokogiri (~> 1.8, >= 1.8.4)
-    oauth (0.5.4)
-    oga (3.2)
-      ast
-      ruby-ll (~> 2.1)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    ruby-ll (2.1.2)
-      ansi
-      ast
-    ruby-progressbar (1.10.1)
-    sanitize (5.1.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    xml-simple (1.1.5)
-    zeitwerk (2.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  awesome_print
-  bundler
-  front_matter_parser
-  hatenablog_publisher!
-  mime-types
-  oauth
-  oga
-  pry-byebug
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop
-  sanitize
-  xml-simple
-
-BUNDLED WITH
-   2.1.4