jrun-couchrest 0.2.1.1 → 0.12.6

data/lib/couchrest/monkeypatches.rb

@@ -1,6 +1,3 @@
-require File.join(File.dirname(__FILE__), 'support', 'class')
-require File.join(File.dirname(__FILE__), 'support', 'blank')
-
 # This file must be loaded after the JSON gem and any other library that beats up the Time class.
 class Time
   # This date format sorts lexicographically
@@ -31,19 +28,13 @@ if RUBY_VERSION.to_f < 1.9
   class Net::BufferedIO #:nodoc:
     alias :old_rbuf_fill :rbuf_fill
     def rbuf_fill
-      if @io.respond_to?(:read_nonblock)
-        begin
+      begin
+        @rbuf << @io.read_nonblock(65536)
+      rescue Errno::EWOULDBLOCK
+        if IO.select([@io], nil, nil, @read_timeout)
           @rbuf << @io.read_nonblock(65536)
-        rescue Errno::EWOULDBLOCK
-          if IO.select([@io], nil, nil, @read_timeout)
-            retry
-          else
-            raise Timeout::TimeoutError
-          end
-        end
-      else
-        timeout(@read_timeout) do
-          @rbuf << @io.sysread(65536)
+        else
+          raise Timeout::TimeoutError
         end
       end
     end
@@ -62,58 +53,47 @@ module RestClient
     :url => url,
     :headers => headers)
   end
-
-#   class Request
-#     
-#     def establish_connection(uri)
-#       Thread.current[:connection].finish if (Thread.current[:connection] && Thread.current[:connection].started?)
-#       p net_http_class
-#       net = net_http_class.new(uri.host, uri.port)
-#       net.use_ssl = uri.is_a?(URI::HTTPS)
-#       net.verify_mode = OpenSSL::SSL::VERIFY_NONE
-#       Thread.current[:connection] = net
-#       Thread.current[:connection].start
-#       Thread.current[:connection]
-#     end
-#     
-#     def transmit(uri, req, payload)
-#       setup_credentials(req)
-#       
-#       Thread.current[:host] ||= uri.host
-#       Thread.current[:port] ||= uri.port
-#       
-#       if (Thread.current[:connection].nil? || (Thread.current[:host] != uri.host))
-#         p "establishing a connection"
-#         establish_connection(uri)
-#       end
-# 
-#       display_log request_log
-#       http = Thread.current[:connection]
-#       http.read_timeout = @timeout if @timeout
-#       
-#       begin
-#         res = http.request(req, payload)
-#       rescue
-#         p "Net::HTTP connection failed, reconnecting"
-#         establish_connection(uri)
-#         http = Thread.current[:connection]
-#         require 'ruby-debug'
-#         debugger
-#         req.body_stream = nil
-#         
-#         res = http.request(req, payload)
-#         display_log response_log(res)
-#         result res
-#       else
-#         display_log response_log(res)
-#         process_result res
-#       end
-#       
-#     rescue EOFError
-#       raise RestClient::ServerBrokeConnection
-#     rescue Timeout::Error
-#       raise RestClient::RequestTimeout
-#     end
-#   end
   
+  class Request 
+    def transmit(uri, req, payload)
+			setup_credentials(req)
+			
+			Thread.current[:host] ||= uri.host
+      Thread.current[:port] ||= uri.port
+
+			net = net_http_class.new(uri.host, uri.port)
+      
+      if Thread.current[:connection].nil? || Thread.current[:host] != uri.host
+        Thread.current[:connection].finish if (Thread.current[:connection] && Thread.current[:connection].started?)
+        net.use_ssl = uri.is_a?(URI::HTTPS)
+        net.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        Thread.current[:connection] = net
+        Thread.current[:connection].start
+      end
+
+			display_log request_log
+      http = Thread.current[:connection]
+
+      http.read_timeout = @timeout if @timeout
+      begin
+  			res = http.request(req, payload)
+  		rescue
+  		  # p "Net::HTTP connection failed, reconnecting"
+  		  Thread.current[:connection].finish
+  		  http = Thread.current[:connection] = net
+        Thread.current[:connection].start
+        res = http.request(req, payload)
+        display_log response_log(res)
+  			process_result res
+		  else
+  			display_log response_log(res)
+  			process_result res
+  		end
+			
+		rescue EOFError
+			raise RestClient::ServerBrokeConnection
+		rescue Timeout::Error
+			raise RestClient::RequestTimeout
+		end
+  end
 end

data/lib/couchrest.rb

@@ -13,28 +13,24 @@
 #    limitations under the License.
 
 require "rubygems"
-gem 'json'
 require 'json'
-gem 'rest-client'
 require 'rest_client'
 
 $:.unshift File.dirname(__FILE__) unless
   $:.include?(File.dirname(__FILE__)) ||
   $:.include?(File.expand_path(File.dirname(__FILE__)))
   
