norr-couchrest 0.30.4 → 0.33.01

data/lib/couchrest/mixins/views.rb

@@ -72,7 +72,7 @@ module CouchRest
         #  
         # To understand the capabilities of this view system more completely,
         # it is recommended that you read the RSpec file at
-        # <tt>spec/core/model_spec.rb</tt>.
+        # <tt>spec/couchrest/more/extended_doc_spec.rb</tt>.
 
         def view_by(*keys)
           opts = keys.pop if keys.last.is_a?(Hash)
@@ -95,11 +95,11 @@ module CouchRest
 
         # Dispatches to any named view.
         def view(name, query={}, &block)
-          unless design_doc_fresh
-            refresh_design_doc
+          db = query.delete(:database) || database
+          unless design_doc_fresh            
+            refresh_design_doc_on(db)
           end
           query[:raw] = true if query[:reduce]        
-          db = query.delete(:database) || database
           raw = query.delete(:raw)
           fetch_view_with_docs(db, name, query, raw, &block)
         end
@@ -124,14 +124,6 @@ module CouchRest
         # potentially large indexes.
         def cleanup_design_docs!(db = database)
           save_design_doc_on(db)
-          # db.refresh_design_doc
-          #           db.save_design_doc
-          # design_doc = model_design_doc(db)
-          # if design_doc
-          #   db.delete_doc(design_doc)
-          # else
-          #   false
-          # end
         end
 
         private
@@ -162,7 +154,7 @@ module CouchRest
           begin
             design_doc.view_on(db, view_name, opts, &block)
             # the design doc may not have been saved yet on this database
-          rescue RestClient::ResourceNotFound => e
+          rescue HttpAbstraction::ResourceNotFound => e
             if retryable
               save_design_doc_on(db)
               retryable = false

data/lib/couchrest/monkeypatches.rb

@@ -51,63 +51,63 @@ if RUBY_VERSION.to_f < 1.9
   end
 end
 
-module RestClient
-  def self.copy(url, headers={})
-    Request.execute(:method => :copy,
-      :url => url,
-      :headers => headers)
-  end
-
-#   class Request
-#     
-#     def establish_connection(uri)
-#       Thread.current[:connection].finish if (Thread.current[:connection] && Thread.current[:connection].started?)
-#       p net_http_class
-#       net = net_http_class.new(uri.host, uri.port)
-#       net.use_ssl = uri.is_a?(URI::HTTPS)
-#       net.verify_mode = OpenSSL::SSL::VERIFY_NONE
-#       Thread.current[:connection] = net
-#       Thread.current[:connection].start
-#       Thread.current[:connection]
-#     end
-#     
-#     def transmit(uri, req, payload)
-#       setup_credentials(req)
-#       
-#       Thread.current[:host] ||= uri.host
-#       Thread.current[:port] ||= uri.port
-#       
-#       if (Thread.current[:connection].nil? || (Thread.current[:host] != uri.host))
-#         p "establishing a connection"
-#         establish_connection(uri)
-#       end
+# module RestClient
+#   # def self.copy(url, headers={})
+#   #   Request.execute(:method => :copy,
+#   #     :url => url,
+#   #     :headers => headers)
+#   # end  
 # 
-#       display_log request_log
-#       http = Thread.current[:connection]
-#       http.read_timeout = @timeout if @timeout
-#       
-#       begin
-#         res = http.request(req, payload)
-#       rescue
-#         p "Net::HTTP connection failed, reconnecting"
-#         establish_connection(uri)
-#         http = Thread.current[:connection]
-#         require 'ruby-debug'
-#         req.body_stream = nil
-#         
-#         res = http.request(req, payload)
-#         display_log response_log(res)
-#         result res
-#       else
-#         display_log response_log(res)
-#         process_result res
-#       end
-#       
-#     rescue EOFError
-#       raise RestClient::ServerBrokeConnection
-#     rescue Timeout::Error
-#       raise RestClient::RequestTimeout
-#     end
-#   end
-  
-end
+# #   class Request
+# #     
+# #     def establish_connection(uri)
+# #       Thread.current[:connection].finish if (Thread.current[:connection] && Thread.current[:connection].started?)
+# #       p net_http_class
+# #       net = net_http_class.new(uri.host, uri.port)
+# #       net.use_ssl = uri.is_a?(URI::HTTPS)
+# #       net.verify_mode = OpenSSL::SSL::VERIFY_NONE
+# #       Thread.current[:connection] = net
+# #       Thread.current[:connection].start
+# #       Thread.current[:connection]
+# #     end
+# #     
+# #     def transmit(uri, req, payload)
+# #       setup_credentials(req)
+# #       
+# #       Thread.current[:host] ||= uri.host
+# #       Thread.current[:port] ||= uri.port
+# #       
+# #       if (Thread.current[:connection].nil? || (Thread.current[:host] != uri.host))
+# #         p "establishing a connection"
+# #         establish_connection(uri)
+# #       end
+# # 
+# #       display_log request_log
+# #       http = Thread.current[:connection]
+# #       http.read_timeout = @timeout if @timeout
+# #       
+# #       begin
+# #         res = http.request(req, payload)
+# #       rescue
+# #         p "Net::HTTP connection failed, reconnecting"
+# #         establish_connection(uri)
+# #         http = Thread.current[:connection]
+# #         require 'ruby-debug'
+# #         req.body_stream = nil
+# #         
+# #         res = http.request(req, payload)
+# #         display_log response_log(res)
+# #         result res
+# #       else
+# #         display_log response_log(res)
+# #         process_result res
+# #       end
+# #       
+# #     rescue EOFError
+# #       raise RestClient::ServerBrokeConnection
+# #     rescue Timeout::Error
+# #       raise RestClient::RequestTimeout
+# #     end
+# #   end
+#   
+# end 

data/lib/couchrest/more/casted_model.rb

@@ -1,10 +1,11 @@
-require File.join(File.dirname(__FILE__), '..', 'mixins', 'properties')
+require File.expand_path('../../mixins/properties', __FILE__)
+
 
 module CouchRest
   module CastedModel
     
     def self.included(base)
-      base.send(:include, CouchRest::Mixins::Properties)
+      base.send(:include, ::CouchRest::Mixins::Properties)
       base.send(:attr_accessor, :casted_by)
     end
     

data/lib/couchrest/more/extended_document.rb

@@ -52,8 +52,25 @@ module CouchRest
       end
     end
     
-
+    # Defines an instance and save it directly to the database 
+    # 
+    # ==== Returns
+    #  returns the reloaded document
+    def self.create(options)
+      instance = new(options)
+      instance.create
+      instance
+    end
     
+    # Defines an instance and save it directly to the database 
+    # 
+    # ==== Returns
+    #  returns the reloaded document or raises an exception
+    def self.create!(options)
+      instance = new(options)
+      instance.create!
+      instance
+    end
     
     # Automatically set <tt>updated_at</tt> and <tt>created_at</tt> fields
     # on the document whenever saving occurs. CouchRest uses a pretty

data/lib/couchrest/validation/validation_errors.rb

@@ -104,6 +104,13 @@ module CouchRest
         entries.empty?
       end
 
+      # Return size of errors hash
+      #
+      # Allows us to play nicely with Rails' helpers
+      def count
+        errors.size
+      end
+
       def method_missing(meth, *args, &block)
         errors.send(meth, *args, &block)
       end

data/spec/couchrest/core/couchrest_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../../spec_helper", __FILE__)
 
 describe CouchRest do
 
@@ -191,7 +191,7 @@ describe CouchRest do
   describe "using a proxy for RestClient connections" do
     it "should set proxy url for RestClient" do
       CouchRest.proxy 'http://localhost:8888/'
-      proxy_uri = URI.parse(RestClient.proxy)
+      proxy_uri = URI.parse(HttpAbstraction.proxy)
       proxy_uri.host.should eql( 'localhost' )
       proxy_uri.port.should eql( 8888 )
       CouchRest.proxy nil

data/spec/couchrest/core/database_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../../spec_helper", __FILE__)
 
 describe CouchRest::Database do
   before(:each) do
