abn_search 0.0.5 → 0.0.6
Sign up to get free protection for your applications and to get access to all the features.
- data/abn_search.gemspec +1 -1
- data/lib/abn_search.rb +16 -6
- metadata +2 -2
data/abn_search.gemspec
CHANGED
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
|
|
3
3
|
|
4
4
|
Gem::Specification.new do |s|
|
5
5
|
s.name = "abn_search"
|
6
|
-
s.version = '0.0.
|
6
|
+
s.version = '0.0.6'
|
7
7
|
s.authors = ["James Martin"]
|
8
8
|
s.email = ["james@visualconnect.net"]
|
9
9
|
s.homepage = "https://github.com/jamsi/abn_search"
|
data/lib/abn_search.rb
CHANGED
@@ -17,7 +17,7 @@ require 'savon'
|
|
17
17
|
class ABNSearch
|
18
18
|
|
19
19
|
module Version
|
20
|
-
VERSION = "0.0.
|
20
|
+
VERSION = "0.0.6"
|
21
21
|
end
|
22
22
|
|
23
23
|
attr_accessor :errors, :guid, :proxy, :client_options
|
@@ -90,10 +90,15 @@ class ABNSearch
|
|
90
90
|
}
|
91
91
|
|
92
92
|
response = client.call(:abr_search_by_name, message: request)
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
93
|
+
result_list = response.body[:abr_search_by_name_response][:abr_payload_search_results][:response][:search_results_list]
|
94
|
+
|
95
|
+
if result_list.blank?
|
96
|
+
return []
|
97
|
+
else
|
98
|
+
results = response.body[:abr_search_by_name_response][:abr_payload_search_results][:response][:search_results_list][:search_results_record]
|
99
|
+
return [parse_search_result(results)] if !results.is_a?(Array)
|
100
|
+
return results.map do |r| parse_search_result(r) end
|
101
|
+
end
|
97
102
|
rescue => ex
|
98
103
|
self.errors << ex.to_s
|
99
104
|
end
|
@@ -108,6 +113,7 @@ class ABNSearch
|
|
108
113
|
main_name: result[:main_name].blank? ? "" : result[:main_name][:organisation_name],
|
109
114
|
trading_name: result[:main_trading_name].blank? ? "" : result[:main_trading_name][:organisation_name],
|
110
115
|
legal_name: result[:legal_name].blank? ? "" : "#{result[:legal_name][:given_name]} #{result[:legal_name][:family_name]}",
|
116
|
+
legal_name2: result[:legal_name].blank? ? "" : result[:legal_name][:full_name],
|
111
117
|
other_trading_name: result[:other_trading_name].blank? ? "" : result[:other_trading_name][:organisation_name]
|
112
118
|
}
|
113
119
|
|
@@ -119,7 +125,11 @@ class ABNSearch
|
|
119
125
|
elsif !result[:other_trading_name].blank?
|
120
126
|
result[:name] = result[:other_trading_name]
|
121
127
|
else
|
122
|
-
result[:
|
128
|
+
if !result[:legal_name].blank? && result[:legal_name].length > 2
|
129
|
+
result[:name] = result[:legal_name]
|
130
|
+
elsif !result[:legal_name].blank?
|
131
|
+
result[:name] = result[:legal_name2]
|
132
|
+
end
|
123
133
|
end
|
124
134
|
|
125
135
|
return result
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: abn_search
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.6
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-07-
|
12
|
+
date: 2013-07-15 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: savon
|