-$COUCHREST_DEBUG ||= false
   
 require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.2.1.1' unless self.const_defined?("VERSION")
+  VERSION = '0.12.6'
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'
-  autoload :Response,     'couchrest/core/response'
   autoload :Document,     'couchrest/core/document'
-  autoload :Design,       'couchrest/core/design'
+  autoload :Design,     'couchrest/core/design'
   autoload :View,         'couchrest/core/view'
   autoload :Model,        'couchrest/core/model'
   autoload :Pager,        'couchrest/helper/pager'
@@ -42,7 +38,6 @@ module CouchRest
   autoload :Streamer,     'couchrest/helper/streamer'
   
   autoload :ExtendedDocument,     'couchrest/more/extended_document'
-  autoload :CastedModel,          'couchrest/more/casted_model'
   
   require File.join(File.dirname(__FILE__), 'couchrest', 'mixins')
   
@@ -51,23 +46,6 @@ module CouchRest
   # some helpers for tasks like instantiating a new Database or Server instance.
   class << self
 
-    # extracted from Extlib
-    #
-    # Constantize tries to find a declared constant with the name specified
-    # in the string. It raises a NameError when the name is not in CamelCase
-    # or is not initialized.
-    #
-    # @example
-    # "Module".constantize #=> Module
-    # "Class".constantize #=> Class
-    def constantize(camel_cased_word)
-      unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word
-        raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!"
-      end
-
-      Object.module_eval("::#{$1}", __FILE__, __LINE__)
-    end
-    
     # todo, make this parse the url and instantiate a Server or Database instance
     # depending on the specificity.
     def new(*opts)
@@ -125,42 +103,18 @@ module CouchRest
       cr.database(parsed[:database])
     end
     
-    def put(uri, doc = nil)
+    def put uri, doc = nil
       payload = doc.to_json if doc
-      begin
-        JSON.parse(RestClient.put(uri, payload))
-      rescue Exception => e
-        if $COUCHREST_DEBUG == true
-          raise "Error while sending a PUT request #{uri}\npayload: #{payload.inspect}\n#{e}"
-        else
-          raise e
-        end
-      end
+      JSON.parse(RestClient.put(uri, payload))
     end
 
-    def get(uri)
-      begin
-        JSON.parse(RestClient.get(uri), :max_nesting => false)
-      rescue => e
-        if $COUCHREST_DEBUG == true
-          raise "Error while sending a GET request #{uri}\n: #{e}"
-        else
-          raise e
-        end
-      end
+    def get uri
+      JSON.parse(RestClient.get(uri), :max_nesting => false)
     end
   
     def post uri, doc = nil
       payload = doc.to_json if doc
-      begin
-        JSON.parse(RestClient.post(uri, payload))
-      rescue Exception => e
-        if $COUCHREST_DEBUG == true
-          raise "Error while sending a POST request #{uri}\npayload: #{payload.inspect}\n#{e}"
-        else
-          raise e
-        end
-      end
+      JSON.parse(RestClient.post(uri, payload))
     end
   
     def delete uri
@@ -186,4 +140,4 @@ module CouchRest
       url
     end
   end # class << self
-end
+end

data/spec/couchrest/core/database_spec.rb

@@ -244,14 +244,12 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save_doc(@doc)
+      @db.save(@doc)
     end
     
-    # Depreacated
-    # it "should get the attachment with the doc's _id" do
-    #   @db.fetch_attachment("mydocwithattachment", "test.html").should == @attach
-    # end
-    
+    it "should get the attachment with the doc's _id" do
+      @db.fetch_attachment("mydocwithattachment", "test.html").should == @attach
+    end
     it "should get the attachment with the doc itself" do
       @db.fetch_attachment(@db.get('mydocwithattachment'), 'test.html').should == @attach
     end
@@ -268,8 +266,7 @@ describe CouchRest::Database do
     it "should save the attachment to a new doc" do
       r = @db.put_attachment({'_id' => 'attach-this'}, 'couchdb.png', image = @file.read, {:content_type => 'image/png'})
       r['ok'].should == true
-      doc = @db.get("attach-this")
-      attachment = @db.fetch_attachment(doc,"couchdb.png")
+      attachment = @db.fetch_attachment("attach-this","couchdb.png")
       attachment.should == image
     end
   end
@@ -277,7 +274,7 @@ describe CouchRest::Database do
   describe "PUT document with attachment" do
     before(:each) do
       @attach = "<html><head><title>My Doc</title></head><body><p>Has words.</p></body></html>"