@@ -263,7 +263,11 @@ describe CouchRest::Database do
       r['ok'].should == true
       doc = @db.get("attach-this")
       attachment = @db.fetch_attachment(doc,"couchdb.png")
-      attachment.should == image
+      if attachment.respond_to?(:net_http_res)  
+        attachment.net_http_res.body.should == image
+      else
+        attachment.should == image
+      end
     end
   end
 
@@ -368,8 +372,18 @@ describe CouchRest::Database do
     end
     it "should delete the attachment" do
       lambda { @db.fetch_attachment(@doc,'test.html') }.should_not raise_error
-      @db.delete_attachment(@doc, "test.html")
-      lambda { @db.fetch_attachment(@doc,'test.html') }.should raise_error(RestClient::ResourceNotFound)
+      @db.delete_attachment(@doc, "test.html")  
+      @doc = @db.get('mydocwithattachment') # avoid getting a 409
+      lambda{ @db.fetch_attachment(@doc,'test.html')}.should raise_error
+    end
+    
+    it "should force a delete even if we get a 409" do
+      @doc['new_attribute'] = 'something new'
+      @db.put_attachment(@doc, 'test', File.open(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'attachments', 'test.html')).read)
+      # at this point the revision number changed, if we try to save doc one more time
+      # we would get a 409.
+      lambda{ @db.save_doc(@doc) }.should raise_error
+      lambda{ @db.delete_attachment(@doc, "test", true) }.should_not raise_error
     end
   end
 
@@ -690,7 +704,7 @@ describe CouchRest::Database do
     
     it "should recreate a db even tho it doesn't exist" do
       @cr.databases.should_not include(@db2.name)
-      @db2.recreate!
+      begin @db2.recreate! rescue nil end
       @cr.databases.should include(@db2.name)
     end
     

data/spec/couchrest/core/design_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../../spec_helper", __FILE__)
 
 describe CouchRest::Design do
   

data/spec/couchrest/core/document_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../../spec_helper", __FILE__)
 
 class Video < CouchRest::Document; end
 

data/spec/couchrest/core/server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../../spec_helper", __FILE__)
 
 describe CouchRest::Server do
   

data/spec/couchrest/helpers/pager_spec.rb

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

data/spec/couchrest/helpers/streamer_spec.rb

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

data/spec/couchrest/more/casted_extended_doc_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 require File.join(FIXTURE_PATH, 'more', 'card')
 
 class Car < CouchRest::ExtendedDocument

data/spec/couchrest/more/casted_model_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
 require File.join(FIXTURE_PATH, 'more', 'card')
 require File.join(FIXTURE_PATH, 'more', 'cat')
 require File.join(FIXTURE_PATH, 'more', 'person')

data/spec/couchrest/more/extended_doc_attachment_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "ExtendedDocument attachments" do
   

data/spec/couchrest/more/extended_doc_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../../spec_helper", __FILE__)
 require File.join(FIXTURE_PATH, 'more', 'article')
 require File.join(FIXTURE_PATH, 'more', 'course')
 
@@ -97,6 +97,22 @@ describe "ExtendedDocument" do
     end
   end
   
+  describe "creating a new document" do
+    it "should instantialize and save a document" do
+      article = Article.create(:title => 'my test')
+      article.title.should == 'my test'
+      article.should_not be_new_document 
+    end 
+    
+    it "should trigger the create callbacks" do
+      doc = WithCallBacks.create(:name => 'my other test') 
+      doc.run_before_create.should be_true
+      doc.run_after_create.should be_true
+      doc.run_before_save.should be_true
+      doc.run_after_save.should be_true
+    end
+  end
+  
   describe "update attributes without saving" do
     before(:each) do
       a = Article.get "big-bad-danger" rescue nil
@@ -200,6 +216,15 @@ describe "ExtendedDocument" do
       foundart = Article.get @art.id
       foundart.title.should == "All About Getting"
     end
+    
+    it "should return nil if `get` is used and the document doesn't exist" do
+      foundart = Article.get 'matt aimonetti'
+      foundart.should be_nil
+    end                     
+    
+    it "should raise an error if `get!` is used and the document doesn't exist" do
+       lambda{foundart = Article.get!('matt aimonetti')}.should raise_error
+    end
   end
 
   describe "getting a model with a subobjects array" do
@@ -491,7 +516,7 @@ describe "ExtendedDocument" do
     end
     it "should make it go away" do
       @dobj.destroy
-      lambda{Basic.get(@dobj.id)}.should raise_error
+      lambda{Basic.get!(@dobj.id)}.should raise_error
     end
   end
   

data/spec/couchrest/more/extended_doc_subclass_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../../spec_helper", __FILE__)
 require File.join(FIXTURE_PATH, 'more', 'card')
 require File.join(FIXTURE_PATH, 'more', 'course')
 

data/spec/couchrest/more/extended_doc_view_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path("../../../spec_helper", __FILE__)
 require File.join(FIXTURE_PATH, 'more', 'article')
 require File.join(FIXTURE_PATH, 'more', 'course')
 
@@ -121,7 +121,7 @@ describe "ExtendedDocument views" do
   describe "a model class not tied to a database" do
     before(:all) do
       reset_test_db!
-      @db = DB
+      @db = DB 
       %w{aaa bbb ddd eee}.each do |title|
         u = Unattached.new(:title => title)
         u.database = @db
@@ -133,14 +133,15 @@ describe "ExtendedDocument views" do
       lambda{Unattached.all}.should raise_error
     end
     it "should query all" do
-      rs = Unattached.all :database=>@db
+      Unattached.cleanup_design_docs!(@db)
+      rs = Unattached.all :database => @db
       rs.length.should == 4
     end
     it "should barf on query if no database given" do
       lambda{Unattached.view :by_title}.should raise_error
     end
     it "should make the design doc upon first query" do
-      Unattached.by_title :database=>@db
+      Unattached.by_title :database => @db
       doc = Unattached.design_doc
       doc['views']['all']['map'].should include('Unattached')
     end
@@ -157,7 +158,7 @@ describe "ExtendedDocument views" do
       things = []
       Unattached.view(:by_title, :database=>@db) do |thing|
         things << thing
-      end
+      end 
       things[0]["doc"]["title"].should =='aaa'
     end
     it "should yield with by_key method" do
@@ -167,8 +168,11 @@ describe "ExtendedDocument views" do
       end
       things[0]["doc"]["title"].should =='aaa'
     end
-    it "should barf on get if no database given" do
-      lambda{Unattached.get("aaa")}.should raise_error
+    it "should return nil on get if no database given" do
+      Unattached.get("aaa").should be_nil
+    end
+    it "should barf on get! if no database given" do
+      lambda{Unattached.get!("aaa")}.should raise_error
     end
     it "should get from specific database" do
       u = Unattached.get(@first_id, @db)
@@ -199,7 +203,7 @@ describe "ExtendedDocument views" do
     before(:all) do
       reset_test_db!
       # setup the class default doc to save the design doc
-      Unattached.use_database DB
+      Unattached.use_database nil # just to be sure it is really unattached
       @us = Unattached.on(DB)
       %w{aaa bbb ddd eee}.each do |title|
         u = @us.new(:title => title)
@@ -211,6 +215,9 @@ describe "ExtendedDocument views" do
       rs = @us.all
       rs.length.should == 4
     end
+    it "should count" do
+      @us.count.should == 4
+    end
     it "should make the design doc upon first query" do
       @us.by_title
       doc = @us.design_doc
@@ -347,7 +354,8 @@ describe "ExtendedDocument views" do
         a = Article.new(:title => title, :date => Date.today)
         a.save
       end
-    end
+    end 
+    require 'date'
     it "should return a proxy that looks like an array of 7 Article objects" do
       articles = Article.by_date :key => Date.today
       articles.class.should == Array
@@ -364,6 +372,10 @@ describe "ExtendedDocument views" do
       articles.paginated_each(:per_page => 3) do |a|
         a.should_not be_nil
       end
+    end 
+    it "should have the amount of paginated pages" do
+      articles = Article.by_date :key => Date.today
+      articles.paginate(:per_page => 3).amount_pages.should == 3
     end
     it "should provide a class method to access the collection directly" do
       articles = Article.collection_proxy_for('Article', 'by_date', :descending => true,