zip5 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3982f4dded1b426a7add3df82e08a9affe2f885b
-  data.tar.gz: 850bdc085e5cc52678f2e7335c5fd0cd8374cdc1
+  metadata.gz: b7c3edd5d43e8625eb9eb1adf9564483e1211373
+  data.tar.gz: 8e166debb115563f57903d944f03ea947a9afc01
 SHA512:
-  metadata.gz: c3a66e397971e788e8ea1a68c4bf43fc9e69cd6a9f57eeda37249746b1ed74415c1b88fdb47a1312aa09f8ea98cf8d7ef82155c480f655a4019f3f7616487ef3
-  data.tar.gz: 4fc6495ba4f502c46dd397c9f6fd31262055c6d8eb3124ae1f5741dbf8e916f627abdb8c82f41949fd288607ac07a17021726681640f8265131324dfae04f185
+  metadata.gz: 3be32884d951637bbc50ba19cd9bfe2604949ef8b403e4e56d33ae8d7ea7d3129403a6d37b46e6647242da540ea82a3efa4030886194b1dc3439fd76f68e1f6e
+  data.tar.gz: e4bdc489f11582a42816ccf206fe297959b220572a9a3147a9124a3b3136fbd07ce2fabc1570aa7a13c4b5262e1fadb0d6bff1d9c1cb14b3aceb89113dd0522b

data/CHANGELOG

@@ -0,0 +1,9 @@
+0.0.2 / 2016-08-02
+
+* Enhancements
+
+  * Zip5.zip4 returns zip+4
+
+0.0.1 / 2014-05-16
+
+Initial release!

data/lib/zip5.rb

@@ -4,7 +4,7 @@ module Zip5
   VALID = 501..99950
   
   def Zip5.zip5(input)
-    input = input.to_i.to_s.delete('-')
+    input = input.to_i.to_s.gsub('-', '')
     memo = case input.length
     when 9
       input[0,5]
@@ -26,4 +26,19 @@ module Zip5
     end
     memo
   end
+
+  def Zip5.zip4(input)
+    input = input.to_s.gsub(/\.\d*\z/, '')
+    memo = nil
+    if input =~ /\A\d+\-(\d+)\z/
+      memo = $1.to_i
+    elsif zip5 = zip5(input)
+      hunk = zip5.gsub /\A0*/, ''
+      pat = /\A0*#{hunk}/
+      memo = input.gsub(pat, '').to_i
+    end
+    if memo and memo > 0
+      '%04d' % memo.to_i
+    end
+  end
 end

data/lib/zip5/version.rb

@@ -1,3 +1,3 @@
 module Zip5
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'zip5'
+
+require 'pry'

data/spec/zip5_spec.rb

@@ -2,27 +2,34 @@ require 'spec_helper'
 
 describe Zip5 do
   {
-    999501234  => '99950',
-  '99950-1234' => '99950',
-     57531234  => '05753',
-   '5753-1234' => '05753',
-  '05753-1234' => '05753',
-      5011234  => '00501',
-    99950      => '99950',
-     5753      => '05753',
-     1000      => '01000',
-      501      => '00501',
-           ''  => nil,
-        'abc'  => nil,
+    999500004  => ['99950', '0004'],
+  '99950-0004' => ['99950', '0004'],
+     57530004  => ['05753', '0004'],
+   '5753-0004' => ['05753', '0004'],
+  '05753-0004' => ['05753', '0004'],
+      5010004  => ['00501', '0004'],
+  '99950-4'    => ['99950', '0004'],
+   '5753-4'    => ['05753', '0004'],
+  '05753-4'    => ['05753', '0004'],
+    99950      => ['99950', nil],
+     5753      => ['05753', nil],
+     1000      => ['01000', nil],
+      501      => ['00501', nil],
+           ''  => [nil, nil],
+        'abc'  => [nil, nil],
   }.each do |input, expected|
-    it "parses #{input.inspect} as #{expected.inspect}" do
-      expect(Zip5.zip5(input)).to eq(expected)
+    it "parses #{input.inspect} as #{expected.compact.join('-')}" do
+      zip5, zip4 = expected
+      expect(Zip5.zip5(input)).to eq(zip5)
+      expect(Zip5.zip4(input)).to eq(zip4)
     end
-    # here we also test 57531234.0, etc.
+    # here we also test 57530004.0, etc.
     if input.is_a?(Integer)
       input_f = input.to_f
-      it "parses #{input_f.inspect} as #{expected.inspect}" do
-        expect(Zip5.zip5(input_f)).to eq(expected)
+      it "parses #{input_f.inspect} as #{expected.compact.join('-')}" do
+        zip5, zip4 = expected
+        expect(Zip5.zip5(input_f)).to eq(zip5)
+        expect(Zip5.zip4(input_f)).to eq(zip4)
       end
     end
   end

data/zip5.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zip5
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: For example, 8840 means 08840 and 5011234 means 00501-1234.
 email:
 - seamus@abshere.net
@@ -62,6 +76,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -91,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Convert United States zip codes to their correct Zip5 representation, even