german_numbers 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c69a4ae9284efcc24b09557e2f4b8dbad914d0b26cfdf541c564de021eb1eb3
-  data.tar.gz: 4c3b0358adda93768847113a414f58a4785f8d257dbd7863453a27aa4ff9b189
+  metadata.gz: cc75dfff46fb6d28d6c2c1cfaa342441e546c0cebdfdfcf1d9fe3459ea627429
+  data.tar.gz: 7083530b748d6b2b67456699dade28d60a12cb08b260052f0728456df57a8fb5
 SHA512:
-  metadata.gz: 506041e8f80b4a90fed72d0006b36ee18606fa85a5b3ae04dc67c17ba1612fdbf784f9fb6d1a6826bf65cc045c6e36dbe68c68057251627b466a52c0ea95d76e
-  data.tar.gz: 832857c4f115fde37d01ef3e4d23e6091d846587ef8fbd4f6664ac35a1afda5550d1903cf4042a01b229f7307453283e33ad469ff328a5a586fe5bc5cebf2916
+  metadata.gz: dc7ee38d18853e5a525e5cf820d3dcfe5f8d051f961ae7bbd3d1a1896bb1dd7928cda6d2ee11e6dd148751e8c2b5043ba02b4891bf0d546d6a7b1291e7f8afbc
+  data.tar.gz: 05a5750adbd6df591abe390edf99d5e49d3a812b784376c715c597858067ab8c93316f53e0eeb4ea04266239a90fe106520d5baf1e36418ce0d21179b6679783

data/.rubocop.yml

@@ -1,5 +1,11 @@
+require:
+  - rubocop-performance
+  - rubocop-rspec
+  - rubocop-rake
+
 AllCops:
-  TargetRubyVersion: 2.4.2
+  TargetRubyVersion: 3.0.0
+  NewCops: enable
 
   Exclude:
     - ./**/schema.rb

data/Gemfile.lock

@@ -1,89 +1,100 @@
 PATH
   remote: .
   specs:
-    german_numbers (0.7)
+    german_numbers (0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.1)
     backport (1.1.2)
-    benchmark (0.1.0)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    benchmark (0.1.1)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    docile (1.3.4)
     e2mmap (0.1.0)
-    io-console (0.5.3)
-    irb (1.1.0)
-      reline (>= 0.0.1)
     jaro_winkler (1.5.4)
-    json (2.3.0)
-    maruku (0.7.3)
-    method_source (0.9.2)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    method_source (1.0.0)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.8)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    parallel (1.19.1)
-    parser (2.7.0.2)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    parallel (1.20.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    reline (0.1.2)
-      io-console (~> 0.5)
-    reverse_markdown (1.4.0)
+    rake (13.0.3)
+    regexp_parser (2.0.2)
+    reverse_markdown (2.0.0)
       nokogiri
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.79.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (1.7.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-prof (1.1.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.3.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.9.1)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.1.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-prof (1.4.2)
     ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
+    simplecov (0.20.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    solargraph (0.38.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    solargraph (0.40.0)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
       e2mmap
-      irb (<= 1.1.0)
       jaro_winkler (~> 1.5)
-      maruku (~> 0.7, >= 0.7.3)
-      nokogiri (~> 1.9, >= 1.9.1)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
       parser (~> 2.3)
-      reverse_markdown (~> 1.0, >= 1.0.5)
-      rubocop (~> 0.52)
+      reverse_markdown (>= 1.0.5, < 3)
+      rubocop (>= 0.52)
       thor (~> 1.0)
       tilt (~> 2.0)
-      yard (~> 0.9)
+      yard (~> 0.9, >= 0.9.24)
     thor (1.0.1)
     tilt (2.0.10)
-    unicode-display_width (1.6.0)
-    yard (0.9.24)
+    unicode-display_width (1.7.0)
+    yard (0.9.26)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler
@@ -92,9 +103,12 @@ DEPENDENCIES
   rake
   rspec
   rubocop
+  rubocop-performance
+  rubocop-rake
+  rubocop-rspec
   ruby-prof
   simplecov
   solargraph
 
 BUNDLED WITH
-   2.1.2
+   2.2.3

data/german_numbers.gemspec

@@ -4,11 +4,12 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'german_numbers/version'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.name          = 'german_numbers'
   spec.version       = GermanNumbers::VERSION
   spec.authors       = ['Gleb Sinyavsky']
   spec.email         = ['zhulik.gleb@gmail.com']
+  spec.required_ruby_version = '3.0.0'
 
   spec.summary       = 'Gem for converting numbers to german words and vise-versa.'
   spec.description   = 'Gem for converting numbers to german words and vise-versa.'
@@ -27,6 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'ruby-prof'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'solargraph'

data/lib/german_numbers/parser/parser.rb

@@ -49,7 +49,7 @@ module GermanNumbers
       def parse(string)
         raise ParsingError if ERRORS.include?(string)
 
-        string.split(' ').reverse.inject(0, &method(:parse_part)).tap do
+        string.split.reverse.inject(0) { parse_part(_1, _2) }.tap do
           raise ParsingError unless final_order_state?
         end
       rescue ParsingError, StateMachine::StateError

data/lib/german_numbers/parser/small_number_parser.rb

@@ -22,7 +22,7 @@ module GermanNumbers
       end
 
       def parse(string)
-        string.split(/(tausend)/).reverse.inject(0, &method(:parse_part))
+        string.split(/(tausend)/).reverse.inject(0) { parse_part(_1, _2) }
       end
 
       private
@@ -43,7 +43,7 @@ module GermanNumbers
 
       def parse_number(sum, part)
         m = StackMachine.new
-        (sum + part.split('').reverse.inject(0, &m.method(:step)) * @k).tap do
+        (sum + part.split('').reverse.inject(0) { m.step(_1, _2) } * @k).tap do
           raise ParsingError if !m.empty? || !m.final_stack_state? || !@range.cover?(_1)
         end
       end

data/lib/german_numbers/state_machine.rb

@@ -29,9 +29,7 @@ module GermanNumbers
     end
 
     class Machine
-      attr_reader :states
-
-      attr_reader :transitions
+      attr_reader :states, :transitions
 
       def initialize
         @states = {}

data/lib/german_numbers/stringifier.rb

@@ -36,8 +36,8 @@ module GermanNumbers
 
     def postprocess(result)
       result += 's' if result.end_with?('ein')
-      result = 'ein' + result if SMALL_KEYWORDS.include?(result)
-      result = 'eine ' + result if BIG_KEYWORDS.include?(result)
+      result = "ein#{result}" if SMALL_KEYWORDS.include?(result)
+      result = "eine #{result}" if BIG_KEYWORDS.include?(result)
       result.strip
     end
 
@@ -54,14 +54,14 @@ module GermanNumbers
       n = DIGITS["#{digits[1]}#{digits[0]}".to_i]
       return n unless n.nil?
 
-      DIGITS[digits[0]] + 'und' + DIGITS[(digits[1] * 10)]
+      "#{DIGITS[digits[0]]}und#{DIGITS[(digits[1] * 10)]}"
     end
 
     def decline(count, number)
       return number if count == 1
-      return number + 'n' if number.end_with?('e')
+      return "#{number}n" if number.end_with?('e')
 
-      number + 'en'
+      "#{number}en"
     end
   end
 end

data/lib/german_numbers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GermanNumbers
-  VERSION = '0.7'
+  VERSION = '0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: german_numbers
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Gleb Sinyavsky
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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: rubocop-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: rubocop-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: ruby-prof
   requirement: !ruby/object:Gem::Requirement
@@ -161,9 +203,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="