hatenablog 0.5.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ccc4d78dfaffced49de2aa8f7e9794d2767302a9
-  data.tar.gz: 4edfad9e3555d2fecf0726049864ced76e8b5b48
+SHA256:
+  metadata.gz: 5c6ebd627cfd566a53f9423b632b3ef6f42d285e2ffa84b176af438022a78bbe
+  data.tar.gz: c7dbd064aee0d3557c17464be93b351cc741b973c16ede5dd6d8cf6afde30bfc
 SHA512:
-  metadata.gz: dee4dd74034022f4f559ce6c24fbeb7dcaa9853451d4db59cbfbf4c85effc3c9b1a55b3434978a11011be802aef9355e3b774c5f6eca77fe558e8f2011ed00f6
-  data.tar.gz: fe01c44cfcc8b547ea7f69791704ac7c8da279cf701422354e5f151bf9e10a4501089da6db20e3740e6a0f4ba449110d3d6ff6128caf5312e547c7d6a628b283
+  metadata.gz: fe094c01e6c51c1b41bd674bc6aa891767532c3472135312709d090bd1301dfcc3041fb95e90a7a641c20ea07f5a32403d6d006a13a8a6c16aa319c74ad1c454
+  data.tar.gz: 8c86b99f15106170419012c8e8d15c90b1a2644488a62b16cfb76defad288ca81cb04a920f772d8fedf314f88ff8c4351889439a766e59305caad5134d0d15cf

data/.github/workflows/build.yml

@@ -0,0 +1,49 @@
+name: build
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7', '3.0', '3.1.0-preview1']
+        include:
+          - ruby: '3.0'
+            report-coverage: true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: gem install bundler
+      - run: bundle install -j4
+      - name: Run tests and report test coverage
+        if: matrix.report-coverage
+        uses: paambaati/codeclimate-action@v2.7.5
+        env:
+          CC_TEST_REPORTER_ID: 309cf0784d00d2a6009566d28be111a8a0280cdeb2da280225eedf577b16beb5
+        with:
+          coverageCommand: bundle exec rake
+          coverageLocations: ${{github.workspace}}/coverage/coverage.json:simplecov
+      - name: Run tests
+        if: "!matrix.report-coverage"
+        env:
+          TZ: Asia/Tokyo
+        run: bundle exec rake
+  steep:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+      - run: bundle install -j4
+      - run: rbs collection install
+      - run: bundle exec steep check

data/.gitignore

