jchris-couchrest 0.9.11 → 0.9.12

data/Rakefile

@@ -5,8 +5,8 @@ require 'spec/rake/spectask'
 
 spec = Gem::Specification.new do |s|
   s.name = "couchrest"
-  s.version = "0.9.11"
-  s.date = "2008-09-11"
+  s.version = "0.9.12"
+  s.date = "2008-10-14"
   s.summary = "Lean and RESTful interface to CouchDB."
   s.email = "jchris@grabb.it"
   s.homepage = "http://github.com/jchris/couchrest"
@@ -61,7 +61,7 @@ end
 
 desc "Run all specs"
 Spec::Rake::SpecTask.new('spec') do |t|
-	t.spec_files = FileList['spec/*_spec.rb']
+	t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
 desc "Print specdocs"

data/lib/couchrest.rb

@@ -108,8 +108,8 @@ module CouchRest
       JSON.parse(RestClient.delete(uri))
     end
   
-    def paramify_url url, params = nil
-      if params
+    def paramify_url url, params = {}
+      if params && !params.empty?
         query = params.collect do |k,v|
           v = v.to_json if %w{key startkey endkey}.include?(k.to_s)
           "#{k}=#{CGI.escape(v.to_s)}"

data/lib/couchrest/core/database.rb

@@ -5,8 +5,9 @@ module CouchRest
   class Database
     attr_reader :server, :host, :name, :root
      
-    # Create a CouchRest::Database adapter for the supplied CouchRest::Server and database name.
-    # 
+    # Create a CouchRest::Database adapter for the supplied CouchRest::Server
+    # and database name.
+    #  
     # ==== Parameters
     # server<CouchRest::Server>:: database host
     # name<String>:: database name
@@ -16,6 +17,7 @@ module CouchRest
       @server = server
       @host = server.uri
       @root = "#{host}/#{name}"
+      @streamer = Streamer.new(self)
     end
     
     # returns the database's uri
@@ -29,21 +31,40 @@ module CouchRest
     end
     
     # Query the <tt>_all_docs</tt> view. Accepts all the same arguments as view.
-    def documents params = nil
+    def documents params = {}
+      keys = params.delete(:keys)
       url = CouchRest.paramify_url "#{@root}/_all_docs", params
-      CouchRest.get url  
+      if keys
+        CouchRest.post(url, {:keys => keys})
+      else
+        CouchRest.get url
+      end
     end
   
-    # POST a temporary view function to CouchDB for querying. This is not recommended, as you don't get any performance benefit from CouchDB's materialized views. Can be quite slow on large databases.
-    def temp_view funcs, params = nil
+    # POST a temporary view function to CouchDB for querying. This is not
+    # recommended, as you don't get any performance benefit from CouchDB's
+    # materialized views. Can be quite slow on large databases.
+    def temp_view funcs, params = {}
+      keys = params.delete(:keys)
+      funcs = funcs.merge({:keys => keys}) if keys
       url = CouchRest.paramify_url "#{@root}/_temp_view", params
       JSON.parse(RestClient.post(url, funcs.to_json, {"Content-Type" => 'application/json'}))
     end
   
-    # Query a CouchDB view as defined by a <tt>_design</tt> document. Accepts paramaters as described in http://wiki.apache.org/couchdb/HttpViewApi
-    def view name, params = nil
+    # Query a CouchDB view as defined by a <tt>_design</tt> document. Accepts
+    # paramaters as described in http://wiki.apache.org/couchdb/HttpViewApi
+    def view name, params = {}, &block
+      keys = params.delete(:keys)
       url = CouchRest.paramify_url "#{@root}/_view/#{name}", params
-      CouchRest.get url
+      if keys
+        CouchRest.post(url, {:keys => keys})
+      else
+        if block_given?
+          @streamer.view(name, params, &block)
+        else
+          CouchRest.get url
+        end
+      end
     end
     
     # GET a document from CouchDB, by id. Returns a Ruby Hash.
@@ -72,7 +93,12 @@ module CouchRest
       JSON.parse(RestClient.put(uri, file, options))
     end
     
-    # Save a document to CouchDB. This will use the <tt>_id</tt> field from the document as the id for PUT, or request a new UUID from CouchDB, if no <tt>_id</tt> is present on the document. IDs are attached to documents on the client side because POST has the curious property of being automatically retried by proxies in the event of network segmentation and lost responses.
+    # Save a document to CouchDB. This will use the <tt>_id</tt> field from
+    # the document as the id for PUT, or request a new UUID from CouchDB, if
+    # no <tt>_id</tt> is present on the document. IDs are attached to
+    # documents on the client side because POST has the curious property of
+    # being automatically retried by proxies in the event of network
+    # segmentation and lost responses.
     def save doc
       if doc['_attachments']
         doc['_attachments'] = encode_attachments(doc['_attachments'])
@@ -90,7 +116,8 @@ module CouchRest
       end
     end
     
-    # POST an array of documents to CouchDB. If any of the documents are missing ids, supply one from the uuid cache.
+    # POST an array of documents to CouchDB. If any of the documents are
+    # missing ids, supply one from the uuid cache.
     def bulk_save docs
       ids, noids = docs.partition{|d|d['_id']}
       uuid_count = [noids.length, @server.uuid_batch_count].max
@@ -101,13 +128,15 @@ module CouchRest
       CouchRest.post "#{@root}/_bulk_docs", {:docs => docs}
     end
     
-    # DELETE the document from CouchDB that has the given <tt>_id</tt> and <tt>_rev</tt>.
+    # DELETE the document from CouchDB that has the given <tt>_id</tt> and
+    # <tt>_rev</tt>.
     def delete doc
       slug = CGI.escape(doc['_id'])
       CouchRest.delete "#{@root}/#{slug}?rev=#{doc['_rev']}"
     end
     
-    # DELETE the database itself. This is not undoable and could be rather catastrophic. Use with care!
+    # DELETE the database itself. This is not undoable and could be rather
+    # catastrophic. Use with care!
     def delete!
       CouchRest.delete @root
     end

data/lib/couchrest/core/model.rb

@@ -5,18 +5,18 @@ require 'digest/md5'
 # = CouchRest::Model - ORM, the CouchDB way
 module CouchRest
   # = CouchRest::Model - ORM, the CouchDB way
-  #  
+  #    
   # CouchRest::Model provides an ORM-like interface for CouchDB documents. It
   # avoids all usage of <tt>method_missing</tt>, and tries to strike a balance
   # between usability and magic. See CouchRest::Model#view_by for
   # documentation about the view-generation system.
-  #  
+  #    
   # ==== Example
-  #  
+  #    
   # This is an example class using CouchRest::Model. It is taken from the
   # spec/couchrest/core/model_spec.rb file, which may be even more up to date
   # than this example.
-  #  
+  #    
   #   class Article < CouchRest::Model
   #     use_database CouchRest.database!('http://localhost:5984/couchrest-model-test')
   #     unique_id :slug
@@ -49,6 +49,25 @@ module CouchRest
   #       self['slug'] = title.downcase.gsub(/[^a-z0-9]/,'-').squeeze('-').gsub(/^\-|\-$/,'')
   #     end
   #   end
+  #   
+  # ==== Examples of finding articles with these views: 
+  #   
+  # * All the articles by Barney published in the last 24 hours. Note that we
+  #   use <tt>{}</tt> as a special value that sorts after all strings,
+  #   numbers, and arrays.
+  #   
+  #     Article.by_user_id_and_date :startkey => ["barney", Time.now - 24 * 3600], :endkey => ["barney", {}]
+  #    
+  # * The most recent 20 articles. Remember that the <tt>view_by :date</tt>
+  #   has the default option <tt>:descending => true</tt>.
+  #  
+  #     Article.by_date :count => 20
+  #  
+  # * The raw CouchDB view reduce result for the custom <tt>:tags</tt> view.
+  #   In this case we'll get a count of the number of articles tagged "ruby".
+  #  
+  #     Article.by_tags :key => "ruby", :reduce => true
+  #  
   class Model < Hash
 
     # instantiates the hash by converting all the keys to strings.
@@ -86,12 +105,15 @@ module CouchRest
         self.class_database || CouchRest::Model.default_database
       end
 
-      # load a document from the database
+      # Load a document from the database by id
       def get id
         doc = database.get id
         new(doc)
       end
 
+      # Load all documents that have the "couchrest-type" field equal to the
+      # name of the current class. Take thes the standard set of
+      # CouchRest::Database#view options.
       def all opts = {}
         self.generated_design_doc ||= default_design_doc
         unless design_doc_fresh
@@ -99,8 +121,7 @@ module CouchRest
         end
         view_name = "#{design_doc_slug}/all"
         raw = opts.delete(:raw)
-        view = fetch_view(view_name, opts)
-        process_view_results view, raw
+        fetch_view_with_docs(view_name, opts, raw)
       end
       
       # Cast a field as another class. The class must be happy to have the
@@ -244,7 +265,7 @@ module CouchRest
       #  
       # To understand the capabilities of this view system more compeletly,
       # it is recommended that you read the RSpec file at
-      # <tt>spec/core/model.rb</tt>.
+      # <tt>spec/core/model_spec.rb</tt>.
       def view_by *keys
         opts = keys.pop if keys.last.is_a?(Hash)
         opts ||= {}
@@ -252,7 +273,7 @@ module CouchRest
 
         method_name = "by_#{keys.join('_and_')}"
         self.generated_design_doc ||= default_design_doc
-
+        ducktype = opts.delete(:ducktype)
         if opts[:map]
           view = {}
           view['map'] = opts.delete(:map)
@@ -267,7 +288,7 @@ module CouchRest
           key_emit = doc_keys.length == 1 ? "#{doc_keys.first}" : "[#{doc_keys.join(', ')}]"
           map_function = <<-JAVASCRIPT
           function(doc) {
-            if (doc['couchrest-type'] == '#{type}' && #{key_protection}) {
+            if (#{!ducktype ? "doc['couchrest-type'] == '#{type}' && " : ""}#{key_protection}) {
               emit(#{key_emit}, null);
             }
           }
@@ -276,21 +297,25 @@ module CouchRest
             'map' => map_function
           }
         end
-
+        generated_design_doc['views'][method_name]['couchrest-defaults'] = opts
         self.design_doc_fresh = false
+        method_name
+      end
 
-        self.meta_class.instance_eval do
-          define_method method_name do |*args|
-            query = opts.merge(args[0] || {})
-            query[:raw] = true if query[:reduce]
-            unless design_doc_fresh
-              refresh_design_doc
-            end
-            raw = query.delete(:raw)
-            view_name = "#{design_doc_slug}/#{method_name}"
-            view = fetch_view(view_name, query)
-            process_view_results view, raw
-          end
+      def method_missing m, *args
+        if opts = has_view?(m)
+          query = args.shift || {}
+          view(m, opts.merge(query), *args)
+        else
+          super
+        end
+      end
+
+      # returns true if the there is a view named this in the design doc
+      def has_view?(view)
+        view = view.to_s
+        if generated_design_doc['views'][view]
+          generated_design_doc['views'][view]["couchrest-defaults"]
         end
       end
 
@@ -299,21 +324,39 @@ module CouchRest
         database.get("_design/#{design_doc_slug}")
       end
 
+      # Dispatches to any named view.
+      def view name, query={}, &block
+        unless design_doc_fresh
+          refresh_design_doc
+        end
+        query[:raw] = true if query[:reduce]        
+        raw = query.delete(:raw)
+        view_name = "#{design_doc_slug}/#{name}"
+        fetch_view_with_docs(view_name, query, raw, &block)
+      end
+
       private
 
-      def process_view_results view, raw=false
+      def fetch_view_with_docs name, opts, raw=false, &block
         if raw
-          view
+          fetch_view name, opts, &block
         else
-          # TODO this can be optimized once the include-docs patch is applied
-          view['rows'].collect{|r|new(database.get(r['id']))}
+          begin
+            view = fetch_view name, opts.merge({:include_docs => true}), &block
+            view['rows'].collect{|r|new(r['doc'])} if view['rows']
+          rescue
+            # fallback for old versions of couchdb that don't 
+            # have include_docs support
+            view = fetch_view name, opts, &block
+            view['rows'].collect{|r|new(database.get(r['id']))} if view['rows']
+          end
         end
       end
 
-      def fetch_view view_name, opts
+      def fetch_view view_name, opts, &block
         retryable = true
         begin
-          database.view(view_name, opts)
+          database.view(view_name, opts, &block)
           # the design doc could have been deleted by a rouge process
         rescue RestClient::ResourceNotFound => e
           if retryable
@@ -383,6 +426,19 @@ module CouchRest
       self['_rev']
     end
 
+    # Takes a hash as argument, and applies the values by using writer methods
+    # for each key. Raises a NoMethodError if the corresponding methods are
+    # missing. In case of error, no attributes are changed.
+    def update_attributes hash
+      hash.each do |k, v|
+        raise NoMethodError, "#{k}= method not available, use key_accessor or key_writer :#{key}" unless self.respond_to?("#{k}=")
+      end      
+      hash.each do |k, v|
+        self.send("#{k}=",v)
+      end
+      save
+    end
+
     # returns true if the document has never been saved
     def new_record?
       !rev

data/lib/couchrest/helper/streamer.rb

@@ -6,15 +6,19 @@ module CouchRest
     end
     
     # Stream a view, yielding one row at a time. Shells out to <tt>curl</tt> to keep RAM usage low when you have millions of rows.
-    def view name, params = nil
+    def view name, params = nil, &block
       urlst = /^_/.match(name) ? "#{@db.root}/#{name}" : "#{@db.root}/_view/#{name}"
       url = CouchRest.paramify_url urlst, params
+      # puts "stream #{url}"
+      first = nil
       IO.popen("curl --silent #{url}") do |view|
-        view.gets # discard header
-        while row = parse_line(view.gets)
-          yield row
+        first = view.gets # discard header
+        while line = view.gets 
+          row = parse_line(line)
+          block.call row
         end
       end
+      parse_first(first)
     end
     
     private
@@ -25,6 +29,16 @@ module CouchRest
         JSON.parse($1)
       end
     end
+
+    def parse_first first
+      return nil unless first
+      parts = first.split(',')
+      parts.pop
+      line = parts.join(',')
+      JSON.parse("#{line}}")
+    rescue
+      nil
+    end
     
   end
 end

data/spec/couchapp_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe "couchapp" do
   before(:all) do
-    @fixdir = File.expand_path(File.dirname(__FILE__)) + '/fixtures/couchapp-test'
+    @fixdir = FIXTURE_PATH + '/couchapp-test'
     @couchapp = File.expand_path(File.dirname(__FILE__)) + '/../bin/couchapp'
     `rm -rf #{@fixdir}`
     `mkdir -p #{@fixdir}`

data/spec/couchrest/core/database_spec.rb

@@ -22,17 +22,21 @@ describe CouchRest::Database do
       rs['rows'].select{|r|r['key'] == 'wild' && r['value'] == 'and random'}.length.should == 1
     end
     it "should work with a range" do
-      rs = @db.temp_view(@temp_view,{:startkey => "b", :endkey => "z"})
+      rs = @db.temp_view(@temp_view, :startkey => "b", :endkey => "z")
       rs['rows'].length.should == 2
     end
     it "should work with a key" do
-      rs = @db.temp_view(@temp_view,{:key => "wild"})
+      rs = @db.temp_view(@temp_view, :key => "wild")
       rs['rows'].length.should == 1
     end
     it "should work with a count" do
-      rs = @db.temp_view(@temp_view,{:count => 1})
+      rs = @db.temp_view(@temp_view, :count => 1)
       rs['rows'].length.should == 1
     end
+    it "should work with multi-keys" do
+      rs = @db.temp_view(@temp_view, :keys => ["another", "wild"])
+      rs['rows'].length.should == 2
+    end
   end
 
   describe "map/reduce query with _temp_view in Javascript" do
@@ -98,17 +102,29 @@ describe CouchRest::Database do
       rs['rows'].select{|r|r['key'] == 'wild' && r['value'] == 'and random'}.length.should == 1
     end
     it "should work with a range" do
-      rs = @db.view('first/test',{:startkey => "b", :endkey => "z"})
+      rs = @db.view('first/test', :startkey => "b", :endkey => "z")
       rs['rows'].length.should == 2
     end
     it "should work with a key" do
-      rs = @db.view('first/test',{:key => "wild"})
+      rs = @db.view('first/test', :key => "wild")
       rs['rows'].length.should == 1
     end
     it "should work with a count" do
-      rs = @db.view('first/test',{:count => 1})
+      rs = @db.view('first/test', :count => 1)
       rs['rows'].length.should == 1
     end
+    it "should work with multi-keys" do
+      rs = @db.view('first/test', :keys => ["another", "wild"])
+      rs['rows'].length.should == 2
+    end
+    it "should accept a block" do
+      rows = []
+      rs = @db.view('first/test', :include_docs => true) do |row|
+        rows << row
+      end
+      rows.length.should == 4
+      rs["total_rows"].should == 3
+    end
   end
 
   describe "GET (document by id) when the doc exists" do
@@ -207,7 +223,7 @@ describe CouchRest::Database do
 
   describe "PUT attachment from file" do
     before(:each) do
-      filename = File.dirname(__FILE__) + '/../../fixtures/attachments/couchdb.png'
+      filename = FIXTURE_PATH + '/attachments/couchdb.png'
       @file = File.open(filename)
     end
     after(:each) do
@@ -414,18 +430,32 @@ describe CouchRest::Database do
     ds['total_rows'].should == 5
   end
   
-  it "should list documents with keys and such" do
-    9.times do |i|
-      @db.save({'_id' => "doc#{i}",'another' => 'doc', 'will-exist' => 'here'})
+  describe "documents / _all_docs" do
+    before(:each) do
+      9.times do |i|
+        @db.save({'_id' => "doc#{i}",'another' => 'doc', 'will-exist' => 'here'})
+      end
+    end
+    it "should list documents with keys and such" do
+      ds = @db.documents
+      ds['rows'].should be_an_instance_of(Array)
+      ds['rows'][0]['id'].should == "doc0"
+      ds['total_rows'].should == 9      
+    end
+    it "should take query params" do
+      ds = @db.documents(:startkey => 'doc0', :endkey => 'doc3')
+      ds['rows'].length.should == 4
+      ds = @db.documents(:key => 'doc0')
+      ds['rows'].length.should == 1
+    end
+    it "should work with multi-key" do
+      rs = @db.documents :keys => ["doc0", "doc7"]
+      rs['rows'].length.should == 2
+    end
+    it "should work with include_docs" do
+      ds = @db.documents(:startkey => 'doc0', :endkey => 'doc3', :include_docs => true)
+      ds['rows'][0]['doc']['another'].should == "doc"
     end
-    ds = @db.documents
-    ds['rows'].should be_an_instance_of(Array)
-    ds['rows'][0]['id'].should == "doc0"
-    ds['total_rows'].should == 9
-    ds = @db.documents(:startkey => 'doc0', :endkey => 'doc3')
-    ds['rows'].length.should == 4
-    ds = @db.documents(:key => 'doc0')
-    ds['rows'].length.should == 1
   end
   
   describe "deleting a database" do

data/spec/couchrest/core/model_spec.rb

@@ -30,6 +30,7 @@ class Course < CouchRest::Model
   cast :questions, :as => ['Question']
   cast :professor, :as => 'Person'
   view_by :title
+  view_by :dept, :ducktype => true
 end
 
 class Article < CouchRest::Model
@@ -38,7 +39,7 @@ class Article < CouchRest::Model
   
   view_by :date, :descending => true
   view_by :user_id, :date
-  
+    
   view_by :tags,
     :map => 
       "function(doc) {
@@ -133,6 +134,41 @@ describe CouchRest::Model do
     end
   end
   
+  describe "update attributes" do
+    before(:each) do
+      a = Article.get "big-bad-danger" rescue nil
+      a.destroy if a
+      @art = Article.new(:title => "big bad danger")
+      @art.save
+    end
+    it "should work for attribute= methods" do
+      @art['title'].should == "big bad danger"
+      @art.update_attributes('date' => Time.now, :title => "super danger")
+      @art['title'].should == "super danger"
+    end
+    
+    it "should flip out if an attribute= method is missing" do
+      lambda {
+        @art.update_attributes('slug' => "new-slug", :title => "super danger")        
+      }.should raise_error
+    end
+    
+    it "should not change other attributes if there is an error" do
+      lambda {
+        @art.update_attributes('slug' => "new-slug", :title => "super danger")        
+      }.should raise_error
+      @art['title'].should == "big bad danger"
+    end
+    
+    it "should save" do
+      @art['title'].should == "big bad danger"
+      @art.update_attributes('date' => Time.now, :title => "super danger")
+      loaded = Article.get @art.id
+      loaded['title'].should == "super danger"
+    end
+    
+  end
+  
   describe "a model with template values" do
     before(:all) do
       @tmpl = WithTemplate.new
@@ -326,7 +362,9 @@ describe CouchRest::Model do
   end
 
   describe "a model with timestamps" do
-    before(:all) do
+    before(:each) do
+      oldart = Article.get "saving-this" rescue nil
+      oldart.destroy if oldart
       @art = Article.new(:title => "Saving this")
       @art.save
     end
@@ -381,14 +419,53 @@ describe CouchRest::Model do
       @db = @cr.create_db(TESTDB) rescue nil
       Course.new(:title => 'aaa').save
       Course.new(:title => 'bbb').save
+      Course.new(:title => 'ddd').save
+      Course.new(:title => 'eee').save
     end
-    it "should make the design doc" do
+    it "should make the design doc upon first query" do
+      Course.by_title 
       doc = Course.design_doc
       doc['views']['all']['map'].should include('Course')
     end
+    it "should can query via view" do
+      # register methods with method-missing, for local dispatch. method
+      # missing lookup table, no heuristics.
+      view = Course.view :by_title
+      designed = Course.by_title
+      view.should == designed
+    end
     it "should get them" do
       rs = Course.by_title 
-      rs.length.should == 2
+      rs.length.should == 4
+    end
+    it "should yield" do
+      courses = []
+      rs = Course.by_title # remove me
+      Course.view(:by_title) do |course|
+        # puts "course"
+        courses << course
+      end
+      # courses.should == 'x'
+      courses[0]["doc"]["title"].should =='aaa'
+    end
+  end
+  
+  describe "a ducktype view" do
+    before(:all) do
+      @id = @db.save({:dept => true})['id']
+    end
+    it "should setup" do
+      duck = Course.get(@id) # from a different db
+      duck["dept"].should == true
+    end
+    it "should make the design doc" do
+      @as = Course.by_dept
+      @doc = Course.design_doc
+      @doc["views"]["by_dept"]["map"].should_not include("couchrest")
+    end
+    it "should not look for class" do |variable|
+      @as = Course.by_dept
+      @as[0]['_id'].should == @id
     end
   end
   
@@ -412,7 +489,8 @@ describe CouchRest::Model do
     end
     it "should sort correctly" do
       articles = Article.by_user_id_and_date
-      articles.collect{|a|a['user_id']}.should == ['aaron', 'aaron', 'quentin', 'quentin']
+      articles.collect{|a|a['user_id']}.should == ['aaron', 'aaron', 'quentin', 
+        'quentin']
       articles[1].title.should == 'not junk'
     end
     it "should be queryable with couchrest options" do
@@ -424,7 +502,8 @@ describe CouchRest::Model do
   
   describe "with a custom view" do
     before(:all) do
-      @titles = ["very uniq one", "even less interesting", "some fun", "really junk", "crazy bob"]
+      @titles = ["very uniq one", "even less interesting", "some fun", 
+        "really junk", "crazy bob"]
       @tags = ["cool", "lame"]
       @titles.each_with_index do |title,i|
         u = i % 2
@@ -451,17 +530,20 @@ describe CouchRest::Model do
   describe "adding a view" do
     before(:each) do
       Article.by_date
-      @design_docs = Article.database.documents :startkey => "_design/", :endkey => "_design/\u9999"
+      @design_docs = Article.database.documents :startkey => "_design/", 
+        :endkey => "_design/\u9999"
     end
     it "should not create a design doc on view definition" do
       Article.view_by :created_at
-      newdocs = Article.database.documents :startkey => "_design/", :endkey => "_design/\u9999"
+      newdocs = Article.database.documents :startkey => "_design/", 
+        :endkey => "_design/\u9999"
       newdocs["rows"].length.should == @design_docs["rows"].length
     end
     it "should create a new design document on view access" do
-      Article.view_by :created_at
-      Article.by_created_at
-      newdocs = Article.database.documents :startkey => "_design/", :endkey => "_design/\u9999"
+      Article.view_by :updated_at
+      Article.by_updated_at
+      newdocs = Article.database.documents :startkey => "_design/", 
+        :endkey => "_design/\u9999"
       newdocs["rows"].length.should == @design_docs["rows"].length + 1
     end
   end

data/spec/{file_manager_spec.rb → couchrest/helpers/file_manager_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe CouchRest::FileManager do
   before(:all) do
@@ -26,7 +26,7 @@ end
 
 describe CouchRest::FileManager, "generating an app" do
   before(:all) do
-    @appdir = File.expand_path(File.dirname(__FILE__)) + '/fixtures/couchapp'
+    @appdir = FIXTURE_PATH + '/couchapp'
     `rm -rf #{@appdir}`
     `mkdir -p #{@appdir}`
     CouchRest::FileManager.generate_app(@appdir)
@@ -56,7 +56,7 @@ describe CouchRest::FileManager, "pushing an app" do
     @db.delete! rescue nil
     @db = @cr.create_db(TESTDB) rescue nil
     
-    @appdir = File.expand_path(File.dirname(__FILE__)) + '/fixtures/couchapp'
+    @appdir = FIXTURE_PATH + '/couchapp'
     `rm -rf #{@appdir}`
     `mkdir -p #{@appdir}`
     CouchRest::FileManager.generate_app(@appdir)
@@ -86,7 +86,7 @@ describe CouchRest::FileManager, "pushing views" do
     @db = @cr.create_db(TESTDB) rescue nil
     
     @fm = CouchRest::FileManager.new(TESTDB, COUCHHOST)
-    @view_dir = File.dirname(__FILE__) + '/fixtures/views'
+    @view_dir = FIXTURE_PATH + '/views'
     ds = @fm.push_views(@view_dir)
     @design = @db.get("_design/test_view")
   end
@@ -119,7 +119,7 @@ describe CouchRest::FileManager, "pushing a directory with id" do
     @db = @cr.create_db(TESTDB) rescue nil
     
     @fm = CouchRest::FileManager.new(TESTDB, COUCHHOST)
-    @push_dir = File.dirname(__FILE__) + '/fixtures/attachments'
+    @push_dir = FIXTURE_PATH + '/attachments'
     ds = @fm.push_directory(@push_dir, 'attached')
   end
   it "should create a document for the folder" do
@@ -143,7 +143,7 @@ describe CouchRest::FileManager, "pushing a directory without id" do
     @db = @cr.create_db(TESTDB) rescue nil
     
     @fm = CouchRest::FileManager.new(TESTDB, COUCHHOST)
-    @push_dir = File.dirname(__FILE__) + '/fixtures/attachments'
+    @push_dir = FIXTURE_PATH + '/attachments'
     ds = @fm.push_directory(@push_dir)
   end
   it "should use the dirname" do
@@ -160,7 +160,7 @@ describe CouchRest::FileManager, "pushing a directory/ without id" do
     @db = @cr.create_db(TESTDB) rescue nil
     
     @fm = CouchRest::FileManager.new(TESTDB, COUCHHOST)
-    @push_dir = File.dirname(__FILE__) + '/fixtures/attachments/'
+    @push_dir = FIXTURE_PATH + '/attachments/'
     ds = @fm.push_directory(@push_dir)
   end
   it "should use the dirname" do

data/spec/{pager_spec.rb → couchrest/helpers/pager_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe CouchRest::Pager do
   before(:all) do

data/spec/{streamer_spec.rb → couchrest/helpers/streamer_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe CouchRest::Streamer do
   before(:all) do
@@ -17,7 +17,7 @@ describe CouchRest::Streamer do
     @streamer.view("_all_docs") do |row|
       count += 1
     end
-    count.should == 1000
+    count.should == 1001
   end
   
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require File.dirname(__FILE__) + '/../lib/couchrest'
 
+FIXTURE_PATH = File.dirname(__FILE__) + '/fixtures'
+
 COUCHHOST = "http://localhost:5984"
 TESTDB = 'couchrest-test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jchris-couchrest
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-11 00:00:00 -07:00
+date: 2008-10-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,7 +99,10 @@ files:
 - spec/couchrest/core/couchrest_spec.rb
 - spec/couchrest/core/database_spec.rb
 - spec/couchrest/core/model_spec.rb
-- spec/file_manager_spec.rb
+- spec/couchrest/helpers
+- spec/couchrest/helpers/file_manager_spec.rb
+- spec/couchrest/helpers/pager_spec.rb
+- spec/couchrest/helpers/streamer_spec.rb
 - spec/fixtures
 - spec/fixtures/attachments
 - spec/fixtures/attachments/couchdb.png
@@ -111,6 +114,12 @@ files:
 - 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/views
+- spec/fixtures/couchapp-test/my-app/views/example-map.js
+- spec/fixtures/couchapp-test/my-app/views/example-reduce.js
 - spec/fixtures/views
 - spec/fixtures/views/lib.js
 - spec/fixtures/views/test_view
@@ -118,10 +127,8 @@ files:
 - spec/fixtures/views/test_view/only-map.js
 - spec/fixtures/views/test_view/test-map.js
 - spec/fixtures/views/test_view/test-reduce.js
-- spec/pager_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/streamer_spec.rb
 - utils/remap.rb
 - utils/subset.rb
 has_rdoc: "true"