miyabi 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76bf59a957c90d9f6df20eda03f8db7e9847bb0c509fe25c2c71550b49d9ce5b
-  data.tar.gz: b150b5eb7b8b4d33dad208156c6f9507e48a6162722f04d5b21c8f10bc27db92
+  metadata.gz: ff4cce51bc6a0dd5533d754d2df91cb70b79bacf43fef0d8bb543894931118a9
+  data.tar.gz: 5523168b8206d1fa59601abb7ce23c5886de7b5948fa0820dac28c96a5b4570f
 SHA512:
-  metadata.gz: 155682d907e72f54cc2b8f13c7582a62b34c5cd0270b36479d31a3ba22714b0fa628b977f2a84ecee7781c471447ea6c785aac6cf8f834498497f694a0edaa20
-  data.tar.gz: 801e29a7233f90a7f3b241e67137963ef370830c947aa88d7e143f79db3f72c20d051a5bd731286729031dcfffab42bd96278923ba910b7483b6894479b5f6bc
+  metadata.gz: 1acb6a56705b8f019171b624c1f68b78a2328118e0726cb054f10f19084c053f19722f65a0fc88b474a51e6c36b5cb22b36f193655a4f4049a8b10bd8c6241b7
+  data.tar.gz: 56c8c59c54ef513ffee048bd4342b79e7e4847b74ef639a11fe2613a53ba519ce96f7e45f3080e3abe5fe308579dc2ed40be621c24e275aec89727c43c017f42

data/.rubocop.yml

@@ -0,0 +1,18 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.0
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: never
+
+Style/MutableConstant:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,28 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2023-05-13 02:36:18 UTC using RuboCop version 1.50.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 5
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/check.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowedConstants.
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/check.rb'
+    - 'lib/format.rb'
+    - 'lib/miyabi.rb'

data/CHANGELOG.md

