german_numbers 0.5 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 013dae0466819b3a48241f72efbecfc135d997a0
-  data.tar.gz: 651d87269eb855b5dab6e6a43f68ae3e7ddf098d
+SHA256:
+  metadata.gz: 1c69a4ae9284efcc24b09557e2f4b8dbad914d0b26cfdf541c564de021eb1eb3
+  data.tar.gz: 4c3b0358adda93768847113a414f58a4785f8d257dbd7863453a27aa4ff9b189
 SHA512:
-  metadata.gz: 292e5224dceb2cfbb925d57893ae34e96ea79d207f73817468e7fa07c2209a8ed85762ff48708cfa93874d6b6338a190adc1bc66eb767e551730a250be7e3da1
-  data.tar.gz: '09ceb4a387b0334f1e1655b4632876bcbce5eb18245a7852afe413c27cd288ec8b7fc70648fcf0806b22ce93a880eb39eb083ae6e291e7f9bf3b82d76b084c7b'
+  metadata.gz: 506041e8f80b4a90fed72d0006b36ee18606fa85a5b3ae04dc67c17ba1612fdbf784f9fb6d1a6826bf65cc045c6e36dbe68c68057251627b466a52c0ea95d76e
+  data.tar.gz: 832857c4f115fde37d01ef3e4d23e6091d846587ef8fbd4f6664ac35a1afda5550d1903cf4042a01b229f7307453283e33ad469ff328a5a586fe5bc5cebf2916

data/.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-       - image: circleci/ruby:2.4.1
+       - image: circleci/ruby:2.7.0
     working_directory: ~/german_numbers
 
     steps:
@@ -10,8 +10,7 @@ jobs:
 
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
-          - v1-dependencies-
+          - dependencies-{{ checksum "Gemfile.lock" }}
 
       - run:
           name: install dependencies
@@ -20,8 +19,7 @@ jobs:
       - save_cache:
           paths:
             - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
+          key: dependencies-{{ checksum "Gemfile.lock" }}
       - run:
           name: run rubocop
           command: bundle exec rubocop

data/.rubocop.yml

@@ -10,7 +10,7 @@ AllCops:
 
   DisplayCopNames: true
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   Exclude:
     - spec/**/*.rb
@@ -63,5 +63,5 @@ Metrics/ClassLength:
 Style/ClassAndModuleChildren:
   Enabled: false
 
-Documentation:
+Style/Documentation:
   Enabled: false

data/Gemfile.lock

@@ -1,67 +1,100 @@
 PATH
   remote: .
   specs:
-    german_numbers (0.5)
+    german_numbers (0.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    backport (1.1.2)
+    benchmark (0.1.0)
     coderay (1.1.2)
     diff-lcs (1.3)
-    docile (1.1.5)
-    json (2.1.0)
-    method_source (0.9.0)
-    parallel (1.12.1)
-    parser (2.5.0.2)
+    docile (1.3.2)
+    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)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.19.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.0.1)
+    reline (0.1.2)
+      io-console (~> 0.5)
+    reverse_markdown (1.4.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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubocop (0.52.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.79.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-prof (0.17.0)
-    ruby-progressbar (1.9.0)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-prof (1.1.0)
+    ruby-progressbar (1.10.1)
+    simplecov (0.17.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    unicode-display_width (1.3.0)
+    solargraph (0.38.1)
+      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)
+      parser (~> 2.3)
+      reverse_markdown (~> 1.0, >= 1.0.5)
+      rubocop (~> 0.52)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9)
+    thor (1.0.1)
+    tilt (2.0.10)
+    unicode-display_width (1.6.0)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler
   german_numbers!
-  pry (~> 0.11)
-  rake (~> 10.0)
-  rspec (~> 3.7)
-  rubocop (~> 0.52)
-  ruby-prof (~> 0.17)
-  simplecov (~> 0.15)
+  pry
+  rake
+  rspec
+  rubocop
+  ruby-prof
+  simplecov
+  solargraph
 
 BUNDLED WITH
-   1.16.1
+   2.1.2

data/german_numbers.gemspec

@@ -1,7 +1,6 @@
-
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'german_numbers/version'
 
@@ -13,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Gem for converting numbers to german words and vise-versa.'
   spec.description   = 'Gem for converting numbers to german words and vise-versa.'
-  spec.homepage      = 'https://github.com/zhulik/german_words'
+  spec.homepage      = 'https://github.com/zhulik/german_numbers'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -23,11 +22,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'pry', '~> 0.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'rubocop', '~> 0.52'
-  spec.add_development_dependency 'ruby-prof', '~> 0.17'
-  spec.add_development_dependency 'simplecov', '~> 0.15'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'ruby-prof'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'solargraph'
 end

data/lib/german_numbers/parser/parser.rb

@@ -8,7 +8,7 @@ module GermanNumbers
     class Parser
       extend GermanNumbers::StateMachine
       state_machine_for :order do
-        state :initial, can_be_initial: true, final: false
+        state :initial, final: false
         state :thousands
         state :million_keyword, final: false
         state :millionen_keyword, final: false
@@ -21,7 +21,8 @@ module GermanNumbers
 
         transition from: :initial, to: %i[thousands million_keyword millionen_keyword
                                           milliarde_keyword milliarden_keyword]
-        transition from: :thousands, to: %i[million_keyword millionen_keyword milliarde_keyword milliarden_keyword]
+        transition from: :thousands, to: %i[million_keyword millionen_keyword milliarde_keyword
+                                            milliarden_keyword]
         transition from: :million_keyword, to: :million
         transition from: :millionen_keyword, to: :millions
         transition from: :milliarde_keyword, to: :billion
@@ -31,7 +32,9 @@ module GermanNumbers
       end
 
       DIGITS = GermanNumbers::DIGITS.invert
+
       ERRORS = ['ein', 'sech', 'sieb', nil, ''].freeze
+
       KEYWORDS = {
         'Million' => :million_keyword,
         'Millionen' => :millionen_keyword,
@@ -45,6 +48,7 @@ module GermanNumbers
 
       def parse(string)
         raise ParsingError if ERRORS.include?(string)
+
         string.split(' ').reverse.inject(0, &method(:parse_part)).tap do
           raise ParsingError unless final_order_state?
         end
@@ -76,15 +80,19 @@ module GermanNumbers
 
         if order_state == :million
           raise ParsingError unless part == 'eine'
+
           return sum + 1_000_000
         end
         if order_state == :billion
           raise ParsingError unless part == 'eine'
+
           return sum + 1_000_000_000
         end
 
         return sum + SmallNumberParser.new(2..999).parse(part) * 1_000_000 if order_state == :millions
         return sum + SmallNumberParser.new(2..999).parse(part) * 1_000_000_000 if order_state == :billions
+
+        raise ParsingError
       end
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/MethodLength

data/lib/german_numbers/parser/small_number_parser.rb

@@ -6,7 +6,7 @@ module GermanNumbers
       extend GermanNumbers::StateMachine
 
       state_machine_for :order do
-        state :initial, can_be_initial: true, final: false
+        state :initial, final: false
         state :units
         state :tausend_keyword, unique: true, final: false
         state :thousands
@@ -36,14 +36,15 @@ module GermanNumbers
           self.order_state = :tausend_keyword
           return sum
         end
-        raise ParsingError if (part == 'eins' || part == 'null') && order_state == :thousands
+        raise ParsingError if %w(eins null).include?(part) && order_state == :thousands
+
         parse_number(sum, part)
       end
 
       def parse_number(sum, part)
         m = StackMachine.new
-        (sum + part.split('').reverse.inject(0, &m.method(:step)) * @k).tap do |res|
-          raise ParsingError if !m.empty? || !m.final_stack_state? || !@range.cover?(res)
+        (sum + part.split('').reverse.inject(0, &m.method(:step)) * @k).tap do
+          raise ParsingError if !m.empty? || !m.final_stack_state? || !@range.cover?(_1)
         end
       end
     end

data/lib/german_numbers/parser/stack_machine.rb

@@ -6,7 +6,7 @@ module GermanNumbers
       extend GermanNumbers::StateMachine
 
       state_machine_for :stack do
-        state :initial, can_be_initial: true, final: false
+        state :initial, final: false
         state :null, unique: true
         state :eins, unique: true
         state :zehn, unique: true
@@ -42,7 +42,7 @@ module GermanNumbers
         'hundert' => :hundert_keyword
       }.freeze
 
-      SHORT_UNITS = Set.new(%w(drei vier fünf sech sieb acht neun)).freeze
+      SHORT_UNITS = Set.new(%w(drei vier fünf sech sieb acht neun))
 
       def initialize
         initialize_stack(:initial)
@@ -67,6 +67,7 @@ module GermanNumbers
           return result
         end
         return result if num.nil?
+
         @collector = ''
         result + num * @k
       end

data/lib/german_numbers/state_machine.rb

@@ -29,26 +29,28 @@ module GermanNumbers
     end
 
     class Machine
-      attr_reader :states, :transitions
+      attr_reader :states
+
+      attr_reader :transitions
 
       def initialize
         @states = {}
         @transitions = Hash.new { [] }
       end
 
-      def state(state, can_be_initial: false, final: true, unique: false)
-        @states[state] = State.new(state, can_be_initial, final, unique)
+      def state(state, final: true, unique: false)
+        @states[state] = State.new(state, @states.empty?, final, unique)
       end
 
       def transition(from:, to:)
         to = [to].flatten
-        validate_state!(from, *to)
-        to.each do |s|
-          @transitions[from] = @transitions[from] << s
+        validate_state!([from, to].flatten)
+        to.each do
+          @transitions[from] = @transitions[from] << _1
         end
       end
 
-      def validate_state!(*states)
+      def validate_state!(states)
         states.each do |state|
           raise StateError, "#{state} is unknown state" unless @states.include?(state)
         end
@@ -74,13 +76,15 @@ module GermanNumbers
         if instance_variable_get(history_name).include?(ns) && m.states[ns].unique?
           raise StateError, "#{ns} is a unique state and has already been taken"
         end
+
         instance_variable_get(history_name) << ns
         instance_variable_set(var_name, ns)
       end
 
       define_method("initialize_#{field}") do |initial|
-        m.validate_state!(initial)
+        m.validate_state!([initial])
         raise StateError, "#{initial} is not possible initial state" unless m.states[initial].can_be_initial?
+
         instance_variable_set(history_name, Set.new)
         instance_variable_set(var_name, initial)
       end

data/lib/german_numbers/stringifier.rb

@@ -11,8 +11,8 @@ module GermanNumbers
 
       number = number.to_s.rjust(12, '0')
 
-      billions, millions, thousands, number = number.to_s.reverse.scan(/.{1,3}/).map do |part|
-        part.reverse.to_i
+      billions, millions, thousands, number = number.reverse.scan(/.{1,3}/).map do
+        _1.reverse.to_i
       end.reverse
 
       postprocess(process(billions, millions, thousands, number))
@@ -50,14 +50,17 @@ module GermanNumbers
 
     def under_hundred(digits)
       return '' if digits.all?(&:zero?)
+
       n = DIGITS["#{digits[1]}#{digits[0]}".to_i]
       return n unless n.nil?
+
       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')
+
       number + 'en'
     end
   end

data/lib/german_numbers/version.rb

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

metadata

@@ -1,113 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: german_numbers
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.7'
 platform: ruby
 authors:
 - Gleb Sinyavsky
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-02-25 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  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'
 description: Gem for converting numbers to german words and vise-versa.
 email:
 - zhulik.gleb@gmail.com
@@ -121,7 +135,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -138,11 +151,11 @@ files:
 - lib/german_numbers/state_machine.rb
 - lib/german_numbers/stringifier.rb
 - lib/german_numbers/version.rb
-homepage: https://github.com/zhulik/german_words
+homepage: https://github.com/zhulik/german_numbers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,9 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Gem for converting numbers to german words and vise-versa.
 test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-2.4.2