rets 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.1.5 / 2012-03-17
+
+* fix: retries raise error after too many failures
+* fix: raise error for failed multipart object request
+* fix: retries start with a clean slate, fixing authorization errors during retry
+
 ### 0.1.4 / 2012-03-12
 
 * fix: an MLS uses lower case in RETS tag

data/lib/rets.rb

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

data/lib/rets/client.rb

@@ -13,16 +13,17 @@ module Rets
       @options = options
       clean_setup
     end
-    
+
     def clean_setup
-      
-      @capabilities = nil
-      @cookies      = nil
-      @metadata     = nil
-      @cached_metadata = nil
-      
+
+      @capabilities      = nil
+      @cookies           = nil
+      @metadata          = nil
+      @cached_metadata   = nil
+      @tries             = nil
+      @connection        = nil
       self.authorization = nil
-      self.capabilities = nil
+      self.capabilities  = nil
 
       uri          = URI.parse(@options[:login_url])
 
@@ -88,6 +89,8 @@ module Rets
           self.logger.info "Retry #{retries}/3"
           clean_setup
           retry
+        else
+          raise e
         end
       end
     end
@@ -300,7 +303,7 @@ module Rets
       if Net::HTTPUnauthorized === response
         raise AuthorizationFailure, "Authorization failed, check credentials?"
       else
-        check_errors(response)
+        ErrorChecker.check(response)
         self.capabilities = extract_capabilities(Nokogiri.parse(response.body))
       end
     end
@@ -311,7 +314,7 @@ module Rets
         handle_unauthorized_response(response)
 
       elsif Net::HTTPSuccess === response # 2xx
-        check_errors(response)
+        ErrorChecker.check(response)
       else
         raise UnknownResponse, "Unable to handle response #{response.class}"
       end
@@ -319,25 +322,6 @@ module Rets
       return response
     end
 
-    def check_errors(response)
-      begin
-        if !response.body.empty?
-          xml = Nokogiri::XML.parse(response.body, nil, nil, Nokogiri::XML::ParseOptions::STRICT)
-
-          rets_element = xml.xpath("/RETS")
-          reply_text = (rets_element.attr("ReplyText") || rets_element.attr("replyText")).value
-          reply_code = (rets_element.attr("ReplyCode") || rets_element.attr("replyCode")).value.to_i
-
-          if reply_code.nonzero?
-            raise InvalidRequest, "Got error code #{reply_code} (#{reply_text})."
-          end
-        end
-
-      rescue Nokogiri::XML::SyntaxError => e
-        logger.debug "Not xml"
-      end
-    end
-
     def handle_cookies(response)
       if cookies?(response)
         self.cookies = response.get_fields('set-cookie')
@@ -498,5 +482,26 @@ module Rets
       out.join("\n")
     end
 
+    class ErrorChecker
+      def self.check(response)
+        begin
+          if !response.body.empty?
+            xml = Nokogiri::XML.parse(response.body, nil, nil, Nokogiri::XML::ParseOptions::STRICT)
+
+            rets_element = xml.xpath("/RETS")
+            reply_text = (rets_element.attr("ReplyText") || rets_element.attr("replyText")).value
+            reply_code = (rets_element.attr("ReplyCode") || rets_element.attr("replyCode")).value.to_i
+
+            if reply_code.nonzero?
+              raise InvalidRequest, "Got error code #{reply_code} (#{reply_text})."
+            end
+          end
+
+        rescue Nokogiri::XML::SyntaxError => e
+          #Not xml
+        end
+      end
+    end
+
   end
 end

data/lib/rets/parser/multipart.rb

@@ -28,9 +28,14 @@ module Rets
               next # not a valid chunk.
             end
           end
-
+        check_for_invalids_parts!(parts)
         parts
       end
+
+      def self.check_for_invalids_parts!(parts)
+        return unless parts.length == 1 && parts.first.headers['content-type'] == 'text/xml'
+        Client::ErrorChecker.check(parts.first)
+      end
     end
   end
 end

data/test/test_client.rb

@@ -437,6 +437,13 @@ DIGEST
     @client.find(:all, :foo => :bar)
   end
 
+  def test_find_retries_on_errors
+    @client.stubs(:find_every).raises(Rets::AuthorizationFailure)
+    assert_raise Rets::AuthorizationFailure do
+      @client.find(:all, :foo => :bar)
+    end
+  end
+
   def test_find_provides_default_values
     @client.expects(:build_key_values).
       with("QueryType" => "DMQL2", "Format" => "COMPACT", "Query" => "x", "Foo" => "bar").

data/test/test_parser_multipart.rb

@@ -28,4 +28,12 @@ class TestParserMultipart < Test::Unit::TestCase
     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
+
+  def test_parse_with_error
+    raw = "\r\n--89467f8e0c6b48158c8f1883910212ec\r\nContent-Type: text/xml\r\nContent-ID: foo\r\nObject-ID: *\r\n\r\n<RETS ReplyCode=\"20403\" ReplyText=\"No Object Found\" />\r\n\r\n--89467f8e0c6b48158c8f1883910212ec--\r\n"
+    boundary = "89467f8e0c6b48158c8f1883910212ec"
+    assert_raise Rets::InvalidRequest do
+      Rets::Parser::Multipart.parse(raw, boundary)
+    end
+  end
 end

metadata

@@ -1,85 +1,114 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rets
-version: !ruby/object:Gem::Version
-  version: 0.1.4
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
-authors:
+authors: 
 - Estately, Inc. Open Source
 - Ben Bleything
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: net-http-persistent
-  requirement: &70169260555460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 7
+        version: "1.7"
   type: :runtime
-  prerelease: false
-  version_requirements: *70169260555460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &70169260555040 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
   type: :runtime
-  prerelease: false
-  version_requirements: *70169260555040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &70169260554620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 0
+        - 9
+        - 12
         version: 0.9.12
   type: :development
-  prerelease: false
-  version_requirements: *70169260554620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &70169260554200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
-  prerelease: false
-  version_requirements: *70169260554200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &70169260553780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 16
+        version: "2.16"
   type: :development
-  prerelease: false
-  version_requirements: *70169260553780
-description: ! 'A pure-ruby library for fetching data from [RETS] servers.
-
-
-  [RETS]: http://www.rets.org'
-email:
+  version_requirements: *id005
+description: |-
+  A pure-ruby library for fetching data from [RETS] servers.
+  
+  [RETS]: http://www.rets.org
+email: 
 - opensource@estately.com
 - ben@bleything.net
-executables:
+executables: 
 - rets
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - Manifest.txt
-files:
+files: 
 - CHANGELOG.md
 - Manifest.txt
 - README.md
@@ -106,31 +135,39 @@ files:
 - .gemtest
 homepage: http://github.com/estately/rets
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.md
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 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
-test_files:
+test_files: 
 - test/test_client.rb
 - test/test_metadata.rb
 - test/test_parser_compact.rb