couchrest 0.34 → 0.35

data/Rakefile

@@ -56,3 +56,12 @@ end
 
 desc "Run the rspec"
 task :default => :spec
+
+module Rake
+  def self.remove_task(task_name)
+    Rake.application.instance_variable_get('@tasks').delete(task_name.to_s)
+  end
+end
+
+Rake.remove_task("github:release")
+Rake.remove_task("release")

data/history.txt

@@ -1,3 +1,25 @@
+== Next Version
+
+* Major enhancements
+
+* Minor enhancements
+
+== 0.35
+
+* Major enhancements
+  * CouchRest::ExtendedDocument allow chaining the inherit class callback (Kenneth Kalmer) - http://github.com/couchrest/couchrest/issues#issue/8
+
+* Minor enhancements
+  * Fix attachment bug (Johannes Jörg Schmidt)
+  * Fix create database exception bug (Damien Mathieu)
+  * Compatible with restclient >= 1.4.0 new responses (Julien Kirch)
+  * Bug fix: Attribute protection no longer strips attributes coming from the database (Will Leinweber)
+  * Bug fix: Remove double CGI escape when PUTting an attachment (nzoschke)
+  * Bug fix: Changing Class proxy to set database on result sets (Peter Gumeson)
+  * Bug fix: Updated time regexp (Nolan Darilek)
+  * Added an update_doc method to database to handle conflicts during atomic updates. (Pierre Larochelle)
+  * Bug fix: http://github.com/couchrest/couchrest/issues/#issue/2 (Luke Burton)
+
 == 0.34
 
 * Major enhancements
@@ -85,4 +107,4 @@
 ---
 
 Unfortunately, before 0.30 we did not keep a track of the modifications made to CouchRest.
-You can see the full commit history on GitHub: http://github.com/couchrest/couchrest/commits/master/
+You can see the full commit history on GitHub: http://github.com/couchrest/couchrest/commits/master/

data/lib/couchrest/core/adapters/restclient.rb

@@ -10,25 +10,25 @@ module RestClientAdapter
     end
   
     def get(uri, headers={})
-      RestClient.get(uri, headers)
+      RestClient.get(uri, headers).to_s
     end
   
     def post(uri, payload, headers={})
-      RestClient.post(uri, payload, headers)
+      RestClient.post(uri, payload, headers).to_s
     end
   
     def put(uri, payload, headers={})
-      RestClient.put(uri, payload, headers)
+      RestClient.put(uri, payload, headers).to_s
     end
   
     def delete(uri, headers={})
-      RestClient.delete(uri, headers)
+      RestClient.delete(uri, headers).to_s
     end
   
     def copy(uri, headers)
       RestClient::Request.execute(  :method   => :copy,
                                     :url      => uri,
-                                    :headers  => headers) 
+                                    :headers  => headers).to_s
     end
   end 
   

data/lib/couchrest/core/database.rb

@@ -107,7 +107,6 @@ module CouchRest
     # PUT an attachment directly to CouchDB
     def put_attachment(doc, name, file, options = {})
       docid = escape_docid(doc['_id'])
-      name = CGI.escape(name)
       uri = url_for_attachment(doc, name)
       JSON.parse(HttpAbstraction.put(uri, file, options))
     end
@@ -250,6 +249,33 @@ module CouchRest
       CouchRest.copy "#{@root}/#{slug}", destination
     end
     
+    # Updates the given doc by yielding the current state of the doc
+    # and trying to update update_limit times. Returns the new doc
+    # if the doc was successfully updated without hitting the limit
+    def update_doc(doc_id, params = {}, update_limit=10)
+      resp = {'ok' => false}
+      new_doc = nil
+      last_fail = nil
+
+      until resp['ok'] or update_limit <= 0
+        doc = self.get(doc_id, params)  # grab the doc
+        new_doc = yield doc # give it to the caller to be updated
+        begin
+          resp = self.save_doc new_doc # try to PUT the updated doc into the db
+        rescue RestClient::RequestFailed => e
+          if e.http_code == 409 # Update collision
+            update_limit -= 1
+            last_fail = e
+          else # some other error
+            raise e
+          end
+        end
+      end
+
+      raise last_fail unless resp['ok']
+      new_doc
+    end
+    
     # Compact the database, removing old document revisions and optimizing space use.
     def compact!
       CouchRest.post "#{@root}/_compact"
@@ -265,7 +291,7 @@ module CouchRest
     def recreate!
       delete!
       create!
-    rescue HttpAbstraction::ResourceNotFound
+    rescue RestClient::ResourceNotFound
     ensure
       create!
     end

data/lib/couchrest/mixins/class_proxy.rb

@@ -56,7 +56,9 @@ module CouchRest
         # Mixins::DocumentQueries
         
         def all(opts = {}, &block)
-          @klass.all({:database => @database}.merge(opts), &block)
+          docs = @klass.all({:database => @database}.merge(opts), &block)
+          docs.each { |doc| doc.database = @database if doc.respond_to?(:database) } if docs
+          docs
         end
         
         def count(opts = {}, &block)
@@ -64,11 +66,15 @@ module CouchRest
         end
         
         def first(opts = {})
-          @klass.first({:database => @database}.merge(opts))
+          doc = @klass.first({:database => @database}.merge(opts))
+          doc.database = @database if doc && doc.respond_to?(:database)
+          doc
         end
         
         def get(id)
-          @klass.get(id, @database)
+          doc = @klass.get(id, @database)
+          doc.database = @database if doc && doc.respond_to?(:database)
+          doc
         end
         
         # Mixins::Views
@@ -78,7 +84,9 @@ module CouchRest
         end
         
         def view(name, query={}, &block)
-          @klass.view(name, {:database => @database}.merge(query), &block)
+          docs = @klass.view(name, {:database => @database}.merge(query), &block)
+          docs.each { |doc| doc.database = @database if doc.respond_to?(:database) } if docs
+          docs
         end
         
         def all_design_doc_versions

data/lib/couchrest/mixins/collection.rb

@@ -183,7 +183,7 @@ module CouchRest
           if @container_class.nil?
             results
           else
-            results['rows'].collect { |row| @container_class.new(row['doc']) } unless results['rows'].nil?
+            results['rows'].collect { |row| @container_class.create_from_database(row['doc']) } unless results['rows'].nil?
           end
         end
 

data/lib/couchrest/mixins/document_queries.rb

@@ -51,11 +51,9 @@ module CouchRest
         # db<Database>:: optional option to pass a custom database to use
         def get(id, db = database)
           begin
-            doc = db.get id
+            get!(id, db)
           rescue
             nil
-          else
-            new(doc)
           end
         end
         
@@ -72,11 +70,11 @@ module CouchRest
         # db<Database>:: optional option to pass a custom database to use
         def get!(id, db = database)
           doc = db.get id
-          new(doc)
+          create_from_database(doc)
         end
         
       end
       
     end
   end
-end
+end

data/lib/couchrest/mixins/extended_attachments.rb

@@ -14,7 +14,7 @@ module CouchRest
 
       # reads the data from an attachment
       def read_attachment(attachment_name)
-        Base64.decode64(database.fetch_attachment(self, attachment_name))
+        database.fetch_attachment(self, attachment_name)
       end
 
       # modifies a file attachment on the current doc
@@ -52,10 +52,6 @@ module CouchRest
       
       private
       
-        def encode_attachment(data)
-          ::Base64.encode64(data).gsub(/\r|\n/,'')
-        end
-
         def get_mime_type(file)
           ::MIME::Types.type_for(file.path).empty? ? 
             'text\/plain' : MIME::Types.type_for(file.path).first.content_type.gsub(/\//,'\/')
@@ -65,10 +61,10 @@ module CouchRest
           content_type = args[:content_type] ? args[:content_type] : get_mime_type(args[:file])
           self['_attachments'][args[:name]] = {
             'content_type' => content_type,
-            'data'         => encode_attachment(args[:file].read)
+            'data'         => args[:file].read
           }
         end
       
     end # module ExtendedAttachments
   end
-end
+end

data/lib/couchrest/mixins/properties.rb

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), '..', 'more', 'property')
 class Time                       
   # returns a local time value much faster than Time.parse
   def self.mktime_with_offset(string)
-    string =~ /(\d{4})\/(\d{2})\/(\d{2}) (\d{2}):(\d{2}):(\d{2}) ([\+\-])(\d{2})/
+    string =~ /(\d{4})[\-|\/](\d{2})[\-|\/](\d{2})[T|\s](\d{2}):(\d{2}):(\d{2})([\+|\s|\-])*(\d{2}):?(\d{2})/
     # $1 = year
     # $2 = month
     # $3 = day
@@ -197,4 +197,4 @@ module CouchRest
       
     end
   end
-end
+end

data/lib/couchrest/mixins/views.rb

@@ -137,13 +137,13 @@ module CouchRest
                 collection_proxy_for(design_doc, name, opts.merge({:include_docs => true}))
               else
                 view = fetch_view db, name, opts.merge({:include_docs => true}), &block
-                view['rows'].collect{|r|new(r['doc'])} if view['rows']
+                view['rows'].collect{|r|create_from_database(r['doc'])} if view['rows']
               end
             rescue
               # fallback for old versions of couchdb that don't 
               # have include_docs support
               view = fetch_view(db, name, opts, &block)
-              view['rows'].collect{|r|new(db.get(r['id']))} if view['rows']
+              view['rows'].collect{|r|create_from_database(db.get(r['id']))} if view['rows']
             end
           end
         end
@@ -170,4 +170,4 @@ module CouchRest
       
     end
   end
-end
+end

data/lib/couchrest/more/extended_document.rb

@@ -21,9 +21,11 @@ module CouchRest
     end
     
     def self.inherited(subklass)
+      super
       subklass.send(:include, CouchRest::Mixins::Properties)
       subklass.class_eval <<-EOS, __FILE__, __LINE__ + 1
         def self.inherited(subklass)
+          super
           subklass.properties = self.properties.dup
         end
       EOS
@@ -38,11 +40,20 @@ module CouchRest
     define_callbacks :save, "result == :halt"
     define_callbacks :update, "result == :halt"
     define_callbacks :destroy, "result == :halt"
+
+    # Creates a new instance, bypassing attribute protection
+    #
+    # ==== Returns
+    #  a document instance
+    def self.create_from_database(passed_keys={})
+      new(passed_keys, :directly_set_attributes => true)      
+    end
     
-    def initialize(passed_keys={})
+    def initialize(passed_keys={}, options={})
       apply_defaults # defined in CouchRest::Mixins::Properties
-	  set_attributes(passed_keys) unless passed_keys.nil?
-      super
+      remove_protected_attributes(passed_keys) unless options[:directly_set_attributes]
+      directly_set_attributes(passed_keys) unless passed_keys.nil?
+      super(passed_keys)
       cast_keys      # defined in CouchRest::Mixins::Properties
       unless self['_id'] && self['_rev']
         self['couchrest-type'] = self.class.to_s
@@ -281,14 +292,18 @@ module CouchRest
         raise NoMethodError, "#{attribute_name}= method not available, use property :#{attribute_name}" unless self.respond_to?("#{attribute_name}=")
       end      
 		end
-
-		def set_attributes(hash)
-			attrs = remove_protected_attributes(hash)
-      attrs.each do |attribute_name, attribute_value|
+    
+    def directly_set_attributes(hash)
+      hash.each do |attribute_name, attribute_value|
         if self.respond_to?("#{attribute_name}=")
-          self.send("#{attribute_name}=", attrs.delete(attribute_name))
+          self.send("#{attribute_name}=", hash.delete(attribute_name))
         end
       end
+    end
+    
+		def set_attributes(hash)
+			attrs = remove_protected_attributes(hash)
+			directly_set_attributes(attrs)
 		end
   end
 end

data/lib/couchrest.rb

@@ -28,7 +28,7 @@ require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.34' unless self.const_defined?("VERSION")
+  VERSION    = '0.35' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'

data/spec/couchrest/core/database_spec.rb

@@ -551,6 +551,53 @@ describe CouchRest::Database do
     
   end
   
+  describe  "UPDATE existing document" do
+    before :each do
+      @id = @db.save_doc({
+          'article' => 'Pete Doherty Kicked Out For Nazi Anthem',
+          'upvotes' => 10,
+          'link' => 'http://beatcrave.com/2009-11-30/pete-doherty-kicked-out-for-nazi-anthem/'})['id']
+    end
+    it "should work under normal conditions" do
+      @db.update_doc @id do |doc|
+        doc['upvotes'] += 1
+        doc
+      end
+      @db.get(@id)['upvotes'].should == 11
+    end
+    it "should fail if update_limit is reached" do
+      lambda do
+        @db.update_doc @id do |doc|
+          # modify and save the doc so that a collision happens
+          conflicting_doc = @db.get @id
+          conflicting_doc['upvotes'] += 1
+          @db.save_doc conflicting_doc
+        
+          # then try saving it through the update
+          doc['upvotes'] += 1
+          doc
+        end
+      end.should raise_error(RestClient::RequestFailed)
+    end
+    it "should not fail if update_limit is not reached" do
+      limit = 5
+      lambda do
+      @db.update_doc @id do |doc|
+          # same as the last spec except we're only forcing 5 conflicts
+          if limit > 0
+            conflicting_doc = @db.get @id
+            conflicting_doc['upvotes'] += 1
+            @db.save_doc conflicting_doc
+            limit -= 1
+          end
+          doc['upvotes'] += 1
+          doc
+        end
+      end.should_not raise_error
+      @db.get(@id)['upvotes'].should == 16
+    end
+  end
+  
   describe "COPY existing document" do
     before :each do
       @r = @db.save_doc({'artist' => 'Zappa', 'title' => 'Muffin Man'})
@@ -716,7 +763,7 @@ describe CouchRest::Database do
     
     it "should recreate a db even tho it doesn't exist" do
       @cr.databases.should_not include(@db2.name)
-      begin @db2.recreate! rescue nil end
+      @db2.recreate!
       @cr.databases.should include(@db2.name)
     end
     

data/spec/couchrest/more/attribute_protection_spec.rb

@@ -21,6 +21,17 @@ describe "ExtendedDocument", "no declarations" do
     user.name.should == "will"
     user.phone.should == "555-5555"
   end
+  
+  it "should recreate from the database properly" do
+    user = NoProtection.new
+    user.name = "will"
+    user.phone = "555-5555"
+    user.save!
+    
+    user = NoProtection.get(user.id)
+    user.name.should == "will"
+    user.phone.should == "555-5555"
+  end
 end
 
 describe "ExtendedDocument", "accessible flag" do
@@ -92,3 +103,48 @@ describe "ExtendedDocument", "protected flag" do
     lambda { WithBoth.new }.should raise_error 
   end
 end
+
+describe "ExtendedDocument", "from database" do
+  class WithProtected < CouchRest::ExtendedDocument
+    use_database TEST_SERVER.default_database
+    property :name
+    property :admin, :default => false, :protected => true
+    view_by :name
+  end
+  
+  before(:each) do
+    @user = WithProtected.new
+    @user.name = "will"
+    @user.admin = true
+    @user.save!
+  end
+
+  def verify_attrs(user)
+    user.name.should  == "will"
+    user.admin.should == true
+  end
+
+  it "ExtendedDocument#get should not strip protected attributes" do
+    reloaded = WithProtected.get( @user.id )
+    verify_attrs reloaded 
+  end
+
+  it "ExtendedDocument#get! should not strip protected attributes" do
+    reloaded = WithProtected.get!( @user.id )
+    verify_attrs reloaded 
+  end
+
+  it "ExtendedDocument#all should not strip protected attributes" do
+    # all creates a CollectionProxy
+    docs = WithProtected.all(:key => @user.id)
+    docs.size.should == 1
+    reloaded = docs.first
+    verify_attrs reloaded 
+  end
+
+  it "views should not strip protected attributes" do
+    docs = WithProtected.by_name(:startkey => "will", :endkey => "will")
+    reloaded = docs.first
+    verify_attrs reloaded 
+  end
+end

data/spec/couchrest/more/casted_extended_doc_spec.rb

@@ -49,7 +49,7 @@ describe "assigning a value to casted attribute after initializing an object" do
   end
   
   it "should cast attribute" do
-    @car.driver = JSON.parse(JSON.generate(@driver))
+    @car.driver = JSON.parse(@driver.to_json)
     @car.driver.should be_instance_of(Driver)
   end
 
@@ -60,7 +60,7 @@ describe "casting an extended document from parsed JSON" do
   before(:each) do
     @driver = Driver.new(:name => 'Matt')
     @car    = Car.new(:name => 'Renault 306', :driver => @driver)
-    @new_car = Car.new(JSON.parse(JSON.generate(@car)))
+    @new_car = Car.new(JSON.parse(@car.to_json))
   end
 
   it "should cast casted attribute" do

data/spec/couchrest/more/extended_doc_inherited_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+begin
+  require 'rubygems' unless ENV['SKIP_RUBYGEMS']  
+  require 'activesupport'
+  ActiveSupport::JSON.backend = :JSONGem
+
+  class PlainParent
+    class_inheritable_accessor :foo
+    self.foo = :bar
+  end
+
+  class PlainChild < PlainParent
+  end
+
+  class ExtendedParent < CouchRest::ExtendedDocument
+    class_inheritable_accessor :foo
+    self.foo = :bar
+  end
+
+  class ExtendedChild < ExtendedParent
+  end
+
+  describe "Using chained inheritance without CouchRest::ExtendedDocument" do
+    it "should preserve inheritable attributes" do
+      PlainParent.foo.should == :bar
+      PlainChild.foo.should == :bar
+    end
+  end
+
+  describe "Using chained inheritance with CouchRest::ExtendedDocument" do
+    it "should preserve inheritable attributes" do
+      ExtendedParent.foo.should == :bar
+      ExtendedChild.foo.should == :bar
+    end
+  end
+
+rescue LoadError
+  puts "This spec requires 'active_support' to be loaded"
+end

data/spec/couchrest/more/extended_doc_view_spec.rb

@@ -25,39 +25,33 @@ describe "ExtendedDocument views" do
         written_at += 24 * 3600
       end
     end
-
     it "should have a design doc" do
       Article.design_doc["views"]["by_date"].should_not be_nil
     end
-  
     it "should save the design doc" do
       Article.by_date #rescue nil
       doc = Article.database.get Article.design_doc.id
       doc['views']['by_date'].should_not be_nil
     end
-  
     it "should return the matching raw view result" do
       view = Article.by_date :raw => true
       view['rows'].length.should == 4
     end
-  
     it "should not include non-Articles" do
       Article.database.save_doc({"date" => 1})
       view = Article.by_date :raw => true
       view['rows'].length.should == 4
     end
-  
     it "should return the matching objects (with default argument :descending => true)" do
       articles = Article.by_date
       articles.collect{|a|a.title}.should == @titles.reverse
     end
-  
     it "should allow you to override default args" do
       articles = Article.by_date :descending => false
       articles.collect{|a|a.title}.should == @titles
     end
   end
-
+  
   describe "another model with a simple view" do
     before(:all) do
       reset_test_db!
@@ -96,8 +90,7 @@ describe "ExtendedDocument views" do
       courses[0]["doc"]["title"].should =='aaa'
     end
   end
-
-
+  
   describe "a ducktype view" do
     before(:all) do
       reset_test_db!
@@ -117,7 +110,7 @@ describe "ExtendedDocument views" do
       @as[0]['_id'].should == @id
     end
   end
-
+  
   describe "a model class not tied to a database" do
     before(:all) do
       reset_test_db!
@@ -198,7 +191,7 @@ describe "ExtendedDocument views" do
       Unattached.model_design_doc(@db)['_rev'].should_not == original_revision
     end
   end
-
+  
   describe "class proxy" do
     before(:all) do
       reset_test_db!
@@ -254,6 +247,36 @@ describe "ExtendedDocument views" do
       u = @us.first
       u.title.should =~ /\A...\z/
     end
+    it "should set database on first retreived document" do
+      u = @us.first
+      u.database.should === DB
+    end
+    it "should set database on all retreived documents" do
+      @us.all.each do |u|
+        u.database.should === DB
+      end
+    end
+    it "should set database on each retreived document" do
+      rs = @us.by_title :startkey=>"bbb", :endkey=>"eee"
+      rs.length.should == 3
+      rs.each do |u|
+        u.database.should === DB
+      end
+    end
+    it "should set database on document retreived by id" do
+      u = @us.get(@first_id)
+      u.database.should === DB
+    end
+    it "should not attempt to set database on raw results using :all" do
+      @us.all(:raw => true).each do |u|
+        u.respond_to?(:database).should be_false
+      end
+    end
+    it "should not attempt to set database on raw results using view" do
+      @us.by_title(:raw => true).each do |u|
+        u.respond_to?(:database).should be_false
+      end
+    end
     it "should clean up design docs left around on specific database" do
       @us.by_title
       original_id = @us.model_design_doc['_rev']
@@ -262,7 +285,7 @@ describe "ExtendedDocument views" do
       @us.model_design_doc['_rev'].should_not == original_id
     end
   end
-
+  
   describe "a model with a compound key view" do
     before(:all) do
       Article.by_user_id_and_date.each{|a| a.destroy(true)}
@@ -295,7 +318,7 @@ describe "ExtendedDocument views" do
       articles[0].title.should == "even more interesting"
     end
   end
-
+  
   describe "with a custom view" do
     before(:all) do
       @titles = ["very uniq one", "even less interesting", "some fun", 
@@ -311,18 +334,18 @@ describe "ExtendedDocument views" do
       view = Article.by_tags :raw => true
       view['rows'].length.should == 5
     end
-
+    
     it "should be default to :reduce => false" do
       ars = Article.by_tags
       ars.first.tags.first.should == 'cool'
     end
-  
+    
     it "should be raw when reduce is true" do
       view = Article.by_tags :reduce => true, :group => true
       view['rows'].find{|r|r['key'] == 'cool'}['value'].should == 3
     end
   end
-
+  
   # TODO: moved to Design, delete
   describe "adding a view" do
     before(:each) do
@@ -344,7 +367,7 @@ describe "ExtendedDocument views" do
       Article.design_doc["views"].keys.should include("by_updated_at")
     end
   end
-
+  
   describe "with a collection" do
     before(:all) do
       reset_test_db!
@@ -354,7 +377,7 @@ describe "ExtendedDocument views" do
         a = Article.new(:title => title, :date => Date.today)
         a.save
       end
-
+      
       titles = ["yesterday very uniq one", "yesterday really interesting", "yesterday some fun",
         "yesterday really awesome", "yesterday crazy bob", "yesterday this rocks"]
       titles.each_with_index do |title,i|
@@ -390,11 +413,11 @@ describe "ExtendedDocument views" do
       articles = Article.paginate(:design_doc => 'Article', :view_name => 'by_date',
         :per_page => 3, :descending => true, :key => Date.today, :include_docs => true)
       articles.size.should == 3
-
+      
       articles = Article.paginate(:design_doc => 'Article', :view_name => 'by_date',
         :per_page => 3, :page => 2, :descending => true, :key => Date.today, :include_docs => true)
       articles.size.should == 3
-
+      
       articles = Article.paginate(:design_doc => 'Article', :view_name => 'by_date',
         :per_page => 3, :page => 3, :descending => true, :key => Date.today, :include_docs => true)
       articles.size.should == 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest
 version: !ruby/object:Gem::Version 
-  version: "0.34"
+  version: "0.35"
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -02:00
+date: 2010-02-27 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,6 +121,7 @@ files:
 - spec/couchrest/more/casted_extended_doc_spec.rb
 - spec/couchrest/more/casted_model_spec.rb
 - spec/couchrest/more/extended_doc_attachment_spec.rb
+- spec/couchrest/more/extended_doc_inherited_spec.rb
 - spec/couchrest/more/extended_doc_spec.rb
 - spec/couchrest/more/extended_doc_subclass_spec.rb
 - spec/couchrest/more/extended_doc_view_spec.rb
@@ -187,6 +188,7 @@ test_files:
 - spec/couchrest/more/casted_extended_doc_spec.rb
 - spec/couchrest/more/casted_model_spec.rb
 - spec/couchrest/more/extended_doc_attachment_spec.rb
+- spec/couchrest/more/extended_doc_inherited_spec.rb
 - spec/couchrest/more/extended_doc_spec.rb
 - spec/couchrest/more/extended_doc_subclass_spec.rb
 - spec/couchrest/more/extended_doc_view_spec.rb