jchris-couchrest 0.2.1 → 0.2.2

data/lib/couchrest.rb

@@ -28,7 +28,7 @@ require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.2.1' unless self.const_defined?("VERSION")
+  VERSION    = '0.2.2' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'
@@ -40,6 +40,7 @@ module CouchRest
   autoload :Pager,        'couchrest/helper/pager'
   autoload :FileManager,  'couchrest/helper/file_manager'
   autoload :Streamer,     'couchrest/helper/streamer'
+  autoload :Upgrade,      'couchrest/helper/upgrade'
   
   autoload :ExtendedDocument,     'couchrest/more/extended_document'
   autoload :CastedModel,          'couchrest/more/casted_model'

data/lib/couchrest/core/database.rb

@@ -61,12 +61,15 @@ module CouchRest
     # paramaters as described in http://wiki.apache.org/couchdb/HttpViewApi
     def view(name, params = {}, &block)
       keys = params.delete(:keys)
-      url = CouchRest.paramify_url "#{@uri}/_view/#{name}", params
+      name = name.split('/') # I think this will always be length == 2, but maybe not...
+      dname = name.shift
+      vname = name.join('/')
+      url = CouchRest.paramify_url "#{@uri}/_design/#{dname}/_view/#{vname}", params
       if keys
         CouchRest.post(url, {:keys => keys})
       else
         if block_given?
-          @streamer.view(name, params, &block)
+          @streamer.view("_design/#{dname}/_view/#{vname}", params, &block)
         else
           CouchRest.get url
         end
@@ -74,13 +77,15 @@ module CouchRest
     end
     
     # GET a document from CouchDB, by id. Returns a Ruby Hash.
-    def get(id)
+    def get(id, params = {})
       slug = escape_docid(id)
-      hash = CouchRest.get("#{@uri}/#{slug}")
-      doc = if /^_design/ =~ hash["_id"]
-        Design.new(hash)
+      url = CouchRest.paramify_url("#{@uri}/#{slug}", params)
+      result = CouchRest.get(url)
+      return result unless result.is_a?(Hash)
+      doc = if /^_design/ =~ result["_id"]
+        Design.new(result)
       else
-        Document.new(hash)
+        Document.new(result)
       end
       doc.database = self
       doc

data/lib/couchrest/helper/upgrade.rb

@@ -0,0 +1,51 @@
+module CouchRest
+  class Upgrade
+    attr_accessor :olddb, :newdb, :dbname
+    def initialize dbname, old_couch, new_couch
+      @dbname = dbname
+      @olddb = old_couch.database dbname
+      @newdb = new_couch.database!(dbname)
+      @bulk_docs = []
+    end
+    def clone!
+      puts "#{dbname} - #{olddb.info['doc_count']} docs"
+      streamer  = CouchRest::Streamer.new(olddb)
+      streamer.view("_all_docs_by_seq") do |row|
+        load_row_docs(row) if row
+        maybe_flush_bulks
+      end
+      flush_bulks!
+    end
+    
+    private
+    
+    def maybe_flush_bulks
+      flush_bulks! if (@bulk_docs.length > 99)
+    end
+    
+    def flush_bulks!
+      url = CouchRest.paramify_url "#{@newdb.uri}/_bulk_docs", {:all_or_nothing => true}
+      puts "posting #{@bulk_docs.length} bulk docs to #{url}"
+      begin
+        CouchRest.post url, {:docs => @bulk_docs}      
+        @bulk_docs = []
+      rescue Exception => e
+        puts e.response
+        raise e
+      end
+    end
+    
+    def load_row_docs(row)
+      results = @olddb.get(row["id"], {:open_revs => "all", :attachments => true})
+      results.select{|r|r["ok"]}.each do |r|
+        doc = r["ok"]
+        if /^_/.match(doc["_id"]) && !/^_design/.match(doc["_id"])
+          puts "invalid docid #{doc["_id"]} -- trimming"
+          doc["_id"] = doc["_id"].sub('_','')
+        end
+        doc.delete('_rev')
+        @bulk_docs << doc
+      end
+    end
+  end
+end

data/spec/couchrest/more/casted_model_spec.rb

@@ -70,6 +70,7 @@ describe CouchRest::CastedModel do
   
   describe "saved document with casted models" do
     before(:each) do
+      reset_test_db!
       @obj = DummyModel.new(:casted_attribute => {:name => 'whatever'})
       @obj.save.should be_true
       @obj = DummyModel.get(@obj.id)
@@ -94,4 +95,4 @@ describe CouchRest::CastedModel do
     
   end
   
-end
+end

data/spec/couchrest/more/extended_doc_attachment_spec.rb

@@ -4,6 +4,7 @@ describe "ExtendedDocument attachments" do
   
   describe "#has_attachment?" do
     before(:each) do
+      reset_test_db!
       @obj = Basic.new
       @obj.save.should == true
       @file = File.open(FIXTURE_PATH + '/attachments/test.html')
@@ -126,4 +127,4 @@ describe "ExtendedDocument attachments" do
       @obj.attachment_url(@attachment_name).should == "#{Basic.database}/#{@obj.id}/#{@attachment_name}"
     end
   end
-end
+end

data/spec/couchrest/more/extended_doc_view_spec.rb

@@ -190,6 +190,7 @@ describe "ExtendedDocument views" do
 
   describe "with a lot of designs left around" do
     before(:each) do
+      reset_test_db!
       Article.by_date
       Article.view_by :field
       Article.by_field
@@ -203,4 +204,4 @@ describe "ExtendedDocument views" do
       ddocs["rows"].length.should == 1
     end
   end
-end
+end

data/spec/couchrest/more/property_spec.rb

@@ -8,6 +8,7 @@ require File.join(FIXTURE_PATH, 'more', 'event')
 describe "ExtendedDocument properties" do
   
   before(:each) do
+    reset_test_db!
     @card = Card.new(:first_name => "matt")
   end
   
@@ -126,4 +127,4 @@ describe "ExtendedDocument properties" do
     end
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jchris-couchrest
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -89,6 +89,7 @@ files:
 - lib/couchrest/helper
 - lib/couchrest/helper/pager.rb
 - lib/couchrest/helper/streamer.rb
+- lib/couchrest/helper/upgrade.rb
 - lib/couchrest/mixins
 - lib/couchrest/mixins/attachments.rb
 - lib/couchrest/mixins/callbacks.rb
@@ -149,26 +150,6 @@ files:
 - spec/fixtures/attachments/couchdb.png
 - spec/fixtures/attachments/README
 - spec/fixtures/attachments/test.html
-- spec/fixtures/couchapp
-- spec/fixtures/couchapp/_attachments
-- spec/fixtures/couchapp/_attachments/index.html
-- spec/fixtures/couchapp/doc.json
-- spec/fixtures/couchapp/foo
-- spec/fixtures/couchapp/foo/bar.txt
-- spec/fixtures/couchapp/foo/test.json
-- spec/fixtures/couchapp/test.json
-- spec/fixtures/couchapp/views
-- spec/fixtures/couchapp/views/example-map.js
-- spec/fixtures/couchapp/views/example-reduce.js
-- spec/fixtures/couchapp-test
-- spec/fixtures/couchapp-test/my-app
-- spec/fixtures/couchapp-test/my-app/_attachments
-- spec/fixtures/couchapp-test/my-app/_attachments/index.html
-- spec/fixtures/couchapp-test/my-app/foo
-- spec/fixtures/couchapp-test/my-app/foo/bar.txt
-- spec/fixtures/couchapp-test/my-app/views
-- spec/fixtures/couchapp-test/my-app/views/example-map.js
-- spec/fixtures/couchapp-test/my-app/views/example-reduce.js
 - spec/fixtures/more
 - spec/fixtures/more/article.rb
 - spec/fixtures/more/card.rb