itest5ch 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c541a98e77de8fb2fbdf1e8053fe17701115e8b2ffb20a46a56d3927a5e02cb
-  data.tar.gz: 98be41ebe60e8d3cc30c2334d1dd05003f10864e039d8511413d32d8ccb84ad6
+  metadata.gz: 86a8195d9e6ada1f2c79881c16c2c8cebaa8b0e5ecfaaee7cba362b37b690186
+  data.tar.gz: 7706d01fbd21c45d087bb2a246821fdb7144d91bb7b29811431b7a2d9109eb99
 SHA512:
-  metadata.gz: b7133eda1d48f3a1fc852ae5d4b3e4567e442e50afe4f441578fb7376371945643a682949c36decfe41e78699edf5a603d01fee4fa6bcc563e5ab6bcd1d0a32a
-  data.tar.gz: dcf94763f4d7cbc7850263e1207ccfcfcdcb365f1a6f90a8053c82e546bf70a11ec78fd4244d6ecb365f74c53b08ca7e4a77e0dd19ecd9a53fff6406be638e0f
+  metadata.gz: 43681bd069b97857699bd6f20ca707e38bda2b03955dbad3c82d4942e30ee02530e095a84e00b1c8ff3ad0a7a9d48115b41fff6fe2cf3b68d14c1e37d27fc00f
+  data.tar.gz: 9f83f6bd52b8096e497e8f44ea4a5094f402b65f711a6a0344fc281c9a92f537e0bb8678181553f11d0a6a4d23787a8cebe9c373868ed14e6756b2a3c399f248

data/.circleci/config.yml

@@ -2,115 +2,80 @@
 #
 # Check https://circleci.com/docs/2.0/language-ruby/ for more details
 #
-version: 2
-
-default: &default
-  docker:
-    - image: ruby
-  environment:
-    # c.f. https://github.com/ffaker/ffaker/issues/277#issuecomment-263519146
-    LANG:     en_US.UTF-8
-    LANGUAGE: en_US.UTF-8
-    LC_ALL:   C.UTF-8
-
-    BUNDLE_PATH: vendor/bundle
-    BUNDLE_JOBS: 4
-
-  working_directory: ~/app
-
-restore_repo_cache_option: &restore_repo_cache_option
-  key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
-
-save_repo_cache_option: &save_repo_cache_option
-  key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
-  paths:
-    - ~/app
-
-restore_bundle_cache_option: &restore_bundle_cache_option
-  keys:
-    - v3-bundle-{{ .Environment.CIRCLE_JOB }}-{{ checksum "itest5ch.gemspec" }}
-    - v3-bundle-{{ .Environment.CIRCLE_JOB }}
-
-save_bundle_cache_option: &save_bundle_cache_option
-  key: v3-bundle-{{ .Environment.CIRCLE_JOB }}-{{ checksum "itest5ch.gemspec" }}
-  paths:
-    - ~/app/vendor/bundle
-    - ~/app/Gemfile.lock
-
-rspec_steps: &rspec_steps
-  - restore_cache:
-      <<: *restore_repo_cache_option
-  - restore_cache:
-      <<: *restore_bundle_cache_option
-  - run: ./.circleci/setup.sh
-  - save_cache:
-      <<: *save_bundle_cache_option
-
-  - run: bundle exec rspec
-
-build_jobs: &build_jobs
-  - checkout_code
-  - rspec:2.3:
-      requires:
-        - checkout_code
-  - rspec:2.4:
-      requires:
-        - checkout_code
-  - rspec:2.5:
-      requires:
-        - checkout_code
-  - rubocop:
-      requires:
-        - checkout_code
+version: 2.1
+
+orbs:
+  codeclimate: sue445/codeclimate@volatile
+  ruby-orbs:   sue445/ruby-orbs@volatile
+
+executors:
+  ruby:
+    parameters:
+      tag:
+        type: string
+        default: "latest"
+    docker:
+      - image: ruby:<< parameters.tag >>
+    environment:
+      # c.f. https://github.com/ffaker/ffaker/issues/277#issuecomment-263519146
+      LANG:     en_US.UTF-8
+      LANGUAGE: en_US.UTF-8
+      LC_ALL:   C.UTF-8
+
+      BUNDLE_PATH: vendor/bundle
+      BUNDLE_JOBS: 4
+      CC_TEST_REPORTER_ID: d91e7c9665019f1574eb4c5a3de1547c80bc3062e3c297282f106501a3c5c694
+    working_directory: ~/app
 
 jobs:
-  checkout_code:
-    <<: *default
-
+  rspec:
+    parameters:
+      version:
+        type: string
+    executor:
+      name: ruby
+      tag: << parameters.version >>
     steps:
       - checkout
-
-      - save_cache:
-          <<: *save_repo_cache_option
-
-  rspec:2.3:
-    <<: *default
-
-    docker:
-      - image: ruby:2.3
-
-    steps: *rspec_steps
-
-  rspec:2.4:
-    <<: *default
-
-    docker:
-      - image: ruby:2.4
-
-    steps: *rspec_steps
-
-  rspec:2.5:
-    <<: *default
-
-    docker:
-      - image: ruby:2.5
-
-    steps: *rspec_steps
+      - run: ruby --version
+      - run: bundle --version
+      - run: gem --version
+      - ruby-orbs/bundle-install:
+          cache_key_prefix: "v2-rspec"
+          with_gemfile_lock: false
+          gemspec_name: "itest5ch"
+          update_always: true
+      - codeclimate/with-cc-test-reporter:
+          after_build_args: "--coverage-input-type simplecov"
+          steps:
+            - run: bundle exec rspec
 
   rubocop:
-    <<: *default
+    executor:
+      name: ruby
 
     steps:
-      - restore_cache:
-          <<: *restore_repo_cache_option
-      - restore_cache:
-          <<: *restore_bundle_cache_option
-      - run: ./.circleci/setup.sh
-      - save_cache:
-          <<: *save_bundle_cache_option
+      - checkout
+      - ruby-orbs/bundle-install:
+          cache_key_prefix: "v2-rubocop"
+          with_gemfile_lock: false
+          gemspec_name: "itest5ch"
+          update_always: true
 
       - run: bundle exec rubocop
 
+build_jobs: &build_jobs
+  - rspec:
+      name:    "rspec:2.5"
+      version: "2.5"
+  - rspec:
+      name:    "rspec:2.6"
+      version: "2.6"
+  - rspec:
+      name:    "rspec:2.7"
+      version: "2.7"
+  - rubocop
+
 workflows:
   version: 2
 

data/.rubocop.yml

@@ -4,11 +4,16 @@ inherit_gem:
     - "config/rspec.yml"
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   # uncomment if use rails cops
   # TargetRailsVersion: 5.1
 