-      doc = {
+      @doc = {
         "_id" => "mydocwithattachment",
         "field" => ["some value"],
         "_attachments" => {
@@ -287,14 +284,14 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save_doc(doc)
-      @doc = @db.get("mydocwithattachment")
+      @db.save_doc(@doc)
     end
     it "should save and be indicated" do
-      @doc['_attachments']['test.html']['length'].should == @attach.length
+      doc = @db.get("mydocwithattachment")
+      doc['_attachments']['test.html']['length'].should == @attach.length
     end
     it "should be there" do
-      attachment = @db.fetch_attachment(@doc,"test.html")
+      attachment = @db.fetch_attachment("mydocwithattachment","test.html")
       attachment.should == @attach
     end
   end
@@ -312,15 +309,14 @@ describe CouchRest::Database do
         }
       }
       @db.save_doc(doc)
-      doc['_rev'].should_not be_nil
+      doc = @db.get('mydocwithattachment')
       doc['field'] << 'another value'
-      @db.save_doc(doc)["ok"].should be_true
+      @db.save_doc(doc)
     end
     
     it 'should be there' do
-      doc = @db.get('mydocwithattachment')
-      attachment = @db.fetch_attachment(doc, 'test.html')
-      Base64.decode64(attachment).should == @attach
+      attachment = @db.fetch_attachment('mydocwithattachment', 'test.html')
+      attachment.should == @attach
     end
   end
 
@@ -343,18 +339,18 @@ describe CouchRest::Database do
         }
       }
       @db.save_doc(@doc)
-      @doc = @db.get("mydocwithattachment")
     end
     it "should save and be indicated" do
-      @doc['_attachments']['test.html']['length'].should == @attach.length
-      @doc['_attachments']['other.html']['length'].should == @attach2.length
+      doc = @db.get("mydocwithattachment")
+      doc['_attachments']['test.html']['length'].should == @attach.length
+      doc['_attachments']['other.html']['length'].should == @attach2.length
     end
     it "should be there" do
-      attachment = @db.fetch_attachment(@doc,"test.html")
+      attachment = @db.fetch_attachment("mydocwithattachment","test.html")
       attachment.should == @attach
     end
     it "should be there" do
-      attachment = @db.fetch_attachment(@doc,"other.html")
+      attachment = @db.fetch_attachment("mydocwithattachment","other.html")
       attachment.should == @attach2
     end
   end
@@ -370,13 +366,13 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save_doc(doc)
+      @db.save(doc)
       @doc = @db.get('mydocwithattachment')
     end
     it "should delete the attachment" do
-      lambda { @db.fetch_attachment(@doc,'test.html') }.should_not raise_error
+      lambda { @db.fetch_attachment('mydocwithattachment','test.html') }.should_not raise_error
       @db.delete_attachment(@doc, "test.html")
-      lambda { @db.fetch_attachment(@doc,'test.html') }.should raise_error(RestClient::ResourceNotFound)
+      lambda { @db.fetch_attachment('mydocwithattachment','test.html') }.should raise_error(RestClient::ResourceNotFound)
     end
   end
 
@@ -399,8 +395,7 @@ describe CouchRest::Database do
       doc['_attachments']['http://example.com/stuff.cgi?things=and%20stuff']['length'].should == @attach.length
     end
     it "should be there" do
-      doc = @db.get(@docid)
-      attachment = @db.fetch_attachment(doc,"http://example.com/stuff.cgi?things=and%20stuff")
+      attachment = @db.fetch_attachment(@docid,"http://example.com/stuff.cgi?things=and%20stuff")
       attachment.should == @attach
     end
   end
@@ -677,7 +672,7 @@ describe CouchRest::Database do
   
   describe "replicating a database" do
     before do
-      @db.save_doc({'_id' => 'test_doc', 'some-value' => 'foo'})
+      @db.save({'_id' => 'test_doc', 'some-value' => 'foo'})
       @other_db = @cr.database 'couchrest-test-replication'
       @other_db.delete! rescue nil
       @other_db = @cr.create_db 'couchrest-test-replication'
@@ -709,7 +704,7 @@ describe CouchRest::Database do
   describe "creating a database" do
     before(:each) do
       @db = @cr.database('couchrest-test-db_to_create')
-      @db.delete! if @cr.databases.include?('couchrest-test-db_to_create')
+      @db.delete!
     end
     
     it "should just work fine" do
@@ -747,4 +742,4 @@ describe CouchRest::Database do
   end
 
 
-end
+end

data/spec/couchrest/core/document_spec.rb

@@ -249,7 +249,7 @@ describe "dealing with attachments" do
   before do
     @db = reset_test_db!
     @attach = "<html><head><title>My Doc</title></head><body><p>Has words.</p></body></html>"
-    response = @db.save_doc({'key' => 'value'})
+    response = @db.save({'key' => 'value'})
     @doc = @db.get(response['id'])
   end