pigeon_band 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89627bdafb67b4c29ff45d574a94a89035841c07
-  data.tar.gz: 9a2a36e86ea842aaff7908415f9dcbe3fd31679a
+  metadata.gz: f9bb12b73441bd04685095520d4beb619b64b821
+  data.tar.gz: db6173092cf90a4a29deb5ca97dc3bc602744114
 SHA512:
-  metadata.gz: 287cb8976481aa8447c2ebaa9d36556bf4af979f56605f275b9dbe8be51eee237a1d9c4b388002e71fe300dc14766c5306f986d7a14cd2fa22cf6ab099b1443c
-  data.tar.gz: cffffe5db7db81b60baa52f800e47eea305dca968f13cfb73cc704c1d16e02b1f3ef86f0751b90420b0601f5aa7c794428b951167da2310e7a1e1fe48bd47955
+  metadata.gz: 855afe5fddec55de982a639dcef2fede78965998f28a14db6e0e737db3296a4d72fe668a0c64d2335d4760926bf4f5108f049b4f648cb5da32752c259da23bbc
+  data.tar.gz: cd104cd192bc447279a57ff88d7ceb2e1e164b943a15d1d9ed07b6771bb6c9f7e85622359f618a448fac73140f1c1db51cb7bc4b221b3c1a4854c8e327c2789f

data/README.md

@@ -35,12 +35,7 @@ above bands a input, a call to PigeonBand#format would return the following hash
 
 ```ruby
 PigeonBand.format("DV-06914-12-479")
-  {
-    band: "DV-06914-12-479"
-    slug: "DV-06914-12-0479"
-    year: 2012
-    code: "DE"
-  }
+  { band: "DV-06914-12-479" coll: "DV-06914-12-0479" year: 2012 code: "DE" }
 ```
 ## Development
 

data/lib/pigeon_band.rb

@@ -2,7 +2,7 @@ require "pigeon_band/version"
 
 module PigeonBand
   def self.format(band, country = COUNTRY)
-    raise "missing input for pigeon band" if band.nil? or band == ""
+    return { error: "missing input for pigeon band" } if band.nil? or band.match(/\A[[:space:]]*\z/)
     band_msg = "in pigeon band '#{band}'"
     band.upcase!
     band.tr!('. /', '---')
@@ -11,49 +11,57 @@ module PigeonBand
     case list[0]
       when 'B'
         year = get_year(band, list[1], band_msg)
+        return year if year.is_a?(Hash)
         sequ = get_number(band, list[2], "counter", 1, 9999999, band_msg)
+        return sequ if sequ.is_a?(Hash)
         band = sprintf("B-%02d-%07d", year % 100, sequ)
-        slug = band
+        coll = band
         code = 'BE'
       when 'DV'
         club = get_number(band, list[1], "club", 1, 9999, band_msg)
+        return club if club.is_a?(Hash)
         year = get_year(band, list[2], band_msg)
+        return year if year.is_a?(Hash)
         sequ = get_number(band, list[3], "counter", 1, 9999, band_msg)
+        return sequ if sequ.is_a?(Hash)
         band = sprintf("DV-0%d-%02d-%d", club, year % 100, sequ)
-        slug = sprintf("DV-%05d-%02d-%04d", club, year % 100, sequ)
+        coll = sprintf("DV-%05d-%02d-%04d", club, year % 100, sequ)
         code = 'DE'
       when 'NL'
         year = get_year(band, list[1], band_msg)
+        return year if year.is_a?(Hash)
         sequ = get_number(band, list[2], "counter", 1, 9999999, band_msg)
+        return sequ if sequ.is_a?(Hash)
         band = sprintf("NL-%02d-%07d", year % 100, sequ)
-        slug = band
+        coll = band
         code = 'NL'
       else
-        raise "Please add more formats at https://github.com/volkerwiegand/pigeon_band"
+        url = PigeonBand::HOMEPAGE
+        return { error: "unknown country '#{list[0]}'. Please add more countries at #{url}" }
     end
-    { band: band, slug: slug, year: year, code: code }
+    { band: band, coll: coll, year: year, code: code, error: nil}
   end
 
 private
 
+  def self.get_number(band, num, num_type, min_num, max_num, band_msg)
+    return { error: "missing #{num_type} #{band_msg}" } if num.nil? or num.empty?
+    return { error: "invalid #{num_type} '#{num}' #{band_msg}" } unless num.match(/^\d/)
+    num = num.to_i
+    return { error: "#{num_type} '#{num}' too small #{band_msg}" } if num < min_num
+    return { error: "#{num_type} '#{num}' too big #{band_msg}"   } if num > max_num
+    return num
+  end
+
   def self.get_year(band, year, band_msg)
-    raise "missing year #{band_msg}" if year.nil? or year == ""
-    raise "invalid year '#{year}' #{band_msg}" unless year.match(/^\d/)
+    return { error: "missing year #{band_msg}" } if year.nil? or year.empty?
+    return { error: "invalid year '#{year}' #{band_msg}" } unless year.match(/^\d/)
     year = year.to_i
-    raise "year '#{year}' out of range #{band_msg}" if year < 0 or year > 99
+    return { error: "year '#{year}' out of range #{band_msg}" } if year < 0 or year > 99
     year += 2000
     year -= 100 if year > (Time.now.to_date.year + 5)
     return year
   end
-
-  def self.get_number(band, num, num_type, min_num, max_num, band_msg)
-    raise "missing #{num_type} #{band_msg}" if num.nil? or num == ""
-    raise "invalid #{num_type} '#{num}' #{band_msg}" unless num.match(/^\d/)
-    num = num.to_i
-    raise "#{num_type} '#{num}' too small #{band_msg}" if num < min_num
-    raise "#{num_type} '#{num}' too big #{band_msg}"   if num > max_num
-    return num
-  end
 end
 
 # vim: set et ts=2 sw=2 ai:

data/lib/pigeon_band/version.rb

@@ -1,4 +1,5 @@
 module PigeonBand
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
   COUNTRY = "DV"
+  HOMEPAGE = "https://github.com/volkerwiegand/pigeon_band"
 end

data/pigeon_band.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["volker.wiegand@cvw.de"]
   spec.summary       = %q{Pigeon band formatter}
   spec.description   = %q{Format year and collation sequence for pigeon bands of various countries}
-  spec.homepage      = "https://github.com/volkerwiegand/pigeon_band"
+  spec.homepage      = PigeonBand::HOMEPAGE
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pigeon_band
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord