russianpost 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82c37e35bd3b295eac5eec7f402397c229ab69ba
-  data.tar.gz: a8bdd5bad1006e475d06fdf584314eb3d0a907df
+  metadata.gz: 47bbb1af0b21cfb7f4fb2caa809e2cf4f999deb8
+  data.tar.gz: 9d959970148f6bb4ddb7dc438433f0f2cb7fa580
 SHA512:
-  metadata.gz: 310e61d27a24e56b10c30fe05257b59d89a55e65b346749a435f7aa4841b72278c0b67af78e336d03e70311dbbd6c64ac6fb7193b0ac0a9537dc39bc634c745e
-  data.tar.gz: 3cfa617e03109d025c6b3e2fd7e07a8610278d76cbabd17b8b47253d5e6bc7cbd2c32b5f268cefe8965b46efc344d66e9e26eeab2598d54204d89173139b61d5
+  metadata.gz: a4132cfbcb85e7d41cf74653cc0f70681e723432264508d2ebfe54a0bcbaa30a4761849dca92166d5b5b65df8fa09e2d7a291b71e0e841c1d1be7f06c41b70e8
+  data.tar.gz: 9bf5df8b9ad495761182fcee06d3ebdd3e9d0d80bbea77b4e195c0d97b5dba85a7a63fc48622536cac1295355c30cfdb99674ed4abecd191d93cbfde465a6eef

data/README.md

@@ -14,9 +14,9 @@ To install gem stand-alone:
 
 To use gem in a Rails app, add the following to your `Gemfile`:
 
-    gem "russianpost", "~> 0.5.1"
+    gem "russianpost", "~> 0.6.0"
 
-This gem uses [Savon](http://savonrb.com/), which in turn uses [HTTPI](https://github.com/savonrb/httpi) internally. HTTPI chooses the best HTTP library of those you have installed. For the fastest results, make sure you add [Curb](https://github.com/taf2/curb) to your `Gemfile`:
+This gem uses [Savon](http://savonrb.com/), which in turn uses [HTTPI](https://github.com/savonrb/httpi) internally. HTTPI chooses the best HTTP library of those you have installed. For the fastest results add [Curb](https://github.com/taf2/curb) to your `Gemfile`:
 
     gem "curb"
     gem "russianpost"

data/lib/russianpost/barcode.rb

@@ -1,24 +1,13 @@
-require "forwardable"
-require "russianpost/barcode_validator"
+require 'russianpost/barcode/international'
+require 'russianpost/barcode/domestic'
+require 'russianpost/barcode/invalid'
 
 module RussianPost
-  class Barcode
-    extend Forwardable
-
-    def_delegator :barcode, :=~
-
-    attr_reader :barcode
-
-    def initialize(barcode)
-      @barcode = barcode.strip.upcase
-    end
-
-    def to_s
-      barcode
-    end
-
-    def valid?
-      BarcodeValidator.validate(barcode)
+  module Barcode
+    def self.new(barcode)
+      [International, Domestic, Invalid].each do |klass|
+        return klass.new(barcode) if barcode =~ klass.format
+      end
     end
   end
 end

data/lib/russianpost/barcode/base.rb

@@ -0,0 +1,30 @@
+require "forwardable"
+
+module RussianPost
+  module Barcode
+    class Base
+      extend Forwardable
+
+      def_delegator :barcode, :=~
+
+      attr_reader :barcode, :digits
+
+      def self.format
+        /.*/
+      end
+
+      def initialize(barcode)
+        @barcode = barcode.strip.upcase
+        @digits  = barcode.scan(/\d/).map { |d| d.to_i }
+      end
+
+      def valid?
+        barcode =~ self.class.format && digits.last == checkdigit
+      end
+
+      def to_s
+        barcode
+      end
+    end
+  end
+end

data/lib/russianpost/barcode/domestic.rb

@@ -0,0 +1,18 @@
+require 'russianpost/barcode/base'
+
+module RussianPost
+  module Barcode
+    class Domestic < Base
+      def self.format
+        /\A\d{14}\Z/
+      end
+
+      private
+
+      def checkdigit
+        odds, evens = *digits.partition.with_index { |d, i| (i&1).zero? }
+        (10 - ((odds.reduce(:+) * 3 + evens[0..-2].reduce(:+)) % 10)) % 10
+      end
+    end
+  end
+end

data/lib/russianpost/barcode/international.rb

@@ -0,0 +1,23 @@
+require 'russianpost/barcode/base'
+
+module RussianPost
+  module Barcode
+    class International < Base
+      WEIGHT_FACTORS = [8, 6, 4, 2, 3, 5, 9, 7, 0]
+
+      def self.format
+        /\A([A-Z]{2}\d{9}[A-Z]{2})\Z/
+      end
+
+      private
+
+      def checkdigit
+        checksum < 11 ? checksum % 10 : 5
+      end
+
+      def checksum
+        11 - (digits.zip(WEIGHT_FACTORS).map{|i| i.reduce(:*)}.reduce(:+) % 11)
+      end
+    end
+  end
+end

data/lib/russianpost/barcode/invalid.rb

@@ -0,0 +1,11 @@
+require 'russianpost/barcode/base'
+
+module RussianPost
+  module Barcode
+    class Invalid < Base
+      def valid?
+        false
+      end
+    end
+  end
+end

data/lib/russianpost/version.rb

@@ -1,3 +1,3 @@
 module Russianpost
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/test/russianpost/barcode_test.rb

@@ -13,7 +13,7 @@ module RussianPost
         refute Barcode.new(barcode).valid?
       end
 
-      ["RD025500807SE", "12345678901234"].each do |barcode|
+      ["RD025500807SE", "62009147017544"].each do |barcode|
         assert Barcode.new(barcode).valid?
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: russianpost
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Artem Shitov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,10 @@ files:
 - Rakefile
 - lib/russianpost.rb
 - lib/russianpost/barcode.rb
-- lib/russianpost/barcode_validator.rb
+- lib/russianpost/barcode/base.rb
+- lib/russianpost/barcode/domestic.rb
+- lib/russianpost/barcode/international.rb
+- lib/russianpost/barcode/invalid.rb
 - lib/russianpost/client.rb
 - lib/russianpost/country_factory.rb
 - lib/russianpost/operation.rb

data/lib/russianpost/barcode_validator.rb

@@ -1,46 +0,0 @@
-module RussianPost
-  class BarcodeValidator
-    attr_reader :barcode, :digits
-
-    INTERNATIONAL_FORMAT = /\A([A-Z]{2}\d{9}[A-Z]{2})\Z/
-    DOMESTIC_FORMAT      = /\A(\d{14})\Z/
-    WEIGHT_FACTORS       = [8, 6, 4, 2, 3, 5, 9, 7, 0]
-
-    def self.validate(barcode)
-      new(barcode).valid?
-    end
-
-    def initialize(barcode)
-      @barcode = barcode
-      @digits  = barcode[/\d+/].split("").map { |d| d.to_i }
-    end
-
-    def valid?
-      valid_international? || valid_domestic?
-    end
-
-
-    private
-
-    def valid_international?
-      (barcode =~ INTERNATIONAL_FORMAT && digits.last == checkdigit) || false
-    end
-
-    def valid_domestic?
-      barcode =~ DOMESTIC_FORMAT || false
-    end
-
-    def checkdigit
-      if (1..9).include? checksum
-        checksum
-      else 
-        checksum == 10 ? 0 : 5
-      end
-    end
-    
-    def checksum
-      product = digits.zip(WEIGHT_FACTORS)
-      (11 - product.map{|i| i.reduce(:*)}.reduce(:+)) % 11
-    end
-  end
-end