@@ -9,11 +9,30 @@ The format is based on [Keep a Changelog][cl], and this project adheres to [Sema
 
 ## [Unreleased]
 
+## [0.2.1]
+
+### Fixed
+
+* `Miyabi::FormatString#to_roman`
+  * to properly handle two chars conversions.
+  * add 'ー' to '-' conversion.
+
+## [0.2.0]
+
+Trivial changes:
+
+* Use net/http and Nokogiri instead of Mechanize.
+
+### Added
+
+* modules to provide instance methods for `String`: `Miyabi::CheckString` and `Miyabi::FormatString`
+
 ## [0.1.2]
 
 Trivial changes:
 
 * Added this changelog file.
+* Lint Ruby sources with RuboCop.
 
 ### Fixed
 

data/Gemfile

@@ -1,3 +1,3 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gemspec
+gemspec

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "miyabi"
+require 'bundler/setup'
+require 'miyabi'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "miyabi"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/check.rb

@@ -1,26 +1,5 @@
-class String
-  def is_hira?
-    return true if self =~ /\p{hiragana}/
-    false
-  end
-
-  def is_japanese?
-    return true if self =~ /\A(?:\p{Hiragana}|\p{Katakana}|[ー－]|[一-龠々])+\z/
-    false
-  end
-
-  def is_kana?
-    return true if self =~ /\p{katakana}/
-    false
-  end
+require_relative "miyabi/check_string"
 
-  def is_kanji?
-    return true if self =~ /^[一-龥]+$/
-    false
-  end
-
-  def is_roman?
-    return true if self =~ /^[a-zA-Z]+$/
-    false
-  end
-end
+class String
+  include ::Miyabi::CheckString
+end

data/lib/format.rb

@@ -1,145 +1,5 @@
-require 'mechanize'
-class String
-  def to_kanhira
-    agent = Mechanize.new
-    agent.get("https://yomikatawa.com/kanji/#{self}").search('#yomikata tbody tr td').first.inner_text
-  end
-
-  def to_kana
-    self.tr('ぁ-ん','ァ-ン')
-  end
-
-  def to_hira
-    self.tr('ァ-ン','ぁ-ん')
-  end
-
-  def to_roman
-    s = self.to_kana
-    s.gsub(/[#{s}]/, kana_roman)
-  end
-
-  private
-  def kana_roman
-    {
-      'ア' => 'a',
-      'イ' => 'i',
-      'ウ' => 'u',
-      'エ' => 'e',
-      'オ' => 'o',
-      'カ' => 'ka',
-      'キ' => 'ki',
-      'ク' => 'ku',
-      'ケ' => 'ke',
-      'コ' => 'ko',
-      'サ' => 'sa',
-      'シ' => 'shi',
-      'ス' => 'su',
-      'セ' => 'se',
-      'ソ' => 'so',
-      'タ' => 'ta',
-      'チ' => 'chi',
-      'ツ' => 'tsu',
-      'テ' => 'te',
-      'ト' => 'to',
-      'ナ' => 'na',
-      'ニ' => 'ni',
-      'ヌ' => 'nu',
-      'ネ' => 'ne',
-      'ノ' => 'no',
-      'ハ' => 'ha',
-      'ヒ' => 'hi',
-      'フ' => 'fu',
-      'ヘ' => 'he',
-      'ホ' => 'ho',
-      'マ' => 'ma',
-      'ミ' => 'mi',
-      'ム' => 'mu',
-      'メ' => 'me',
-      'モ' => 'mo',
-      'ヤ' => 'ya',
-      'ユ' => 'yu',
-      'ヨ' => 'yo',
-      'ラ' => 'ra',
-      'リ' => 'ri',
-      'ル' => 'ru',
-      'レ' => 're',
-      'ロ' => 'ro',
-      'ワ' => 'wa',
-      'ヰ' => 'i',
-      'ヱ' => 'e',
-      'ヲ' => 'o',
-      'ン' => 'n',
-      'ガ' => 'ga',
-      'ギ' => 'gi',
-      'グ' => 'gu',
-      'ゲ' => 'ge',
-      'ゴ' => 'go',
-      'ザ' => 'za',
-      'ジ' => 'ji',
-      'ズ' => 'zu',
-      'ゼ' => 'ze',
-      'ゾ' => 'zo',
-      'ダ' => 'da',
-      'ヂ' => 'ji',
-      'ヅ' => 'zu',
-      'デ' => 'de',
-      'ド' => 'do',
-      'バ' => 'ba',
-      'ビ' => 'bi',
-      'ブ' => 'bu',
-      'ベ' => 'be',
-      'ボ' => 'bo',
-      'パ' => 'pa',
-      'ピ' => 'pi',
-      'プ' => 'pu',
-      'ペ' => 'pe',
-      'ポ' => 'po',
-      'キャ' => 'kya',
-      'キュ' => 'kyu',
-      'キョ' => 'kyo',
-      'シャ' => 'sha',
-      'シュ' => 'shu',
-      'ショ' => 'sho',
-      'チャ' => 'cha',
-      'チュ' => 'chu',
-      'チョ' => 'cho',
-      'ヂャ' => 'ja',
-      'ヂュ' => 'ju',
-      'ヂョ' => 'jo',
-      'ニャ' => 'nya',
-      'ニュ' => 'nyu',
-      'ニョ' => 'nyo',
-      'ヒャ' => 'hya',
-      'ヒュ' => 'hyu',
-      'ヒョ' => 'hyo',
-      'ミャ' => 'mya',
-      'ミュ' => 'myu',
-      'ミョ' => 'myo',
-      'リャ' => 'rya',
-      'リュ' => 'ryu',
-      'リョ' => 'ryo',
-      'ギャ' => 'gya',
-      'ギュ' => 'gyu',
-      'ギョ' => 'gyo',
-      'ジャ' => 'ja',
-      'ジュ' => 'ju',
-      'ジョ' => 'jo',
-      'ビャ' => 'bya',
-      'ビュ' => 'byu',
-      'ビョ' => 'byo',
-      'ピャ' => 'pya',
-      'ピュ' => 'pyu',
-      'ピョ' => 'pyo',
-      'ヴァ' => 'va',
-      'ヴィ' => 'vi',
-      'ヴ' => 'vu',
-      'ヴェ' => 've',
-      'ヴォ' => 'vo',
-      'ファ' => 'fa',
-      'フィ' => 'fi',
-      'フェ' => 'fe',
-      'フォ' => 'fo',
-    }
-  end
+require_relative "miyabi/format_string"
 
+class String
+  include ::Miyabi::FormatString
 end

data/lib/miyabi/check_string.rb

@@ -0,0 +1,28 @@
+module Miyabi
+  module CheckString
+    def is_hira?
+      return true if self =~ /\p{hiragana}/
+      false
+    end
+
+    def is_japanese?
+      return true if self =~ /\A(?:\p{Hiragana}|\p{Katakana}|[ー－]|[一-龠々])+\z/
+      false
+    end
+
+    def is_kana?
+      return true if self =~ /\p{katakana}/
+      false
+    end
+
+    def is_kanji?
+      return true if self =~ /^[一-龥]+$/
+      false
+    end
+
+    def is_roman?
+      return true if self =~ /^[a-zA-Z]+$/
+      false
+    end
+  end
+end

data/lib/miyabi/format_string.rb

@@ -0,0 +1,155 @@
+require 'net/http'
+require 'nokogiri'
+
+module Miyabi
+  module FormatString
+    def to_kanhira
+      http = Net::HTTP.new('yomikatawa.com', 443)
+      http.use_ssl = true
+      path = File.join('/kanji', self)
+      html = http.get(path).body
+      Nokogiri::HTML(html).search('#yomikata tbody tr td').first.inner_text
+    end
+
+    def to_kana
+      self.tr('ぁ-ん','ァ-ン')
+    end
+
+    def to_hira
+      self.tr('ァ-ン','ぁ-ん')
+    end
+
+    def to_roman
+      s = to_kana
+      KATAKANA_TO_ROMAN_MAPPING.each do |kana, roman|
+        s.gsub!(kana, roman)
+      end
+      s
+    end
+
+    KATAKANA_TO_ROMAN_MAPPING =
+      {
+        'キャ' => 'kya',
+        'キュ' => 'kyu',
+        'キョ' => 'kyo',
+        'シャ' => 'sha',
+        'シュ' => 'shu',
+        'ショ' => 'sho',
+        'チャ' => 'cha',
+        'チュ' => 'chu',
+        'チョ' => 'cho',
+        'ヂャ' => 'ja',
+        'ヂュ' => 'ju',
+        'ヂョ' => 'jo',
+        'ニャ' => 'nya',
+        'ニュ' => 'nyu',
+        'ニョ' => 'nyo',
+        'ヒャ' => 'hya',
+        'ヒュ' => 'hyu',
+        'ヒョ' => 'hyo',
+        'ミャ' => 'mya',
+        'ミュ' => 'myu',
+        'ミョ' => 'myo',
+        'リャ' => 'rya',
+        'リュ' => 'ryu',
+        'リョ' => 'ryo',
+        'ギャ' => 'gya',
+        'ギュ' => 'gyu',
+        'ギョ' => 'gyo',
+        'ジャ' => 'ja',
+        'ジュ' => 'ju',
+        'ジョ' => 'jo',
+        'ビャ' => 'bya',
+        'ビュ' => 'byu',
+        'ビョ' => 'byo',
+        'ピャ' => 'pya',
+        'ピュ' => 'pyu',
+        'ピョ' => 'pyo',
+        'ヴァ' => 'va',
+        'ヴィ' => 'vi',
+        'ヴェ' => 've',
+        'ヴォ' => 'vo',
+        'ファ' => 'fa',
+        'フィ' => 'fi',
+        'フェ' => 'fe',
+        'フォ' => 'fo',
+        'ア' => 'a',
+        'イ' => 'i',
+        'ウ' => 'u',
+        'エ' => 'e',
+        'オ' => 'o',
+        'カ' => 'ka',
+        'キ' => 'ki',
+        'ク' => 'ku',
+        'ケ' => 'ke',
+        'コ' => 'ko',
+        'サ' => 'sa',
+        'シ' => 'shi',
+        'ス' => 'su',
+        'セ' => 'se',
+        'ソ' => 'so',
+        'タ' => 'ta',
+        'チ' => 'chi',
+        'ツ' => 'tsu',
+        'テ' => 'te',
+        'ト' => 'to',
+        'ナ' => 'na',
+        'ニ' => 'ni',
+        'ヌ' => 'nu',
+        'ネ' => 'ne',
+        'ノ' => 'no',
+        'ハ' => 'ha',
+        'ヒ' => 'hi',
+        'フ' => 'fu',
+        'ヘ' => 'he',
+        'ホ' => 'ho',
+        'マ' => 'ma',
+        'ミ' => 'mi',
+        'ム' => 'mu',
+        'メ' => 'me',
+        'モ' => 'mo',
+        'ヤ' => 'ya',
+        'ユ' => 'yu',
+        'ヨ' => 'yo',
+        'ラ' => 'ra',
+        'リ' => 'ri',
+        'ル' => 'ru',
+        'レ' => 're',
+        'ロ' => 'ro',
+        'ワ' => 'wa',
+        'ヰ' => 'i',
+        'ヱ' => 'e',
+        'ヲ' => 'o',
+        'ン' => 'n',
+        'ガ' => 'ga',
+        'ギ' => 'gi',
+        'グ' => 'gu',
+        'ゲ' => 'ge',
+        'ゴ' => 'go',
+        'ザ' => 'za',
+        'ジ' => 'ji',
+        'ズ' => 'zu',
+        'ゼ' => 'ze',
+        'ゾ' => 'zo',
+        'ダ' => 'da',
+        'ヂ' => 'ji',
+        'ヅ' => 'zu',
+        'デ' => 'de',
+        'ド' => 'do',
+        'バ' => 'ba',
+        'ビ' => 'bi',
+        'ブ' => 'bu',
+        'ベ' => 'be',
+        'ボ' => 'bo',
+        'パ' => 'pa',
+        'ピ' => 'pi',
+        'プ' => 'pu',
+        'ペ' => 'pe',
+        'ポ' => 'po',
+        'ヴ' => 'vu',
+        'ー' => '-',
+      }
+
+    private_constant :KATAKANA_TO_ROMAN_MAPPING
+  end
+end

data/lib/miyabi/version.rb

@@ -1,3 +1,3 @@
 module Miyabi
-  VERSION = "0.1.2"
+  VERSION = '0.2.1'
 end

data/lib/miyabi.rb

@@ -1,6 +1,6 @@
-require "miyabi/version"
-require "format"
-require "check"
+require_relative 'miyabi/version'
+require_relative 'format'
+require_relative 'check'
 
 module Miyabi
 end

data/miyabi.gemspec

@@ -1,26 +1,25 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "miyabi/version"
+require 'miyabi/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "miyabi"
+  spec.name          = 'miyabi'
   spec.version       = Miyabi::VERSION
-  spec.authors       = ["Hironori Akaishi"]
-  spec.email         = ["ah.gm3622@gmail.com"]
+  spec.authors       = ['Hironori Akaishi']
+  spec.email         = ['ah.gm3622@gmail.com']
 
-  spec.summary       = %q{kana,hira,kanji formatter}
-  spec.description   = %q{Format Japanese characters}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.summary       = 'kana,hira,kanji formatter'
+  spec.description   = 'Format Japanese characters'
+  spec.homepage      = 'https://github.com/isy/miyabi'
+  spec.license       = 'MIT'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "rspec", "~> 3.12"
-  spec.add_dependency "mechanize", "~> 2.9"
+  spec.required_ruby_version = '>= 3.0'
+  spec.add_dependency 'nokogiri', '~> 1.14'
+  spec.add_development_dependency 'rspec', '~> 3.12'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: miyabi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Hironori Akaishi
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
+        version: '1.14'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :runtime
+        version: '3.12'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.12'
 description: Format Japanese characters
 email:
 - ah.gm3622@gmail.com
@@ -47,6 +47,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -59,12 +61,15 @@ files:
 - lib/check.rb
 - lib/format.rb
 - lib/miyabi.rb
+- lib/miyabi/check_string.rb
+- lib/miyabi/format_string.rb
 - lib/miyabi/version.rb
 - miyabi.gemspec
-homepage: ''
+homepage: https://github.com/isy/miyabi
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -73,14 +78,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: kana,hira,kanji formatter