rus_bank 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051a9c51a7ac2666d39d4a7f9988c40dc5578385
-  data.tar.gz: 1ab9c9f0eef089704fe62818d45b036934b4e163
+  metadata.gz: 0a79896c9ff56fec5a5fa2afa206fe2d43f11c50
+  data.tar.gz: f4d218426c51d95219fc3d147afb058763adefb1
 SHA512:
-  metadata.gz: f5bbfc4dc442b293e096d7c9dcfd7098db3c91e5df28f7959d4eca82dc0e292c364e15749ee42115032bfa1037fe19761fd77987167e40ed6e274564312aab87
-  data.tar.gz: 4a18725ed9a9d25d2e35f951a091f910323f7ddb0565de5efd46d908658713576db4cb512e12452420f59e254d6b4d3b72ec5080fa4aae0134bf208d26711373
+  metadata.gz: 506dab7f3e70803cfa907a6eab56e145afce6eee7bebd3aff0b441fc507fa70d24d091086ead7d66b4adeffe6a89e8cc76487d5441f4c162532bd6b68ec22aea
+  data.tar.gz: cd555655d1883acd2529930cb44f86d21380a587cc945269c2fa76770827ee8924f2889cb69f715cff658e4775ff68b5199efd1a12fe044df6410e715a7db8d1

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/lib/rus_bank.rb

@@ -33,43 +33,29 @@ class RusBank
   def SearchByRegionCodeXML(region_code)
     params = { "RegCode" => region_code }
     response = call(:search_by_region_code_xml, params)
-    if response.nil?
-      nil
-    else
-      response[:credit_org][:enum_credits]
-    end
+    get_array(response, :credit_org, :enum_credits)
   end
 
   def SearchByNameXML(bank_name)    # Метод возвращает nil, либо массив хэшей
     params = { "NamePart" => bank_name }
     response = call(:search_by_name_xml, params)
-    if response[:credit_org][:enum_credits].nil?
-      nil
-    else
-      if not response[:credit_org][:enum_credits].instance_of?(Array)      # Если найдена одна запись, возвращается единичный хэш,
-        [response[:credit_org][:enum_credits]]                             # если более одной, то массив хешей,
-      else                                                                 # поэтому одну запись преобразуем к массиву из одного хэша.
-        response[:credit_org][:enum_credits]
-      end
-    end
+    get_array(response, :credit_org, :enum_credits)
+  end
+
+  def GetOfficesXML(int_code)
+    params = { "IntCode" => int_code }
+    response = call(:get_offices_xml, params)
+    get_array(response, :co_offices, :offices)
   end
 
   def EnumBicXML
     response = call(:enum_bic_xml)
-    if response.nil?
-      nil
-    else
-      response[:enum_bic][:bic]
-    end
+    get_array(response, :enum_bic, :bic)
   end
 
   def RegionsEnumXML
     response = call(:regions_enum_xml)
-    if response.nil?
-      nil
-    else
-      response[:regions_enum][:rgid]
-    end
+    get_array(response, :regions_enum, :rgid)
   end
 
   def CreditInfoByIntCodeXML(internal_code)
@@ -78,7 +64,7 @@ class RusBank
     if response.nil?
       nil
     else
-      response[:credit_org_info][:co]
+      response[:credit_org_info]
     end
   end
 
@@ -90,4 +76,20 @@ class RusBank
       response
     end
   end
+
+  private
+
+  def get_array(response, *params)
+    node = params.inject(response){|inner_node, param| inner_node[param]}     # Вытягиваем вложенные ноды
+    if node.nil?
+      nil
+    else
+      if not node.instance_of?(Array)      # Если найдена одна запись, возвращается единичный хэш,
+        [node]                             # если более одной, то массив хешей,
+      else                                 # поэтому одну запись преобразуем к массиву из одного хэша.
+        node
+      end
+    end
+  end
+
 end

