ShyCouch 0.7.3 → 0.7.4

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/lib/ShyCouch.rb

@@ -80,16 +80,18 @@ module ShyCouch
   		@server.create_db(@name)
   	end
 		def getDocumentById(id)
-		  @server.get_document_by_id(@name, id)
+		  @server.getDocumentById @name, id
+		rescue RestClient::ResourceNotFound
+			raise ShyCouch::ResourceNotFound
 		end
 
 		def pull_design(designName)
-		  doc = @server.get_document_by_id(@name, designName)
+		  doc = @server.getDocumentById(@name, designName)
 		  return ShyCouch::Data::Design.new(designName).merge! doc
 		end
 		def all_docs
-		  get_document_by_id('_all_docs').rows.map { |doc|
-				get_document_by_id(doc["id"])
+		  getDocumentById('_all_docs').rows.map { |doc|
+				getDocumentById(doc["id"])
 		  }
 		end
 		def uri
@@ -125,7 +127,7 @@ module ShyCouch
 			# build query string from the options
 			uri = "_design/#{design_name}/_view/#{view_name}"
 			uri += "?#{query_string opts}" if opts.length > 0
-		  result = ShyCouch::Data::ViewResultHandler.init(get_document_by_id(uri))
+		  result = ShyCouch::Data::ViewResultHandler.init(getDocumentById(uri))
       if opts.has_key? :key and result.kind_of? ShyCouch::Data::CouchDocumentCollection #result.length == 1
         # Return it as a document if it was a key query
         return result[0]
@@ -180,7 +182,7 @@ module ShyCouch
 				rescue ShyCouch::DesignConflict => e
 				  # Get the rev of the existing one, then try again!
 				  # If that fails, it should still throw an error
-				  existing_design = get_document_by_id design._id
+				  existing_design = getDocumentById design._id
 				  design._rev = existing_design._rev
 				  design._rev = push_document!(design)["rev"]
 				end
@@ -189,7 +191,7 @@ module ShyCouch
 		
 		def view(design, view_obj)
 		  url = "#{design._id}/_view/#{view_obj.name}"
-		  get_document_by_id(url)
+		  getDocumentById(url)
 		end
 		
 		private 
@@ -230,6 +232,8 @@ module ShyCouch
 			if settings["db"]["user"]
 				raise ShyCouch::DatabaseError unless settings["db"]["password"]
 			end
+		rescue NoMethodError
+			raise ShyCouch::DatabaseError
 		end
 		
 		class CouchServerConnection
@@ -260,6 +264,7 @@ module ShyCouch
 			end
 		  
 		  def req(kind, uri, data = nil)
+		  	# TODO - remove this
 				raise TypeError unless [:get,:delete,:put,:post].include?(kind) # only support these 4 request methods currently
 				if @user and @password
 					res = couch_req_with_auth kind, uri, data
@@ -308,7 +313,7 @@ module ShyCouch
 			  pull_all_doc_ids(db_name).map { |id| Data::CouchDocument.new(req(:get,"/#{db_name}/#{id}")) }
 			end
 
-			def get_document_by_id(db_name, id)
+			def getDocumentById(db_name, id)
 				document = Data::CouchDocument.new(:data => req(:get,"/#{db_name}/#{id}"))
 			end
 			def pull_document(db_name, document)
@@ -321,7 +326,7 @@ module ShyCouch
 			  raise TypeError unless document.kind_of?(ShyCouch::Data::CouchDocument)
 			  raise JSON::GeneratorError unless document.valid?
 			  if document["_rev"]
-					return req(:put, "/#{db_name}/#{document._id}?rev=#{document._rev}/", document.to_json)
+					return req(:put, "/#{db_name}/#{document._id}?rev=#{document._rev}", document.to_json)
   			elsif document["_id"]
   			  return req(:put, "/#{db_name}/#{document._id}", document.to_json)
 			  else

data/test/test_couch_document.rb

@@ -130,43 +130,44 @@ class CouchDocumentTests
        end
        
     def test_push_new_documents
-       @valid_documents.each { |doc|
+      @valid_documents.each { |doc|
          # put the document on the server, grab the server's response
-         res = doc.push!(:push_to => $couchdb)
+        res = doc.push! :push_to => $couchdb
          # check that the server included "ok"=>true in its response
-         assert(res["ok"])
+        assert(res["ok"])
          # check that the doc now has an id and a rev
-         assert(doc["_id"])
-         assert(doc["_rev"])
+        assert(doc["_id"])
+        assert(doc["_rev"])
          # get the new doc
-         newDoc = $couchdb.pull_document(doc)
+        newDoc = $couchdb.pull_document(doc)
          # test equality of all the attributes aside from id and rev on the new document
-         doc.attr_keys.each { |k|
-           assert_equal(doc["k"], newDoc["k"])
-         }
-       }
+        doc.attr_keys.each { |k|
+          assert_equal(doc["k"], newDoc["k"])
+        }
+      }
     end
     
     def test_change_existing_documents
       @existing_valid_documents.each { |doc| 
         # add some more attributes
-        assert(doc._rev)
+        doc = doc.pull! :pull_from => $couchdb
+        assert(doc["_rev"])
         doc["owner"] = "the guvvmint"
         doc["buttonCount"] = nil
         doc["friends"] = nil
         doc.buttonCount = 5
         doc.friends = ["alan", "alex", "all me other mates"]
-        
         res = doc.push!(:push_to => $couchdb)
         assert(res["ok"])
-        
-        # pull it from the database again
         checkDoc = $couchdb.pull_document(doc)
-        
+
         # check that the one from the database has all the new attributes
         assert_equal(doc.owner, checkDoc.owner)
         assert_equal(doc.buttonCount, checkDoc.buttonCount)
         assert_equal(doc.friends, checkDoc.friends)
+
+        
+        # pull it from the database again
       }
     end
   

data/test/test_couchdb_api.rb

@@ -47,7 +47,7 @@ class TestCouchDBAPI < Test::Unit::TestCase
 		# should throw an error when the settings hash is invalid
 		invalid_settings.each do |settings|	
 			assert_raises ShyCouch::DatabaseError do
-				ShyCouch::CouchDatabase.new settings
+				ShyCouch::getDB settings
 			end
 			assert_raises ArgumentError do
 				ShyCouch::CouchDatabase.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ShyCouch
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000Z
+date: 2011-12-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70205277506120 !ruby/object:Gem::Requirement
+  requirement: &70284349002760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205277506120
+  version_requirements: *70284349002760
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70205281690720 !ruby/object:Gem::Requirement
+  requirement: &70284349002280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70205281690720
+  version_requirements: *70284349002280
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70205281690240 !ruby/object:Gem::Requirement
+  requirement: &70284349001800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70205281690240
+  version_requirements: *70284349001800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70205281689760 !ruby/object:Gem::Requirement
+  requirement: &70284349001320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70205281689760
+  version_requirements: *70284349001320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70205281689280 !ruby/object:Gem::Requirement
+  requirement: &70284349000840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70205281689280
+  version_requirements: *70284349000840
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70205281688800 !ruby/object:Gem::Requirement
+  requirement: &70284349000360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205281688800
+  version_requirements: *70284349000360
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70205281688320 !ruby/object:Gem::Requirement
+  requirement: &70284348999880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70205281688320
+  version_requirements: *70284348999880
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70205281687840 !ruby/object:Gem::Requirement
+  requirement: &70284348999400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70205281687840
+  version_requirements: *70284348999400
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70205281687360 !ruby/object:Gem::Requirement
+  requirement: &70284348998920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205281687360
+  version_requirements: *70284348998920
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70205281686880 !ruby/object:Gem::Requirement
+  requirement: &70284348998440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205281686880
+  version_requirements: *70284348998440
 description: Ruby API for CouchDB, designed to work with the Camping micro-framework.
 email: danbryan@gmail.com
 executables: []
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -517428942183322011
+      hash: -2484123326453231349
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: