mattly-couchrest 0.12.2 → 0.12.6

data/Rakefile

@@ -25,16 +25,13 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.authors = ["J. Chris Anderson"]
   s.files = %w( LICENSE README.md Rakefile THANKS.md ) + 
-    Dir["{bin,examples,lib,spec,utils}/**/*"] - 
+    Dir["{examples,lib,spec,utils}/**/*"] - 
     Dir["spec/tmp"]
   s.extra_rdoc_files = %w( README.md LICENSE THANKS.md )
   s.require_path = "lib"
-  s.bindir = 'bin'
-  s.executables << 'couchdir'
   s.add_dependency("json", ">= 1.1.2")
   s.add_dependency("rest-client", ">= 0.5")
   s.add_dependency("mime-types", ">= 1.15")
-  s.add_dependency("extlib", ">= 0.9.6")
 end
 
 desc "create .gemspec file (useful for github)"

data/examples/word_count/word_count_views.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'couchrest'
+
+couch = CouchRest.new("http://127.0.0.1:5984")
+db = couch.database('word-count-example')
+
+word_count = {
+  :map => 'function(doc){
+    var words = doc.text.split(/\W/);
+    words.forEach(function(word){
+      if (word.length > 0) emit([word,doc.title],1);
+    });
+  }',
+  :reduce => 'function(key,combine){
+    return sum(combine);
+  }'
+}
+
+db.delete db.get("_design/word_count") rescue nil
+
+db.save({
+  "_id" => "_design/word_count",
+  :views => {
+    :words => word_count
+  }
+})

data/lib/couchrest.rb

@@ -15,7 +15,6 @@
 require "rubygems"
 require 'json'
 require 'rest_client'
-# require 'extlib'
 
 $:.unshift File.dirname(__FILE__) unless
   $:.include?(File.dirname(__FILE__)) ||
@@ -26,7 +25,7 @@ require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION = '0.12.2'
+  VERSION = '0.12.6'
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'

data/lib/couchrest/core/database.rb

@@ -50,7 +50,7 @@ module CouchRest
     def slow_view funcs, params = {}
       keys = params.delete(:keys)
       funcs = funcs.merge({:keys => keys}) if keys
-      url = CouchRest.paramify_url "#{@root}/_slow_view", params
+      url = CouchRest.paramify_url "#{@root}/_temp_view", params
       JSON.parse(RestClient.post(url, funcs.to_json, {"Content-Type" => 'application/json'}))
     end
     
@@ -149,16 +149,18 @@ module CouchRest
     # missing ids, supply one from the uuid cache.
     #
     # If called with no arguments, bulk saves the cache of documents to be bulk saved.
-    def bulk_save (docs = nil)
+    def bulk_save(docs = nil, use_uuids = true)
       if docs.nil?
         docs = @bulk_save_cache
         @bulk_save_cache = []
       end
-      ids, noids = docs.partition{|d|d['_id']}
-      uuid_count = [noids.length, @server.uuid_batch_count].max
-      noids.each do |doc|
-        nextid = @server.next_uuid(uuid_count) rescue nil
-        doc['_id'] = nextid if nextid
+      if (use_uuids) 
+        ids, noids = docs.partition{|d|d['_id']}
+        uuid_count = [noids.length, @server.uuid_batch_count].max
+        noids.each do |doc|
+          nextid = @server.next_uuid(uuid_count) rescue nil
+          doc['_id'] = nextid if nextid
+        end
       end
       CouchRest.post "#{@root}/_bulk_docs", {:docs => docs}
     end
@@ -211,7 +213,19 @@ module CouchRest
     def compact!
       CouchRest.post "#{@root}/_compact"
     end
-
+    
+    # Replicates via "pulling" from another database to this database. Makes no attempt to deal with conflicts.
+    def replicate_from other_db
+      raise ArgumentError, "must provide a CouchReset::Database" unless other_db.kind_of?(CouchRest::Database)
+      CouchRest.post "#{@host}/_replicate", :source => other_db.root, :target => name
+    end
+    
+    # Replicates via "pushing" to another database. Makes no attempt to deal with conflicts.
+    def replicate_to other_db
+      raise ArgumentError, "must provide a CouchReset::Database" unless other_db.kind_of?(CouchRest::Database)
+      CouchRest.post "#{@host}/_replicate", :target => other_db.root, :source => name
+    end
+    
     # DELETE the database itself. This is not undoable and could be rather
     # catastrophic. Use with care!
     def delete!

data/lib/couchrest/core/model.rb

@@ -1,5 +1,10 @@
 require 'rubygems'
-require 'extlib'
+begin
+  require 'extlib'
+rescue 
+  puts "CouchRest::Model requires extlib. This is left out of the gemspec on purpose."
+  raise
+end
 require 'digest/md5'
 require File.dirname(__FILE__) + '/document'
 require 'mime/types'
@@ -439,6 +444,7 @@ module CouchRest
             saved['views'][name] = view
           end
           database.save(saved)
+          self.design_doc = saved
         else
           design_doc['_id'] = did
           design_doc.delete('_rev')

data/spec/couchrest/core/database_spec.rb

@@ -624,6 +624,37 @@ describe CouchRest::Database do
       @cr.databases.should_not include('couchrest-test')
     end
   end
+  
+  describe "replicating a database" do
+    before do
+      @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'
+    end
+
+    describe "via pulling" do
+      before do
+        @other_db.replicate_from @db
+      end
+      
+      it "contains the document from the original database" do
+        doc = @other_db.get('test_doc')
+        doc['some-value'].should == 'foo'
+      end
+    end
+    
+    describe "via pushing" do
+      before do
+        @db.replicate_to @other_db
+      end
+      
+      it "copies the document to the other database" do
+        doc = @other_db.get('test_doc')
+        doc['some-value'].should == 'foo'
+      end
+    end
+  end
 
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattly-couchrest
 version: !ruby/object:Gem::Version 
-  version: 0.12.2
+  version: 0.12.6
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -10,7 +10,7 @@ bindir: bin
 cert_chain: []
 
 date: 2008-11-22 00:00:00 -08:00
-default_executable: couchdir
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -39,19 +39,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.15"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: extlib
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.6
-    version: 
 description: CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments.
 email: jchris@apache.org
-executables: 
-- couchdir
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -63,7 +54,6 @@ files:
 - README.md
 - Rakefile
 - THANKS.md
-- bin/couchdir
 - examples/model
 - examples/model/example.rb
 - examples/word_count
@@ -80,6 +70,7 @@ files:
 - examples/word_count/views/word_count/count-reduce.js
 - examples/word_count/word_count.rb
 - examples/word_count/word_count_query.rb
+- examples/word_count/word_count_views.rb
 - lib/couchrest
 - lib/couchrest/commands
 - lib/couchrest/commands/generate.rb

data/bin/couchdir

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-unless ARGV.length >= 2
-  puts "usage: couchdir path/to/directory db-name [docid]"
-  exit
-end
-
-require 'rubygems'
-require 'couchrest'
-
-dirname = ARGV[0]
-dbname = ARGV[1]
-docid = ARGV[2]
-
-puts "Create attachments for the files in #{dirname} in database #{dbname}."
-
-fm = CouchRest::FileManager.new(dbname)
-fm.loud = true
-puts "Pushing views from directory #{dirname} to database #{fm.db}"
-fm.push_directory(dirname, docid)