abn_search 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abnsearch (0.0.1)
+    abn_search (0.0.2)
       nokogiri
 
 GEM
@@ -13,4 +13,4 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  abnsearch!
+  abn_search!

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.2'
+  s.version     = '0.0.3'
   s.authors     = ["James Martin"]
   s.email       = ["james@visualconnect.net"]
   s.homepage    = "https://github.com/jamsi/abn_search"
@@ -15,6 +15,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_dependency("nokogiri")
 end

data/lib/abn_search.rb

@@ -2,28 +2,29 @@ require 'nokogiri'
 require 'open-uri'
 
 class ABNSearch
-  
+
   module Version
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
-  
+
   attr_accessor :name, :abn, :entity_type, :errors, :guid
-  
+
   def initialize(abn=nil, guid=nil)
     self.errors = []
     self.abn = abn unless abn.nil?
     self.guid = guid unless guid.nil?
+    self.name = "n/a"
     self.search
   end
 
-  def search    
+  def search
     self.errors << "No ABN provided." && return if self.abn.nil?
     self.errors << "No GUID provided. Please obtain one at - http://www.abr.business.gov.au/Webservices.aspx" && return if self.guid.nil?
-  
-    @WSDL_URL = 'http://abr.business.gov.au/ABRXMLSearch/AbrXmlSearch.asmx/ABRSearchByABN?'    
+
+    @WSDL_URL = 'http://abr.business.gov.au/ABRXMLSearch/AbrXmlSearch.asmx/ABRSearchByABN?'
     url = @WSDL_URL + "searchString=#{self.abn}&includeHistoricalDetails=n&authenticationGuid=#{self.guid}"
     doc = Nokogiri::HTML(open(url))
-  
+
     # Fetch attributes we require
     base_path = '//html/body/abrpayloadsearchresults/response/businessentity'
     entity_type = doc.xpath(base_path + '/entitytype')
@@ -31,30 +32,30 @@ class ABNSearch
     trading_name = doc.xpath(base_path + '/maintradingname/organisationname')
     main_name = doc.xpath(base_path + '/mainname/organisationname')
     expires = doc.xpath(base_path + '/entitystatus/entitystatuscode')
-    
+
     # Did we find a valid ABN?
     if abn[0].nil?
       self.errors << "Invalid ABN number."
       return
     end
-  
+
     # Is the busines still valid?
     if expires && expires[0].content.include?("Cancelled")
       self.errors << "Business ABN #{self.abn} has expired."
       return
     end
-  
+
     # Set ABN business attributes
     self.entity_type = entity_type[0].content unless entity_type[0].nil?
-  
+
     # Set the business name. Sometimes there's no trading name .. but a "main name".
     if trading_name[0].nil?
-      self.name = main_name[0].content
-    else 
-      self.name = trading_name[0].content
+      self.name = main_name[0].content if !main_name.empty?
+    else
+      self.name = trading_name[0].content if !trading_name.empty?
     end
   end
-  
+
   def valid?
     self.errors.size == 0
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abn_search
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000Z
+date: 2012-01-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153391800 !ruby/object:Gem::Requirement
+  requirement: &2157861680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153391800
+  version_requirements: *2157861680
 description: A simple ABN search library for validating and obtaining ABN details
   from the Australian Business Register.
 email:
@@ -61,3 +61,4 @@ signing_key:
 specification_version: 3
 summary: ABNSearch library for Australian businesses.
 test_files: []
+has_rdoc: