jchris-couchrest 0.16 → 0.17.0

data/lib/couchrest/core/database.rb

@@ -20,7 +20,7 @@ module CouchRest
       @uri = @root = "#{host}/#{name}"
       @streamer = Streamer.new(self)
       @bulk_save_cache = []
-      @bulk_save_cache_limit = 50
+      @bulk_save_cache_limit = 500  # must be smaller than the uuid count
     end
     
     # returns the database's uri
@@ -61,12 +61,15 @@ module CouchRest
     # paramaters as described in http://wiki.apache.org/couchdb/HttpViewApi
     def view(name, params = {}, &block)
       keys = params.delete(:keys)
-      url = CouchRest.paramify_url "#{@uri}/_view/#{name}", params
+      name = name.split('/') # I think this will always be length == 2, but maybe not...
+      dname = name.shift
+      vname = name.join('/')
+      url = CouchRest.paramify_url "#{@uri}/_design/#{dname}/_view/#{vname}", params
       if keys
         CouchRest.post(url, {:keys => keys})
       else
         if block_given?
-          @streamer.view(name, params, &block)
+          @streamer.view("_design/#{dname}/_view/#{vname}", params, &block)
         else
           CouchRest.get url
         end
@@ -74,13 +77,15 @@ module CouchRest
     end
     
     # GET a document from CouchDB, by id. Returns a Ruby Hash.
-    def get(id)
+    def get(id, params = {})
       slug = escape_docid(id)
-      hash = CouchRest.get("#{@uri}/#{slug}")
-      doc = if /^_design/ =~ hash["_id"]
-        Design.new(hash)
+      url = CouchRest.paramify_url("#{@uri}/#{slug}", params)
+      result = CouchRest.get(url)
+      return result unless result.is_a?(Hash)
+      doc = if /^_design/ =~ result["_id"]
+        Design.new(result)
       else
-        Document.new(hash)
+        Document.new(result)
       end
       doc.database = self
       doc

data/lib/couchrest/core/response.rb

@@ -1,14 +1,15 @@
 module CouchRest
   class Response < Hash
-    def initialize(keys = {})
-      keys.each do |k,v|
+    def initialize(pkeys = {})
+      pkeys ||= {}
+      pkeys.each do |k,v|
         self[k.to_s] = v
       end
     end
-    def []= key, value
+    def []=(key, value)
       super(key.to_s, value)
     end
-    def [] key
+    def [](key)
       super(key.to_s)
     end
   end

data/lib/couchrest/helper/upgrade.rb

@@ -0,0 +1,51 @@
+module CouchRest
+  class Upgrade
+    attr_accessor :olddb, :newdb, :dbname
+    def initialize dbname, old_couch, new_couch
+      @dbname = dbname
+      @olddb = old_couch.database dbname
+      @newdb = new_couch.database!(dbname)
+      @bulk_docs = []
+    end
+    def clone!
+      puts "#{dbname} - #{olddb.info['doc_count']} docs"
+      streamer  = CouchRest::Streamer.new(olddb)
+      streamer.view("_all_docs_by_seq") do |row|
+        load_row_docs(row) if row
+        maybe_flush_bulks
+      end
+      flush_bulks!
+    end
+    
+    private
+    
+    def maybe_flush_bulks
+      flush_bulks! if (@bulk_docs.length > 99)
+    end
+    
+    def flush_bulks!
+      url = CouchRest.paramify_url "#{@newdb.uri}/_bulk_docs", {:all_or_nothing => true}
+      puts "posting #{@bulk_docs.length} bulk docs to #{url}"
+      begin
+        CouchRest.post url, {:docs => @bulk_docs}      
+        @bulk_docs = []
+      rescue Exception => e
+        puts e.response
+        raise e
+      end
+    end
+    
+    def load_row_docs(row)
+      results = @olddb.get(row["id"], {:open_revs => "all", :attachments => true})
+      results.select{|r|r["ok"]}.each do |r|
+        doc = r["ok"]
+        if /^_/.match(doc["_id"]) && !/^_design/.match(doc["_id"])
+          puts "invalid docid #{doc["_id"]} -- trimming"
+          doc["_id"] = doc["_id"].sub('_','')
+        end
+        doc.delete('_rev')
+        @bulk_docs << doc
+      end
+    end
+  end
+end

data/lib/couchrest/mixins/callbacks.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'support', 'class')
 
 # Extracted from ActiveSupport::Callbacks written by Yehuda Katz
+# http://github.com/wycats/rails/raw/abstract_controller/activesupport/lib/active_support/new_callbacks.rb
 # http://github.com/wycats/rails/raw/18b405f154868204a8f332888871041a7bad95e1/activesupport/lib/active_support/callbacks.rb
 
 module CouchRest
@@ -11,7 +12,7 @@ module CouchRest
   #
   # Example:
   #   class Storage
-  #     include CouchRest::Callbacks
+  #     include ActiveSupport::Callbacks
   #
   #     define_callbacks :save
   #   end
@@ -45,7 +46,7 @@ module CouchRest
   #
   # Example:
   #   class Storage
-  #     include CouchRest::Callbacks
+  #     include ActiveSupport::Callbacks
   #
   #     define_callbacks :save
   #
@@ -85,8 +86,8 @@ module CouchRest
       klass.extend ClassMethods
     end
         
-    def run_callbacks(kind, options = {})
-      send("_run_#{kind}_callbacks")
+    def run_callbacks(kind, options = {}, &blk)
+      send("_run_#{kind}_callbacks", &blk)
     end
     
     class Callback
@@ -166,9 +167,13 @@ module CouchRest
       
       # This will supply contents for before and around filters, and no
       # contents for after filters (for the forward pass).
-      def start(key = nil, object = nil)
+      def start(key = nil, options = {})
+        object, terminator = (options || {}).values_at(:object, :terminator)
+        
         return if key && !object.send("_one_time_conditions_valid_#{@callback_id}?")
         
+        terminator ||= false
+        
         # options[0] is the compiled form of supplied conditions
         # options[1] is the "end" for the conditional
                 
@@ -177,8 +182,14 @@ module CouchRest
             # if condition    # before_save :filter_name, :if => :condition
             #   filter_name
             # end
-            [@compiled_options[0], @filter, @compiled_options[1]].compact.join("\n")
-          elsif @compiled_options[0]
+            filter = <<-RUBY_EVAL
+              unless halted
+                result = #{@filter}
+                halted ||= (#{terminator})
+              end
+            RUBY_EVAL
+            [@compiled_options[0], filter, @compiled_options[1]].compact.join("\n")
+          else
             # Compile around filters with conditions into proxy methods
             # that contain the conditions.
             #
@@ -196,8 +207,8 @@ module CouchRest
             
             name = "_conditional_callback_#{@kind}_#{next_id}"
             txt = <<-RUBY_EVAL
-              def #{name}
-                #{@compiled_options[0]}
+              def #{name}(halted)
+                #{@compiled_options[0] || "if true"} && !halted
                   #{@filter} do
                     yield self
                   end
@@ -207,16 +218,16 @@ module CouchRest
               end
             RUBY_EVAL
             @klass.class_eval(txt)
-            "#{name} do"
-          else
-            "#{@filter} do"
+            "#{name}(halted) do"
           end
         end
       end
       
       # This will supply contents for around and after filters, but not
       # before filters (for the backward pass).
-      def end(key = nil, object = nil)
+      def end(key = nil, options = {})
+        object = (options || {})[:object]
+        
         return if key && !object.send("_one_time_conditions_valid_#{@callback_id}?")
         
         if @kind == :around || @kind == :after
@@ -299,7 +310,7 @@ module CouchRest
     # This method_missing is supplied to catch callbacks with keys and create
     # the appropriate callback for future use.
     def method_missing(meth, *args, &blk)
-      if meth.to_s =~ /_run_(\w+)_(\w+)_(\w+)_callbacks/
+      if meth.to_s =~ /_run__([\w:]+)__(\w+)__(\w+)__callbacks/
         return self.class._create_and_run_keyed_callback($1, $2.to_sym, $3.to_sym, self, &blk)
       end
       super
@@ -307,20 +318,26 @@ module CouchRest
     
     # An Array with a compile method
     class CallbackChain < Array
-      def compile(key = nil, object = nil)
+      def initialize(symbol)
+        @symbol = symbol
+      end
+      
+      def compile(key = nil, options = {})
         method = []
+        method << "halted = false"
         each do |callback|
-          method << callback.start(key, object)
+          method << callback.start(key, options)
         end
-        method << "yield self"
+        method << "yield self if block_given?"
         reverse_each do |callback|
-          method << callback.end(key, object)
+          method << callback.end(key, options)
         end
         method.compact.join("\n")
       end
       
       def clone(klass)
-        CallbackChain.new(map {|c| c.clone(klass)})
+        chain = CallbackChain.new(@symbol)
+        chain.push(*map {|c| c.clone(klass)})
       end
     end
         
@@ -338,16 +355,18 @@ module CouchRest
       # The _run_save_callbacks method can optionally take a key, which
       # will be used to compile an optimized callback method for each
       # key. See #define_callbacks for more information.
-      def _define_runner(symbol, str, options)
-        self.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+      def _define_runner(symbol, str, options)        
+        str = <<-RUBY_EVAL
           def _run_#{symbol}_callbacks(key = nil)
             if key
-              send("_run_\#{self.class}_#{symbol}_\#{key}_callbacks") { yield }
+              send("_run__\#{self.class.name.split("::").last}__#{symbol}__\#{key}__callbacks") { yield if block_given? }
             else
               #{str}
             end
           end
         RUBY_EVAL
+  
+        class_eval str, __FILE__, __LINE__ + 1
         
         before_name, around_name, after_name = 
           options.values_at(:before, :after, :around)
@@ -359,15 +378,18 @@ module CouchRest
       def _create_and_run_keyed_callback(klass, kind, key, obj, &blk)
         @_keyed_callbacks ||= {}
         @_keyed_callbacks[[kind, key]] ||= begin
-          str = self.send("_#{kind}_callbacks").compile(key, obj)
+          str = self.send("_#{kind}_callbacks").compile(key, :object => obj, :terminator => self.send("_#{kind}_terminator"))
+
           self.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def _run_#{klass}_#{kind}_#{key}_callbacks
+            def _run__#{klass.split("::").last}__#{kind}__#{key}__callbacks
               #{str}
             end
           RUBY_EVAL
+                    
           true
         end
-        obj.send("_run_#{klass}_#{kind}_#{key}_callbacks", &blk)
+                                  
+        obj.send("_run__#{klass.split("::").last}__#{kind}__#{key}__callbacks", &blk)
       end
       
       # Define callbacks.
@@ -402,20 +424,32 @@ module CouchRest
       # method that took into consideration the per_key conditions. This
       # is a speed improvement for ActionPack.
       def define_callbacks(*symbols)
+        terminator = symbols.pop if symbols.last.is_a?(String)
         symbols.each do |symbol|
+          self.class_inheritable_accessor("_#{symbol}_terminator")
+          self.send("_#{symbol}_terminator=", terminator)
           self.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
             class_inheritable_accessor :_#{symbol}_callbacks
-            self._#{symbol}_callbacks = CallbackChain.new
+            self._#{symbol}_callbacks = CallbackChain.new(:#{symbol})
 
-            def self.#{symbol}_callback(type, *filters, &blk)
+            def self.#{symbol}_callback(*filters, &blk)
+              type = [:before, :after, :around].include?(filters.first) ? filters.shift : :before
               options = filters.last.is_a?(Hash) ? filters.pop : {}
               filters.unshift(blk) if block_given?
-              filters.map! {|f| Callback.new(f, type, options.dup, self, :#{symbol})}
+              
+              filters.map! do |filter| 
+                # overrides parent class
+                self._#{symbol}_callbacks.delete_if {|c| c.matches?(type, :#{symbol}, filter)}
+                Callback.new(filter, type, options.dup, self, :#{symbol})
+              end
               self._#{symbol}_callbacks.push(*filters)
-              _define_runner(:#{symbol}, self._#{symbol}_callbacks.compile, options)
+              _define_runner(:#{symbol}, 
+                self._#{symbol}_callbacks.compile(nil, :terminator => _#{symbol}_terminator), 
+                options)
             end
             
-            def self.skip_#{symbol}_callback(type, *filters, &blk)
+            def self.skip_#{symbol}_callback(*filters, &blk)
+              type = [:before, :after, :around].include?(filters.first) ? filters.shift : :before
               options = filters.last.is_a?(Hash) ? filters.pop : {}
               filters.unshift(blk) if block_given?
               filters.each do |filter|
@@ -428,15 +462,22 @@ module CouchRest
                 else
                   self._#{symbol}_callbacks.delete(filter)
                 end
-                _define_runner(:#{symbol}, self._#{symbol}_callbacks.compile, options)
+                _define_runner(:#{symbol}, 
+                  self._#{symbol}_callbacks.compile(nil, :terminator => _#{symbol}_terminator), 
+                  options)
               end
               
             end
             
+            def self.reset_#{symbol}_callbacks
+              self._#{symbol}_callbacks = CallbackChain.new(:#{symbol})
+              _define_runner(:#{symbol}, self._#{symbol}_callbacks.compile, {})
+            end
+            
             self.#{symbol}_callback(:before)
           RUBY_EVAL
         end
       end
     end
   end
-end
+end

data/lib/couchrest/mixins/design_doc.rb

@@ -16,6 +16,7 @@ module CouchRest
         def design_doc_slug
           return design_doc_slug_cache if (design_doc_slug_cache && design_doc_fresh)
           funcs = []
+          design_doc ||= Design.new(default_design_doc)
           design_doc['views'].each do |name, view|
             funcs << "#{name}/#{view['map']}#{view['reduce']}"
           end

data/lib/couchrest/mixins/properties.rb

@@ -55,9 +55,14 @@ module CouchRest
             else
               # Let people use :send as a Time parse arg
               klass = ::CouchRest.constantize(target)
+              # I'm not convince we should or should not create a new instance if we are casting a doc/extended doc without default value and nothing was passed
+              # unless (property.casted && 
+              #   (klass.superclass == CouchRest::ExtendedDocument || klass.superclass == CouchRest::Document) && 
+              #     (self[key].nil? || property.default.nil?))
               klass.send(property.init_method, self[key])
+              #end
             end
-            self[key].casted_by = self if self[key].respond_to?(:casted_by)
+            self[property.name].casted_by = self if self[property.name].respond_to?(:casted_by)
           end
         end
       end

data/lib/couchrest/mixins/views.rb

@@ -129,7 +129,7 @@ module CouchRest
         private
 
         def fetch_view_with_docs(name, opts, raw=false, &block)
-          if raw
+          if raw || (opts.has_key?(:include_docs) && opts[:include_docs] == false)
             fetch_view(name, opts, &block)
           else
             begin

data/lib/couchrest/monkeypatches.rb

@@ -31,13 +31,19 @@ if RUBY_VERSION.to_f < 1.9
   class Net::BufferedIO #:nodoc:
     alias :old_rbuf_fill :rbuf_fill
     def rbuf_fill
-      begin
-        @rbuf << @io.read_nonblock(65536)
-      rescue Errno::EWOULDBLOCK
-        if IO.select([@io], nil, nil, @read_timeout)
+      if @io.respond_to?(:read_nonblock)
+        begin
           @rbuf << @io.read_nonblock(65536)
-        else
-          raise Timeout::TimeoutError
+        rescue Errno::EWOULDBLOCK
+          if IO.select([@io], nil, nil, @read_timeout)
+            retry
+          else
+            raise Timeout::TimeoutError
+          end
+        end
+      else
+        timeout(@read_timeout) do
+          @rbuf << @io.sysread(65536)
         end
       end
     end

data/lib/couchrest/more/extended_document.rb

@@ -24,15 +24,17 @@ module CouchRest
       subklass.send(:include, CouchRest::Mixins::Properties)
     end
     
+    # Accessors
+    attr_accessor :casted_by
+    
     # Callbacks
     define_callbacks :create
     define_callbacks :save
     define_callbacks :update
     define_callbacks :destroy
     
-    def initialize(keys={})
+    def initialize(passed_keys={})
       apply_defaults # defined in CouchRest::Mixins::Properties
-      keys ||= {}
       super
       cast_keys      # defined in CouchRest::Mixins::Properties
       unless self['_id'] && self['_rev']
@@ -203,8 +205,8 @@ module CouchRest
         _run_destroy_callbacks do
           result = database.delete_doc(self, bulk)
           if result['ok']
-            self['_rev'] = nil
-            self['_id'] = nil
+            self.delete('_rev')
+            self.delete('_id')
           end
           result['ok']
         end

data/lib/couchrest/support/class.rb

@@ -25,151 +25,167 @@
 # example, an array without those additions being shared with either their
 # parent, siblings, or children, which is unlike the regular class-level
 # attributes that are shared across the entire hierarchy.
-class Class
-  # Defines class-level and instance-level attribute reader.
-  #
-  # @param *syms<Array> Array of attributes to define reader for.
-  # @return <Array[#to_s]> List of attributes that were made into cattr_readers
-  #
-  # @api public
-  #
-  # @todo Is this inconsistent in that it does not allow you to prevent
-  # an instance_reader via :instance_reader => false
-  def cattr_reader(*syms)
-    syms.flatten.each do |sym|
-      next if sym.is_a?(Hash)
-      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-unless defined? @@#{sym}
-@@#{sym} = nil
-end
+module CouchRest
+  module ClassExtension
+    def self.included(base)
+      if CouchRest::ClassExtension::InstanceMethods.instance_methods.all? {|m| base.respond_to?(m)}
+        # do nothing
+      elsif CouchRest::ClassExtension::InstanceMethods.instance_methods.any? {|m| base.respond_to?(m)}
+        raise RuntimeError, "Conflicting extentions to Class, work it out"
+      else
+        base.send(:include, CouchRest::ClassExtension::InstanceMethods)
+      end
+    end
+    
+    module InstanceMethods
+      # Defines class-level and instance-level attribute reader.
+      #
+      # @param *syms<Array> Array of attributes to define reader for.
+      # @return <Array[#to_s]> List of attributes that were made into cattr_readers
+      #
+      # @api public
+      #
+      # @todo Is this inconsistent in that it does not allow you to prevent
+      # an instance_reader via :instance_reader => false
+      def cattr_reader(*syms)
+        syms.flatten.each do |sym|
+          next if sym.is_a?(Hash)
+          class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+    unless defined? @@#{sym}
+    @@#{sym} = nil
+    end
  
-def self.#{sym}
-@@#{sym}
-end
+    def self.#{sym}
+    @@#{sym}
+    end
  
-def #{sym}
-@@#{sym}
-end
-RUBY
+    def #{sym}
+    @@#{sym}
     end
-  end
+    RUBY
+        end
+      end
  
-  # Defines class-level (and optionally instance-level) attribute writer.
-  #
-  # @param <Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to define writer for.
-  # @option syms :instance_writer<Boolean> if true, instance-level attribute writer is defined.
-  # @return <Array[#to_s]> List of attributes that were made into cattr_writers
-  #
-  # @api public
-  def cattr_writer(*syms)
-    options = syms.last.is_a?(Hash) ? syms.pop : {}
-    syms.flatten.each do |sym|
-      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-unless defined? @@#{sym}
-@@#{sym} = nil
-end
+      # Defines class-level (and optionally instance-level) attribute writer.
+      #
+      # @param <Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to define writer for.
+      # @option syms :instance_writer<Boolean> if true, instance-level attribute writer is defined.
+      # @return <Array[#to_s]> List of attributes that were made into cattr_writers
+      #
+      # @api public
+      def cattr_writer(*syms)
+        options = syms.last.is_a?(Hash) ? syms.pop : {}
+        syms.flatten.each do |sym|
+          class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+    unless defined? @@#{sym}
+    @@#{sym} = nil
+    end
  
-def self.#{sym}=(obj)
-@@#{sym} = obj
-end
-RUBY
+    def self.#{sym}=(obj)
+    @@#{sym} = obj
+    end
+    RUBY
  
-      unless options[:instance_writer] == false
-        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-def #{sym}=(obj)
-@@#{sym} = obj
-end
-RUBY
-      end
+          unless options[:instance_writer] == false
+            class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+    def #{sym}=(obj)
+    @@#{sym} = obj
     end
-  end
+    RUBY
+          end
+        end
+      end
  
-  # Defines class-level (and optionally instance-level) attribute accessor.
-  #
-  # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to define accessor for.
-  # @option syms :instance_writer<Boolean> if true, instance-level attribute writer is defined.
-  # @return <Array[#to_s]> List of attributes that were made into accessors
-  #
-  # @api public
-  def cattr_accessor(*syms)
-    cattr_reader(*syms)
-    cattr_writer(*syms)
-  end
+      # Defines class-level (and optionally instance-level) attribute accessor.
+      #
+      # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to define accessor for.
+      # @option syms :instance_writer<Boolean> if true, instance-level attribute writer is defined.
+      # @return <Array[#to_s]> List of attributes that were made into accessors
+      #
+      # @api public
+      def cattr_accessor(*syms)
+        cattr_reader(*syms)
+        cattr_writer(*syms)
+      end
  
-  # Defines class-level inheritable attribute reader. Attributes are available to subclasses,
-  # each subclass has a copy of parent's attribute.
-  #
-  # @param *syms<Array[#to_s]> Array of attributes to define inheritable reader for.
-  # @return <Array[#to_s]> Array of attributes converted into inheritable_readers.
-  #
-  # @api public
-  #
-  # @todo Do we want to block instance_reader via :instance_reader => false
-  # @todo It would be preferable that we do something with a Hash passed in
-  # (error out or do the same as other methods above) instead of silently
-  # moving on). In particular, this makes the return value of this function
-  # less useful.
-  def class_inheritable_reader(*ivars)
-    instance_reader = ivars.pop[:reader] if ivars.last.is_a?(Hash)
+      # Defines class-level inheritable attribute reader. Attributes are available to subclasses,
+      # each subclass has a copy of parent's attribute.
+      #
+      # @param *syms<Array[#to_s]> Array of attributes to define inheritable reader for.
+      # @return <Array[#to_s]> Array of attributes converted into inheritable_readers.
+      #
+      # @api public
+      #
+      # @todo Do we want to block instance_reader via :instance_reader => false
+      # @todo It would be preferable that we do something with a Hash passed in
+      # (error out or do the same as other methods above) instead of silently
+      # moving on). In particular, this makes the return value of this function
+      # less useful.
+      def class_inheritable_reader(*ivars)
+        instance_reader = ivars.pop[:reader] if ivars.last.is_a?(Hash)
  
-    ivars.each do |ivar|
-      self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-def self.#{ivar}
-return @#{ivar} if self.object_id == #{self.object_id} || defined?(@#{ivar})
-ivar = superclass.#{ivar}
-return nil if ivar.nil? && !#{self}.instance_variable_defined?("@#{ivar}")
-@#{ivar} = ivar && !ivar.is_a?(Module) && !ivar.is_a?(Numeric) && !ivar.is_a?(TrueClass) && !ivar.is_a?(FalseClass) && !ivar.is_a?(Symbol) ? ivar.dup : ivar
-end
-RUBY
-      unless instance_reader == false
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-def #{ivar}
-self.class.#{ivar}
-end
-RUBY
+        ivars.each do |ivar|
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+    def self.#{ivar}
+    return @#{ivar} if self.object_id == #{self.object_id} || defined?(@#{ivar})
+    ivar = superclass.#{ivar}
+    return nil if ivar.nil? && !#{self}.instance_variable_defined?("@#{ivar}")
+    @#{ivar} = ivar && !ivar.is_a?(Module) && !ivar.is_a?(Numeric) && !ivar.is_a?(TrueClass) && !ivar.is_a?(FalseClass) && !ivar.is_a?(Symbol) ? ivar.dup : ivar
+    end
+    RUBY
+          unless instance_reader == false
+            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+    def #{ivar}
+    self.class.#{ivar}
+    end
+    RUBY
+          end
+        end
       end
+ 
+      # Defines class-level inheritable attribute writer. Attributes are available to subclasses,
+      # each subclass has a copy of parent's attribute.
+      #
+      # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to
+      # define inheritable writer for.
+      # @option syms :instance_writer<Boolean> if true, instance-level inheritable attribute writer is defined.
+      # @return <Array[#to_s]> An Array of the attributes that were made into inheritable writers.
+      #
+      # @api public
+      #
+      # @todo We need a style for class_eval <<-HEREDOC. I'd like to make it
+      # class_eval(<<-RUBY, __FILE__, __LINE__), but we should codify it somewhere.
+      def class_inheritable_writer(*ivars)
+        instance_writer = ivars.pop[:instance_writer] if ivars.last.is_a?(Hash)
+        ivars.each do |ivar|
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+    def self.#{ivar}=(obj)
+    @#{ivar} = obj
     end
-  end
+    RUBY
+          unless instance_writer == false
+            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+    def #{ivar}=(obj) self.class.#{ivar} = obj end
+    RUBY
+          end
+        end
+      end
  
-  # Defines class-level inheritable attribute writer. Attributes are available to subclasses,
-  # each subclass has a copy of parent's attribute.
-  #
-  # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to
-  # define inheritable writer for.
-  # @option syms :instance_writer<Boolean> if true, instance-level inheritable attribute writer is defined.
-  # @return <Array[#to_s]> An Array of the attributes that were made into inheritable writers.
-  #
-  # @api public
-  #
-  # @todo We need a style for class_eval <<-HEREDOC. I'd like to make it
-  # class_eval(<<-RUBY, __FILE__, __LINE__), but we should codify it somewhere.
-  def class_inheritable_writer(*ivars)
-    instance_writer = ivars.pop[:instance_writer] if ivars.last.is_a?(Hash)
-    ivars.each do |ivar|
-      self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-def self.#{ivar}=(obj)
-@#{ivar} = obj
-end
-RUBY
-      unless instance_writer == false
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-def #{ivar}=(obj) self.class.#{ivar} = obj end
-RUBY
+      # Defines class-level inheritable attribute accessor. Attributes are available to subclasses,
+      # each subclass has a copy of parent's attribute.
+      #
+      # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to
+      # define inheritable accessor for.
+      # @option syms :instance_writer<Boolean> if true, instance-level inheritable attribute writer is defined.
+      # @return <Array[#to_s]> An Array of attributes turned into inheritable accessors.
+      #
+      # @api public
+      def class_inheritable_accessor(*syms)
+        class_inheritable_reader(*syms)
+        class_inheritable_writer(*syms)
       end
     end
   end
- 
-  # Defines class-level inheritable attribute accessor. Attributes are available to subclasses,
-  # each subclass has a copy of parent's attribute.
-  #
-  # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to
-  # define inheritable accessor for.
-  # @option syms :instance_writer<Boolean> if true, instance-level inheritable attribute writer is defined.
-  # @return <Array[#to_s]> An Array of attributes turned into inheritable accessors.
-  #
-  # @api public
-  def class_inheritable_accessor(*syms)
-    class_inheritable_reader(*syms)
-    class_inheritable_writer(*syms)
-  end
-end
+end
+
+Class.send(:include, CouchRest::ClassExtension)

data/lib/couchrest.rb

@@ -22,12 +22,13 @@ $:.unshift File.dirname(__FILE__) unless
   $:.include?(File.dirname(__FILE__)) ||
   $:.include?(File.expand_path(File.dirname(__FILE__)))
   
+$COUCHREST_DEBUG ||= false
   
 require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION = '0.16' unless self.const_defined?("VERSION")
+  VERSION    = '0.17.0' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'
@@ -39,6 +40,7 @@ module CouchRest
   autoload :Pager,        'couchrest/helper/pager'
   autoload :FileManager,  'couchrest/helper/file_manager'
   autoload :Streamer,     'couchrest/helper/streamer'
+  autoload :Upgrade,      'couchrest/helper/upgrade'
   
   autoload :ExtendedDocument,     'couchrest/more/extended_document'
   autoload :CastedModel,          'couchrest/more/casted_model'
@@ -124,18 +126,42 @@ module CouchRest
       cr.database(parsed[:database])
     end
     
-    def put uri, doc = nil
+    def put(uri, doc = nil)
       payload = doc.to_json if doc
-      JSON.parse(RestClient.put(uri, payload))
+      begin
+        JSON.parse(RestClient.put(uri, payload))
+      rescue Exception => e
+        if $COUCHREST_DEBUG == true
+          raise "Error while sending a PUT request #{uri}\npayload: #{payload.inspect}\n#{e}"
+        else
+          raise e
+        end
+      end
     end
 
-    def get uri
-      JSON.parse(RestClient.get(uri), :max_nesting => false)
+    def get(uri)
+      begin
+        JSON.parse(RestClient.get(uri), :max_nesting => false)
+      rescue => e
+        if $COUCHREST_DEBUG == true
+          raise "Error while sending a GET request #{uri}\n: #{e}"
+        else
+          raise e
+        end
+      end
     end
   
     def post uri, doc = nil
       payload = doc.to_json if doc
-      JSON.parse(RestClient.post(uri, payload))
+      begin
+        JSON.parse(RestClient.post(uri, payload))
+      rescue Exception => e
+        if $COUCHREST_DEBUG == true
+          raise "Error while sending a POST request #{uri}\npayload: #{payload.inspect}\n#{e}"
+        else
+          raise e
+        end
+      end
     end
   
     def delete uri

data/spec/couchrest/core/database_spec.rb

@@ -149,8 +149,8 @@ describe CouchRest::Database do
           {"mild" => "yet local"},
           {"another" => ["set","of","keys"]}
         ])
-      rs['new_revs'].each do |r|
-        @db.get(r['id'])
+      rs.each do |r|
+        @db.get(r['id']).rev.should == r["rev"]
       end
     end
     
@@ -170,26 +170,10 @@ describe CouchRest::Database do
           {"_id" => "twoB", "mild" => "yet local"},
           {"another" => ["set","of","keys"]}
         ])
-      rs['new_revs'].each do |r|
-        @db.get(r['id'])
+      rs.each do |r|
+        @db.get(r['id']).rev.should == r["rev"]
       end
     end
-    
-    it "in the case of an id conflict should not insert anything" do
-      @r = @db.save_doc({'lemons' => 'from texas', 'and' => 'how', "_id" => "oneB"})
-      
-      lambda do
-      rs = @db.bulk_save([
-          {"_id" => "oneB", "wild" => "and random"},
-          {"_id" => "twoB", "mild" => "yet local"},
-          {"another" => ["set","of","keys"]}
-        ])
-      end.should raise_error(RestClient::RequestFailed)
-    
-      lambda do
-        @db.get('twoB')
-      end.should raise_error(RestClient::ResourceNotFound)
-    end
 
     it "should empty the bulk save cache if no documents are given" do
       @db.save_doc({"_id" => "bulk_cache_1", "val" => "test"}, true)
@@ -593,7 +577,8 @@ describe CouchRest::Database do
         @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
       end
       it "should fail without a rev" do
-        lambda{@db.move_doc @doc, @docid}.should raise_error(RestClient::RequestFailed)
+        @doc.delete("_rev")
+        lambda{@db.move_doc @doc, @docid}.should raise_error(ArgumentError)
         lambda{@db.get(@r['id'])}.should_not raise_error
       end
       it "should succeed with a rev" do

data/spec/couchrest/core/document_spec.rb

@@ -224,7 +224,8 @@ describe CouchRest::Document do
         @db.save_doc({'_id' => @docid, 'will-exist' => 'here'})
       end
       it "should fail without a rev" do
-        lambda{@doc.move @docid}.should raise_error(RestClient::RequestFailed)
+        @doc.delete("_rev")
+        lambda{@doc.move @docid}.should raise_error(ArgumentError)
         lambda{@db.get(@resp['id'])}.should_not raise_error
       end
       it "should succeed with a rev" do

data/spec/couchrest/more/casted_extended_doc_spec.rb

@@ -0,0 +1,40 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(FIXTURE_PATH, 'more', 'card')
+
+class Car < CouchRest::ExtendedDocument
+  use_database TEST_SERVER.default_database
+  
+  property :name
+  property :driver, :cast_as => 'Driver'
+end
+
+class Driver < CouchRest::ExtendedDocument
+  use_database TEST_SERVER.default_database
+  # You have to add a casted_by accessor if you want to reach a casted extended doc parent
+  attr_accessor :casted_by
+  
+  property :name
+end
+
+describe "casting an extended document" do
+  
+  before(:each) do
+    @car    = Car.new(:name => 'Renault 306')
+    @driver = Driver.new(:name => 'Matt')
+  end
+  
+  # it "should not create an empty casted object" do
+  #   @car.driver.should be_nil
+  # end
+  
+  it "should let you assign the casted attribute after instantializing an object" do
+    @car.driver = @driver
+    @car.driver.name.should == 'Matt'
+  end
+  
+  it "should let the casted document who casted it" do
+    Car.new(:name => 'Renault 306', :driver => @driver)
+    @car.driver.casted_by.should == @car
+  end
+  
+end

data/spec/couchrest/more/casted_model_spec.rb

@@ -70,6 +70,7 @@ describe CouchRest::CastedModel do
   
   describe "saved document with casted models" do
     before(:each) do
+      reset_test_db!
       @obj = DummyModel.new(:casted_attribute => {:name => 'whatever'})
       @obj.save.should be_true
       @obj = DummyModel.get(@obj.id)
@@ -94,4 +95,4 @@ describe CouchRest::CastedModel do
     
   end
   
-end
+end

data/spec/couchrest/more/extended_doc_attachment_spec.rb

@@ -4,6 +4,7 @@ describe "ExtendedDocument attachments" do
   
   describe "#has_attachment?" do
     before(:each) do
+      reset_test_db!
       @obj = Basic.new
       @obj.save.should == true
       @file = File.open(FIXTURE_PATH + '/attachments/test.html')
@@ -126,4 +127,4 @@ describe "ExtendedDocument attachments" do
       @obj.attachment_url(@attachment_name).should == "#{Basic.database}/#{@obj.id}/#{@attachment_name}"
     end
   end
-end
+end

data/spec/couchrest/more/extended_doc_spec.rb

@@ -442,7 +442,7 @@ describe "ExtendedDocument" do
       @dobj.destroy
       @dobj.rev.should be_nil
       @dobj.id.should be_nil
-      @dobj.save.should == true
+      @dobj.save.should == true 
     end
     it "should make it go away" do
       @dobj.destroy

data/spec/couchrest/more/extended_doc_view_spec.rb

@@ -105,6 +105,9 @@ describe "ExtendedDocument views" do
 
   describe "a model with a compound key view" do
     before(:all) do
+      Article.design_doc_fresh = false
+      Article.by_user_id_and_date.each{|a| a.destroy(true)}
+      Article.database.bulk_delete
       written_at = Time.now - 24 * 3600 * 7
       @titles = ["uniq one", "even more interesting", "less fun", "not junk"]
       @user_ids = ["quentin", "aaron"]
@@ -164,41 +167,41 @@ describe "ExtendedDocument views" do
   # TODO: moved to Design, delete
   describe "adding a view" do
     before(:each) do
+      reset_test_db!
       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
+    it "should create a new version of the design document on view access" do
+      old_design_doc = Article.database.documents(:key => @design_docs["rows"].first["key"], :include_docs => true)["rows"][0]["doc"]
       Article.view_by :updated_at
       Article.by_updated_at
-      newdocs = Article.database.documents :startkey => "_design/", 
-        :endkey => "_design/\u9999"
-      # puts @design_docs.inspect
-      # puts newdocs.inspect
-      newdocs["rows"].length.should == @design_docs["rows"].length + 1
+      newdocs = Article.database.documents({:startkey => "_design/", :endkey => "_design/\u9999"})
+
+      doc = Article.database.documents(:key => @design_docs["rows"].first["key"], :include_docs => true)["rows"][0]["doc"]
+      doc["_rev"].should_not        == old_design_doc["_rev"]
+      doc["views"].keys.should include("by_updated_at")
     end
   end
 
   describe "with a lot of designs left around" do
     before(:each) do
+      reset_test_db!
       Article.by_date
       Article.view_by :field
       Article.by_field
     end
     it "should clean them up" do
+      ddocs = Article.all_design_doc_versions
       Article.view_by :stream
       Article.by_stream
-      ddocs = Article.all_design_doc_versions
-      ddocs["rows"].length.should > 1
       Article.cleanup_design_docs!
       ddocs = Article.all_design_doc_versions
       ddocs["rows"].length.should == 1
     end
   end
-end
+end

data/spec/couchrest/more/property_spec.rb

@@ -8,6 +8,7 @@ require File.join(FIXTURE_PATH, 'more', 'event')
 describe "ExtendedDocument properties" do
   
   before(:each) do
+    reset_test_db!
     @card = Card.new(:first_name => "matt")
   end
   
@@ -126,4 +127,4 @@ describe "ExtendedDocument properties" do
     end
   end
   
-end
+end

data/spec/couchrest/support/class_spec.rb

@@ -0,0 +1,59 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'couchrest', 'support', 'class')
+
+describe CouchRest::ClassExtension do
+  
+  before :all do
+    class FullyDefinedClassExtensions
+      def self.respond_to?(method)
+        if CouchRest::ClassExtension::InstanceMethods.instance_methods.include?(method)
+          true
+        else
+          super
+        end
+      end
+    end
+    
+    class PartDefinedClassExtensions
+      def self.respond_to?(method)
+        methods = CouchRest::ClassExtension::InstanceMethods.instance_methods
+        methods.delete('cattr_reader')
+        
+        if methods.include?(method)
+          false
+        else
+          super
+        end
+      end
+    end
+    
+    class NoClassExtensions
+      def self.respond_to?(method)
+        if CouchRest::ClassExtension::InstanceMethods.instance_methods.include?(method)
+          false
+        else
+          super
+        end
+      end
+    end
+
+
+  end
+  
+  it "should not include InstanceMethods if the class extensions are already defined" do
+    FullyDefinedClassExtensions.send(:include, CouchRest::ClassExtension)
+    FullyDefinedClassExtensions.ancestors.should_not include(CouchRest::ClassExtension::InstanceMethods)
+  end
+  
+  it "should raise RuntimeError if the class extensions are only partially defined" do
+    lambda {
+      PartDefinedClassExtensions.send(:include, CouchRest::ClassExtension)
+    }.should raise_error(RuntimeError)
+  end
+  
+  it "should include class extensions if they are not already defined" do
+    NoClassExtensions.send(:include, CouchRest::ClassExtension)
+    NoClassExtensions.ancestors.should include(CouchRest::ClassExtension::InstanceMethods)
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jchris-couchrest
 version: !ruby/object:Gem::Version 
-  version: "0.16"
+  version: 0.17.0
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -89,6 +89,7 @@ files:
 - lib/couchrest/helper
 - lib/couchrest/helper/pager.rb
 - lib/couchrest/helper/streamer.rb
+- lib/couchrest/helper/upgrade.rb
 - lib/couchrest/mixins
 - lib/couchrest/mixins/attachments.rb
 - lib/couchrest/mixins/callbacks.rb
@@ -136,36 +137,19 @@ files:
 - spec/couchrest/helpers/pager_spec.rb
 - spec/couchrest/helpers/streamer_spec.rb
 - spec/couchrest/more
+- 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_spec.rb
 - spec/couchrest/more/extended_doc_view_spec.rb
 - spec/couchrest/more/property_spec.rb
+- spec/couchrest/support
+- spec/couchrest/support/class_spec.rb
 - spec/fixtures
 - spec/fixtures/attachments
 - spec/fixtures/attachments/couchdb.png
 - spec/fixtures/attachments/README
 - spec/fixtures/attachments/test.html
-- spec/fixtures/couchapp
-- spec/fixtures/couchapp/_attachments
-- spec/fixtures/couchapp/_attachments/index.html
-- spec/fixtures/couchapp/doc.json
-- spec/fixtures/couchapp/foo
-- spec/fixtures/couchapp/foo/bar.txt
-- spec/fixtures/couchapp/foo/test.json
-- spec/fixtures/couchapp/test.json
-- spec/fixtures/couchapp/views
-- 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/foo
-- spec/fixtures/couchapp-test/my-app/foo/bar.txt
-- 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/more
 - spec/fixtures/more/article.rb
 - spec/fixtures/more/card.rb