-require: rubocop-rspec
+require:
+  - rubocop-performance
+  - rubocop-rspec
+
+Layout/HashAlignment:
+  EnforcedColonStyle: table
 
 RSpec/FilePath:
   Exclude:

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## master
-[full changelog](http://github.com/sue445/itest5ch/compare/v1.0.0...master)
+[full changelog](http://github.com/sue445/itest5ch/compare/v2.0.0...master)
+
+## v2.0.0
+[full changelog](http://github.com/sue445/itest5ch/compare/v1.0.0...v2.0.0)
+
+### BREAKING CHANGES :bomb:
+* Drop support ruby 2.3 and 2.4
+  * https://github.com/sue445/itest5ch/pull/66
+
+### House Keeping
+* CI against Ruby 2.7
+  * https://github.com/sue445/itest5ch/pull/65
+* Upgrade rubocop
+  * https://github.com/sue445/itest5ch/pull/67
 
 ## v1.0.0
 * first release

data/Gemfile

@@ -4,3 +4,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in itest5ch.gemspec
 gemspec
+
+group :development do
+  gem "onkcop", github: "sue445/onkcop", require: false, branch: "develop"
+end

data/README.md

@@ -2,7 +2,10 @@
 
 5ch (a.k.a. 2ch) reader via http://itest.5ch.net/
 
-[![CircleCI](https://circleci.com/gh/sue445/itest5ch/tree/master.svg?style=svg&circle-token=6424acab43b6dd71c3e09619ff7bb2e9b5611aa0)](https://circleci.com/gh/sue445/itest5ch/tree/master)
+[![Gem Version](https://badge.fury.io/rb/itest5ch.svg)](https://badge.fury.io/rb/itest5ch)
+[![CircleCI](https://circleci.com/gh/sue445/itest5ch/tree/master.svg)](https://circleci.com/gh/sue445/itest5ch/tree/master)
+[![Coverage Status](https://coveralls.io/repos/github/sue445/itest5ch/badge.svg)](https://coveralls.io/github/sue445/itest5ch)
+[![Maintainability](https://api.codeclimate.com/v1/badges/14a81b3f7da11e475242/maintainability)](https://codeclimate.com/github/sue445/itest5ch/maintainability)
 
 ## Installation
 

data/itest5ch.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "itest5ch/version"
@@ -21,22 +20,25 @@ 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.5.0"
+
   spec.add_dependency "hpricot"
   spec.add_dependency "htmlentities"
 
   spec.add_development_dependency "activesupport"
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", ">= 1.16"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "onkcop", "0.53.0.0"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "retryable"
+  spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-parameterized"
-  spec.add_development_dependency "rubocop", "0.53.0"
-  spec.add_development_dependency "rubocop-rspec", "1.25.1"
+  spec.add_development_dependency "rubocop", "0.78.0"
+  spec.add_development_dependency "rubocop-performance", "1.5.2"
+  spec.add_development_dependency "rubocop-rspec", "1.37.1"
+  spec.add_development_dependency "rubocop_auto_corrector"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "unparser", ">= 0.4.5"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "yard"
 end

data/lib/itest5ch/board_list_page.rb

@@ -12,7 +12,6 @@ module Itest5ch
 
       doc.search("//div[@id='bbsmenu']//ul[@class='pure-menu-list']").
         reject {|ul| ul["id"] == "history" }.each_with_object({}) do |ul, categories|
-
         category_name = ul.at("/li[@class='pure-menu-item pure-menu-selected']").inner_text.strip
         categories[category_name] = get_boards(ul)
       end
@@ -20,20 +19,20 @@ module Itest5ch
 
     private
 
-      def get_boards(ul)
-        ul.search("/li").select {|li| board_element?(li) }.each_with_object([]) do |li, boards|
-          url = URI.join(BOARDS_URL, li.at("/a")["href"]).to_s
-          name = li.inner_text.strip
+    def get_boards(ul)
+      ul.search("/li").select {|li| board_element?(li) }.each_with_object([]) do |li, boards|
+        url = URI.join(BOARDS_URL, li.at("/a")["href"]).to_s
+        name = li.inner_text.strip
 
-          boards << Board.new(url, name: name)
-        end
+        boards << Board.new(url, name: name)
       end
+    end
 
-      def board_element?(li)
-        return false unless li["class"].include?("pure-menu-item")
-        return false if li["class"].include?("pure-menu-selected")
+    def board_element?(li)
+      return false unless li["class"].include?("pure-menu-item")
+      return false if li["class"].include?("pure-menu-selected")
 
-        true
-      end
+      true
+    end
   end
 end

data/lib/itest5ch/http_methods.rb

@@ -12,7 +12,7 @@ module Itest5ch
       options["User-Agent"] = Itest5ch.config.user_agent if Itest5ch.config.user_agent
       options["Referer"] = referer if referer
 
-      open(url, options).read # rubocop:disable Security/Open
+      URI.open(url, options).read
     end
 
     # @param url [String]

data/lib/itest5ch/thread.rb

@@ -119,55 +119,55 @@ module Itest5ch
 
     private
 
-      # @param hash [Hash]
-      def initialize_with_hash(hash)
-        assert_required_keys!(hash, :subdomain, :board, :dat)
-
-        @subdomain = hash[:subdomain]
-        @board     = hash[:board]
-        @dat       = hash[:dat]
-        @name      = hash[:name]
-      end
+    # @param hash [Hash]
+    def initialize_with_hash(hash)
+      assert_required_keys!(hash, :subdomain, :board, :dat)
+
+      @subdomain = hash[:subdomain]
+      @board     = hash[:board]
+      @dat       = hash[:dat]
+      @name      = hash[:name]
+    end
 
-      # @param url [String]
-      def initialize_with_string(url)
-        if (m = url.match(%r{https?://itest\.5ch\.net/(.+)/test/read\.cgi/([^/]+)/([0-9]+)}))
-          @subdomain = m[1]
-          @board     = m[2]
-          @dat       = m[3].to_i
-          return
-        end
-
-        if (m = url.match(%r{https?://(.+)\.5ch\.net/test/read\.cgi/([^/]+)/([0-9]+)}))
-          @subdomain = m[1]
-          @board     = m[2]
-          @dat       = m[3].to_i
-          return
-        end
-
-        raise ArgumentError, "'#{url}' is invalid url format"
+    # @param url [String]
+    def initialize_with_string(url)
+      if (m = url.match(%r{https?://itest\.5ch\.net/(.+)/test/read\.cgi/([^/]+)/([0-9]+)}))
+        @subdomain = m[1]
+        @board     = m[2]
+        @dat       = m[3].to_i
+        return
       end
 
-      # @return [Hash]
-      def fetch_data
-        get_json(json_url, referer: smartphone_url)
+      if (m = url.match(%r{https?://(.+)\.5ch\.net/test/read\.cgi/([^/]+)/([0-9]+)}))
+        @subdomain = m[1]
+        @board     = m[2]
+        @dat       = m[3].to_i
+        return
       end
 
-      # @return [String] random 10 char string
-      def rand
-        SecureRandom.hex(5)
-      end
+      raise ArgumentError, "'#{url}' is invalid url format"
+    end
+
+    # @return [Hash]
+    def fetch_data
+      get_json(json_url, referer: smartphone_url)
+    end
 
-      # @param unixtime [Integer]
-      #
-      # @return [ActiveSupport::TimeWithZone] When `Time.zone` is initialized
-      # @return [Time] When `Time.zone` is not initialized or without activesupport
-      def time_at(unixtime)
-        if Time.respond_to?(:zone) && Time.zone.respond_to?(:at)
-          Time.zone.at(unixtime)
-        else
-          Time.at(unixtime)
-        end
+    # @return [String] random 10 char string
+    def rand
+      SecureRandom.hex(5)
+    end
+
+    # @param unixtime [Integer]
+    #
+    # @return [ActiveSupport::TimeWithZone] When `Time.zone` is initialized
+    # @return [Time] When `Time.zone` is not initialized or without activesupport
+    def time_at(unixtime)
+      if Time.respond_to?(:zone) && Time.zone.respond_to?(:at)
+        Time.zone.at(unixtime)
+      else
+        Time.at(unixtime)
       end
+    end
   end
 end

data/lib/itest5ch/version.rb

@@ -1,3 +1,3 @@
 module Itest5ch
-  VERSION = "1.0.0".freeze
+  VERSION = "2.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itest5ch
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2020-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
@@ -56,14 +56,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: onkcop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.53.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.53.0.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -110,32 +96,18 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: retryable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -184,28 +156,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.78.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.78.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 1.37.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 1.37.1
+- !ruby/object:Gem::Dependency
+  name: rubocop_auto_corrector
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unparser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +270,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
-- ".circleci/setup.sh"
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
@@ -291,15 +304,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: 5ch (a.k.a. 2ch) reader via itest.5ch.net

data/.circleci/setup.sh

@@ -1,8 +0,0 @@
-#!/bin/bash -xe
-
-ruby --version
-bundle --version
-gem --version
-
-bundle update
-bundle clean