abn_search 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,16 +1,50 @@
 PATH
   remote: .
   specs:
-    abn_search (0.0.2)
+    abn_search (0.0.6)
       nokogiri
+      savon
 
 GEM
   remote: http://rubygems.org/
   specs:
-    nokogiri (1.5.0)
+    akami (1.2.2)
+      gyoku (>= 0.4.0)
+      nokogiri
+    builder (3.2.2)
+    gyoku (1.1.1)
+      builder (>= 2.1.2)
+    httpi (2.2.5)
+      rack
+    macaddr (1.7.1)
+      systemu (~> 2.6.2)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    nori (2.4.0)
+    rack (1.5.2)
+    savon (2.6.0)
+      akami (~> 1.2.0)
+      builder (>= 2.1.2)
+      gyoku (~> 1.1.0)
+      httpi (~> 2.2.3)
+      nokogiri (>= 1.4.0)
+      nori (~> 2.4.0)
+      uuid (~> 2.3.7)
+      wasabi (~> 3.3.0)
+    systemu (2.6.4)
+    uuid (2.3.7)
+      macaddr (~> 1.0)
+    wasabi (3.3.0)
+      httpi (~> 2.0)
+      mime-types (< 2.0.0)
+      nokogiri (>= 1.4.0)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   abn_search!
+  yard

data/README.rdoc

@@ -18,7 +18,7 @@ Simply add the following line to your Gemfile and run bundle install.
   # Search by ABN Number
   abn = ABNSearch.new("YOUR_GUID_HERE")
   result = abn.search("59001215354")
-  => {:abn=>"59001215354", :entity_type=>"Australian Public Company", :status=>"Active", :main_name=>"SONY AUSTRALIA LIMITED", :trading_name=>"", :legal_name=>"", :other_trading_name=>"", :name=>"SONY AUSTRALIA LIMITED"}
+  => {:acn=>"001215354", ":abn=>"59001215354", :entity_type=>"Australian Public Company", :status=>"Active", :main_name=>"SONY AUSTRALIA LIMITED", :trading_name=>"", :legal_name=>"", :other_trading_name=>"", :name=>"SONY AUSTRALIA LIMITED"}
 
   puts result[:entity_type]
   => "Australian Public Company"
@@ -29,6 +29,10 @@ Simply add the following line to your Gemfile and run bundle install.
   puts result[:name]
   => "SONY AUSTRALIA LIMITED"
 
+  # Search by ACN Number
+  result = abn.search_by_acn("001215354")
+  => {:acn=>"001215354", ":abn=>"59001215354", :entity_type=>"Australian Public Company", :status=>"Active", :main_name=>"SONY AUSTRALIA LIMITED", :trading_name=>"", :legal_name=>"", :other_trading_name=>"", :name=>"SONY AUSTRALIA LIMITED"}
+
   # Search by name
   results = abn.search_by_name("Sony", ['NSW'], '2000')
 

data/abn_search.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "abn_search"
-  s.version     = '0.0.6'
+  s.version     = '0.0.7'
   s.authors     = ["James Martin"]
   s.email       = ["james@visualconnect.net"]
   s.homepage    = "https://github.com/jamsi/abn_search"

data/lib/abn_search.rb

@@ -38,6 +38,39 @@ class ABNSearch
     self.client_options.merge!({ :proxy => self.proxy }) unless self.proxy.nil?
   end
 
+  # Performs an ABR search for the ABN setup upon initialization
+  #
+  # @param [String] acn - the acn you wish to search for
+  # @return [ABNSearch] search results in class instance
+  def search_by_acn(acn)
+    self.errors << "No ACN provided." && return if acn.nil?
+    self.errors << "No GUID provided. Please obtain one at - http://www.abr.business.gov.au/Webservices.aspx" && return if self.guid.nil?
+
+    begin
+      client = Savon.client(self.client_options)
+
+      response = client.call(:abr_search_by_asic, message: { authenticationGuid: self.guid, searchString: acn.gsub(" ", ""), includeHistoricalDetails: "N" })
+      # puts "First response: #{response}"
+      result = response.body[:abr_search_by_asic_response][:abr_payload_search_results][:response][:business_entity]
+      # puts "Filtered result: #{result}"
+      # puts "ABN: #{(result[:abn][:identifier_value] rescue "")}"
+      # puts "Entity Type: #{(result[:entity_type][:entity_description] rescue "")}"
+      # puts "Status: #{(result[:entity_status][:entity_status_code] rescue "")}"
+      # puts "Main name: #{(result[:main_name][:organisation_name] rescue "")}"
+      # puts "Trading name: #{(result[:main_trading_name][:organisation_name] rescue "")}"
+      # puts "Legal name: #{(result[:legal_name][:full_name] rescue "")}"
+      # puts "Other Trading name: #{(result[:other_trading_name][:organisation_name] rescue "")}"
+      # puts "Active from date: #{(result[:entity_status][:effective_from] rescue "")}"
+      # puts "Address state code: #{(result[:main_business_physical_address][:state_code] rescue "")}"
+      # puts "Address post code: #{(result[:main_business_physical_address][:postcode] rescue "")}"
+      # puts "Address from date: #{(result[:main_business_physical_address][:effective_from] rescue "")}"
+
+      return parse_search_result(result)
+    rescue => ex
+      self.errors << ex.to_s
+    end
+  end
+
   # Performs an ABR search for the ABN setup upon initialization
   #
   # @param [String] abn - the abn you wish to search for
@@ -50,7 +83,21 @@ class ABNSearch
       client = Savon.client(self.client_options)
 
       response = client.call(:abr_search_by_abn, message: { authenticationGuid: self.guid, searchString: abn.gsub(" ", ""), includeHistoricalDetails: "N" })
+      # puts "First response: #{response}"
       result = response.body[:abr_search_by_abn_response][:abr_payload_search_results][:response][:business_entity]
+      # puts "Filtered result: #{result}"
+      # puts "ABN: #{(result[:abn][:identifier_value] rescue "")}"
+      # puts "Entity Type: #{(result[:entity_type][:entity_description] rescue "")}"
+      # puts "Status: #{(result[:entity_status][:entity_status_code] rescue "")}"
+      # puts "Main name: #{(result[:main_name][:organisation_name] rescue "")}"
+      # puts "Trading name: #{(result[:main_trading_name][:organisation_name] rescue "")}"
+      # puts "Legal name: #{(result[:legal_name][:full_name] rescue "")}"
+      # puts "Other Trading name: #{(result[:other_trading_name][:organisation_name] rescue "")}"
+      # puts "Active from date: #{(result[:entity_status][:effective_from] rescue "")}"
+      # puts "Address state code: #{(result[:main_business_physical_address][:state_code] rescue "")}"
+      # puts "Address post code: #{(result[:main_business_physical_address][:postcode] rescue "")}"
+      # puts "Address from date: #{(result[:main_business_physical_address][:effective_from] rescue "")}"
+
       return parse_search_result(result)
     rescue => ex
       self.errors << ex.to_s
@@ -107,14 +154,21 @@ class ABNSearch
   # Parses results for a search by ABN
   def parse_search_result(result)
     result = {
-      abn:            result[:abn][:identifier_value],
-      entity_type:    result[:entity_type].blank? ? "" : result[:entity_type][:entity_description],
-      status:         result[:entity_status].blank? ? "" : result[:entity_status][:entity_status_code],
-      main_name:      result[:main_name].blank? ? "" : result[:main_name][:organisation_name],
-      trading_name:   result[:main_trading_name].blank? ? "" : result[:main_trading_name][:organisation_name],
-      legal_name:     result[:legal_name].blank? ? "" : "#{result[:legal_name][:given_name]} #{result[:legal_name][:family_name]}",
-      legal_name2:     result[:legal_name].blank? ? "" : result[:legal_name][:full_name],
-      other_trading_name: result[:other_trading_name].blank? ? "" : result[:other_trading_name][:organisation_name]
+      acn:                  (result[:asic_number] rescue ""),
+      abn:                  (result[:abn][:identifier_value] rescue ""),
+      entity_type:          result[:entity_type].blank? ? "" : (result[:entity_type][:entity_description] rescue ""),
+      status:               result[:entity_status].blank? ? "" : (result[:entity_status][:entity_status_code] rescue ""),
+      main_name:            result[:main_name].blank? ? "" : (result[:main_name][:organisation_name] rescue ""),
+      trading_name:         result[:main_trading_name].blank? ? "" : (result[:main_trading_name][:organisation_name] rescue ""),
+      legal_name:           result[:legal_name].blank? ? "" : ("#{result[:legal_name][:given_name]} #{result[:legal_name][:family_name]}" rescue ""),
+      legal_name2:          result[:legal_name].blank? ? "" : (result[:legal_name][:full_name] rescue ""),
+      other_trading_name:   result[:other_trading_name].blank? ? "" : (result[:other_trading_name][:organisation_name] rescue ""),
+      active_from_date:     result[:entity_status].blank? ? "" : (result[:entity_status][:effective_from] rescue ""),
+      address_state_code:   result[:main_business_physical_address].blank? ? "" : (result[:main_business_physical_address][:state_code] rescue ""),
+      address_post_code:    result[:main_business_physical_address].blank? ? "" : (result[:main_business_physical_address][:postcode] rescue ""),
+      address_from_date:    result[:main_business_physical_address].blank? ? "" : (result[:main_business_physical_address][:effective_from] rescue ""),
+      last_updated:         (result[:record_last_updated_date] rescue ""),
+      gst_from_date:        result[:goods_and_services_tax].blank? ? "" : (result[:goods_and_services_tax][:effective_from] rescue "")
     }
 
     # Work out what we should return as a name
@@ -127,7 +181,7 @@ class ABNSearch
     else
       if !result[:legal_name].blank? && result[:legal_name].length > 2
         result[:name] = result[:legal_name]
-      elsif !result[:legal_name].blank?
+      elsif !result[:legal_name2].blank?
         result[:name] = result[:legal_name2]
       end
     end
@@ -138,4 +192,4 @@ class ABNSearch
   def valid?
     self.errors.size == 0
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abn_search
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -98,3 +98,4 @@ signing_key:
 specification_version: 3
 summary: ABNSearch library for Australian businesses.
 test_files: []
+has_rdoc: