couch_docs 1.1.1 → 1.2.0

data/History.txt

@@ -1,3 +1,8 @@
+== 1.2.0 / 2010-03-29
+
+ * Directory watcher only applies individual changes, not entire
+   directory when individual changes are made.
+
 == 1.1.1 / 2010-03-15
 
  * Require RestClient 1.1.

data/couch_docs.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couch_docs}
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Strom"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-30}
   s.default_executable = %q{couch-docs}
   s.description = %q{Manage CouchDB views and documents.}
   s.email = %q{chris@eeecooks.com}
   s.executables = ["couch-docs"]
   s.extra_rdoc_files = ["History.txt", "README.rdoc", "bin/couch-docs"]
-  s.files = ["History.txt", "README.rdoc", "Rakefile", "bin/couch-docs", "couch_docs-1.1.0.gem", "couch_docs.gemspec", "fixtures/_design/__lib/foo.js", "fixtures/_design/a/b/c.js", "fixtures/_design/a/b/d.js", "fixtures/_design/x/z.js", "fixtures/bar.json", "fixtures/foo.json", "lib/couch_docs.rb", "lib/couch_docs/command_line.rb", "lib/couch_docs/design_directory.rb", "lib/couch_docs/document_directory.rb", "lib/couch_docs/store.rb", "spec/couch_docs_spec.rb", "spec/spec_helper.rb", "test/test_couch_docs.rb"]
+  s.files = ["History.txt", "README.rdoc", "Rakefile", "bin/couch-docs", "couch_docs-1.1.0.gem", "couch_docs-1.1.1.gem", "couch_docs.gemspec", "fixtures/_design/__lib/foo.js", "fixtures/_design/a/b/c.js", "fixtures/_design/a/b/d.js", "fixtures/_design/x/z.js", "fixtures/bar.json", "fixtures/foo.json", "lib/couch_docs.rb", "lib/couch_docs/command_line.rb", "lib/couch_docs/design_directory.rb", "lib/couch_docs/document_directory.rb", "lib/couch_docs/store.rb", "spec/couch_docs_spec.rb", "spec/spec_helper.rb", "test/test_couch_docs.rb"]
   s.homepage = %q{http://github.com/eee-c/couch_docs}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/couch_docs/command_line.rb

@@ -34,15 +34,14 @@ module CouchDocs
 
         dw.add_observer do |*args|
           puts "Updating documents on CouchDB Server..."
-          CouchDocs.put_dir(@options[:couchdb_url],
-                            @options[:target_dir])
+          directory_watcher_update(args)
         end
 
         if @options[:watch]
           dw.start
 
           begin
-            sleep 30 while true
+            sleep 30 while active?
           rescue Interrupt
             dw.stop
             puts
@@ -131,5 +130,36 @@ module CouchDocs
         raise e
       end
     end
+
+    def directory_watcher_update(args)
+      if initial_add? args
+        CouchDocs.put_dir(@options[:couchdb_url],
+                          @options[:target_dir])
+      else
+        if design_doc_update? args
+          CouchDocs.put_design_dir(@options[:couchdb_url],
+                                   "#{@options[:target_dir]}/_design")
+        end
+        documents(args).each do |update|
+          CouchDocs.put_file(@options[:couchdb_url],
+                             update.path)
+        end
+      end
+    end
+
+    def initial_add?(args)
+      args.all? { |f| f.type == :added }
+    end
+
+    def design_doc_update?(args)
+      args.any? { |f| f.path =~ /_design/ }
+    end
+
+    def documents(args)
+      args.reject { |f| f.path =~ /_design/ }
+    end
+
+    private
+    def active?; true end
   end
 end

data/lib/couch_docs.rb

@@ -3,7 +3,7 @@ require 'ostruct'
 module CouchDocs
 
   # :stopdoc:
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -41,13 +41,22 @@ module CouchDocs
   # located at <tt>db_uri</tt>
   #
   def self.put_document_dir(db_uri, dir)
-    store = Store.new(db_uri)
     dir = DocumentDirectory.new(dir)
     dir.each_document do |name, contents|
       Store.put!("#{db_uri}/#{name}", contents)
     end
   end
 
+
+  # Upload a document located at <tt>file_path</tt> to the CouchDB database
+  # located at <tt>db_uri</tt>
+  #
+  def self.put_file(db_uri, file_path)
+    contents = JSON.parse(File.read(file_path))
+    name = File.basename(file_path, ".json")
+    Store.put!("#{db_uri}/#{name}", contents)
+  end
+
   # Dump all documents located at <tt>db_uri</tt> into the directory
   # <tt>dir</tt>
   #

data/spec/couch_docs_spec.rb

@@ -37,9 +37,6 @@ describe CouchDocs do
   end
 
   it "should be able to load documents into CouchDB" do
-    store = mock("Store")
-    Store.stub!(:new).and_return(store)
-
     dir = mock("Document Directory")
     dir.
       stub!(:each_document).
@@ -54,6 +51,16 @@ describe CouchDocs do
     CouchDocs.put_document_dir("uri", "fixtures")
   end
 
+  it "should be able to upload a single document into CouchDB" do
+    Store.
+      should_receive(:put!).
+      with('uri/foo', {"foo" => "1"})
+
+    File.stub!(:read).and_return('{"foo": "1"}')
+
+    CouchDocs.put_file("uri", "/foo")
+  end
+
   context "dumping CouchDB documents to a directory" do
     before(:each) do
       @store = mock("Store")
@@ -464,6 +471,78 @@ describe CommandLine do
 
       @it.run
     end
+
+    it "should be an initial add if everything is an add" do
+      @it = CommandLine.new(['push', 'uri'])
+      args = [mock(:type => :added),
+              mock(:type => :added)]
+      @it.should be_initial_add(args)
+    end
+
+    it "should not be an initial add if something is not an add" do
+      @it = CommandLine.new(['push', 'uri'])
+      args = [mock(:type => :foo),
+              mock(:type => :added)]
+      @it.should_not be_initial_add(args)
+    end
+
+    it "should be a design docs update if something changes in _design" do
+      @it = CommandLine.new(['push', 'uri'])
+      args = [mock(:path => "foo"),
+              mock(:path => "_design")]
+      @it.should be_design_doc_update(args)
+    end
+
+    it "should know document updates" do
+      @it = CommandLine.new(['push', 'uri'])
+      doc_update = mock(:path => "foo")
+      args = [doc_update,
+              mock(:path => "_design")]
+
+      @it.
+        documents(args).
+        should == [doc_update]
+    end
+
+
+    context "updates on the filesystem" do
+      before(:each) do
+        @args = mock("args")
+        @it = CommandLine.new(%w(push uri dir))
+      end
+      it "should only update design docs if only local design docs have changed" do
+        CouchDocs.
+          should_receive(:put_dir)
+
+        @it.stub!(:initial_add?).and_return(true)
+        @it.directory_watcher_update(@args)
+      end
+      context "not an inital add" do
+        before(:each) do
+          @it.stub!(:initial_add?).and_return(false)
+          @it.stub!(:design_doc_update?).and_return(false)
+          @it.stub!(:documents).and_return([])
+          CouchDocs.stub!(:put_design_dir)
+        end
+        it "should update design docs if there are design document updates" do
+          CouchDocs.
+            should_receive(:put_design_dir)
+
+          @it.stub!(:design_doc_update?).and_return(true)
+          @it.directory_watcher_update(@args)
+        end
+        it "should update documents (if any)" do
+          file_mock = mock("File", :path => "/foo")
+          @it.stub!(:documents).and_return([file_mock])
+
+          CouchDocs.
+            should_receive(:put_file).
+            with("uri", "/foo")
+
+          @it.directory_watcher_update(@args)
+        end
+      end
+    end
   end
 
   context "pushing" do
@@ -490,6 +569,7 @@ describe CommandLine do
       @dw.should_receive(:start)
 
       @it = CommandLine.new(%w(push uri dir -w))
+      @it.stub!(:active?).and_return(false)
       @it.run
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couch_docs
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Chris Strom
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -04:00
+date: 2010-03-30 00:00:00 -04:00
 default_executable: couch-docs
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,7 @@ files:
 - Rakefile
 - bin/couch-docs
 - couch_docs-1.1.0.gem
+- couch_docs-1.1.1.gem
 - couch_docs.gemspec
 - fixtures/_design/__lib/foo.js
 - fixtures/_design/a/b/c.js