rets 0.1.5 → 0.1.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.1.6 / 2012-03-12
+
+* fix: user_agent authentication
+
 ### 0.1.5 / 2012-03-17
 
 * fix: retries raise error after too many failures

data/lib/rets/authentication.rb

@@ -43,16 +43,14 @@ module Rets
       end
     end
 
-    def calculate_user_agent_digest(user_agent, user_agent_password, session_id, version)
-      product, _ = user_agent.split("/")
-
+    def calculate_user_agent_digest(product, user_agent_password, rets_request_id, session_id, version)
       a1 = Digest::MD5.hexdigest "#{product}:#{user_agent_password}"
 
-      Digest::MD5.hexdigest "#{a1}::#{session_id}:#{version}"
+      Digest::MD5.hexdigest "#{a1}:#{rets_request_id}:#{session_id}:#{version}"
     end
 
     def build_user_agent_auth(*args)
-      %Q(Digest "#{calculate_user_agent_digest(*args)}")
+      %Q(Digest #{calculate_user_agent_digest(*args)})
     end
 
   end

data/lib/rets/client.rb

@@ -351,6 +351,12 @@ module Rets
       @cookies.map{ |k,v| "#{k}=#{v}" }.join("; ")
     end
 
+    def cookie(name)
+      return if @cookies.nil? or @cookies.empty?
+
+      @cookies[name]
+    end
+
 
     def session=(session)
       self.authorization = session.authorization
@@ -440,7 +446,7 @@ module Rets
       if options[:ua_password]
         headers.merge!(
           "RETS-UA-Authorization" => build_user_agent_auth(
-            user_agent, options[:ua_password], "", rets_version))
+            user_agent, options[:ua_password], '', cookie('RETS-Session-ID'), rets_version))
       end
 
       headers

data/lib/rets.rb

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

data/test/test_client.rb

@@ -331,7 +331,7 @@ DIGEST
     Digest::MD5.expects(:hexdigest).with("a1::session:version").returns("hash")
 
     assert_equal "hash",
-      @client.calculate_user_agent_digest("agent", "secret", "session", "version")
+      @client.calculate_user_agent_digest("agent", "secret", '', "session", "version")
   end
 
 
@@ -437,7 +437,7 @@ DIGEST
     @client.find(:all, :foo => :bar)
   end
 
-  def test_find_retries_on_errors
+  def test_find_eventually_reraises_errors
     @client.stubs(:find_every).raises(Rets::AuthorizationFailure)
     assert_raise Rets::AuthorizationFailure do
       @client.find(:all, :foo => :bar)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rets
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Estately, Inc. Open Source
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-19 00:00:00 Z
+date: 2012-04-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-http-persistent
@@ -88,11 +88,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 25
         segments: 
         - 2
-        - 16
-        version: "2.16"
+        - 13
+        version: "2.13"
   type: :development
   version_requirements: *id005
 description: |-
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rets
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A pure-ruby library for fetching data from [RETS] servers