ShyCouch 0.5.0 → 0.6.0

data/Rakefile

@@ -31,21 +31,20 @@ Jeweler::RubygemsDotOrgTasks.new
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/test_ShyCouch.rb'
   test.verbose = true
 end
 
 require 'rcov/rcovtask'
 Rcov::RcovTask.new do |test|
   test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/test_ShyCouch.rb'
   test.verbose = true
   test.rcov_opts << '--exclude "gems/*"'
 end
 
 task :default => :test
 
-# require 'rake/rdoctask'
 require 'rdoc/task'
 RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/ShyCouch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ShyCouch}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Shy Inc.}, %q{Daniel Bryan}, %q{Cerales}]
-  s.date = %q{2011-09-18}
+  s.date = %q{2011-09-24}
   s.description = %q{Ruby API for CouchDB, designed to work with the Camping micro-framework.}
   s.email = %q{danbryan@gmail.com}
   s.extra_rdoc_files = [
@@ -30,8 +30,6 @@ Gem::Specification.new do |s|
     "lib/ShyCouch/data.rb",
     "lib/ShyCouch/fields.rb",
     "test/helper.rb",
-    "test/old-test.rb",
-    "test/old-tests.rb",
     "test/test_ShyCouch.rb",
     "test/test_couch_document.rb",
     "test/test_couchdb_api.rb",

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/ShyCouch.rb

@@ -14,7 +14,6 @@ require 'resolv'
 require 'rest-client'
 require 'ShyRubyJS'
 # require everything from the 'ShyCouch' subdirectory
-# Dir.new(File.dirname(__FILE__)+'/ShyCouch').each { |f| require 'shycouch/' + f.split('.')[0] unless f == '.' or f == '..' }
 require 'ShyCouch/data'
 require 'ShyCouch/fields'
 
@@ -22,16 +21,18 @@ require 'ShyCouch/fields'
 module ShyCouch
   class << self
     def getDB(settings)
-      # this is a wrapper for create a CouchDatabase object and testing that it can connect
+      # this is a wrapper for creating CouchDatabase object and testing that it can connect
       database = CouchDatabase.new(settings)
       puts database.connect unless database.connect["ok"] #TODO - hm
-      database.create unless database.on_server?
+      database.create! unless database.exists?
       return database
     end
   end
   attr_accessor :database
 
   class ShyCouchError < StandardError; end
+  
+  class ShyCouchDesignMissing < ShyCouchError; end
 
   class CouchDatabase
   	def initialize(settings)
@@ -39,7 +40,7 @@ module ShyCouch
 	    init(settings)
   	end
 
-  	attr_accessor :server, :name, :host, :port, :design_documents
+  	attr_accessor :server, :name, :host, :port, :design_documents, :designs
 
   	def connect
   		@server = CouchServerConnection.new({"host"=>@host, "port"=>@port, "user"=>@user, "password"=>@password, "database" => @name})
@@ -49,24 +50,37 @@ module ShyCouch
   			return {"ok"=>false, "message"=>"Could not connect to the couch database."}
   		end
   	end
-  	def delete_database
+  	def delete!
   	  @server.delete_db(self.name)
 	  end
   	def server_responds?; return @server.responds?; end
 
-  	def on_server?
-  		@server.has_database?(@name)
-  	end
+    def design(design)
+      if design.kind_of?(ShyCouch::Data::Design)
+        return design_by_name(design.name)
+      else
+        return design_by_name(design)
+      end
+    end
+    
+    def design_by_name(name)
+      @designs.each { |design| return design if design.name == name.to_s }
+      return nil
+    end
 
-  	def create
+    def exists?
+      @server.has_database?(@name)
+    end
+  	def create!
   		@server.create_db(@name)
   	end
     def get_document_by_id(id)
       @server.get_document_by_id(@name, id)
     end
-    def get_design_document_by_id(id)
-      doc = @server.get_document_by_id(@name, id)
-      ShyCouch::Data::Design.new(id).merge! doc
+
+    def pull_design(designName)
+      doc = @server.get_document_by_id(@name, designName)
+      return ShyCouch::Data::Design.new(designName).merge! doc
     end
     def all_docs
       get_document_by_id('_all_docs').rows.map { |doc|
@@ -78,27 +92,44 @@ module ShyCouch
     end
 
     def pull_document(document)
-      @server.pull_document(self.name, document)      
+      @server.pull_document(self.name, document)
     end
 
-    def push_document(document)
+    def push_document!(document)
       @server.push_document(self.name, document)
     end
     
-    def add_design_document(design)
-      @design_documents << design
+    def query_view(design_name, view_name)
+      queryString = "/_design/#{design_name}/_view/#{view_name}"
+      ShyCouch::Data::ViewResult.new(get_document_by_id(queryString))
+    end
+    
+    def add_design(design)
+      throw TypeError unless design.kind_of?(ShyCouch::Data::Design)
+      # if the db has already stored the design, update it
+      if design_by_name(design.name) != nil
+        design_by_name(design.name) == design
+      end
+      # otherwise, add it
+      @designs << design
     end
     
-    def add_design_documents_and_push(*docs)
+    def add_designs_and_push!(*docs)
       docs.each do |doc|
-        @design_documents << doc
+        add_design(doc)
       end
-      push_design_documents
+      push_designs!
+    end
+    
+    def add_design_and_push!(doc)
+      add_design(doc)
+      push_designs!
     end
     
-    def push_design_documents
-      @design_documents.each do |design|
-        design.push(self)
+    def push_designs!
+      @designs.each do |design|
+        # push the document and update it with the rev sent by the response
+        design["_rev"] = push_document!(design)["rev"]
       end
     end
     
@@ -112,7 +143,7 @@ module ShyCouch
     def init(settings, design_documents = [])
 		  db_settings = settings["db"]
   		@host, @port, @name, @user, @password = db_settings["host"],db_settings["port"], db_settings["name"],db_settings["user"], db_settings["password"]
-  		@design_documents = design_documents
+  		@designs = ShyCouch::Data::CouchDocumentCollection.new
   		@server = CouchServerConnection.allocate
     end
     
@@ -142,15 +173,11 @@ module ShyCouch
     	rescue RestClient::ResourceNotFound
     		false
     	end
-    	
-      # def get_database_info(db_name)
-      #   get("/#{db+name}/") 
-      # end
       
       def req(kind, uri, data = nil)
         raise TypeError unless [:get,:delete,:put,:post].include?(kind) # only support these 4 request methods currently
         res = (@user and @password ? couch_req_with_auth(kind, uri, data) : couch_req_without_auth(kind, uri, data))
-        JSON.parse(res)
+        return JSON.parse(res)
       end
       def req_host
         "http://#{(@user + ':' + @password + '@') if @user and @password}#{@host}:#{@port}"
@@ -172,12 +199,6 @@ module ShyCouch
         end
         
       end
-
-      # this should be done w/ couch key stuff?
-      # def pull_all_design_docs(db_name)
-      #   pull_all_doc_ids(db_name).map { get_document_by_id(db_name, id) if id[0,7] == "_design" }
-      # end
-
       #TODO - this is screwed
     	def pull_all_doc_ids(db_name)
         req(:get,"/#{db_name}/_all_docs")["rows"].map { |doc| doc["id"] }
@@ -188,10 +209,10 @@ module ShyCouch
     	end
 
     	def get_document_by_id(db_name, id)
-    		document = Data::CouchDocument.new(req(:get,"/#{db_name}/#{id}"))
+    		document = Data::CouchDocument.new(:data => req(:get,"/#{db_name}/#{id}"))
     	end
     	def pull_document(db_name, document)
-    		document = Data::CouchDocument.new(req(:get,"/#{db_name}/#{document._id}"))  	    
+    		document = Data::CouchDocument.new(:data => req(:get,"/#{db_name}/#{document._id}"))  	    
 	    end
 
     	def delete_document(db_name, id)
@@ -202,12 +223,15 @@ module ShyCouch
       # Haven't decided whether PUT/POST should take a CouchDocument or a JSON string.
 
     	def push_document(db_name, document)
-    	  raise TypeError unless document.kind_of?(Data::CouchDocument)
+    	  raise TypeError unless document.kind_of?(ShyCouch::Data::CouchDocument)
     	  raise JSON::GeneratorError unless document.valid?
     	  if document["_rev"]
-    	    req(:put, "/#{db_name}/#{document._id}?rev=#{document._rev}/", document.to_json)
-  	    else
-  	      req(:post, "/#{db_name}/", document.to_json)
+          # puts "/#{db_name}/#{document._id}?rev=#{document._rev}/" #TODO - remove
+    	    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
+  	      return req(:post, "/#{db_name}/", document.to_json)
   	    end
   	  end
 

data/lib/ShyCouch/data.rb

@@ -8,11 +8,24 @@ module ShyCouch
       end
       @@needs, @@suggests, @@views = [], [], []
 
-      def initialize(hash={})
+      def initialize(opts={})
         # Assumes that the "kind" is the class name unless explicitly stated otherwise
         # TODO - maybe just force it to be the class name no matter what tbh
-        hash["kind"] = self.class.to_s.split("::").last unless hash["kind"]
-        merge!(hash)
+        
+        # this is messy.
+        # If there's some data given, see whether it has a kind.
+        if opts[:data]
+          if !opts[:data]["kind"]
+            # If there's no kind, give the 'kind' the class name as a value
+            opts[:data]["kind"] = self.class.to_s.split("::").last
+          end
+        else 
+          # if there's no data, give it data and a kind
+          opts[:data] = {"kind" => self.class.to_s.split("::").last}
+        end
+        
+        merge!(opts[:data])
+        @database = opts[:push_to] if opts[:push_to]
         raise TypeError unless valid?
         set_up_views
       end
@@ -56,16 +69,24 @@ module ShyCouch
         return self.class.requirements
       end
     
-      def pull(database)
-        new_doc = database.pull_document(self)
+      def pull(db = nil)
+        db ||= @database
+        new_doc = db.pull_document(self)
+        return new_doc
+      end
+      
+      def pull!(db = nil)
+        db ||= @database
+        new_doc = pull(db)
         if new_doc
           self.clear
           self.merge! new_doc
         end
       end
     
-      def push(database)
-        res = database.push_document(self)
+      def push!(database=nil)
+        database ||= @database
+        res = database.push_document!(self)
         self["_id"] = res["id"] unless self["_id"]
         self["_rev"] = res["rev"]
         return res
@@ -133,16 +154,65 @@ module ShyCouch
         return {"map" => @map, "reduce" => @reduce}
       end
     end
+    
+    class ViewResult < Array
+      attr_accessor :total_rows, :offset
+      def initialize(res)
+        @total_rows = res["total_rows"]
+        @offset = res["offset"]
+        concat res["rows"]
+      end
+    end
+    
+    class CouchDocumentCollection < Array
+      def <<(obj)
+        raise TypeError unless obj.kind_of?(ShyCouch::Data::CouchDocument)
+        super
+      end
+      
+      def initialize(opts = {})
+        @database = opts[:push_to] if opts[:push_to]
+      end
+      
+      def pull_all(db = nil)
+        db ||= @database
+        collection = CouchDocumentCollection.new
+        each do |item|
+          collection << db.pull_document(item)
+        end
+        return collection
+      end
+      
+      def pull_all!(db = nil)
+        db ||= @database
+        each do |item|
+          item.pull!(db)
+        end
+      end
+      
+      def push_all!(db = nil)
+        db ||= @database
+        each do |item|
+          item.push!(db)
+        end
+      end
+
+    end
 
     class Design < CouchDocument
       # this is used to manage design documents
       # In practise, the Controllers should be a list of classes corresponding to design documents
       
-      def initialize(name, views=[])
+      def initialize(name, opts = {})
         merge! "_id" => "_design/#{name.to_s}"
         @parser = ShyRubyJS::ShySexpParser.new
-        @views = views
-        merge_views
+        views = opts[:views] if opts[:views]
+        merge_views(views) if views
+        @database = opts[:push_to] if opts[:push_to]
+      end
+      
+      def name
+        return self["_id"].split("_design/").drop(1).join
       end
       
       def add_view(view)
@@ -151,15 +221,28 @@ module ShyCouch
         merge_views
       end
       
+      def query_view(view, db = nil)
+        db ||= @database
+        raise ShyCouchError, "No CouchDB defined" unless db
+        view = view.name if view.kind_of?(ShyCouch::Data::View)
+        #TODO - something
+        db.query_view(self.name, view)
+      end
+      
       def view(view_name, &block)
         add_view(ShyCouch::Data::View.new(view_name, &block))
       end
+      def push!(db = nil)
+        db ||= @database
+        raise ShyCouchError, "No CouchDB defined" unless db
+        db.add_design_and_push!(self)
+      end
       
       private
       
-      def merge_views
+      def merge_views(views)
         h = { "views" => {}}
-        @views.each do |view|
+        views.each do |view|
           h["views"][view.name] = view.functions
         end
         merge! h

data/test/test_ShyCouch.rb

@@ -16,6 +16,28 @@ $settings = {
     },
 }
 
+class ShyCouchTestHelper < Test::Unit::TestCase
+  # The majority of the tests in this suite need the setup provided in here
+  # And it means I don't forget to delete the database in their teardown functions
+  def setup
+    valid_settings = $settings
+    @couchdb = ShyCouch.getDB(valid_settings)
+  end
+  def teardown
+    @couchdb.delete!
+    @couchdb = nil
+  end
+  
+  def add_some_documents
+    4.times do
+      recipe = Recipe.new(:push_to => @couchdb)
+      recipe.push!
+    end
+  end
+  
+  class Recipe < ShyCouch::Data::CouchDocument; end
+end
+
 # test ShyCouch::CouchDBAPI
 require_relative 'test_couchdb_api'
 

data/test/test_couch_document.rb

@@ -9,7 +9,7 @@ class CouchDocumentTests
       @couchdb = ShyCouch.getDB(valid_settings)
     end
     def teardown
-      @couchdb.delete_database
+      @couchdb.delete!
       @couchdb = nil
     end
 
@@ -30,7 +30,7 @@ class CouchDocumentTests
     def test_create_from_string
       # Ensure no doc creation with fixnum argument
       string = "hehe i'm all over here you know"
-      assert_raises IndexError do
+      assert_raises TypeError do
         doc = ShyCouch::Data::CouchDocument.new(string)
       end
     end
@@ -57,26 +57,25 @@ class CouchDocumentTests
       
       
       @valid_documents = [
-        ShyCouch::Data::CouchDocument.new({"kind"=>"post", "message"=>"BUY TRAMADOL ONLINE!!"}),
-        ShyCouch::Data::CouchDocument.new({"kind"=>"comment",
+        ShyCouch::Data::CouchDocument.new(:data => {"kind"=>"post", "message"=>"BUY TRAMADOL ONLINE!!"}),
+        ShyCouch::Data::CouchDocument.new(:data => {"kind"=>"comment",
             "message"=>"gry gry online gry gry online gry gry online gry gry online gry gry online "}),
-        ShyCouch::Data::CouchDocument.new({"kind"=>"tag", "name"=>"FREE CANADIAN PRESCRIPTION DRUGS"}),
-        ShyCouch::Data::CouchDocument.new({"kind"=>"helpers", 
+        ShyCouch::Data::CouchDocument.new(:data => {"kind"=>"tag", "name"=>"FREE CANADIAN PRESCRIPTION DRUGS"}),
+        ShyCouch::Data::CouchDocument.new(:data => {"kind"=>"helpers", 
             "helpers"=>["helper", "bad helper", "terrible helper", "this isn't helping"],
             "actually_helpful"=>false, "times_helped"=>0}),
         ]
       @existing_valid_documents = [
-        ShyCouch::Data::CouchDocument.new("whatever"=>"yep"),
-        ShyCouch::Data::CouchDocument.new("is_a_document"=>true, "number_of_docs_this_is"=>1)
+        ShyCouch::Data::CouchDocument.new(:data => {"whatever"=>"yep"}),
+        ShyCouch::Data::CouchDocument.new(:data => {"is_a_document"=>true, "number_of_docs_this_is"=>1})
       ].each { |doc|
-        doc.push($couchdb)
+        doc.push!($couchdb)
       }
       @invalid_documents = nil # make sure user can't set rev maybe? or is that legal?
     end
     def teardown
-      $couchdb.delete_database
+      $couchdb.delete!
       $couchdb = nil
-      # delete the database
     end
     
     def test_keys_as_attr_accessors
@@ -91,7 +90,7 @@ class CouchDocumentTests
     def test_push_new_documents
        @valid_documents.each { |doc|
          # put the document on the server, grab the server's response
-         res = doc.push($couchdb)
+         res = doc.push!($couchdb)
          # check that the server included "ok"=>true in its response
          assert(res["ok"])
          # check that the doc now has an id and a rev
@@ -116,7 +115,7 @@ class CouchDocumentTests
         doc.buttonCount = 5
         doc.friends = ["alan", "alex", "all me other mates"]
         
-        res = doc.push($couchdb)
+        res = doc.push!($couchdb)
         assert(res["ok"])
         
         # pull it from the database again
@@ -133,10 +132,110 @@ class CouchDocumentTests
       @existing_valid_documents.each { |doc|
         doc._rev = "hurr"
         assert_raise RestClient::BadRequest do
-          res = doc.push($couchdb)
+          res = doc.push!($couchdb)
         end
       }
     end
     
   end
-end
+end
+
+class CouchDocumentCollectionPushingAndPulling < ShyCouchTestHelper
+
+  def setup
+    super
+    @collection = ShyCouch::Data::CouchDocumentCollection.new(:push_to => @couchdb)
+    4.times do
+      @collection << Recipe.new
+    end
+  end
+  
+  def test_push_all_docs
+    assert_nothing_raised Exception do 
+      @collection.push_all!
+    end
+  end
+  
+  def test_pull_all_docs
+    @collection.push_all!
+    collection2 = @collection.pull_all
+    @collection.each_with_index do |item, i|
+      assert_equal(item, collection2[i])
+    end
+  end
+  
+  def test_pull_all_docs_forcefully
+    # tests pulling w/ exclamation yo
+    @collection.push_all!
+    backupCollection = @collection.clone
+    @collection.pull_all!
+    @collection.each_with_index do |item, i|
+      assert_equal(backupCollection[i], item)
+    end
+  end
+  
+  def teardown; super; end
+
+end
+
+# class CouchDocumentCollectionTests < ShyCouchTestHelper
+#   # Test for:
+#   #   * calling a view returns a document collection
+#   #   * treating it like an array gives access to rows
+#   #   * the metadata that is returned with a view is accessible as object attributes
+#     
+#   class Leg < ShyCouch::Data::CouchDocument; end #for testing
+#   
+#   def setup
+#     super
+#     @view = ShyCouch::Data::View.new :legs do
+#       map do
+#         emit(doc.key, doc.name) if(doc.kind == "Leg")
+#       end
+#     end
+#     @design = ShyCouch::Data::Design.new :cool, { :views => [@view], :push_to => $couchdb }
+#     @couchdb.add_design_and_push!(@design)
+#     @legDocument = Leg.new(:push_to => @couchdb).push!
+#     @legDocumentTwo = Leg.new(:push_to => @couchdb).push!
+#   end
+#   
+#   def test_view_returns_collection
+#     collection = $couchdb.design(:cool).view(:butts)
+#     assert_kind_of(ShyCouch::Data::DocumentCollection, collection)
+#   end
+#   
+#   def test_view_metadata_are_attrs
+#     collection = $couchdb.design(:cool).view(:butts)
+#     assert(collection.respond_to? :total_rows)
+#     assert(collection.respond_to? :offset)
+#   end
+#   
+#   def test_doc_collection_takes_couch_doc
+#     collection = ShyCouch::Data::CouchDocumentCollection.new
+#     assert_nothing_raised Exception do
+#       collection << ShyCouch::Data::CouchDocument.new
+#     end
+#   end
+#   
+#   def test_doc_collection_rejects_wrong_type
+#     collection = ShyCouch::Data::CouchDocumentCollection.new
+#     assert_raises TypeError do
+#       collection << 1
+#     end
+#     assert_raises TypeError do
+#       collection << "Nice!"
+#     end
+#   end
+#   
+#   def test_document_collection_has_documents
+#     collection = $couchdb.design(:cool).view(:butts)
+#     
+#     assert(collection.has_row_with(:id,legDocument["id"]))
+#     assert(collection.has_row_with(:id,legDocument["id"]))
+#   end
+#   
+#   def teardown
+#     super
+#   end
+#   
+# end

data/test/test_couchdb_api.rb

@@ -8,7 +8,7 @@ class TestCouchDBAPI < Test::Unit::TestCase
   end
   
   def teardown
-    $database.delete_database
+    $database.delete!
     $database = nil
   end
   

data/test/test_design_documents.rb

@@ -2,56 +2,29 @@ require 'test/unit'
 require_relative '../lib/ShyCouch.rb'
 
 class DesignDocumentTests
-  class TestDesignDocument < Test::Unit::TestCase
-    Design = ShyCouch::Data::Design
-    CouchDocument = ShyCouch::Data::CouchDocument
-    
-    class Recipe < CouchDocument
-      
-    end
-    
+  class ShyCouchDesignTestHelper < ShyCouchTestHelper
     def setup
-      valid_settings = $settings
-      @couchdb = ShyCouch.getDB(valid_settings)
+      super
+      # add some docs to the database
+      @documents = add_some_documents
+      # make some views
       @views = setup_views
-      @design = nil
+      # make a design, push it
+      @design = setup_design_document
+      @design.push!
     end
     def teardown
-      @couchdb.delete_database
-      @couchdb = nil
-    end
-    
-
-    
-    def test_create_design
-      assert_nothing_raised {
-        @design = setup_design_document
-      }
-    end
-    
-    def test_push_to_db
-      design = setup_design_document
-      @couchdb.add_design_documents_and_push(design)
-      new_doc = @couchdb.get_design_document_by_id(design._id)
-      assert_equal(design.as_hash, new_doc.as_hash)
+      super
     end
-    
-    def test_call_views
-      design = setup_design_document
-      @couchdb.add_design_documents_and_push(design)
-      add_some_documents
-      # puts design.views["count_recipes"]
-    end
-    
     def setup_views
       view1 = ShyCouch::Data::View.new :recipes do
         map do
-          emit(doc._id, doc.name) if doc.kind == 'Recipe'
+          emit(doc.name, null) if doc.kind == "Recipe"
         end
       end
-      view2 = ShyCouch::Data::View.new :count_recipes do
+      view2 = ShyCouch::Data::View.new :recipe_count do
         map do
-          emit(doc._id) if doc.kind == 'Recipe'
+          emit(doc.name, null) if doc.kind == "Recipe"
         end
         reduce do
           return sum(values)
@@ -59,13 +32,114 @@ class DesignDocumentTests
       end
       return [view1, view2]
     end
+    
     def setup_design_document
-      return ShyCouch::Data::Design.new :test_design, @views
+      return ShyCouch::Data::Design.new :food, {:views => @views, :push_to => @couchdb }
     end
+    
     def add_some_documents
       4.times do
-        Recipe.new.push(@couchdb)
+        recipe = Recipe.new(:push_to => @couchdb)
+        recipe.push!
       end
     end
   end
+  
+  class TestDesignDocument < ShyCouchDesignTestHelper
+    Design = ShyCouch::Data::Design
+    CouchDocument = ShyCouch::Data::CouchDocument
+    
+    class Recipe < CouchDocument; end
+    
+    def setup
+      super
+    end
+    def teardown
+      super
+    end
+    
+    def test_create_design
+      assert_nothing_raised {
+        @design = setup_design_document
+      }
+    end
+    
+    def test_create_design_to_db
+      new_doc = @couchdb.pull_design(@design._id)
+      assert_equal(@design.as_hash, new_doc.as_hash)
+    end
+  end
+  
+  class TestDesignsInDatabase < ShyCouchDesignTestHelper
+    def setup
+      super
+    end
+    
+    def teardown
+      super
+    end
+    
+    # three different ways of calling the design
+    def test_get_design_1
+      result = @couchdb.design(@design.name)
+      assert_equal(@design, result)
+    end
+    def test_get_design_2
+      result = @couchdb.design(@design)      
+      assert_equal(@design, result)
+    end
+    def test_get_design_3
+      result = @couchdb.design(:food)
+      assert_equal(@design, result)
+    end
+    
+    def test_modify_design_and_push
+      @design.views["recipe_count"].delete("map")
+      @design.push!
+    end
+    
+  end
+  
+  class TestCallViewFromDesign < ShyCouchDesignTestHelper
+    def setup
+      super
+    end
+    
+    def teardown
+      super
+    end
+    
+    def test_call_view_by_name
+      # for the map view:
+      result = @couchdb.design(@design).query_view(:recipes)
+      # test that we got the right kind of object:
+      assert_kind_of(ShyCouch::Data::ViewResult, result)
+      # test that the object has the expected number of rows:
+      assert_equal(4, result.length)
+      
+      # for the reduce view:
+      result = @couchdb.design(@design).query_view(:recipe_count)
+      assert_kind_of(ShyCouch::Data::ViewResult, result)
+      assert_equal(1, result.length)
+      assert_respond_to(result, :total_rows)
+      assert_respond_to(result, :offset)
+    end
+    
+    def test_call_view_with_view_object
+      # for the map view:
+      result = @couchdb.design(@design).query_view(@views[0])
+      # test that we got the right kind of object:
+      assert_kind_of(ShyCouch::Data::ViewResult, result)
+      # test that the object has the expected number of rows:
+      assert_equal(4, result.length)
+      # and that it responds to offset and total rows as method calls:
+      assert_respond_to(result, :total_rows)
+      assert_respond_to(result, :offset)
+      
+      # for the reduce view:
+      # TODO 
+    end
+    
+  end
+  
 end

data/test/test_views.rb

@@ -15,13 +15,8 @@ class CouchViewTests < Test::Unit::TestCase
   end
   def teardown; end
   
-  class Leg < ShyCouch::Data::CouchDocument
-    
-  end
   
-  def test_query_all
-    
-  end
+
   
   # def test_define_map_view
   #     view :five_star_butts do
@@ -50,4 +45,26 @@ class CouchViewTests < Test::Unit::TestCase
   #     assert_equal(expected_reduce, @couch_views[0].reduce)
   #   end
   
+end
+
+class CouchDefaultViewTests < ShyCouchTestHelper
+  # define a class that should have an 'all' method to get all instances of that object
+  class Leg < ShyCouch::Data::CouchDocument; end
+  def setup
+    super
+    # add some instances of the object
+    @test_docs = []
+    @test_docs << Leg.new(:push_to => @couchdb, :data => {"length"=>30}).push!
+    @test_docs << Leg.new(:push_to => @couchdb, :data => {"length"=>18, "broken"=>true}).push!
+  end
+  def teardown
+    super
+  end
+  # 
+  # def test_query_all
+  #   @all_legs = Leg.all
+  #   assert_equal(@test_docs.length, @all_legs.length)
+  #   assert_kind_of(ShyCouch::CouchDocumentCollection, @all_legs)
+  #   # also test that the doc values worked, and that the response has the docs in it, etc.
+  # end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ShyCouch
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-18 00:00:00.000000000Z
+date: 2011-09-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70144500883400 !ruby/object:Gem::Requirement
+  requirement: &70284357957800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144500883400
+  version_requirements: *70284357957800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70144500899300 !ruby/object:Gem::Requirement
+  requirement: &70284357957320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70144500899300
+  version_requirements: *70284357957320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70144500898820 !ruby/object:Gem::Requirement
+  requirement: &70284357956840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70144500898820
+  version_requirements: *70284357956840
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70144500898340 !ruby/object:Gem::Requirement
+  requirement: &70284357956360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144500898340
+  version_requirements: *70284357956360
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70144500897860 !ruby/object:Gem::Requirement
+  requirement: &70284357955880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70144500897860
+  version_requirements: *70284357955880
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70144500897380 !ruby/object:Gem::Requirement
+  requirement: &70284357955400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144500897380
+  version_requirements: *70284357955400
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70144500896900 !ruby/object:Gem::Requirement
+  requirement: &70284357954920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144500896900
+  version_requirements: *70284357954920
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70144500896420 !ruby/object:Gem::Requirement
+  requirement: &70284357954440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70144500896420
+  version_requirements: *70284357954440
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70144500895940 !ruby/object:Gem::Requirement
+  requirement: &70284357953960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144500895940
+  version_requirements: *70284357953960
 description: Ruby API for CouchDB, designed to work with the Camping micro-framework.
 email: danbryan@gmail.com
 executables: []
@@ -133,8 +133,6 @@ files:
 - lib/ShyCouch/data.rb
 - lib/ShyCouch/fields.rb
 - test/helper.rb
-- test/old-test.rb
-- test/old-tests.rb
 - test/test_ShyCouch.rb
 - test/test_couch_document.rb
 - test/test_couchdb_api.rb
@@ -157,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2267181098830076376
+      hash: -2651663880212191407
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/test/old-test.rb

@@ -1,10 +0,0 @@
-require '~/dev/shycouch/shycouch'
-require '~/dev/shycouch/shycouchtests'
-require 'irb'
-
-ShyCouchTests::test_up
-ShyCouchTests::test_down
-message = "Test methods: "
-message += ShyCouchTests::singleton_methods.map { |m| "ShyCouchTests::#{m}"}.join(', ')
-puts message
-IRB.start

data/test/old-tests.rb

@@ -1,89 +0,0 @@
-require '~/dev/shycouch/shycouch'
-module ShyCouchTests
-  def self.test_up
-    begin
-      # set everything up
-      $t_database, $t_id, $t_document = ShyCouch::CouchDatabase.allocate, "", ShyCouch::Data::CouchDocument.new
-
-      #set up the database
-      setup_database
-      setup_document
-      test_model
-      test_doc_kinds
-      # check that everything at least exists
-	    result = if $t_database and $t_database.server and $t_id and $t_document #and $test_doc_kinds.length == 1
-	      {"ok"=>true,"message"=>"Test environment appears to work","database"=>"$t_database",
-	        "server connection"=>"$t_database.server","test doc id"=>"$t_id", "test document"=>"$t_doc",
-	        "test doc model"=>"$t_model"}
-        else
-          {"ok"=>false,"message"=>"Test environment appears not to be working","database"=>$t_database,
-            "server connection"=>$t_database.server,"test doc id"=>$t_id,"test document"=>$t_doc}
-        end
-    rescue Errno::ECONNREFUSED
-	    result = {"ok"=>false, "message"=>"""Server Connection refused.
-	      Is CouchDB running at http://#{$t_database.host}:#{$t_database.port} ?"""}
-    end
-    result.each do |k, v| puts "#{k}: #{v}"; end
-    result["ok"]
-  end
-
-  def self.test_down
-    $t_database.server.delete_db('test')
-    $t_database = nil
-    $t_id = nil
-    $t_doc = nil
-    result = {"ok"=>true, "message"=>"Test environment has been brought down."}
-    result.each do|k, v| puts "#{k}: #{v}"; end
-  end
-
-  class TestModel < ShyCouch::Data::CouchDocument
-    def initialize hash
-      requirements = {
-        "me"=>String,
-        "you"=>Array
-      }
-      super hash, requirements
-    end
-  end
-
-  private
-
-  def self.setup_database
-    settings = {
-      "db"=> {
-          "host" => "localhost",
-          "port" => 5984,
-          "name" => "test",
-          "user" => "cerales",
-          "password" => "password"
-        },
-    }
-    $t_database = ShyCouch::Create.go(settings)
-    raise Errno::ECONNREFUSED unless $t_database.connect["ok"]
-    $t_database.create_on_server unless $t_database.exists_on_server?
-  end
-
-  def self.setup_document
-    if $t_database.all_docs.length == 0
-      emptyDoc = ShyCouch::Data::CouchDocument.new
-      #$t_id = $t_database.server.push_document($t_database, emptyDoc)["id"]
-      $t_id = $t_database.push_document(emptyDoc)["id"]
-    else
-      $t_id = $t_database.all_docs[0]["id"]
-    end
-  end
-
-  def self.test_doc_kinds
-    doc = ShyCouch::Data::CouchDocument.new.merge!("kind"=>"test")
-    doc2 = ShyCouch::Data::CouchDocument.new.merge!("kind"=>"nope")
-    doc3 = ShyCouch::Data::CouchDocument.new.merge!("kind"=>"not me!")
-    $t_database.push_document(doc)
-    $t_database.push_document(doc2)
-    $t_database.push_document(doc3)
-    $t_doc_kind = $t_database.all_docs_with("kind", "not me!")
-  end
-
-  def self.test_model
-    $t_document.merge!($t_database.get_document($t_id))
-  end
-end