abn_search 0.0.5 → 0.0.6

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.5'
+  s.version     = '0.0.6'
   s.authors     = ["James Martin"]
   s.email       = ["james@visualconnect.net"]
   s.homepage    = "https://github.com/jamsi/abn_search"

data/lib/abn_search.rb

@@ -17,7 +17,7 @@ require 'savon'
 class ABNSearch
 
   module Version
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 
   attr_accessor :errors, :guid, :proxy, :client_options
@@ -90,10 +90,15 @@ class ABNSearch
       }
 
       response = client.call(:abr_search_by_name, message: request)
-      results = response.body[:abr_search_by_name_response][:abr_payload_search_results][:response][:search_results_list][:search_results_record]
-
-      return [parse_search_result(results)] if !results.is_a?(Array)
-      return results.map do |r| parse_search_result(r) end
+      result_list = response.body[:abr_search_by_name_response][:abr_payload_search_results][:response][:search_results_list]
+
+      if result_list.blank?
+        return []
+      else
+        results = response.body[:abr_search_by_name_response][:abr_payload_search_results][:response][:search_results_list][:search_results_record]
+        return [parse_search_result(results)] if !results.is_a?(Array)
+        return results.map do |r| parse_search_result(r) end
+      end
     rescue => ex
       self.errors << ex.to_s
     end
@@ -108,6 +113,7 @@ class ABNSearch
       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]
     }
 
@@ -119,7 +125,11 @@ class ABNSearch
     elsif !result[:other_trading_name].blank?
       result[:name] = result[:other_trading_name]
     else
-      result[:name] = result[:legal_name]
+      if !result[:legal_name].blank? && result[:legal_name].length > 2
+        result[:name] = result[:legal_name]
+      elsif !result[:legal_name].blank?
+        result[:name] = result[:legal_name2]
+      end
     end
 
     return result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abn_search
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon