samlown-couchrest 0.37.1 → 0.37.2

data/Rakefile

@@ -15,7 +15,7 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "couchrest"
+    gemspec.name = "samlown-couchrest"
     gemspec.summary = "Lean and RESTful interface to CouchDB."
     gemspec.description = "CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments."
     gemspec.email = "jchris@apache.org"

data/couchrest.gemspec

@@ -4,12 +4,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{samlown-couchrest}
-  s.version = "0.37.1"
+  s.name = %q{couchrest}
+  s.version = "0.37"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["J. Chris Anderson", "Matt Aimonetti", "Marcos Tapajos", "Will Leinweber"]
-  s.date = %q{2010-03-30}
+  s.date = %q{2010-04-05}
   s.description = %q{CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments.}
   s.email = %q{jchris@apache.org}
   s.extra_rdoc_files = [
@@ -131,37 +131,37 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Lean and RESTful interface to CouchDB.}
   s.test_files = [
-    "spec/couchrest/core/couchrest_spec.rb",
-     "spec/couchrest/core/database_spec.rb",
-     "spec/couchrest/core/design_spec.rb",
-     "spec/couchrest/core/document_spec.rb",
-     "spec/couchrest/core/server_spec.rb",
-     "spec/couchrest/helpers/pager_spec.rb",
-     "spec/couchrest/helpers/streamer_spec.rb",
-     "spec/couchrest/more/attribute_protection_spec.rb",
+    "spec/couchrest/more/extended_doc_attachment_spec.rb",
      "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/casted_model_spec.rb",
      "spec/couchrest/more/extended_doc_view_spec.rb",
+     "spec/couchrest/more/extended_doc_spec.rb",
      "spec/couchrest/more/property_spec.rb",
-     "spec/fixtures/more/article.rb",
-     "spec/fixtures/more/card.rb",
+     "spec/couchrest/more/attribute_protection_spec.rb",
+     "spec/couchrest/more/extended_doc_subclass_spec.rb",
+     "spec/couchrest/helpers/streamer_spec.rb",
+     "spec/couchrest/helpers/pager_spec.rb",
+     "spec/couchrest/core/design_spec.rb",
+     "spec/couchrest/core/server_spec.rb",
+     "spec/couchrest/core/couchrest_spec.rb",
+     "spec/couchrest/core/database_spec.rb",
+     "spec/couchrest/core/document_spec.rb",
+     "spec/fixtures/more/person.rb",
      "spec/fixtures/more/cat.rb",
+     "spec/fixtures/more/card.rb",
      "spec/fixtures/more/course.rb",
-     "spec/fixtures/more/event.rb",
-     "spec/fixtures/more/invoice.rb",
-     "spec/fixtures/more/person.rb",
-     "spec/fixtures/more/question.rb",
      "spec/fixtures/more/service.rb",
+     "spec/fixtures/more/article.rb",
+     "spec/fixtures/more/invoice.rb",
      "spec/fixtures/more/user.rb",
+     "spec/fixtures/more/event.rb",
+     "spec/fixtures/more/question.rb",
      "spec/spec_helper.rb",
-     "examples/model/example.rb",
+     "examples/word_count/word_count_views.rb",
      "examples/word_count/word_count.rb",
      "examples/word_count/word_count_query.rb",
-     "examples/word_count/word_count_views.rb"
+     "examples/model/example.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/couchrest/mixins/collection.rb

@@ -20,7 +20,7 @@ module CouchRest
           class_eval <<-END, __FILE__, __LINE__ + 1
             def self.find_all_#{collection_name}(options = {})
               view_options = #{view_options.inspect} || {}
-              CollectionProxy.new(database, "#{design_doc}", "#{view_name}", view_options.merge(options), Kernel.const_get('#{self}'))
+              CollectionProxy.new(options[:database] || database, "#{design_doc}", "#{view_name}", view_options.merge(options), Kernel.const_get('#{self}'))
             end
           END
         end
@@ -63,12 +63,12 @@ module CouchRest
 
         def create_collection_proxy(options)
           design_doc, view_name, view_options = parse_view_options(options)
-          CollectionProxy.new(database, design_doc, view_name, view_options, self)
+          CollectionProxy.new(options[:database] || database, design_doc, view_name, view_options, self)
         end
 
         def create_search_collection_proxy(options)
           design_doc, search_name, search_options = parse_search_options(options)
-          CollectionProxy.new(@database, design_doc, search_name, search_options, self, :search)
+          CollectionProxy.new(options[:database] || database, design_doc, search_name, search_options, self, :search)
         end
 
         def parse_view_options(options)

data/lib/couchrest.rb

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

data/spec/couchrest/more/extended_doc_spec.rb

@@ -83,7 +83,7 @@ describe "ExtendedDocument" do
       self.conditional_two = true
     end
   end
-  
+ 
   class WithTemplateAndUniqueID < CouchRest::ExtendedDocument
     use_database TEST_SERVER.default_database
     unique_id do |model|
@@ -641,6 +641,7 @@ describe "ExtendedDocument" do
         @doc.run_after_validate.should be_true
       end
     end
+
     describe "save" do
       it "should run the after filter after saving" do
         @doc.run_after_save.should be_nil

data/spec/couchrest/more/extended_doc_view_spec.rb

@@ -451,6 +451,12 @@ describe "ExtendedDocument views" do
       articles.paginate(:page => 4, :per_page => 3).size.should == 3
       articles.paginate(:page => 5, :per_page => 3).size.should == 1
     end
+    it "should pass database parameter to pager" do
+      proxy = mock(:proxy)
+      proxy.stub!(:paginate)
+      ::CouchRest::Mixins::Collection::CollectionProxy.should_receive(:new).with('database', anything(), anything(), anything(), anything()).and_return(proxy)
+      Article.paginate(:design_doc => 'Article', :view_name => 'by_date', :database => 'database')
+    end
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 37
-  - 1
-  version: 0.37.1
+  - 2
+  version: 0.37.2
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +00:00
+date: 2010-04-05 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -194,34 +194,34 @@ signing_key:
 specification_version: 3
 summary: Lean and RESTful interface to CouchDB.
 test_files: 
-- spec/couchrest/core/couchrest_spec.rb
-- spec/couchrest/core/database_spec.rb
-- spec/couchrest/core/design_spec.rb
-- spec/couchrest/core/document_spec.rb
-- spec/couchrest/core/server_spec.rb
-- spec/couchrest/helpers/pager_spec.rb
-- spec/couchrest/helpers/streamer_spec.rb
-- spec/couchrest/more/attribute_protection_spec.rb
-- 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/casted_extended_doc_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/casted_model_spec.rb
 - spec/couchrest/more/extended_doc_view_spec.rb
+- spec/couchrest/more/extended_doc_spec.rb
 - spec/couchrest/more/property_spec.rb
-- spec/fixtures/more/article.rb
-- spec/fixtures/more/card.rb
+- spec/couchrest/more/attribute_protection_spec.rb
+- spec/couchrest/more/extended_doc_subclass_spec.rb
+- spec/couchrest/helpers/streamer_spec.rb
+- spec/couchrest/helpers/pager_spec.rb
+- spec/couchrest/core/design_spec.rb
+- spec/couchrest/core/server_spec.rb
+- spec/couchrest/core/couchrest_spec.rb
+- spec/couchrest/core/database_spec.rb
+- spec/couchrest/core/document_spec.rb
+- spec/fixtures/more/person.rb
 - spec/fixtures/more/cat.rb
+- spec/fixtures/more/card.rb
 - spec/fixtures/more/course.rb
-- spec/fixtures/more/event.rb
-- spec/fixtures/more/invoice.rb
-- spec/fixtures/more/person.rb
-- spec/fixtures/more/question.rb
 - spec/fixtures/more/service.rb
+- spec/fixtures/more/article.rb
+- spec/fixtures/more/invoice.rb
 - spec/fixtures/more/user.rb
+- spec/fixtures/more/event.rb
+- spec/fixtures/more/question.rb
 - spec/spec_helper.rb
-- examples/model/example.rb
+- examples/word_count/word_count_views.rb
 - examples/word_count/word_count.rb
 - examples/word_count/word_count_query.rb
-- examples/word_count/word_count_views.rb
+- examples/model/example.rb