ShyCouch 0.4.1 → 0.4.2

data/ShyCouch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ShyCouch}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   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-08-28}
+  s.date = %q{2011-09-01}
   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 = [
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
     "test/old-test.rb",
     "test/old-tests.rb",
     "test/test_ShyCouch.rb",
-    "test/test_camping_integration.rb",
     "test/test_couch_document.rb",
     "test/test_couchdb_api.rb",
     "test/test_couchdb_factory.rb",

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/ShyCouch.rb

@@ -43,7 +43,7 @@ module ShyCouch
 	    init(settings)
   	end
 
-  	attr_accessor :server, :name, :host, :port, :views
+  	attr_accessor :server, :name, :host, :port, :design_documents
 
   	def connect
   		@server = CouchServerConnection.new({"host"=>@host, "port"=>@port, "user"=>@user, "password"=>@password})
@@ -65,12 +65,16 @@ module ShyCouch
   	def create
   		@server.create_db(@name)
   	end
-    def get_document(id)
-      @server.get_document(@name, id)
+    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
     end
     def all_docs
-      get_document('_all_docs').rows.map { |doc|
-        get_document(doc["id"])
+      get_document_by_id('_all_docs').rows.map { |doc|
+        get_document_by_id(doc["id"])
       }
     end
     def all_docs_with(attribute, value=nil)
@@ -92,27 +96,41 @@ module ShyCouch
     end
 
     def pull_document(document)
-      @server.push_document(self.name, document)      
+      @server.pull_document(self.name, document)      
     end
 
     def push_document(document)
       @server.push_document(self.name, document)
     end
     
-    def designs
-      @server.pull_all_design_docs(self.name)
+    def add_design_document(design)
+      @design_documents << design
+    end
+    
+    def add_design_documents_and_push(*docs)
+      docs.each do |doc|
+        @design_documents << doc
+      end
+      push_design_documents
+    end
+    
+    def push_design_documents
+      @design_documents.each do |design|
+        design.push(self)
+      end
     end
     
-    def views
-      designs.map{ |d| d["views"] }
+    def view(design, view_obj)
+      url = "#{design._id}/_view/#{view_obj.name}"
+      get_document_by_id(url)
     end
     
     private 
     
-    def init(settings)
+    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"]
-  		@views = []
+  		@design_documents = design_documents
   		@server = CouchServerConnection.allocate
     end
     
@@ -155,7 +173,7 @@ module ShyCouch
     	end
 
       def pull_all_design_docs(db_name)
-        pull_all_doc_ids(db_name).map { get_document(db_name, id) if id[0,7] == "_design" }
+        pull_all_doc_ids(db_name).map { get_document_by_id(db_name, id) if id[0,7] == "_design" }
       end
 
     	def pull_all_doc_ids(db_name)
@@ -166,9 +184,12 @@ module ShyCouch
     	  pull_all_doc_ids(db_name).map { |id| Data::CouchDocument.new(get("/#{db_name}/#{id}")) }
     	end
 
-    	def get_document(db_name, id)
+    	def get_document_by_id(db_name, id)
     		document = Data::CouchDocument.new(get("/#{db_name}/#{id}"))
     	end
+    	def pull_document(db_name, document)
+    		document = Data::CouchDocument.new(get("/#{db_name}/#{document._id}"))  	    
+	    end
 
     	def delete_document(db_name, id)
     		delete("/#{db_name}/#{id}")
@@ -192,12 +213,10 @@ module ShyCouch
     	  #TODO - return success more meaningfully maybe?
   	  end
   	
-  	  def pull_document(db_name, document)
-    		document = Data::CouchDocument.new(get("/#{db_name}/#{id}"))  	    
-	    end
+
   	
     	def push_document(db_name, document)
-    	  raise TypeError unless document.class == Data::CouchDocument
+    	  raise TypeError unless document.kind_of?(Data::CouchDocument)
     	  raise JSON::GeneratorError unless document.valid?
     	  if document["_rev"]
     	    put("/#{db_name}/#{document._id}?rev=#{document._rev}/", document.to_json)

data/lib/ShyCouch/data.rb

@@ -11,13 +11,14 @@ module ShyCouch
       def initialize(hash={})
         # 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 unless hash["kind"]
+        hash["kind"] = self.class.to_s.split("::").last unless hash["kind"]
         merge!(hash)
         raise TypeError unless valid?
         # super(hash)
       end
     
       def self.all
+        
       end
       
       def self.needs(*requirements)
@@ -56,7 +57,7 @@ module ShyCouch
       end
     
       def pull(database=nil)
-        database = $database unless database
+        database ||= $couchdb
         new_doc = database.pull_document(self)
         if new_doc
           self.clear
@@ -65,10 +66,9 @@ module ShyCouch
       end
     
       def push(database = nil)
-        # assumes $database unless it receives a database argument
-        database = $couchdb unless database
+        database ||= $couchdb
         res = database.push_document(self)
-        self["_id"] = res["id"]
+        self["_id"] = res["id"] unless self["_id"]
         self["_rev"] = res["rev"]
         return res
       end
@@ -96,8 +96,12 @@ module ShyCouch
     
     class View
       attr_accessor :map, :reduce, :name
+      JS_MAP_FUNCTION_HEADER = "function ( doc ) { \n    "
+      JS_REDUCE_FUNCTION_HEADER = "function(key, values, rereduce) { \n    "
+      JS_FUNCTION_FOOTER = "}"
       
       def initialize(view_name, &block)
+        #O TODO - oh dear this is a nightmare
         @parser = ShyRubyJS::ShySexpParser.new
         sexp_check = block.to_sexp
         sexp = block.to_sexp(:strip_enclosure=>true)
@@ -112,11 +116,11 @@ module ShyCouch
           [1,2].each { |num|
             2.times { sexp[num].delete_at(1) }
           }
-          @map = @parser.parse(sexp[1])[0]
-          @reduce = @parser.parse(sexp[2]) if sexp[2].length > 1
+          @map = JS_MAP_FUNCTION_HEADER + @parser.parse(sexp[1])[0] + JS_FUNCTION_FOOTER
+          @reduce = JS_REDUCE_FUNCTION_HEADER + @parser.parse(sexp[2])[0] + JS_FUNCTION_FOOTER
         elsif sexp[0] == :iter
           raise ShyCouchError, "view must be called with map block and optional reduce block" unless sexp[1][2] == :map
-          @map = @parser.parse(sexp[3])
+          @map = JS_MAP_FUNCTION_HEADER + @parser.parse(sexp[3]) + JS_FUNCTION_FOOTER
         end
       end
       
@@ -126,22 +130,25 @@ module ShyCouch
         h.merge!({"reduce" => @reduce}) if @reduce
         return h
       end
+      
+      def functions
+        return {"map" => @map, "reduce" => @reduce}
+      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)
+      def initialize(name, views=[])
         merge! "_id" => "_design/#{name.to_s}"
         @parser = ShyRubyJS::ShySexpParser.new
+        h = {"views" => {}}
+        views.each do |view|
+          h["views"][view.name] = view.functions
+        end
+        merge! h
       end
-      
-      def self.setup
-        # setup_all_view
-      end
-         
-      def push;end #must override push in order to set the ID
     end
 
   end

data/test/test_ShyCouch.rb

@@ -7,8 +7,8 @@ require_relative '../lib/ShyCouch'
 # Settings for a database that is set up and working, with an admin user
 $settings = {
   "db"=> {
-      "host" => "ramponeau.local",
-      # "host" => "localhost",
+      # "host" => "ramponeau.local",
+      "host" => "localhost",
       "port" => 5984,
       "name" => "test",
       "user" => "cerales",
@@ -26,8 +26,6 @@ require_relative 'test_fields'
 # test ShyCouch::Data::CouchDocument
 require_relative 'test_couch_document'
 
-require_relative 'test_camping_integration'
-
 require_relative 'test_couchdb_factory'
 
 require_relative 'test_design_documents'

data/test/test_couch_document.rb

@@ -98,7 +98,7 @@ class CouchDocumentTests# < Test::Unit::TestCase
         assert(doc["_id"])
         assert(doc["_rev"])
         # get the new doc
-        newDoc = $couchdb.get_document(doc._id)
+        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"])
@@ -120,7 +120,7 @@ class CouchDocumentTests# < Test::Unit::TestCase
         assert(res["ok"])
         
         # pull it from the database again
-        checkDoc = $couchdb.get_document(doc._id)
+        checkDoc = $couchdb.pull_document(doc)
         
         # check that the one from the database has all the new attributes
         assert_equal(doc.owner, checkDoc.owner)

data/test/test_couchdb_factory.rb

@@ -10,6 +10,6 @@ class TestCouchDBFactory < Test::Unit::TestCase
   end
   
   def test_create_database
-    assert_kind_of(ShyCouch::CouchDBAPI, ShyCouch.create(@valid_settings))
+    assert_kind_of(ShyCouch::CouchDatabase, ShyCouch.create(@valid_settings))
   end
 end

data/test/test_design_documents.rb

@@ -2,24 +2,72 @@ require 'test/unit'
 require_relative '../lib/ShyCouch.rb'
 
 class DesignDocumentTests
-  class TestDesignDocumentCreation < Test::Unit::TestCase
+  class TestDesignDocument < Test::Unit::TestCase
     Design = ShyCouch::Data::Design
-    def setup; end
-    def teardown; end
+    CouchDocument = ShyCouch::Data::CouchDocument
     
-     class TestDesign < Design
-        def view_cigars
-          map do
-            
-          end
-          reduce do
-            
-          end
+    class Recipe < CouchDocument
+      
+    end
+    
+    def setup
+      valid_settings = $settings
+      @couchdb = ShyCouch.getDB(valid_settings)
+      @views = setup_views
+      @design = nil
+    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)
+    end
+    
+    def test_call_views
+      design = setup_design_document
+      @couchdb.add_design_documents_and_push(design)
+      add_some_documents
+      puts design.views["count_recipes"]
+      require 'irb'
+      IRB.start
+    end
+    
+    def setup_views
+      view1 = ShyCouch::Data::View.new :recipes do
+        map do
+          emit(doc._id, doc.name) if doc.kind == 'Recipe'
         end
       end
-    def test_define_design_document
-      #todo
-      
+      view2 = ShyCouch::Data::View.new :count_recipes do
+        map do
+          emit(doc._id) if doc.kind == 'Recipe'
+        end
+        reduce do
+          return sum(values)
+        end
+      end
+      return [view1, view2]
+    end
+    def setup_design_document
+      return ShyCouch::Data::Design.new :test_design, @views
+    end
+    def add_some_documents
+      4.times do
+        Recipe.new.push(@couchdb)
+      end
     end
   end
 end

data/test/test_views.rb

@@ -3,49 +3,51 @@ require_relative '../lib/ShyCouch.rb'
 
 class CouchViewTests < Test::Unit::TestCase
   JS_MAP_FUNCTION_HEADER = "function ( doc ) { \n    "
-  JS_REDUCE_FUNCTION_HEADER = "function(key, values, rereduce)"
+  JS_REDUCE_FUNCTION_HEADER = "function(key, values, rereduce) { \n    "
   JS_FUNCTION_FOOTER = "}"
   def setup
     @couch_views = []
   end
   
   def view(view_name, &block)
+    #for convenience, and to imitate how it would be used in Camping
     @couch_views << ShyCouch::Data::View.new(view_name, &block)
   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
       map do
-        def function(doc)
+        # def function(doc)
           emit(doc) if doc.kind == "butt" and doc.star_rating == 5
-        end
+        # end
       end
     end
-    expected_js = JS_MAP_FUNCTION_HEADER + %{if( doc.kind == "butt" && doc.star_rating == 5 ) {\n  emit(doc)\n} \n } + JS_FUNCTION_FOOTER
+    expected_js = JS_MAP_FUNCTION_HEADER + %{if( doc.kind == 'butt' && doc.star_rating == 5 ) {\n  emit(doc)\n}} + JS_FUNCTION_FOOTER
     assert_equal(expected_js, @couch_views[0].map)
-    # puts @couch_views[0].map
   end
   
   def test_define_map_and_reduce_view
     view :beggar_count do
       map do
-        def function(doc)
-          emit(doc) if doc.kind == "beggar"
-        end
+        emit(doc) if doc.kind == "beggar"
       end
       reduce do
-        def function(key, values, rereduce)
-          return sum(values)
-        end
+        return sum(values)
       end
     end
-    puts @couch_views[0].map
-    puts @couch_views[0].reduce
-    expected_map = JS_MAP_FUNCTION_HEADER + %{if( doc.kind == "beggar" ) {\n  emit(doc)\n} \n } + JS_FUNCTION_FOOTER
-    expected_rejuce = JS_REDUCE_FUNCTION_HEADER
+    expected_map = JS_MAP_FUNCTION_HEADER + %{if( doc.kind == 'beggar' ) {\n  emit(doc)\n}} + JS_FUNCTION_FOOTER
+    expected_reduce = JS_REDUCE_FUNCTION_HEADER + %{return sum(values);} + JS_FUNCTION_FOOTER
     assert_equal(expected_map, @couch_views[0].map)
-
+    assert_equal(expected_reduce, @couch_views[0].reduce)
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ShyCouch
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-28 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70307013502640 !ruby/object:Gem::Requirement
+  requirement: &70241067513520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307013502640
+  version_requirements: *70241067513520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70307013500880 !ruby/object:Gem::Requirement
+  requirement: &70241067513040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70307013500880
+  version_requirements: *70241067513040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70307013499500 !ruby/object:Gem::Requirement
+  requirement: &70241067512560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70307013499500
+  version_requirements: *70241067512560
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70307013498580 !ruby/object:Gem::Requirement
+  requirement: &70241067512080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307013498580
+  version_requirements: *70241067512080
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70307013497400 !ruby/object:Gem::Requirement
+  requirement: &70241067511600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70307013497400
+  version_requirements: *70241067511600
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70307013496100 !ruby/object:Gem::Requirement
+  requirement: &70241067511120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307013496100
+  version_requirements: *70241067511120
 - !ruby/object:Gem::Dependency
   name: ShyRubyJS
-  requirement: &70307013494400 !ruby/object:Gem::Requirement
+  requirement: &70241067510640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307013494400
+  version_requirements: *70241067510640
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70307013493540 !ruby/object:Gem::Requirement
+  requirement: &70241067510160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307013493540
+  version_requirements: *70241067510160
 description: Ruby API for CouchDB, designed to work with the Camping micro-framework.
 email: danbryan@gmail.com
 executables: []
@@ -124,7 +124,6 @@ files:
 - test/old-test.rb
 - test/old-tests.rb
 - test/test_ShyCouch.rb
-- test/test_camping_integration.rb
 - test/test_couch_document.rb
 - test/test_couchdb_api.rb
 - test/test_couchdb_factory.rb
@@ -146,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2881104089150882121
+      hash: 4020979240365981983
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/test/test_camping_integration.rb

@@ -1,15 +0,0 @@
-require 'test/unit'
-require_relative '../lib/ShyCouch.rb'
-
-class CampingIntegrationTests
-  
-  class TestModelInheritence < Test::Unit::TestCase
-    
-    class InheritanceTest < ShyCouch::Data::CouchDocument; end
-    def test_document_kind_assignment
-         m = InheritanceTest.new
-         assert_equal(InheritanceTest.to_s, m.kind)
-    end
-    
-  end
-end