@@ -28,9 +28,10 @@ build/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+/.gem_rbs_collection/

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Unreleased
+
+## 0.8.0 - 2021-11-20
+
+### Added
+
+- [Create the signature with RBS](https://github.com/kymmt90/hatenablog/pull/24)
+  - This is experimental
+
+### Changed
+
+- [Change the executable name to more specific one](https://github.com/kymmt90/hatenablog/pull/26)
+  - From `get_access_token` to `get_hatena_oauth_access_token`
+- [Use only supported Rubies in 2021-11](https://github.com/kymmt90/hatenablog/pull/27)
+  - Drop Ruby 2.4 and 2.5 and add Ruby 3.1.0-preview1

data/Gemfile

@@ -1,8 +1,11 @@
 source 'https://rubygems.org'
 
+group :development, :test do
+  gem 'steep'
+end
+
 group :test do
   gem 'simplecov'
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
 end
 
 # Specify your gem's dependencies in hatenablog.gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Hatenablog
 
-[![Gem Version](https://badge.fury.io/rb/hatenablog.svg)](https://badge.fury.io/rb/hatenablog) [![Build Status](https://travis-ci.org/kymmt90/hatenablog.svg?branch=master)](https://travis-ci.org/kymmt90/hatenablog)
+[![Gem Version](https://badge.fury.io/rb/hatenablog.svg)](https://badge.fury.io/rb/hatenablog) [![Build Status](https://github.com/kymmt90/hatenablog/workflows/build/badge.svg)](https://github.com/kymmt90/hatenablog/actions?workflow=build)
 [![Code Climate](https://codeclimate.com/github/kymmt90/hatenablog/badges/gpa.svg)](https://codeclimate.com/github/kymmt90/hatenablog)
 [![Test Coverage](https://codeclimate.com/github/kymmt90/hatenablog/badges/coverage.svg)](https://codeclimate.com/github/kymmt90/hatenablog/coverage)
 
@@ -19,15 +19,21 @@ This gem supports following operations through OAuth 1.0a or Basic authenticatio
 
 Add this line to your application's Gemfile:
 
-    gem 'hatenablog'
+```
+gem 'hatenablog'
+```
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install hatenablog
+```
+$ gem install hatenablog
+```
 
 ### Get OAuth credentials
 
@@ -41,11 +47,13 @@ Access [Hatena application registoration page](http://developer.hatena.ne.jp/) a
 
 Execute this command:
 
-    $ get_access_token <your consumer key> <your consumer secret>
-	Visit this website and get the PIN: https://www.hatena.com/oauth/authorize?oauth_token=XXXXXXXXXXXXXXXXXXXX
-	Enter the PIN: <your PIN> [Enter]
-	Access token: <your access token>
-	Access token secret: <your access token secret>
+```
+$ get_hatena_oauth_access_token <your consumer key> <your consumer secret>
+Visit this website and get the PIN: https://www.hatena.com/oauth/authorize?oauth_token=XXXXXXXXXXXXXXXXXXXX
+Enter the PIN: <your PIN> [Enter]
+Access token: <your access token>
+Access token secret: <your access token secret>
+```
 
 #### 3. [Optional] Set up the YAML configuration file
 
@@ -99,15 +107,19 @@ Hatenablog::Client.create do |blog|
   end
 
   # Post new entry
-  posted_entry = blog.post_entry('Entry Title',
-                                 'This is entry contents', # markdown form
-								 ['Test', 'Programming'])  # categories
+  posted_entry = blog.post_entry(
+    'Entry Title',
+    'This is entry contents', # markdown form
+    ['Test', 'Programming']   # categories
+  )
 
   # Update entry
-  updated_entry = blog.update_entry(posted_entry.id,
-                                    'Revised Entry Title',
-							        posted_entry.content,
-							        posted_entry.categories)
+  updated_entry = blog.update_entry(
+    posted_entry.id,
+    'Revised Entry Title',
+    posted_entry.content,
+    posted_entry.categories
+  )
 
   # Delete entry
   blog.delete_entry(updated_entry.id)
@@ -148,8 +160,8 @@ end
 ### Blog
 
 ```ruby
-client.title        # Get the blog title
-client.author_name  # Get the blog author name
+client.title       # Get the blog title
+client.author_name # Get the blog author name
 ```
 
 ### Feeds
@@ -157,16 +169,16 @@ client.author_name  # Get the blog author name
 ```ruby
 feed = client.next_feed # Get the first feed when no argument is passed
 feed.uri
-feed.next_uri     # The next feed URI
+feed.next_uri    # The next feed URI
 feed.title
 feed.author_name
-feed.update       # Updated datetime
+feed.updated     # Updated datetime
 
-feed.entries  # entries in the feed
+feed.entries # entries in the feed
 feed.each_entry do |entry|
   # ...
 end
-feed.has_next?  # true if the next page exists
+feed.has_next? # true if the next page exists
 next_feed = client.next_feed(feed)
 ```
 
@@ -174,38 +186,42 @@ next_feed = client.next_feed(feed)
 
 ```ruby
 client.get_entry('0000000000000000000') # Get the entry specifed by its ID
-client.entries      # Get blog entries in the first page
-client.entries(1)   # Get blog entries in the first and the second page
-client.all_entries  # Get all entries in the blog
-
-entry = client.post_entry('Example Title',  # title
-                          'This is the **example** entry.',  # content
-                          ['Ruby', 'Rails'],  # categories
-                          'yes'  # draft
-                         )
+client.entries     # Get blog entries in the first page
+client.entries(1)  # Get blog entries in the first and the second page
+client.all_entries # Get all entries in the blog
+
+entry = client.post_entry(
+  'Example Title',                  # title
+  'This is the **example** entry.', # content
+  ['Ruby', 'Rails'],                # categories
+  'yes'                             # draft
+)
 entry.id
 entry.uri
 entry.edit_uri
 entry.author_name
-entry.title        #=> 'Example Title'
-entry.content      #=> 'This is the **example** entry.'
-entry.draft        #=> 'yes'
-entry.draft?       #=> true
-entry.categories   #=> ['Ruby', 'Rails']
-entry.updated      # Updated datetime
-
-client.update_entry(entry.id,
-                    entry.title,
-                    'This is the **modified** example entry.',
-                    entry.categories,
-                    'no')
+entry.title             #=> 'Example Title'
+entry.content           #=> 'This is the **example** entry.'
+entry.formatted_content #=> '<p>This is the <strong>example</strong> entry.</p>'
+entry.draft             #=> 'yes'
+entry.draft?            #=> true
+entry.categories        #=> ['Ruby', 'Rails']
+entry.updated           # Updated datetime
+
+client.update_entry(
+  entry.id,
+  entry.title,
+  'This is the **modified** example entry.',
+  entry.categories,
+  'no'
+)
 client.delete_entry(entry.id)
 ```
 
 ### Categories
 
 ```ruby
-categories = client.categories  # Get categories registered in the blog
+categories = client.categories # Get categories registered in the blog
 categories.each do |cat|
   puts cat
 end

data/Rakefile

@@ -11,6 +11,7 @@ Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = Dir["test/hatenablog/*_test.rb"]
   t.verbose = true
+  t.warning = true
 end
 
 YARD::Rake::YardocTask.new do |t|

data/Steepfile

@@ -0,0 +1,11 @@
+D = Steep::Diagnostic
+
+target :lib do
+  check "lib"
+  signature "sig"
+
+  repo_path ".gem_rbs_collection"
+  library "erb", "net-http", "nokogiri", "set", "time", "uri"
+
+  configure_code_diagnostics(D::Ruby.all_error)
+end

data/exe/{get_access_token → get_hatena_oauth_access_token}

@@ -10,6 +10,7 @@ class AccessTokenGetter
   SITE_URI = 'https://www.hatena.com'
   REQUEST_TOKEN_URI = '/oauth/initiate?scope=read_public%2Cread_private%2Cwrite_public%2Cwrite_private'
   ACCESS_TOKEN_URI = '/oauth/token'
+  AUTHORIZE_URI = 'https://www.hatena.ne.jp/oauth/authorize'
 
   def initialize(consumer_key, consumer_secret)
     @consumer_key    = consumer_key
@@ -19,7 +20,8 @@ class AccessTokenGetter
                                     oauth_callback: 'oob',
                                     site: SITE_URI,
                                     request_token_url: REQUEST_TOKEN_URI,
-                                    access_token_url: ACCESS_TOKEN_URI)
+                                    access_token_url: ACCESS_TOKEN_URI,
+                                    authorize_url: AUTHORIZE_URI)
   end
 
   def get_request_token

data/hatenablog.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.2'
+  spec.required_ruby_version = '>= 2.3'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/hatenablog/category.rb

@@ -15,9 +15,12 @@ module Hatenablog
       @categories.dup
     end
 
-    def each
+    def each(&block)
+      return enum_for unless block_given?
+
       @categories.each do |category|
-        yield category
+        # @type var block: ^(String) -> void
+        block.call(category)
       end
     end
 
@@ -36,7 +39,7 @@ module Hatenablog
     end
 
     def parse_document
-      @categories = @document.css('atom|category').inject([]) do |categories, category|
+      @categories = @document.css('atom|category').inject(Array.new) do |categories, category|
         categories << category['term'].to_s
       end
 

data/lib/hatenablog/client.rb

@@ -12,6 +12,7 @@ module Hatenablog
     MEMBER_URI     = "https://blog.hatena.ne.jp/%s/%s/atom/entry/%s".freeze
     CATEGORY_URI   = "https://blog.hatena.ne.jp/%s/%s/atom/category".freeze
 
+    # @dynamic requester=
     attr_writer :requester
 
     # Create a new hatenablog AtomPub client from a configuration file.
@@ -24,9 +25,9 @@ module Hatenablog
       yield blog
     end
 
-    def initialize(config = nil)
+    def initialize(config = Configuration.new)
       if block_given?
-        yield config = Configuration.new
+        yield config
         config.check_valid_or_raise
       end
       @requester = Requester.create(config)
@@ -59,7 +60,7 @@ module Hatenablog
     # Get all blog entries.
     # @return [Hatenablog::Entries] enumerator of blog entries
     def all_entries
-      Entries.new(self, nil)
+      Entries.new(self, 0, :all)
     end
 
     # Get the next feed of the given feed.
@@ -161,7 +162,7 @@ module Hatenablog
             xml.name author_name
           end
           xml.content(content, type: 'text/x-markdown')
-          xml.updated updated unless updated.empty? || updated.nil?
+          xml.updated updated if updated && !updated.empty?
           categories.each do |category|
             xml.category(term: category)
           end
@@ -207,17 +208,45 @@ module Hatenablog
   class Entries
     include Enumerable
 
-    def initialize(client, page = 0)
+    def initialize(client, page = 0, fetch = :partial)
       @client = client
       @page = page
+      @fetch = fetch
     end
 
-    def each
+    def each(&block)
+      return enum_for unless block_given?
+
+      # @type var block: ^(Entry) -> void
+      if @fetch == :all
+        each_all(&block)
+      else
+        each_partial(&block)
+      end
+    end
+
+    private
+
+    def each_all(&block)
+      feed = nil
+
+      while feed = @client.next_feed(feed)
+        feed.entries.each { |entry| block.call(entry) }
+      end
+
+      self
+    end
+
+    def each_partial(&block)
+      feed = nil
+
       current_page = 0
-      until (@page && current_page > @page) || !(feed = @client.next_feed(feed))
-        feed.entries.each { |entry| yield entry }
+      while current_page <= @page && feed = @client.next_feed(feed)
+        feed.entries.each { |entry| block.call(entry) }
         current_page += 1
       end
+
+      self
     end
   end
 end

data/lib/hatenablog/configuration.rb

@@ -4,6 +4,8 @@ require 'ostruct'
 
 module Hatenablog
   class Configuration < OpenStruct
+    # @dynamic auth_type, consumer_key, consumer_secret, access_token, access_token_secret, api_key, user_id, blog_id
+
     OAUTH_KEYS = %i(consumer_key consumer_secret access_token access_token_secret user_id blog_id)
     BASIC_KEYS = %i(api_key user_id blog_id)
 

data/lib/hatenablog/entry.rb

@@ -3,6 +3,9 @@ require 'time'
 
 module Hatenablog
   module AfterHook
+    # @dynamic uri=, edit_uri=, author_name=, title=, content=, updated=, draft=, categories=
+    # @dynamic instance_methods, alias_method, define_method
+
     # Register a hooking method for given methods.
     # The hook method is executed after calling given methods.
     # @param [Symbol] hooking method name
@@ -17,8 +20,10 @@ module Hatenablog
         alias_method origin_method, method
 
         define_method(method) do |*args, &block|
+          # @type var block: ^(*untyped) -> untyped
           result = send(origin_method, *args, &block)
           send(hook)
+          result
         end
       end
     end
@@ -27,8 +32,14 @@ module Hatenablog
   class Entry
     extend AfterHook
 
-    attr_accessor :uri, :author_name, :title, :content, :draft, :categories
-    attr_reader   :edit_uri, :id, :updated
+    # @dynamic uri, uri=, author_name, author_name=, title, title=, content, content=, draft, draft=
+    attr_accessor :uri, :author_name, :title, :content, :draft
+
+    # @dynamic edit_uri, id, updated
+    attr_reader :edit_uri, :id, :updated
+
+    # @dynamic categories=
+    attr_writer :categories
 
     def updated=(date)
       @updated = Time.parse(date)
@@ -87,6 +98,11 @@ module Hatenablog
       @document.to_s.gsub(/\"/, "'")
     end
 
+    # @return [String]
+    def formatted_content
+      @formatted_content
+    end
+
     def self.build_xml(uri, edit_uri, author_name, title, content, draft, categories, updated)
       builder = Nokogiri::XML::Builder.new(encoding: 'utf-8') do |xml|
         xml.entry('xmlns'     => 'http://www.w3.org/2005/Atom',
@@ -128,15 +144,19 @@ module Hatenablog
       @author_name = @document.at_css('author name').content
       @title       = @document.at_css('title').content
       @content     = @document.at_css('content').content
+      @formatted_content = @document.xpath('//hatena:formatted-content', hatena: 'http://www.hatena.ne.jp/info/xmlns#')[0]
+      @formatted_content = @formatted_content.content if @formatted_content
       @draft       = @document.at_css('entry app|control app|draft').content
       @categories  = parse_categories
-      unless @document.at_css('entry updated').nil?
+      if @document.at_css('entry updated')
         @updated = Time.parse(@document.at_css('entry updated').content)
+      else
+        @updated = nil
       end
     end
 
     def parse_categories
-      categories = @document.css('category').inject([]) do |categories, category|
+      categories = @document.css('category').inject(Array.new) do |categories, category|
         categories << category['term'].to_s
       end
       categories
@@ -151,7 +171,7 @@ module Hatenablog
       @document.at_css('entry app|control app|draft').content = @draft
 
       unless @updated.nil? || @document.at_css('entry updated').nil?
-        @document.at_css('entry updated').content = @updated.iso8601
+        @document.at_css('entry updated').content = @updated&.iso8601
       end
 
       unless @categories.nil?

data/lib/hatenablog/feed.rb

@@ -5,6 +5,7 @@ require 'hatenablog/entry'
 
 module Hatenablog
   class Feed
+    # @dynamic uri, next_uri, title, author_name, updated
     attr_reader :uri, :next_uri, :title, :author_name, :updated
 
     # Create a new blog feed from a XML string.
@@ -53,7 +54,7 @@ module Hatenablog
     end
 
     def parse_entry
-      @entries = @document.css('feed > entry').inject([]) do |entries, entry|
+      @entries = @document.css('feed > entry').inject(Array.new) do |entries, entry|
         # add namespace 'app' to recognize XML correctly
         entry['xmlns:app'] = 'http://www.w3.org/2007/app'
         entries << Hatenablog::Entry.load_xml(entry.to_s)

data/lib/hatenablog/requester.rb

@@ -96,7 +96,7 @@ module Hatenablog
       # @param [string] body HTTP request body
       # @param [string] headers HTTP request headers
       # @return [Net::HTTPResponse] HTTP response
-      def post(uri, body, headers = nil)
+      def post(uri, body, headers = {})
         request(uri, :post, body: body, headers: headers)
       end
 
@@ -105,7 +105,7 @@ module Hatenablog
       # @param [string] body HTTP request body
       # @param [string] headers HTTP request headers
       # @return [Net::HTTPResponse] HTTP response
-      def put(uri, body, headers = nil )
+      def put(uri, body, headers = {})
         request(uri, :put, body: body, headers: headers)
       end
 
@@ -113,22 +113,27 @@ module Hatenablog
       # @param [string] uri target URI
       # @param [string] headers HTTP request headers
       # @return [Net::HTTPResponse] HTTP response
-      def delete(uri, headers = nil)
+      def delete(uri, headers = {})
         request(uri, :delete, headers: headers)
       end
 
       private
-      def request(uri, method, body: nil, headers: nil)
+
+      def request(uri, method, body: nil, headers: {})
         uri = URI(uri)
-        req = METHODS[method].new(uri, headers)
+        req = METHODS[method].new(uri.to_s, headers)
         req.basic_auth @user_id, @api_key
         if body
           req.body = body
           req.content_type = ATOM_CONTENT_TYPE
         end
 
-        http = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.port == 443)
-        http.request(req)
+        http = Net::HTTP.new(uri.hostname, uri.port)
+        http.use_ssl = uri.port == 443
+        http.start do |conn|
+          conn.request(req)
+        end
+        
       rescue => problem
         raise RequestError, "Fail to #{method.upcase}: " + problem.to_s
       end

data/lib/hatenablog/version.rb

@@ -1,3 +1,3 @@
 module Hatenablog
-  VERSION = "0.5.1"
+  VERSION = "0.8.0"
 end

data/rbs_collection.lock.yaml

@@ -0,0 +1,36 @@
+---
+sources:
+- name: ruby/gem_rbs_collection
+  remote: https://github.com/ruby/gem_rbs_collection.git
+  revision: main
+  repo_dir: gems
+path: ".gem_rbs_collection"
+gems:
+- name: erb
+  version: '0'
+  source:
+    type: stdlib
+- name: net-http
+  version: '0'
+  source:
+    type: stdlib
+- name: set
+  version: '0'
+  source:
+    type: stdlib
+- name: time
+  version: '0'
+  source:
+    type: stdlib
+- name: uri
+  version: '0'
+  source:
+    type: stdlib
+- name: nokogiri
+  version: '1.11'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 88e86e0b67262f9ab6244a356e81dd9ca8c55b37
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems

data/rbs_collection.yaml

@@ -0,0 +1,36 @@
+# Download sources
+sources:
+  - name: ruby/gem_rbs_collection
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    revision: main
+    repo_dir: gems
+
+# A directory to install the downloaded RBSs
+path: .gem_rbs_collection
+
+gems:
+  # stdlibs
+  - name: erb
+  - name: net-http
+  - name: set
+  - name: time
+  - name: uri
+
+  # gems
+  - name: nokogiri
+
+  # not used
+  - name: activesupport
+    ignore: true
+  - name: ast
+    ignore: true
+  - name: listen
+    ignore: true
+  - name: parallel
+    ignore: true
+  - name: rainbow
+    ignore: true
+  - name: rbs
+    ignore: true
+  - name: steep
+    ignore: true

data/sig/hatenablog.rbs

@@ -0,0 +1,249 @@
+module Hatenablog
+  VERSION: String
+
+  class Category
+    @document: Nokogiri::XML::Document
+    @categories: Array[String]
+    @fixed: String
+
+    def self.load_xml: (String xml) -> Category
+
+    def categories: () -> Array[String]
+    def each: () -> Enumerator[untyped, self]
+            | () { (String) -> void } -> Array[String]
+    def fixed?: () -> bool
+
+    private
+
+    def initialize: (String xml) -> void
+    def parse_document: () -> void
+  end
+
+  class Client
+    DEFAULT_CONFIG_PATH: String
+    COLLECTION_URI: String
+    MEMBER_URI: String
+    CATEGORY_URI: String
+
+    @user_id: String
+    @blog_id: String
+
+    attr_writer requester: Requester::Basic | Requester::OAuth
+
+    def self.create: (?String config_file) -> Client
+                   | (?String config_file) { (Client) -> void } -> void
+
+    def initialize: (?Configuration config) ?{ (Configuration) -> void } -> void
+    def title: () -> String
+    def author_name: () -> String
+    def entries: (?Integer page) -> Entries
+    def all_entries: () -> Entries
+    def next_feed: (?Feed? feed) -> Feed?
+    def categories: () -> Array[String]
+    def get_entry: (String entry_id) -> Entry
+    def post_entry: (?String title, ?String content, ?Array[String] categories, ?String draft) -> Entry
+    def update_entry: (String entry_id, ?String title, ?String content, ?Array[String] categories, ?String draft, ?String updated) -> Entry
+    def delete_entry: (String entry_id) -> void
+    def collection_uri: (?String user_id, ?String blog_id) -> String
+    def member_uri: (String entry_id, ?String user_id, ?String blog_id) -> String
+    def category_doc_uri: (?String user_id, ?String blog_id) -> String
+    def entry_xml: (?String title, ?String content, ?Array[String] categories, ?String draft, ?String updated, ?String author_name) -> String
+
+    private
+
+    def get: (String uri) -> Net::HTTPResponse
+    def get_collection: (?String uri) -> Net::HTTPResponse
+    def get_category_doc: () -> Net::HTTPResponse
+    def post: (String entry_xml, ?String uri) -> Net::HTTPResponse
+    def put: (String entry_xml, String uri) -> Net::HTTPResponse
+    def delete: (String uri) -> Net::HTTPResponse
+  end
+
+  class Entries
+    include Enumerable[Entry]
+
+    @client: Client
+    @page: Integer
+    @fetch: :partial | :all
+
+    def initialize: (Client client, ?Integer page, ?(:partial | :all) fetch) -> void
+    def each: () -> Enumerator[untyped, self]
+            | () { (Entry) -> void } -> Entries
+
+    private
+
+    def each_all: () { (Entry) -> void } -> Entries
+    def each_partial: () { (Entry) -> void } -> Entries
+  end
+
+  class Configuration < OpenStruct
+    OAUTH_KEYS: [:consumer_key, :consumer_secret, :access_token, :access_token_secret, :user_id, :blog_id]
+    BASIC_KEYS: [:api_key, :user_id, :blog_id]
+
+    def self.create: (String) -> Configuration
+    def check_valid_or_raise: () -> Configuration
+
+    # attribute accessors allowed to define dynamically
+    def consumer_key: () -> untyped # String?
+    def consumer_secret: () -> untyped # String?
+    def access_token: () -> untyped # String?
+    def access_token_secret: () -> untyped # String?
+    def user_id: () -> String
+    def blog_id: () -> String
+    def api_key: () -> untyped # String?
+    def auth_type: () -> untyped # String?
+
+    private
+
+    def lacking_keys: () -> (Array[:consumer_key | :consumer_secret | :access_token | :access_token_secret | :user_id | :blog_id | :api_key | :user_id | :blog_id])
+  end
+
+  class ConfigurationError < StandardError
+  end
+
+  module AfterHook
+    def after_hook: (Symbol hook, *Symbol methods) -> Array[Symbol]
+
+    # methods hooked dynamically
+    def uri=: (String uri) -> untyped
+    def edit_uri=: (String uri) -> untyped
+    def author_name=: (String author_name) -> untyped
+    def title=: (String title) -> untyped
+    def content=: (String content) -> untyped
+    def updated=: (String date) -> untyped
+    def draft=: (String draft) -> untyped
+    def categories=: (Array[String] categories) -> untyped
+
+    # workaround for using `Module` instance methods in `after_hook`
+    def alias_method: (::Symbol | ::String new_name, ::Symbol | ::String old_name) -> ::Symbol
+    def define_method: (Symbol | String arg0, ?Proc | Method | UnboundMethod arg1) -> Symbol
+                     | (Symbol | String arg0) { () -> untyped } -> Symbol
+    def instance_methods: (?boolish include_super) -> ::Array[Symbol]
+  end
+
+  class Entry
+    extend AfterHook
+
+    @document: Nokogiri::XML::Document
+    @formatted_content: untyped
+
+    attr_accessor uri: String
+    attr_accessor author_name: String
+    attr_accessor title: String
+    attr_accessor content: String
+    attr_accessor draft: String
+
+    attr_reader edit_uri: String
+    attr_reader id: String?
+    attr_reader updated : Time?
+
+    attr_writer categories: Array[String]
+
+    def self.load_xml: (String xml) -> Entry
+    def self.create: (?uri: String, ?edit_uri: String, ?author_name: String, ?title: String, ?content: String, ?draft: String, ?categories: Array[String], ?updated: String) ?{ (Entry) -> void } -> Entry
+    def self.build_xml: (String uri, String edit_uri, String author_name, String title, String content, String draft, Array[String]? categories, String? updated) -> String
+
+    def updated=: (String date) -> Time?
+    def edit_uri=: (String uri) -> void
+    def draft?: () -> bool
+    def categories: () -> Array[String]
+    def each_category: () { (String) -> void } -> Array[String]
+    def to_xml: () -> String
+    def formatted_content: () -> untyped # result of Nokogiri::XML::NodeSet#[]
+
+    private
+
+    def initialize: (String xml) -> void
+    def parse_document: () -> void
+    def parse_categories: () -> Array[untyped]
+    def update_xml: () -> void
+    def categories_modified?: (Nokogiri::XML::NodeSet old_categories, Array[String] new_categories) -> bool
+  end
+
+  class Feed
+    @document: Nokogiri::XML::Document
+    @entries: Array[Entry]
+
+    attr_reader uri: String
+    attr_reader next_uri: String
+    attr_reader title: String
+    attr_reader author_name: String
+    attr_reader updated: Time
+
+    def self.load_xml: (String xml) -> Feed
+
+    def entries: () -> Array[Entry]
+    def each_entry: () { (Entry) -> void } -> Array[Entry]
+    def has_next?: () -> bool
+
+    private
+
+    def initialize: (String xml) -> void
+    def parse_document: () -> void
+    def parse_entry: () -> void
+  end
+
+  module Requester
+    ATOM_CONTENT_TYPE: String
+    DEFAULT_HEADER: Hash[String, String]
+
+    def self.create: (Configuration config) -> (Basic | OAuth)
+
+    class RequestError < StandardError
+    end
+
+    class OAuth
+      @access_token: ::OAuth::AccessToken
+
+      def initialize: (::OAuth::AccessToken access_token) -> void
+      def get: (String uri) -> Net::HTTPResponse
+      def post: (String uri, ?String body, ?Hash[String, String] headers) -> Net::HTTPResponse
+      def put: (String uri, ?String body, ?Hash[String, String] headers) -> Net::HTTPResponse
+      def delete: (String uri, ?Hash[String, String] headers) -> Net::HTTPResponse
+
+      private
+
+      def request: (:get | :post | :put | :delete method, String uri, ?body: String?, ?headers: Hash[String, String]?) -> Net::HTTPResponse
+    end
+
+    class Basic
+      METHODS: {get: singleton(Net::HTTP::Get), post: singleton(Net::HTTP::Post), put: singleton(Net::HTTP::Put), delete: singleton(Net::HTTP::Delete)}
+
+      @user_id: String
+      @api_key: String
+
+      def initialize: (String user_id, String api_key) -> void
+      def get: (String uri) -> Net::HTTPResponse
+      def post: (String uri, String body, ?Hash[String, String] headers) -> Net::HTTPResponse
+      def put: (String uri, String body, ?Hash[String, String] headers) -> Net::HTTPResponse
+      def delete: (String uri, ?Hash[String, String] headers) -> Net::HTTPResponse
+
+      private
+
+      def request: (String uri, :get | :post | :put | :delete method, ?body: String?, ?headers: Hash[String, String]) -> Net::HTTPResponse
+    end
+  end
+end
+
+# polyfill for ostruct
+class OpenStruct
+  def initialize: (?Hash[untyped, untyped]? hash) -> OpenStruct
+  def []: (String | Symbol) -> Object
+  def to_h: -> Hash[Symbol, Object]
+end
+
+# polyfill for oauth
+module OAuth
+  class AccessToken
+    def initialize: (untyped, untyped, ?untyped) -> void
+  end
+
+  class Consumer
+    def initialize: (untyped, untyped, ?untyped) -> void
+  end
+end
+
+# polyfill for yaml
+module YAML
+  def self.load: (String yaml, ?String? filename, ?fallback: bool, ?symbolize_names: bool) -> untyped
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hatenablog
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Kohei Yamamoto
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,19 +126,21 @@ description: Hatenablog AtomPub API library
 email:
 - kymmt90@gmail.com
 executables:
-- get_access_token
+- get_hatena_oauth_access_token
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- Steepfile
 - bin/console
 - bin/setup
-- exe/get_access_token
+- exe/get_hatena_oauth_access_token
 - hatenablog.gemspec
 - lib/hatenablog.rb
 - lib/hatenablog/category.rb
@@ -148,11 +150,14 @@ files:
 - lib/hatenablog/feed.rb
 - lib/hatenablog/requester.rb
 - lib/hatenablog/version.rb
+- rbs_collection.lock.yaml
+- rbs_collection.yaml
+- sig/hatenablog.rbs
 homepage: https://github.com/kymmt90/hatenablog
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,16 +165,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Hatenablog AtomPub API library
 test_files: []

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-env:
-  - TZ=Asia/Tokyo
-addons:
-  code_climate:
-    repo_token: 309cf0784d00d2a6009566d28be111a8a0280cdeb2da280225eedf577b16beb5
-after_success:
-  - bundle exec codeclimate-test-reporter