nummernkreis 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a662d8dc677f9cf7f635ee3319ae1fb250f17945024bc714acce3e0a89c7b8d
-  data.tar.gz: 6abd42f788629f3d5b395dc49ee162dc1d45880de500502bffea0cd3a5c7a7fe
+  metadata.gz: c2f141b5c5b18f8429de21a681139b96fa2fa6801c62c1e988bdf352acbca67f
+  data.tar.gz: 61f757543b0b38e9607ccf86c0cfcabd856146649126f5cafb91c6760fdd3f41
 SHA512:
-  metadata.gz: dd32be40f56ce8428833c7cb05ae5b548b3be0acdbdf9997420adbdaf4125c13addcebed3ac05a8f6158e8ec5ab248585e2dfba03f16c47be2f07b4133694508
-  data.tar.gz: eeb9242b94ed7fecc4d1f378440e58ec27a4aa1df8803303895d9cfec2a4aa32443e02cbaedec1fe7dd032978d658c3a2c66a85446f3d825bcd380378d1efd8c
+  metadata.gz: cfa8f678d3d937931c4b7d92c372fa52221ae46004e19cd3a170014a803b0beee543830548628e31d4949781f8368a45d8ad471a444e6cdb1dcacd8d0499f576
+  data.tar.gz: e81f62edb7fc551161cff38ed5813a3ffda5bbaaada38881ac6a37bdeb52e692cf4893c13b35b85e2d4a75db73f1a05ff2ec0ee9a1891885f8938491a1d8ef37

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 /vendor/bundle
+/*.gem

data/.gitpod.yml

@@ -0,0 +1,3 @@
+tasks:
+- before: ./bin/setup
+- command: rake test

data/.travis.yml

@@ -1,7 +1,17 @@
----
 sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.2
+- 2.0
+- 2.2
+- 2.6
 before_install: gem install bundler -v 1.17.2
+script: bundle exec rake test
+deploy:
+  provider: rubygems
+  api_key:
+    secure: Wqs0XtfWzevTGwN+4Zz3oIy2ULpjxmha2h9Kb1mGzzc586g8Mb/ptzQiXHFdZmQYRgVQooBrKnr26H3cEQfX+OHK44/zpbKm8X1bmeEnMCO2+lYycRaraJw0F814yT1QpoSbHY5OHa3yfd2Knudwxirx+Fqohypap/NBG22PFDbVXl9OmP2sdIfESeSoUjVqZrTlLjchl2pQyUPkoFA0+ZM5NQkmAuJ9cEkbv9D0xbENLc76WwXGAmLdYxjdeg/OssHITYxivi2lH/uszpYYSjXz5jG3c5fF47Cn6H1ctLGCmzAsLg5OVXg35j26bedr1hGS+C0TGAWvf7cet7oqEmM8fSA7Tp5vEd2aMAdaLL/XM4fihbT+1IugZ11HNOhGtz1YsYXY1Cm9TA8LcQjGhxxjXnXyWDpPxyavjo1/VG0MO8d3dgV6RcyjQdxfPLjdrOEOX+8+gi6y5jWg/Zh4vEs6KshPJyPxZol/pfnOs3Dj8dl3Pm1T35oTvV7iWr7fY0EdhEzltcSOSFlfSPcTvoO6Xf5+nefs0gTJOCeeI3lZt2hd54kK9RdYWv6I6JumB0FEzHwlliSFmFkmiY2om1JQKhLrQF5ar5GnxcNdC+baOOkHOR+k2KiZxA0v+u1/3h2rOHA3MfY9m9H8lLt2iYOGXHYddDiP9d2f+3GkJMg=
+  gem: nummernkreis
+  on:
+    tags: true
+    repo: frontrunnerio/nummernkreis

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# Changes since 0.1.0
+
+- add '#next(now: true)' which gives the next number for today.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nummernkreis (0.1.0)
+    nummernkreis (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,5 +1,7 @@
 # Nummernkreis
 
+[![Build Status](https://travis-ci.org/frontrunnerio/nummernkreis.svg?branch=master)](https://travis-ci.org/frontrunnerio/nummernkreis)
+
 This gem implements a number range ("Nummernkreis" in German) which is very common for German documents like invoices where the invoice number is not just a number sequence but also includes date components.
 
 ## Installation
@@ -46,6 +48,12 @@ Examples (assuming current date is 2019-04-15):
 
   Nummernkreis.new('yymmdd-##').parse('181231-04').next
   # '181231-05'
+
+  Nummernkreis.new('yymmdd-##').parse('181231-04').next(now: true)
+  # '190425-01'
+
+  Nummernkreis.new('yymmdd-##').parse('181231-04').next(now: true)
+  # '190425-02'
 ```
 
 ## Development
@@ -56,7 +64,10 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/deepflame/nummernkreis.
+Bug reports and pull requests are welcome on GitHub at https://github.com/frontrunnerio/nummernkreis.
+You can just use Gitpod and start hacking.
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io#https://github.com/frontrunnerio/nummernkreis)
 
 ## License
 

data/lib/nummernkreis.rb

@@ -1,40 +1,81 @@
 require "nummernkreis/version"
 require 'date'
 
+# Nummernkreis
+#
+# class to generate and increment number ranges based on a simple pattern
+#
+# pattern can include:
+#
+# yyyy::  year with 4 digit representation (e.g. 2018)
+# yy::    year with 2 digit representation (e.g. 80 for 1980)
+# mm::    month with 2 digits (e.g. 03 for March)
+# dd::    day of the month with 2 digits (e.g. 01 for the first day)
+# -::     dash separator
+# #::     placeholder for variable digit part / counter (e.g. 001 as first value for ###)
+#
 class Nummernkreis
   class Error < StandardError; end
 
+  # @param pattern [String] number range pattern
   def initialize pattern
     @pattern = pattern
-    @number = PatternParser.new(pattern).sample
+    @number_now = PatternParser.new(pattern).sample
+    @number = @number_now
   end
 
+  # returns the current number range string
+  # @return [String] current number range
   def to_s
     @number
   end
 
-  def next
-    digit_count = @pattern.split('').count('#')
-    raise Error.new('only works if pattern has a digit part') if digit_count == 0
+  # increments the digit part of the number range
+  # @param now [Boolean] if the next number should be generated for today
+  # @return [String] next number range
+  def next(now: false)
+    @number = if now && !numbers_equal_without_digits?(@number, @number_now)
+                @number_now
+              else
+                increment_digits_for_number @number
+              end
+  end
 
-    digits_start_at = @pattern.index('#')
-    digits_end_at = @pattern.rindex('#')
+  # "parses" the number range (sets the current number range)
+  # @return [Nummernkreis] instance
+  def parse number
+    @number = number
+    self
+  end
+
+  private
 
-    before_digits = digits_start_at < 1 ? '' : @number[0..digits_start_at-1]
-    digits = @number[digits_start_at..digits_end_at]
-    after_digits = @number[digits_end_at+1..@number.length]
+  def increment_digits_for_number number
+    digit_count = @pattern.split('').count('#')
+    raise Error.new('only works if pattern has a digit part') if digit_count == 0
 
+    before_digits, digits, after_digits = decompose_number_parts(@number)
     new_digits = format("%0#{digit_count}d", digits.to_i + 1)
 
-    @number = "#{before_digits}#{new_digits}#{after_digits}"
+    "#{before_digits}#{new_digits}#{after_digits}"
   end
 
-  def parse number
-    @number = number
-    self
+  def numbers_equal_without_digits? number1, number2
+    parts1 = decompose_number_parts number1
+    parts2 = decompose_number_parts number2
+    parts1[0] == parts2[0] && parts1[2] == parts2[2]
   end
 
-  private
+  def decompose_number_parts number
+    digits_start_at = @pattern.index('#')
+    digits_end_at = @pattern.rindex('#')
+
+    [
+      digits_start_at < 1 ? '' : number[0..digits_start_at-1],
+      number[digits_start_at..digits_end_at],
+      number[digits_end_at+1..number.length]
+    ]
+  end
 
   class PatternParser
 
@@ -108,5 +149,4 @@ class Nummernkreis
     end
   end
 
-end
-
+end

data/lib/nummernkreis/version.rb

@@ -1,3 +1,3 @@
 class Nummernkreis
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nummernkreis
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andreas Böhrnsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitpod.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt