couchrest 0.12.2 → 0.12.4

data/README.md

@@ -6,8 +6,7 @@ which I find to be concise, clear, and well designed. CouchRest lightly wraps
 CouchDB's HTTP API, managing JSON serialization, and remembering the URI-paths
 to CouchDB's API endpoints so you don't have to.
 
-CouchRest's lighweight is designed to make a simple base for application and
-framework-specific object oriented APIs.
+CouchRest is designed to make a simple base for application and framework-specific object oriented APIs. CouchRest is Object-Mapper agnostic, the parsed JSON it returns from CouchDB shows up as subclasses of Ruby's Hash. Naked JSON, just as it was mean to be.
 
 ## Easy Install
 

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
 
 
@@ -46,40 +43,6 @@ task :gemspec do
   end
 end
 
-# desc "Update Github Gemspec"
-# task :gemspec do
-#   skip_fields = %w(new_platform original_platform)
-#   integer_fields = %w(specification_version)
-# 
-#   result = "Gem::Specification.new do |s|\n"
-#   spec.instance_variables.each do |ivar|
-#     value = spec.instance_variable_get(ivar)
-#     name  = ivar.split("@").last
-#     next if skip_fields.include?(name) || value.nil? || value == "" || (value.respond_to?(:empty?) && value.empty?)
-#     if name == "dependencies"
-#       value.each do |d|
-#         dep, *ver = d.to_s.split(" ")
-#         result <<  "  s.add_dependency #{dep.inspect}, [#{ /\(([^\,]*)/ . match(ver.join(" "))[1].inspect}]\n"
-#       end
-#     else        
-#       case value
-#       when Array
-#         value =  name != "files" ? value.inspect : value.inspect.split(",").join(",\n")
-#       when Fixnum
-#         # leave as-is
-#       when String
-#         value = value.to_i if integer_fields.include?(name)
-#         value = value.inspect
-#       else
-#         value = value.to_s.inspect
-#       end
-#       result << "  s.#{name} = #{value}\n"
-#     end
-#   end
-#   result << "end"
-#   File.open(File.join(File.dirname(__FILE__), "#{spec.name}.gemspec"), "w"){|f| f << result}
-# end
-
 desc "Run all specs"
 Spec::Rake::SpecTask.new('spec') do |t|
 	t.spec_files = FileList['spec/**/*_spec.rb']

data/examples/word_count/word_count.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../../couchrest'
+require 'rubygems'
+require 'couchrest'
 
 couch = CouchRest.new("http://127.0.0.1:5984")
 db = couch.database('word-count-example')
@@ -39,29 +40,7 @@ books.keys.each do |book|
     end
   end
 end
- 
-# 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 => {
-#     :count => word_count,
-#     :words => {:map => word_count[:map]}
-#   }
-# })
 
 # puts "The books have been stored in your CouchDB. To initiate the MapReduce process, visit http://127.0.0.1:5984/_utils/ in your browser and click 'word-count-example', then select view 'words' or 'count'. The process could take about 15 minutes on an average MacBook."
-# 
+
 

data/examples/word_count/word_count_query.rb

@@ -1,22 +1,23 @@
-require File.dirname(__FILE__) + '/../../couchrest'
+require 'rubygems'
+require 'couchrest'
 
 couch = CouchRest.new("http://127.0.0.1:5984")
 db = couch.database('word-count-example')
 
 puts "Now that we've parsed all those books into CouchDB, the queries we can run are incredibly flexible."
 puts "\nThe simplest query we can run is the total word count for all words in all documents:"
-
-puts db.view('word_count/count').inspect
+puts "this will take a few minutes the first time. if it times out, just rerun this script in a few few minutes."
+puts db.view('word_count/words').inspect
 
 puts "\nWe can also narrow the query down to just one word, across all documents. Here is the count for 'flight' in all three books:"
 
 word = 'flight'
 params = {
   :startkey => [word], 
-  :endkey => [word,'Z']
+  :endkey => [word,{}]
   }
 
-puts db.view('word_count/count',params).inspect
+puts db.view('word_count/words',params).inspect
 
 puts "\nWe scope the query using startkey and endkey params to take advantage of CouchDB's collation ordering. Here are the params for the last query:"
 puts params.inspect
@@ -28,7 +29,7 @@ params = {
   :key => [word, title]
   }
   
-puts db.view('word_count/count',params).inspect
+puts db.view('word_count/words',params).inspect
 
 
 puts "\nHere are the params for 'flight' in the da-vinci book:"

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/core/document.rb

@@ -56,6 +56,18 @@ module CouchRest
       end
       result['ok']
     end
+    
+    def copy(dest)
+      raise ArgumentError, "doc.database required to copy" unless database
+      result = database.copy(self, dest)
+      result['ok']
+    end
+    
+    def move(dest)
+      raise ArgumentError, "doc.database required to copy" unless database
+      result = database.move(self, dest)
+      result['ok']
+    end
 
   end
 

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/lib/couchrest/monkeypatches.rb

@@ -8,7 +8,7 @@ class Time
 
   def to_json(options = nil)
     u = self.utc
-    %("#{u.strftime("%Y/%m/%d %H:%M:%S.#{u.usec} +0000")}")
+    %("#{u.strftime("%Y/%m/%d %H:%M:%S +0000")}")
   end
 
   # Decodes the JSON time format to a UTC time.
@@ -21,4 +21,18 @@ class Time
   # rescue
   #   fallback
   # end
+end
+
+module RestClient
+  def self.copy(url, headers={})
+    Request.execute(:method => :copy,
+      :url => url,
+      :headers => headers)
+  end
+  
+  def self.move(url, headers={})
+    Request.execute(:method => :move,
+    :url => url,
+    :headers => headers)
+  end
 end

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.4'
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'

data/spec/couchrest/core/database_spec.rb

@@ -492,7 +492,6 @@ describe CouchRest::Database do
       it "should work" do
         @db.copy @doc, @docid
         newdoc = @db.get(@docid)
-        debugger
         newdoc['artist'].should == 'Zappa'
       end
       it "should fail without an _id" do

data/spec/couchrest/core/document_spec.rb

@@ -128,3 +128,86 @@ describe "destroying a document from a db using bulk save" do
     lambda{@db.get @resp['id']}.should raise_error
   end
 end
+
+describe "copying a document" do
+  before :each do
+    @db = reset_test_db!
+    @resp = @db.save({'key' => 'value'})
+    @docid = 'new-location'
+    @doc = @db.get(@resp['id'])
+  end
+  describe "to a new location" do
+    it "should work" do
+      @doc.copy @docid
+      newdoc = @db.get(@docid)
+      newdoc['key'].should == 'value'
+    end
+    it "should fail without a database" do
+      lambda{CouchRest::Document.new({"not"=>"a real doc"}).copy}.should raise_error(ArgumentError)
+    end
+  end
+  describe "to an existing location" do
+    before :each do
+      @db.save({'_id' => @docid, 'will-exist' => 'here'})
+    end
+    it "should fail without a rev" do
+      lambda{@doc.copy @docid}.should raise_error(RestClient::RequestFailed)
+    end
+    it "should succeed with a rev" do
+      @to_be_overwritten = @db.get(@docid)
+      @doc.copy "#{@docid}?rev=#{@to_be_overwritten['_rev']}"
+      newdoc = @db.get(@docid)
+      newdoc['key'].should == 'value'
+    end
+    it "should succeed given the doc to overwrite" do
+      @to_be_overwritten = @db.get(@docid)
+      @doc.copy @to_be_overwritten
+      newdoc = @db.get(@docid)
+      newdoc['key'].should == 'value'
+    end
+  end
+end
+
+describe "MOVE existing document" do
+  before :each do
+    @db = reset_test_db!
+    @resp = @db.save({'key' => 'value'})
+    @docid = 'new-location'
+    @doc = @db.get(@resp['id'])
+  end
+  describe "to a new location" do
+    it "should work" do
+      @doc.move @docid
+      newdoc = @db.get(@docid)
+      newdoc['key'].should == 'value'
+      lambda {@db.get(@resp['id'])}.should raise_error(RestClient::ResourceNotFound)
+    end
+    it "should fail without a database" do
+      lambda{CouchRest::Document.new({"not"=>"a real doc"}).move}.should raise_error(ArgumentError)
+      lambda{CouchRest::Document.new({"_id"=>"not a real doc"}).move}.should raise_error(ArgumentError)
+    end
+  end
+  describe "to an existing location" do
+    before :each do
+      @db.save({'_id' => @docid, 'will-exist' => 'here'})
+    end
+    it "should fail without a rev" do
+      lambda{@doc.move @docid}.should raise_error(RestClient::RequestFailed)
+      lambda{@db.get(@resp['id'])}.should_not raise_error
+    end
+    it "should succeed with a rev" do
+      @to_be_overwritten = @db.get(@docid)
+      @doc.move "#{@docid}?rev=#{@to_be_overwritten['_rev']}"
+      newdoc = @db.get(@docid)
+      newdoc['key'].should == 'value'
+      lambda {@db.get(@resp['id'])}.should raise_error(RestClient::ResourceNotFound)
+    end
+    it "should succeed given the doc to overwrite" do
+      @to_be_overwritten = @db.get(@docid)
+      @doc.move @to_be_overwritten
+      newdoc = @db.get(@docid)
+      newdoc['key'].should == 'value'
+      lambda {@db.get(@resp['id'])}.should raise_error(RestClient::ResourceNotFound)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest
 version: !ruby/object:Gem::Version 
-  version: 0.12.2
+  version: 0.12.4
 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
@@ -42,20 +42,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.15"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: extlib
-  type: :runtime
-  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: 
@@ -67,7 +57,6 @@ files:
 - README.md
 - Rakefile
 - THANKS.md
-- bin/couchdir
 - examples/model
 - examples/model/example.rb
 - examples/word_count
@@ -84,6 +73,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)