russianpost 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da46adf9f7207d98af2037c0c12d26d3ecff2803
-  data.tar.gz: f2397fb606ad100130ac6093e2b6eb06795de8de
+  metadata.gz: b6585900413a5e00bb43ef2b5704a24d5a1772a5
+  data.tar.gz: 81ffcfe46db8a248952f105faf04c7eea1826c74
 SHA512:
-  metadata.gz: 0495a81e24f4b0a8f59bbc32680b3c623c4b398fa44b3d8e6f0c5fd5da17213b8e9244340c55dfd7f6353810126bf1b6e26bfadb3e8c088cbe20b6d8fedd8c4c
-  data.tar.gz: 1328b97674bf01ef7d05e2ccf5a3894a833539db7225362eb7308f0324fece819f8a53c128de0b2ae51aec7c37e1e7f3220650adfc954ddb00536ed06493b7ea
+  metadata.gz: 8f5d467ab436e2b4c6cbec9dbfcab2ddfc2449c35595c593f5a2b09627043162e585b697595e1419b7bb5939a8e307de57a87c75b70be03ffd5898b767e5c242
+  data.tar.gz: d081eb9c72d536414a43a16bf351f494dc2c69722659f34eece265bf15bb582062fdf4ee2fc48588b2e7077506ce3520a8c141fc07b6247f29ff4438089b1e96

data/README.md

@@ -14,7 +14,7 @@ To install gem stand-alone:
 
 To use gem in a Rails app, add the following to your `Gemfile`:
 
-    gem "russianpost", "~> 0.4.5"
+    gem "russianpost", "~> 0.5.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`:
 

data/lib/russianpost/barcode.rb

@@ -11,23 +11,14 @@ module RussianPost
 
     def initialize(barcode)
       @barcode = barcode.strip.upcase
-      raise InvalidBarcode unless valid?
     end
 
     def to_s
       barcode
     end
 
-    def digits
-      barcode[/\d+/].split("").map { |d| d.to_i }
-    end
-
-    private
-
     def valid?
-      BarcodeValidator.validate(self)
+      BarcodeValidator.validate(barcode)
     end
   end
-
-  class InvalidBarcode < ArgumentError; end
 end

data/lib/russianpost/barcode_validator.rb

@@ -12,7 +12,7 @@ module RussianPost
 
     def initialize(barcode)
       @barcode = barcode
-      @digits  = barcode.digits
+      @digits  = barcode[/\d+/].split("").map { |d| d.to_i }
     end
 
     def valid?
@@ -23,11 +23,11 @@ module RussianPost
     private
 
     def valid_international?
-      barcode =~ INTERNATIONAL_FORMAT && digits.last == checkdigit
+      (barcode =~ INTERNATIONAL_FORMAT && digits.last == checkdigit) || false
     end
 
     def valid_domestic?
-      barcode =~ DOMESTIC_FORMAT
+      barcode =~ DOMESTIC_FORMAT || false
     end
 
     def checkdigit

data/lib/russianpost/parcel.rb

@@ -38,7 +38,10 @@ module RussianPost
     private
 
     def fetch_operations
+      raise InvalidBarcode unless barcode.valid?
       OperationsFactory.build(client.call(barcode: barcode))
     end
   end
+
+  class InvalidBarcode < ArgumentError; end
 end

data/lib/russianpost/version.rb

@@ -1,3 +1,3 @@
 module Russianpost
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/test/russianpost/barcode_test.rb

@@ -8,17 +8,13 @@ module RussianPost
       assert_equal "bar RD025500807SE", "bar #{barcode}"
     end
 
-    def test_raises_on_invalid_barcode
+    def test_validates_barcode
       ["123", "RR123456789EE"].each do |barcode|
-        assert_raises InvalidBarcode do
-          Barcode.new(barcode)
-        end
+        refute Barcode.new(barcode).valid?
       end
-    end
 
-    def test_doesnt_raise_on_valid_barcode
       ["RD025500807SE", "12345678901234"].each do |barcode|
-          Barcode.new(barcode)
+        assert Barcode.new(barcode).valid?
       end
     end
   end

data/test/russianpost/parcel_test.rb

@@ -23,7 +23,7 @@ module RussianPost
 
     def test_raises_error_on_invalid_barcode
       assert_raises InvalidBarcode do
-        Parcel.new("123")
+        Parcel.new("123").operations
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: russianpost
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Artem Shitov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler