ruby-ares 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50972475ce973dc631c0dc3ecd6f1dfac01f2e25
-  data.tar.gz: fc170ac8e02fc2c9275535636241efca524df9d0
+  metadata.gz: c201f2b161757e4d716d9e352b40e7474cc614ea
+  data.tar.gz: 2f797901583b9f8f543ca0bba76a3fdbc8b83a27
 SHA512:
-  metadata.gz: f63f5c44c5e7b5527ca65513a0c0240e2ee7ec8bc753317e7f0cb1f4e22f86f8a87441d6135123beab6419257b267d1371d13114b5c6935217855579e3f3b196
-  data.tar.gz: 5adb94c1f6ba5734f22e57120599dd27c8f3e4ce3288a01860c4560e910cec3b22ed2d831c803fc0286cf28471ae337004d76f4f93d7b1c9455578eef40ce505
+  metadata.gz: 34d598af7286a11db71463c9965c82b5573df2a380aae548a80f92d3a95ea6cc7b8d1de8aa682028fc244d5f99207a54d743b8355378fdd6e8327d2d360eedf3
+  data.tar.gz: 8c79a206fad9496ebaf870ddc4c8778c7e0373f374e86e6ceab8d7262c40d7edc6ea19c147304fb0aaec421bbd660e2be408f99c127623912ef05c5d52ec79f2

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## 0.0.3
+
+- Change to DARV BAS registry (with support of legal form)

data/README.md

@@ -29,10 +29,10 @@ subject = RubyARES::Subject.get(74948440)
 ```
 And then:
 ```ruby
-subject => #<RubyARES::Subject:0x007fc691a77470 @ico="74948440", @ic="74948440", @dic=nil, @name="Josef Stříbný", @company=nil, @status="A", @addresses=[#<RubyARES::Address:0x007fc691a776a0 @id="10731009", @street="Nádražní", @postcode="74727", @city="Kobeřice", @city_part="Kobeřice", @house_number="721", @house_number_type="1", @orientational_number=nil>], @updated_at="2009-08-25">
+subject => #<RubyARES::Subject:0x000000013ac2c0 @ico="74948440", @ic="74948440", @dic=nil, @name="Josef Stříbný", @company=nil, @status=nil, @addresses=[#<RubyARES::Address:0x000000013ac978 @id="406358731", @street="Nádražní", @postcode="74727", @city="Kobeřice", @city_part="Kobeřice", @house_number="721", @house_number_type="1", @orientational_number=nil>], @updated_at=nil, @legal_form="Fyzická osoba podnikající dle živnostenského zákona nezapsaná v obchodním rejstříku">
 subject.name => Josef Stříbný
 subject.ic => 74948440
-subject.address => #<RubyARES::Address:0x007fc691a776a0 @id="10731009", @street="Nádražní", @postcode="74727", @city="Kobeřice", @city_part="Kobeřice", @house_number="721", @house_number_type="1", @orientational_number=nil>
+subject.address => #<RubyARES::Address:0x007fc691a776a0 @id="406358731", @street="Nádražní", @postcode="74727", @city="Kobeřice", @city_part="Kobeřice", @house_number="721", @house_number_type="1", @orientational_number=nil>
 ```
 
 ### Exceptions
@@ -43,4 +43,14 @@ If the connection to the ARES database can't be established ruby-ares raises `Ru
 
 ## License
 
-See LICENSE
+ruby-ares is written and maintained by [Josef Strzibny](http://strzibny.name).
+
+See LICENSE file.
+
+## Contributors
+
+Contributions are welcome!
+
+Here are the list of current contributors:
+
+- Jindřich Skupa

data/Rakefile

@@ -5,26 +5,7 @@ require 'rake/testtask'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
 require 'ruby-ares'
 
-gemspec = Gem::Specification.new do |s|
-  s.name     = 'ruby-ares'
-  s.version  = RubyARES::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.summary     = 'Gem for accesing business information from ARES database.'
-  s.description = <<-EOF
-                    ARES is the Czech business database maintained by Ministry of Finance of the Czech Republic.
-                    This gem helps to retrieve data provided by this database.
-                  EOF
-  s.licenses = ['GPLv3']
-  s.author   = 'Josef Strzibny'
-  s.email    = 'strzibny@strzibny.name'
-  s.homepage = 'http://github.com/strzibny/ruby-ares'
-  s.required_ruby_version     = '>= 1.8.7'
-  s.required_rubygems_version = '>= 1.8.0'
-  s.files = FileList['README.md', 'Rakefile',
-                      'lib/**/*.rb', 'test/**/test*.rb']
-  s.add_runtime_dependency 'libxml-ruby'
-  s.requirements << 'libxml2'
-end
+gemspec = eval(File.open(File.join(File.dirname(__FILE__),'ruby-ares.gemspec')).read)
 
 Gem::PackageTask.new gemspec do |pkg|
 end

data/lib/ruby-ares.rb

@@ -8,5 +8,5 @@ require 'ruby-ares/address'
 require 'ruby-ares/parser'
 
 module RubyARES
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/ruby-ares/address.rb

@@ -24,11 +24,10 @@ module RubyARES
     end
 
     def to_str
-      @city_part = '' if @city == @city_part
 <<EOF
-#{self.street} #{self.street_number}
+#{self.street.nil? ? self.city_part : self.street} #{self.street_number}
 #{self.postcode} #{self.city}
-#{self.city_part}
+#{self.city_part == self.city ? "" : self.city_part}
 EOF
     end
 

data/lib/ruby-ares/http.rb

@@ -9,8 +9,8 @@ module RubyARES
 
     def self.fetch_subject_xml(ic)
       # Get a subject info from ARES[http://wwwinfo.mfcr.cz/ares/]
-      uri = URI('http://wwwinfo.mfcr.cz/cgi-bin/ares/darv_rzp.cgi')
-      params = { :ico => ic, :ver => '1.0.4' }
+      uri = URI('http://wwwinfo.mfcr.cz/cgi-bin/ares/darv_bas.cgi')
+      params = { :ico => ic, :version => '1.0.3' }
       uri.query = URI.encode_www_form(params)
 
       begin

data/lib/ruby-ares/parser.rb

@@ -15,15 +15,15 @@ module RubyARES
         doc = self.parse_document xml
 
         # Basic info
-        doc.find('//dtt:Zakladni_udaje').each do |node|
+        doc.find('//D:VBAS').each do |node|
           attrs = node.children()
 
           # Attributes of the subject
-          @status = node.find('dtt:Stav').to_a[0].content unless node.find('dtt:Stav') == 0
-          @updated_at = node.find('dtt:Datum_zmeny').to_a[0].content unless node.find('dtt:Datum_zmeny').to_a.size == 0
-          @ic = node.find('dtt:ICO').to_a[0].content
-          @dic = node.find('dtt:DIC').to_a[0].content unless node.find('dtt:DIC').to_a.size == 0
-          @name = node.find('dtt:Obchodni_firma').to_a[0].content unless node.find('dtt:Obchodni_firma').to_a.size == 0
+          @status = node.find("D:ROR/D:SOR/D:SSU").to_a[0].content unless node.find('D:ROR/D:SOR/D:SSU').to_a.size == 0
+          @ic = node.find('D:ICO').to_a[0].content unless node.find('D:ICO').to_a.size == 0
+          @dic = node.find('D:DIC').to_a[0].content unless node.find('D:DIC').to_a.size == 0
+          @name = node.find('D:OF').to_a[0].content unless node.find('D:OF').to_a.size == 0
+          @legal_form = node.find('D:PF/D:NPF').to_a[0].content unless node.find('D:PF/D:NPF').to_a.size == 0
         end
 
         # Corresponding addresses
@@ -32,12 +32,12 @@ module RubyARES
         raise ParseError, "Can't parse the given document."
       end
 
-      if doc.find('//dtt:Error').to_a.size > 0
+      if doc.find('//D:E').to_a.size > 0
         raise ARESDatabaseError, 'ARES returned an error.'
       end
 
       # Create and return subject
-      return RubyARES::Subject.new(@ic, @dic, @name, @status, @addresses, @updated_at)
+      return RubyARES::Subject.new(@ic, @dic, @name, @status, @addresses, @updated_at, @legal_form)
     end
 
     protected
@@ -45,15 +45,15 @@ module RubyARES
       def self.find_addresses(doc)
         @addresses = []
 
-        doc.find('//dtt:Adresa').each do |node|
-          id = node.find('dtt:ID_adresy').to_a[0].content
-          street = node.find('dtt:Nazev_ulice').to_a[0].content unless node.find('dtt:Nazev_ulice').to_a.size == 0
-          postcode = node.find('dtt:PSC').to_a[0].content unless node.find('dtt:PSC').to_a.size == 0
-          city = node.find('dtt:Nazev_obce').to_a[0].content unless node.find('dtt:Nazev_obce').to_a.size == 0
-          city_part = node.find('dtt:Nazev_casti_obce').to_a[0].content unless node.find('dtt:Nazev_casti_obce').to_a.size == 0
-          house_number = node.find('dtt:Cislo_domovni').to_a[0].content unless node.find('dtt:Cislo_domovni').to_a.size == 0
-          house_number_type = node.find('dtt:Typ_cislo_domovni').to_a[0].content unless node.find('dtt:Typ_cislo_domovni').to_a.size == 0
-          orientational_number = node.find('dtt:Cislo_orientacni').to_a[0].content unless node.find('dtt:Cislo_orientacni').to_a.size == 0
+        doc.find('//D:AA').each do |node|
+          id = node.find('D:IDA').to_a[0].content
+          street = node.find('D:NU').to_a[0].content unless node.find('D:NU').to_a.size == 0
+          postcode = node.find('D:PSC').to_a[0].content unless node.find('D:PSC').to_a.size == 0
+          city = node.find('D:N').to_a[0].content unless node.find('D:N').to_a.size == 0
+          city_part = node.find('D:NCO').to_a[0].content unless node.find('D:NCO').to_a.size == 0
+          house_number = node.find('D:CD').to_a[0].content unless node.find('D:CD').to_a.size == 0
+          house_number_type = node.find('D:TCD').to_a[0].content unless node.find('D:TCD').to_a.size == 0
+          orientational_number = node.find('D:CO').to_a[0].content unless node.find('D:CO').to_a.size == 0
 
           @addresses << RubyARES::Address.new(id, street, postcode, city, city_part,
                                           house_number, house_number_type, orientational_number)

data/lib/ruby-ares/subject.rb

@@ -10,6 +10,7 @@ module RubyARES
                 :dic,       # DIC
                 :name,      # Obchodni_firma
                 :company,   # alias for name
+                :legal_form,# Pravni forma
                 :status,    # Stav
                 :addresses,
                 :updated_at # Datum_zmeny
@@ -19,13 +20,14 @@ module RubyARES
       RubyARES::Parser.get_subject xml
     end
 
-    def initialize(ic, dic, name, status, addresses, updated_at)
+    def initialize(ic, dic, name, status, addresses, updated_at, legal_form)
       @ic, @ico = ic, ic
       @dic = dic
       @name, @company = name
       @status = status
       @addresses = addresses
       @updated_at = updated_at
+      @legal_form = legal_form
     end
 
     def address

data/test/test_ares.rb

@@ -1,34 +1,50 @@
 # encoding: UTF-8
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'helper'
 require 'ruby-ares'
 
-class RubyARESTest < Test::Unit::TestCase
+class RubyARESTest < Minitest::Test
   def setup
     @subject = RubyARES::Parser.get_subject RubyARESTestHelper.subject_xml
   end
 
   def test_subject_address_house_number
-    assert_equal '2178 1', "#{@subject.addresses[0].house_number} #{@subject.addresses[0].house_number_type}"
+    assert_equal '778 1', "#{@subject.addresses[0].house_number} #{@subject.addresses[0].house_number_type}"
   end
 
   def test_subject_address_street
-    assert_equal 'Podvinný mlýn 6/2178', "#{@subject.addresses[0].street} #{@subject.addresses[0].street_number}"
+    assert_equal 'Budějovická 3a/778', "#{@subject.addresses[0].street} #{@subject.addresses[0].street_number}"
   end
 
   def test_subject_address_city
-    assert_equal 'Praha Libeň', "#{@subject.addresses[0].city} #{@subject.addresses[0].city_part}"
+    assert_equal 'Praha Michle', "#{@subject.addresses[0].city} #{@subject.addresses[0].city_part}"
   end
 
   def test_subject_address_postcode
-    assert_equal '19000', @subject.addresses[0].postcode
+    assert_equal '14000', @subject.addresses[0].postcode
   end
 
   def test_subject_name
     assert_equal 'Asseco Central Europe, a.s.', @subject.name
   end
 
+  def test_subject_dic
+    assert_equal 'CZ27074358', @subject.dic
+  end
+
+  def test_subject_ic
+    assert_equal '27074358', @subject.ic
+  end
+
+  def test_subject_legal_form
+    assert_equal 'Akciová společnost', @subject.legal_form
+  end
+
+  def test_subject_status
+    assert_equal 'Aktivní', @subject.status
+  end
+
   def test_number_of_subject_addresses
     assert_equal 1, @subject.addresses.size
   end

data/test/test_ares_address.rb

@@ -1,9 +1,9 @@
 # encoding: UTF-8
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'ruby-ares/address'
 
-class RubyARESAddressTest < Test::Unit::TestCase
+class RubyARESAddressTest < Minitest::Test
 
   def setup
     @address = RubyARES::Address.new(1, 'Kunzova', '10010', 'Brno', 'Královo pole', 1, 1, nil)

data/test/test_ares_http.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'ruby-ares/http'
 
-class RubyARESHTTPTest < Test::Unit::TestCase
+class RubyARESHTTPTest < Minitest::Test
 
 end

data/test/test_ares_parser.rb

@@ -1,13 +1,13 @@
 # encoding: UTF-8
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'helper'
 require 'ruby-ares/parser'
 
-class RubyARESParserTest < Test::Unit::TestCase
+class RubyARESParserTest < Minitest::Test
 
   def test_parser_should_fail
-    assert_raise(RubyARES::Parser::ARESDatabaseError) {
+    assert_raises(RubyARES::Parser::ARESDatabaseError) {
       RubyARES::Parser.get_subject(RubyARESTestHelper.error_responce_xml)
     }
   end

data/test/test_ares_subject.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'ruby-ares/subject'
 
-class RubyARESSubjectTest < Test::Unit::TestCase
+class RubyARESSubjectTest < Minitest::Test
 
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ares
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Josef Strzibny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -32,6 +32,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - README.md
 - Rakefile
 - lib/ruby-ares.rb
@@ -54,18 +55,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.0
 requirements:
 - libxml2
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gem for accesing business information from ARES database.