data/rus_bank.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rus_bank"
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["wilDAlex"]
-  s.date = "2013-12-23"
+  s.date = "2013-12-24"
   s.description = "\u{41d}\u{430}\u{431}\u{43e}\u{440} ruby-\u{43c}\u{435}\u{442}\u{43e}\u{434}\u{43e}\u{432} \u{434}\u{43b}\u{44f} \u{440}\u{430}\u{431}\u{43e}\u{442}\u{44b} \u{441} \u{441}\u{435}\u{440}\u{432}\u{438}\u{441}\u{430}\u{43c}\u{438} \u{426}\u{411} \u{420}\u{424}"
   s.email = "some@wild-x.ru"
   s.extra_rdoc_files = [

data/test/test_rus_bank.rb

@@ -1,23 +1,21 @@
 require "../test/test_helper"
 
 class TestRusBank < Test::Unit::TestCase
-  #should "probably rename this file and start testing for real" do
-  #  flunk "hey buddy, you should probably rename this file and start testing for real"
-  #end
-  #
+
+  VALID_BIC = "044585216"
+  INVALID_BIC = "0445852169999"
+  VALID_INT_CODE = "450000650"
+  INVALID_INT_CODE = "450000650999999"
+  VALID_REG_NUMBER = "316"
+  INVALID_REG_NUMBER = "289375237580009"
+  VALID_REGION = "16"
+  INVALID_REGION = "999"
+  INVALID_ORG_NAME = "djhgsjdlksl"
+  VALID_ORG_NAME = "ХКФ БАНК"
+
   context "RusBank" do
     setup do
       @cbr = RusBank.new
-      VALID_BIC = "044585216"
-      INVALID_BIC = "0445852169999"
-      VALID_INT_CODE = "450000650"
-      INVALID_INT_CODE = "450000650999999"
-      VALID_REG_NUMBER = "316"
-      INVALID_REG_NUMBER = "289375237580009"
-      VALID_REGION = "16"
-      INVALID_REGION = "999"
-      INVALID_ORG_NAME = "djhgsjdlksl"
-      VALID_ORG_NAME = "ХКФ БАНК"
     end
 
     should "Service return implemented methods" do
@@ -69,10 +67,16 @@ class TestRusBank < Test::Unit::TestCase
       assert_equal(nil, @cbr.SearchByNameXML(INVALID_ORG_NAME), "Should return nil if value not found")
     end
 
+    should ":get_offices_xml returns array of elements" do
+      assert(@cbr.GetOfficesXML(VALID_INT_CODE).instance_of?(Array), "This should be array")
+      assert(@cbr.GetOfficesXML(VALID_INT_CODE).length > 2, "This should return more than 2 offices")
+      assert_equal(nil, @cbr.GetOfficesXML(INVALID_INT_CODE), "Should return nil if value not found")
+    end
+
     should ":credit_info_by_int_code_xml return correct bank" do
-      assert_equal(VALID_REG_NUMBER, @cbr.CreditInfoByIntCodeXML(VALID_INT_CODE)[:reg_number])
-      assert_equal(VALID_ORG_NAME, @cbr.CreditInfoByIntCodeXML(VALID_INT_CODE)[:org_name])
-      assert_equal(VALID_BIC, @cbr.CreditInfoByIntCodeXML(VALID_INT_CODE)[:bic])
+      assert_equal(VALID_REG_NUMBER, @cbr.CreditInfoByIntCodeXML(VALID_INT_CODE)[:co][:reg_number])
+      assert_equal(VALID_ORG_NAME, @cbr.CreditInfoByIntCodeXML(VALID_INT_CODE)[:co][:org_name])
+      assert_equal(VALID_BIC, @cbr.CreditInfoByIntCodeXML(VALID_INT_CODE)[:co][:bic])
       assert_equal(nil, @cbr.CreditInfoByIntCodeXML(INVALID_INT_CODE), "Should return nil if value not found")
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rus_bank
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - wilDAlex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon