restr 0.5.0 → 0.5.2

data/History.txt

@@ -1,3 +1,11 @@
+== 0.5.2 :: 2009-03-18
+
+* Use xml_in instead of xml_in_string to process XML.
+
+== 0.5.1 :: 2009-01-30
+
+* Fixed error in the way the request_timeout value was being set.
+
 == 0.5.0 :: 2009-01-07
 
 * A logger can be provided on a per-call basis, rather than just for the

data/Manifest.txt

@@ -1,5 +1,3 @@
-.loadpath
-.project
 History.txt
 License.txt
 Manifest.txt
@@ -8,7 +6,6 @@ Rakefile
 config/hoe.rb
 config/requirements.rb
 lib/restr.rb
-log/debug.log
 script/destroy
 script/generate
 script/txt2html

data/config/hoe.rb

@@ -30,6 +30,7 @@ ENV['NODOT'] = '1'
 REV = nil 
 # UNCOMMENT IF REQUIRED: 
 #REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
+#REV = Time.now.strftime('%Y%m%d')
 VERS = Restr::VERSION::STRING + (REV ? ".#{REV}" : "")
 RDOC_OPTS = ['--quiet', '--title', 'restr documentation',
     "--opname", "index.html",
@@ -67,4 +68,4 @@ end
 CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
 PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
 hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-hoe.rsync_args = '-av --delete --ignore-errors'
+hoe.rsync_args = '-av --delete --ignore-errors'

data/lib/restr.rb

@@ -74,14 +74,14 @@ class Restr
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 0
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
   
   
   @@logger = nil
-  @@request_timeout = 3.minutes
+  @@request_timeout = 180
   
   cattr_accessor :request_timeout
   
@@ -100,10 +100,10 @@ class Restr
   end
   
   def self.do(method, url, params = {}, options = {})
-    puts "METHOD:  #{method.inspect}"
-    puts "URL:     #{url.inspect}"
-    puts "PARAMS:  #{params.inspect}"
-    puts "OPTIONS: #{options.inspect}"
+    #puts "METHOD:  #{method.inspect}"
+    #puts "URL:     #{url.inspect}"
+    #puts "PARAMS:  #{params.inspect}"
+    #puts "OPTIONS: #{options.inspect}"
     
     uri = URI.parse(url)
     
@@ -138,8 +138,9 @@ class Restr
       req.set_form_data(params, '&')
     end
     
-    logger.debug("Sending #{method.inspect} request to #{url.inspect} with data #{params.inspect}"+
-        (options ? " with options" : "")+".") if logger
+    logger.debug("Sending #{method.inspect} request to #{url.inspect} "+
+        (method.to_s == 'get' ? "params" : "data")+" #{params.inspect}"+
+        (options.blank? ? "" : " with options #{options.inspect}}")+".") if logger
  
     client = Net::HTTP.new(uri.host, uri.port)
     client.use_ssl = (uri.scheme == 'https')
@@ -159,7 +160,7 @@ class Restr
     when Net::HTTPSuccess
       if res.content_type =~ /[\/+]xml$/
         logger.debug("Got XML response: \n#{res.body}") if logger
-        return XmlSimple.xml_in_string(res.body,
+        return XmlSimple.xml_in(res.body,
           'forcearray'   => false,
           'keeproot'     => false
         )
@@ -169,7 +170,7 @@ class Restr
       end
     when TimeoutError
       logger.debug(res) if logger
-      return XmlSimple.xml_in_string(res,
+      return XmlSimple.xml_in(res,
           'forcearray'   => false,
           'keeproot'     => false
         )
@@ -183,4 +184,4 @@ class Restr
   
   class InvalidRequestMethod < Exception
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: restr
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-07 00:00:00 -05:00
+date: 2009-03-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.8.0
     version: 
 description: A very simple REST client.
 email: 
@@ -36,8 +36,6 @@ extra_rdoc_files:
 - README.txt
 - website/index.txt
 files: 
-- .loadpath
-- .project
 - History.txt
 - License.txt
 - Manifest.txt
@@ -46,7 +44,6 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - lib/restr.rb
-- log/debug.log
 - script/destroy
 - script/generate
 - script/txt2html

data/.loadpath

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<loadpath>
-	<pathentry path="" type="src"/>
-	<pathentry path="org.rubypeople.rdt.launching.RUBY_CONTAINER" type="con"/>
-</loadpath>

data/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>restr</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.rubypeople.rdt.core.rubybuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.rubypeople.rdt.core.rubynature</nature>
-	</natures>
-</projectDescription>