rets4r 0.8.4 → 0.8.5

data/CHANGELOG

@@ -1,6 +1,13 @@
+0.8.5
+	Parser#parse_compact_line now once again ignores beginning and ending delimiters. (Scott Patterson)
+	Parser#parse_data now ignores header fields that are nil or blank when stripped. (Scott Patterson)
+	Updated test to use the rets client version of the client, not hardcoded for post and get tests. (Scott Patterson)
+	
 0.8.4
 	Fixed auth issue with authenticate headers with spaces after commas. (Ken Wiesner, Scott Patterson)
-	When an exception is raised in the authentication parsing code, complain by raising a new exception, but also report anything of interest at the same time: request, response, response's body. (Fran�ois Beausoleil)
+	When an exception is raised in the authentication parsing code, complain by raising 
+		a new exception, but also report anything of interest at the same time: request, 
+		response, response's body. (Fran�ois Beausoleil)
 	Fixed Client#request to actually respect the specified request method instead of always using GET requests. (Scott Patterson)
 	Set default request method to POST since some RETS servers seem to have trouble with GET requests. (Scott Patterson)
 	

data/lib/rets4r/client.rb

@@ -32,7 +32,7 @@ module RETS4R
 		DEFAULT_OUTPUT		   = OUTPUT_RUBY
 		DEFAULT_METHOD 		   = METHOD_POST
 		DEFAULT_RETRY        = 2
-		DEFAULT_USER_AGENT 	 = 'RETS4R/0.8.4'
+		DEFAULT_USER_AGENT 	 = 'RETS4R/0.8.5'
 		DEFAULT_RETS_VERSION = '1.7'
 		SUPPORTED_RETS_VERSIONS = ['1.5', '1.7']
 		CAPABILITY_LIST   = ['Action', 'ChangePassword', 'GetObject', 'Login', 'LoginComplete', 'Logout', 'Search', 'GetMetadata', 'Update']

data/lib/rets4r/client/parser.rb

@@ -102,7 +102,9 @@ module RETS4R
 			
 			def parse_compact_line(data, delim = "\t")
 				begin
-					return data.to_s.split(delim)
+					# We need to remove the beginning and ending delimiters prior to splitting
+					string_data = data.to_s
+					return string_data[1, string_data.length - 2].split(delim, -1)
 				rescue
 					raise "Error while parsing compact line: #{$!} with data: #{data}"
 				end
@@ -114,7 +116,11 @@ module RETS4R
 				parsed_data = parse_compact_line(data, @transaction.ascii_delimiter)
 				
 				header.length.times do |pos|
-					results[header[pos]] = parsed_data[pos]
+					# The removal of delimiters in #parse_compact_line prevents blank fields in newer
+					# version of Ruby, but on older versions (specifically 1.8.5 from 2006) a blank
+					# field would still manage to sneak in, so we now explicitly prevent them from going
+					# to the results.
+					results[header[pos]] = parsed_data[pos] unless header[pos].nil? || header[pos].strip == ""
 				end
 				
 				results

data/test/client/tc_client.rb

@@ -290,7 +290,7 @@ module RETS4R
 			response.stubs(:code).returns('500')
 			response.stubs(:message).returns('Move along, nothing to see here.')
 			
-			http.expects(:get).with('', {'RETS-Session-ID' => '0', 'User-Agent' => 'RETS4R/0.8.2', 'RETS-Version' => 'RETS/1.7', 'Accept' => '*/*'}).at_least_once.returns(response)
+			http.expects(:get).with('', {'RETS-Session-ID' => '0', 'User-Agent' => @rets.user_agent, 'RETS-Version' => "RETS/#{@rets.rets_version}", 'Accept' => '*/*'}).at_least_once.returns(response)
 			http.expects(:post).never
 			Net::HTTP.any_instance.expects(:start).at_least_once.yields(http)
 			
@@ -307,7 +307,7 @@ module RETS4R
 			response.stubs(:code).returns('500')
 			response.stubs(:message).returns('Move along, nothing to see here.')
 			
-			http.expects(:post).with('', '', {'RETS-Session-ID' => '0', 'User-Agent' => 'RETS4R/0.8.2', 'RETS-Version' => 'RETS/1.7', 'Accept' => '*/*'}).at_least_once.returns(response)
+			http.expects(:post).with('', '', {'RETS-Session-ID' => '0', 'User-Agent' => @rets.user_agent, 'RETS-Version' => "RETS/#{@rets.rets_version}", 'Accept' => '*/*'}).at_least_once.returns(response)
 			http.expects(:get).never
 			Net::HTTP.any_instance.expects(:start).at_least_once.yields(http)
 			

data/test/client/test_parser.rb

@@ -104,6 +104,25 @@ module RETS4R
 				assert_equal('20400', transaction.reply_code)
 				assert_equal('Invalid Invalidness.', transaction.reply_text)
 			end
+			
+			def test_parse_compact_line
+				results = @parser.parse_compact_line("	1	2	3	")
+
+				assert_equal 3, results.size
+				assert_equal '1', results[0]
+				assert_equal '2', results[1]
+				assert_equal '3', results[2]
+			end
+			
+			def test_parse_data_should_ignore_empty_header_fields
+				header = ["", "1", "2", "3"]
+				data   = "		1	2	3	"
+				
+				results = @parser.parse_data(data, header)
+				
+				assert_nil results[""]
+				assert_equal 3, results.size
+			end
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rets4r
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - Scott Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-05 00:00:00 -08:00
+date: 2008-11-06 00:00:00 -08:00
 default_executable: 
 dependencies: []