couch_docs 1.3.0 → 1.3.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.3.1 / 2011-01-02
+
+ * Fix destructive pushes.
+
+
 == 1.3.0 / 2011-01-01
 
  * Attachment support

data/couch_docs.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.0"])
   s.add_runtime_dependency(%q<json>, ["~> 1.4.0"])
   s.add_runtime_dependency(%q<directory_watcher>, ["~> 1.3.0"])
+  s.add_runtime_dependency(%q<mime-types>, ["~> 1.16"])
 end

data/lib/couch_docs/command_line.rb

@@ -147,6 +147,15 @@ module CouchDocs
                              update.path)
         end
       end
+    rescue RestClient::ResourceNotFound => e
+      $stderr.puts "\n"
+      $stderr.puts e.message
+      $stderr.puts "Does the database exist? Try using the -R option."
+      $stderr.puts "\n"
+    rescue Exception => e
+      $stderr.puts "\n"
+      $stderr.puts e.message
+      $stderr.puts e.backtrace
     end
 
     def initial_add?(args)

data/lib/couch_docs/document_directory.rb

@@ -36,7 +36,7 @@ module CouchDocs
     end
 
     def file_as_attachment(file)
-      type = mime_type(File.extname(file))
+      type = mime_type(file)
       data = File.read(file)
 
       attachment =  {
@@ -69,12 +69,9 @@ module CouchDocs
     end
 
     private
-    def mime_type(extension)
-      ({
-         ".gif" => "image/gif",
-         ".jpg" => "image/jpeg",
-         ".png" => "image/png"
-       })[extension]
+    def mime_type(file)
+      type = MIME::Types.type_for(file).first.to_s
+      (type && type != '') ? type : nil
     end
   end
 end

data/lib/couch_docs/store.rb

@@ -55,7 +55,8 @@ module CouchDocs
     def self.delete(path)
       # retrieve existing to obtain the revision
       old = self.get(path)
-      RestClient.delete(path + "?rev=#{old['_rev']}")
+      url = old['_rev'] ? path + "?rev=#{old['_rev']}" : path
+      RestClient.delete(url)
     end
 
     def self.get(path)

data/lib/couch_docs/version.rb

@@ -1,3 +1,3 @@
 module CouchDocs
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/couch_docs/store_spec.rb

@@ -81,6 +81,16 @@ describe CouchDocs::Store do
       CouchDocs::Store.delete("uri")
     end
 
+    it "deletes without revision if none is present (e.g. database delete)" do
+      CouchDocs::Store.stub!(:get).and_return({ })
+
+      RestClient.
+        should_receive(:delete).
+        with("uri")
+
+      CouchDocs::Store.delete("uri")
+    end
+
     it "should be able to load each document" do
       CouchDocs::Store.stub!(:get).
         with("uri/_all_docs").

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: couch_docs
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Chris Strom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 -05:00
+date: 2011-01-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,21 @@ dependencies:
         version: 1.3.0
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 1
+        - 16
+        version: "1.16"
+  type: :runtime
+  version_requirements: *id005
 description: Manage CouchDB views and documents.
 email: 
 - chris@eeecooks.com