ShyCouch 0.7.2 → 0.7.3

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/ShyCouch.rb

@@ -79,7 +79,7 @@ module ShyCouch
   	def create!
   		@server.create_db(@name)
   	end
-		def get_document_by_id(id)
+		def getDocumentById(id)
 		  @server.get_document_by_id(@name, id)
 		end
 
@@ -223,10 +223,10 @@ module ShyCouch
 			# Should check that host and port exist
 			# and that database name is specified
 			# and that there is a password if there is a username
-			raise ShyCouch::DatabaseError unless settings["db"]
-			raise ShyCouch::DatabaseError unless settings["db"]["host"]
-			raise ShyCouch::DatabaseError unless settings["db"]["port"]
-			raise ShyCouch::DatabaseError unless settings["db"]["name"]
+			raise ShyCouch::DatabaseError, 'settings has no db attribute' unless settings["db"] or settings[:db]
+			raise ShyCouch::DatabaseError, 'db settings has no host' unless settings["db"]["host"] or settings[:db][:host]
+			raise ShyCouch::DatabaseError, 'db settings has no port' unless settings["db"]["port"] or settings[:db][:port]
+			raise ShyCouch::DatabaseError, 'db settings has no name' unless settings["db"]["name"] or settings[:db][:name]
 			if settings["db"]["user"]
 				raise ShyCouch::DatabaseError unless settings["db"]["password"]
 			end

data/lib/ShyCouch/data.rb

@@ -91,14 +91,14 @@ module ShyCouch
 		  
 		  def satisfies_needs?
 				# Check everything in constraints that is this class or a superclass of this class
-				self.class.constraints.each do |classKey, constraints|
-				  if self.kind_of?(classKey) and constraints[:needs]
-						constraints[:needs].each do |need|
-						  return false unless has_key?(need)
-						end
-				  end
-				end
-				return true
+			self.class.constraints.each do |classKey, constraints|
+			  if self.kind_of?(classKey) and constraints[:needs]
+					constraints[:needs].each do |need|
+					  return false unless has_key? need.to_sym or has_key? need.to_s
+					end
+			  end
+			end
+			return true
 		  end
 		  
 		  def satisfies_suggestions?(opts = {})
@@ -138,50 +138,50 @@ module ShyCouch
 		  end
 		  
 		  def missing_suggestions(opts = {})
-				missing = []
-				raise ArgumentError if opts.has_key?(:ignore_suggestions) and opts.has_key?(:ignore_suggestion)
-				opts.has_key?(:ignore_suggestions) ? ign = opts[:ignore_suggestions] : 
-				opts.has_key?(:ignore_suggestion) ? ign = [opts[:ignore_suggestion]] : ign = []
-				
-				@@constraints.each do |classKey, constraints|
-				  if self.kind_of?(classKey)
-						constraints[:suggests].each do |suggestion|
-						  missing << suggestion unless has_key?(:suggests) or ign.include?(suggestion)
-						end
-				  end
+			missing = []
+			raise ArgumentError if opts.has_key?(:ignore_suggestions) and opts.has_key?(:ignore_suggestion)
+			opts.has_key?(:ignore_suggestions) ? ign = opts[:ignore_suggestions] : 
+			opts.has_key?(:ignore_suggestion) ? ign = [opts[:ignore_suggestion]] : ign = []
+			
+			@@constraints.each do |classKey, constraints|
+			  if self.kind_of?(classKey)
+				constraints[:suggests].each do |suggestion|
+				  missing << suggestion unless has_key?(:suggests) or ign.include?(suggestion)
 				end
-				return missing
+			  end
+			end
+			return missing
 		  end
 		  
 		  def needs?(need)
-				@@constraints.each do |classKey, constraints|
-				  if self.kind_of?(classKey)
-						return true if constraints[:needs].include?(need)
-				  end
-				end
-				return false
+			@@constraints.each do |classKey, constraints|
+			  if self.kind_of?(classKey)
+					return true if constraints[:needs].include?(need)
+			  end
+			end
+			return false
 		  end
 		  
 		  def suggests?(suggestion)
-				@@constraints.each do |classKey, constraints|
-				  if self.kind_of?(classKey)
-						return true if constraints[:suggests].include?(suggestion)
-				  end
-				end
-				return false
+			@@constraints.each do |classKey, constraints|
+			  if self.kind_of?(classKey)
+				return true if constraints[:suggests].include?(suggestion)
+			  end
+			end
+			return false
 		  end
 		  
 		  def suggests; self.class.suggests; end
 		  def needs; self.class.needs; end
 		  
 		  def attr_keys
-				# TODO - is this needed?
-				# returns the keys for all the attrs that aren't the id or rev
-				attr_keys = []
-				self.map { |k,v|
-				  attr_keys << k unless k == "_id" or k == "_rev"
-				}
-				return attr_keys
+			# TODO - is this needed?
+			# returns the keys for all the attrs that aren't the id or rev
+			attr_keys = []
+			self.map { |k,v|
+			  attr_keys << k unless k == "_id" or k == "_rev"
+			}
+			return attr_keys
 		  end
 
 		  def pull(opts = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ShyCouch
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
+date: 2011-12-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70306878993300 !ruby/object:Gem::Requirement
+  requirement: &70205277506120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306878993300
+  version_requirements: *70205277506120
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70306878992620 !ruby/object:Gem::Requirement
+  requirement: &70205281690720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70306878992620
+  version_requirements: *70205281690720
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70306878992080 !ruby/object:Gem::Requirement
+  requirement: &70205281690240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70306878992080
+  version_requirements: *70205281690240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70306878991600 !ruby/object:Gem::Requirement
+  requirement: &70205281689760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70306878991600
+  version_requirements: *70205281689760
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70306878991100 !ruby/object:Gem::Requirement
+  requirement: &70205281689280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70306878991100
+  version_requirements: *70205281689280
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70306878990600 !ruby/object:Gem::Requirement
+  requirement: &70205281688800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306878990600
+  version_requirements: *70205281688800
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70306878990120 !ruby/object:Gem::Requirement
+  requirement: &70205281688320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70306878990120
+  version_requirements: *70205281688320
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70306878989600 !ruby/object:Gem::Requirement
+  requirement: &70205281687840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70306878989600
+  version_requirements: *70205281687840
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70306878989020 !ruby/object:Gem::Requirement
+  requirement: &70205281687360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306878989020
+  version_requirements: *70205281687360
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70306878988480 !ruby/object:Gem::Requirement
+  requirement: &70205281686880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306878988480
+  version_requirements: *70205281686880
 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: 3461732306326743331
+      hash: -517428942183322011
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: