Changeset 172

Timestamp:

02/20/08 21:19:04 (6 months ago)

Author:

Brendan Taylor <whateley@…>

Message:

whitespace cleanup and a teensy-tiny bugfix

Files:

• COPYING (modified) (1 diff)
• lib/atom/http.rb (modified) (8 diffs)
• lib/atom/service.rb (modified) (1 diff)

COPYING

@@ -7 +7 @@
 sell copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
-  
+
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
-   
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

lib/atom/http.rb

@@ -69 +69 @@
       else
         @@nonce_count += 1
-        nc = ('%08x' % @@nonce_count) 
+        nc = ('%08x' % @@nonce_count)
 
         # XXX auth-int
@@ -78 +78 @@
 
       header = %Q<Digest username="#{user}", uri="#{req.path}", realm="#{params[:realm]}", response="#{response}", nonce="#{params[:nonce]}">
-   
+
       if params[:opaque]
         header += %Q<, opaque="#{params[:opaque]}">
@@ -108 +108 @@
   # This object can be used on its own, or passed to an Atom::Service,
   # Atom::Collection or Atom::Feed, where it will be used for requests.
-  # 
+  #
   # All its HTTP methods return a Net::HTTPResponse
   class HTTP
@@ -119 +119 @@
     attr_accessor :token
 
-    # when set to :basic, :wsse or :authsub, this will send an 
-    # Authentication header with every request instead of waiting for a 
-    # challenge from the server. 
-    # 
+    # when set to :basic, :wsse or :authsub, this will send an
+    # Authentication header with every request instead of waiting for a
+    # challenge from the server.
+    #
     # be careful; always_auth :basic will send your username and
     # password in plain text to every URL this object requests.
     #
-    # :digest won't work, since Digest authentication requires an 
+    # :digest won't work, since Digest authentication requires an
     # initial challenge to generate a response
     #
@@ -250 +250 @@
 
       digest = [Digest::SHA1.digest(nonce + now + pass)].pack("m").chomp
-      
+
       req['X-WSSE'] = %Q<UsernameToken Username="#{user}", PasswordDigest="#{digest}", Nonce="#{nonce_enc}", Created="#{now}">
       req["Authorization"] = 'WSSE profile="UsernameToken"'
@@ -305 +305 @@
 
       req, url = new_request(url_s, method, headers)
-   
+
       # two reasons to authenticate;
       if @always_auth
@@ -325 +325 @@
       case res
       when Net::HTTPUnauthorized
-        if @always_auth or www_authenticate or not res["WWW-Authenticate"] # XXX and not stale (Digest only) 
+        if @always_auth or www_authenticate or not res["WWW-Authenticate"] # XXX and not stale (Digest only)
           # we've tried the credentials you gave us once
           # and failed, or the server gave us no way to fix it
@@ -362 +362 @@
       res
     end
-    
+
     def new_request(url_string, method, init_headers = {})
       headers = { "User-Agent" => UA }.merge(init_headers)
-      
+
       url = url_string.to_uri
-       
+
       rel = url.path
       rel += "?" + url.query if url.query

lib/atom/service.rb

@@ -209 +209 @@
 
       unless atom
-        raise AutodiscoveryFailure "couldn't find an Atom link in the RSD"
+        raise AutodiscoveryFailure, "couldn't find an Atom link in the RSD"
       end