rets 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.1.3 / 2012-03-05
+
+* fixes to support location=1 in getobject query
+
 ### 0.1.2 / 2012-02-17
 
 * bugfix - check ReplyCode in login, retry on errors

data/lib/rets.rb

@@ -8,7 +8,7 @@ require 'net/http/persistent'
 require 'nokogiri'
 
 module Rets
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   AuthorizationFailure = Class.new(ArgumentError)
   InvalidRequest       = Class.new(ArgumentError)

data/lib/rets/client.rb

@@ -157,7 +157,7 @@ module Rets
       content_type = response["content-type"]
 
       if content_type.include?("multipart")
-        boundary = content_type.scan(/boundary="(.*?)"/).to_s
+        boundary = content_type.scan(/boundary="?([^;"]*)?/).to_s
 
         parts = Parser::Multipart.parse(response.body, boundary)
 
@@ -194,7 +194,7 @@ module Rets
         "Resource" => opts[:resource],
         "Type"     => opts[:object_type],
         "ID"       => "#{opts[:resource_id]}:#{object_id}",
-        "Location" => 0
+        "Location" => opts[:location] || 0
       )
 
       headers = build_headers.merge(

data/lib/rets/parser/multipart.rb

@@ -20,7 +20,7 @@ module Rets
             header_part, body_part = chunk.split(/#{CRLF}#{WSP}*#{CRLF}/m, 2)
 
             if header_part =~ HEADER_LINE
-              headers = header_part.split(/\r\n/).map { |kv| k,v = kv.split(/:\s?/); [k.downcase, v] }
+              headers = header_part.split(/\r\n/).map { |kv| p = kv.split(/:\s?/); [p[0].downcase, p[1..-1].join(':')] }
               headers = Hash[*headers.flatten]
 
               parts << Part.new(headers, body_part)

data/test/fixtures.rb

@@ -109,6 +109,49 @@ MULITPART_RESPONSE = [
   ""
 ].join("\r\n")
 
+MULTIPART_RESPONSE_URLS = [
+  '--rets.object.content.boundary.1330546052739',
+  'Content-ID: 38845440',
+  'Object-ID: 1',
+  'Content-Type: text/xml',
+  'Location: http://foobarmls.com/RETS//MediaDisplay/98/hr2890998-1.jpg',
+  '',
+  '<RETS ReplyCode="0" ReplyText="Operation Successful" />',
+  '',
+  '--rets.object.content.boundary.1330546052739',
+  'Content-ID: 38845440',
+  'Object-ID: 2',
+  'Content-Type: text/xml',
+  'Location: http://foobarmls.com/RETS//MediaDisplay/98/hr2890998-2.jpg',
+  '',
+  '<RETS ReplyCode="0" ReplyText="Operation Successful" />',
+  '',
+  '--rets.object.content.boundary.1330546052739',
+  'Content-ID: 38845440',
+  'Object-ID: 3',
+  'Content-Type: text/xml',
+  'Location: http://foobarmls.com/RETS//MediaDisplay/98/hr2890998-3.jpg',
+  '',
+  '<RETS ReplyCode="0" ReplyText="Operation Successful" />',
+  '',
+  '--rets.object.content.boundary.1330546052739',
+  'Content-ID: 38845440',
+  'Object-ID: 4',
+  'Content-Type: text/xml',
+  'Location: http://foobarmls.com/RETS//MediaDisplay/98/hr2890998-4.jpg',
+  '',
+  '<RETS ReplyCode="0" ReplyText="Operation Successful" />',
+  '',
+  '--rets.object.content.boundary.1330546052739',
+  'Content-ID: 38845440',
+  'Object-ID: 5',
+  'Content-Type: text/xml',
+  'Location: http://foobarmls.com/RETS//MediaDisplay/98/hr2890998-5.jpg',
+  '',
+  '<RETS ReplyCode="0" ReplyText="Operation Successful" />',
+  '',
+  '--rets.object.content.boundary.1330546052739--'
+].join("\r\n")
 
 SAMPLE_COMPACT = <<XML
 <RETS ReplyCode="0" ReplyText="Operation successful.">

data/test/test_client.rb

@@ -531,6 +531,17 @@ DIGEST
     @client.create_parts_from_response(response)
   end
 
+  def test_parse_boundary_wo_quotes
+    response = {"content-type" => 'multipart; boundary=simple boundary; foo;'}
+    response.stubs(:body => MULITPART_RESPONSE)
+
+    Rets::Parser::Multipart.expects(:parse).
+      with(MULITPART_RESPONSE, "simple boundary").
+      returns([])
+
+    @client.create_parts_from_response(response)
+  end
+
   def test_create_parts_from_response_returns_a_single_part_when_not_multipart_response
     response = {"content-type" => "text/plain"}
     response.stubs(:body => "fakebody")

data/test/test_parser_multipart.rb

@@ -18,4 +18,14 @@ class TestParserMultipart < Test::Unit::TestCase
     assert_equal headers.merge("object-id" => "2"), part.headers
     assert_equal "yyyyyyyy", part.body.strip
   end
+  
+  def test_parse_real_mls_data
+    parts = Rets::Parser::Multipart.parse(MULTIPART_RESPONSE_URLS, "rets.object.content.boundary.1330546052739")
+    assert_equal 5, parts.size
+  end
+  
+  def test_parse_values_with_colon_data
+    parts = Rets::Parser::Multipart.parse(MULTIPART_RESPONSE_URLS, "rets.object.content.boundary.1330546052739")
+    assert_equal 'http://foobarmls.com/RETS//MediaDisplay/98/hr2890998-1.jpg', parts[0].headers['location']
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rets
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Estately, Inc. Open Source
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-17 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-http-persistent
@@ -65,36 +65,21 @@ dependencies:
         version: 0.9.12
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
-  type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 27
         segments: 
         - 2
-        - 13
-        version: "2.13"
+        - 12
+        version: "2.12"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 description: |-
   A pure-ruby library for fetching data from [RETS] servers.
   
@@ -163,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rets
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A pure-ruby library for fetching data from [RETS] servers