mattetti-couchrest 0.21 → 0.22

data/lib/couchrest.rb

@@ -28,7 +28,7 @@ require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.21' unless self.const_defined?("VERSION")
+  VERSION    = '0.22' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'
@@ -40,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'
@@ -68,6 +69,18 @@ module CouchRest
       Object.module_eval("::#{$1}", __FILE__, __LINE__)
     end
     
+    # extracted from Extlib
+    #    
+    # Capitalizes the first word and turns underscores into spaces and strips _id.
+    # Like titleize, this is meant for creating pretty output.
+    #
+    # @example
+    #   "employee_salary" #=> "Employee salary"
+    #   "author_id" #=> "Author"
+    def humanize(lower_case_and_underscored_word)
+      lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
+    end
+    
     # todo, make this parse the url and instantiate a Server or Database instance
     # depending on the specificity.
     def new(*opts)
@@ -170,10 +183,6 @@ module CouchRest
     def copy uri, destination
       JSON.parse(RestClient.copy(uri, {'Destination' => destination}))
     end
-    
-    def move uri, destination
-      JSON.parse(RestClient.move(uri, {'Destination' => destination}))
-    end
   
     def paramify_url url, params = {}
       if params && !params.empty?

data/lib/couchrest/core/database.rb

@@ -77,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
@@ -222,26 +224,6 @@ module CouchRest
       copy_doc(doc, dest)
     end
     
-    # MOVE an existing document to a new id. If the destination id currently exists, a rev must be provided.
-    # <tt>dest</tt> can take one of two forms if overwriting: "id_to_overwrite?rev=revision" or the actual doc
-    # hash with a '_rev' key
-    def move_doc(doc, dest)
-      raise ArgumentError, "_id and _rev are required for moving" unless doc['_id'] && doc['_rev']
-      slug = escape_docid(doc['_id'])        
-      destination = if dest.respond_to?(:has_key?) && dest['_id'] && dest['_rev']
-        "#{dest['_id']}?rev=#{dest['_rev']}"
-      else
-        dest
-      end
-      CouchRest.move "#{@uri}/#{slug}?rev=#{doc['_rev']}", destination
-    end
-    
-    ### DEPRECATION NOTICE
-    def move(doc, dest)
-      puts "CouchRest::Database's move method is being deprecated, please use move_doc instead"
-      move_doc(doc, dest)
-    end
-    
     # Compact the database, removing old document revisions and optimizing space use.
     def compact!
       CouchRest.post "#{@uri}/_compact"

data/lib/couchrest/core/document.rb

@@ -5,10 +5,10 @@ module CouchRest
     include CouchRest::Mixins::Attachments
 
     # def self.inherited(subklass)
-    #   subklass.send(:class_inheritable_accessor, :database)
+    #   subklass.send(:extlib_inheritable_accessor, :database)
     # end
     
-    class_inheritable_accessor :database
+    extlib_inheritable_accessor :database
     attr_accessor :database
     
     # override the CouchRest::Model-wide default_database

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

@@ -426,10 +426,10 @@ module CouchRest
       def define_callbacks(*symbols)
         terminator = symbols.pop if symbols.last.is_a?(String)
         symbols.each do |symbol|
-          self.class_inheritable_accessor("_#{symbol}_terminator")
+          self.extlib_inheritable_accessor("_#{symbol}_terminator")
           self.send("_#{symbol}_terminator=", terminator)
           self.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            class_inheritable_accessor :_#{symbol}_callbacks
+            extlib_inheritable_accessor :_#{symbol}_callbacks
             self._#{symbol}_callbacks = CallbackChain.new(:#{symbol})
 
             def self.#{symbol}_callback(*filters, &blk)
@@ -480,4 +480,4 @@ module CouchRest
       end
     end
   end
-end
+end

data/lib/couchrest/mixins/properties.rb

@@ -1,3 +1,4 @@
+require 'time'
 require File.join(File.dirname(__FILE__), '..', 'more', 'property')
 
 module CouchRest
@@ -7,10 +8,10 @@ module CouchRest
       class IncludeError < StandardError; end
       
       def self.included(base)
-        base.cattr_accessor(:properties)
-          base.class_eval <<-EOS, __FILE__, __LINE__
-              @@properties = []
-          EOS
+        base.class_eval <<-EOS, __FILE__, __LINE__
+            extlib_inheritable_accessor(:properties)
+            self.properties ||= []
+        EOS
         base.extend(ClassMethods)
         raise CouchRest::Mixins::Properties::IncludeError, "You can only mixin Properties in a class responding to [] and []=, if you tried to mixin CastedModel, make sure your class inherits from Hash or responds to the proper methods" unless (base.new.respond_to?(:[]) && base.new.respond_to?(:[]=))
       end
@@ -70,7 +71,10 @@ module CouchRest
       module ClassMethods
         
         def property(name, options={})
-          define_property(name, options) unless self.properties.map{|p| p.name}.include?(name.to_s)
+          existing_property = self.properties.find{|p| p.name == name.to_s}
+          if existing_property.nil? || (existing_property.default != options[:default])
+            define_property(name, options)
+          end
         end
         
         protected

data/lib/couchrest/mixins/validation.rb

@@ -49,10 +49,10 @@ module CouchRest
   module Validation
     
     def self.included(base)
-      base.cattr_accessor(:auto_validation)
+      base.extlib_inheritable_accessor(:auto_validation)
       base.class_eval <<-EOS, __FILE__, __LINE__
           # Turn off auto validation by default
-          @@auto_validation = false
+          self.auto_validation ||= false
           
           # Force the auto validation for the class properties
           # This feature is still not fully ported over,
@@ -60,6 +60,11 @@ module CouchRest
           def self.auto_validate!
             self.auto_validation = true
           end
+          
+          # share the validations with subclasses
+          def self.inherited(subklass)
+            subklass.instance_variable_set(:@validations, self.validators.dup)
+          end
       EOS
       
       base.extend(ClassMethods)
@@ -71,7 +76,7 @@ module CouchRest
       base.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
         def self.define_property(name, options={})
           super
-          auto_generate_validations(properties.last)
+          auto_generate_validations(properties.last) if properties && properties.size > 0
           autovalidation_check = true
         end
       RUBY_EVAL

data/lib/couchrest/mixins/views.rb

@@ -4,9 +4,9 @@ module CouchRest
       
       def self.included(base)
         base.extend(ClassMethods)
-        base.send(:class_inheritable_accessor, :design_doc)
-        base.send(:class_inheritable_accessor, :design_doc_slug_cache)
-        base.send(:class_inheritable_accessor, :design_doc_fresh)
+        base.send(:extlib_inheritable_accessor, :design_doc)
+        base.send(:extlib_inheritable_accessor, :design_doc_slug_cache)
+        base.send(:extlib_inheritable_accessor, :design_doc_fresh)
       end
       
       module ClassMethods

data/lib/couchrest/monkeypatches.rb

@@ -10,7 +10,7 @@ class Time
   # in your application.)
 
   def to_json(options = nil)
-    u = self.utc
+    u = self.getutc
     %("#{u.strftime("%Y/%m/%d %H:%M:%S +0000")}")
   end
 

data/lib/couchrest/more/extended_document.rb

@@ -1,11 +1,3 @@
-begin
-  # still required for Time parsing and pluralization in the validation
-  require 'extlib'
-rescue 
-  puts "CouchRest::ExtendedDocument still requires extlib (not for much longer). This is left out of the gemspec on purpose."
-  raise
-end
-
 require 'mime/types'
 require File.join(File.dirname(__FILE__), "property")
 require File.join(File.dirname(__FILE__), '..', 'mixins', 'extended_document_mixins')
@@ -22,6 +14,11 @@ module CouchRest
     
     def self.inherited(subklass)
       subklass.send(:include, CouchRest::Mixins::Properties)
+      subklass.class_eval <<-EOS, __FILE__, __LINE__
+        def self.inherited(subklass)
+          subklass.properties = self.properties.dup
+        end
+      EOS
     end
     
     # Accessors
@@ -205,8 +202,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,167 +25,152 @@
 # 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.
-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 #{sym}
-    @@#{sym}
-    end
-    RUBY
+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
-      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
- 
-          unless options[:instance_writer] == false
-            class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-    def #{sym}=(obj)
-    @@#{sym} = obj
+
+        def self.#{sym}
+          @@#{sym}
+        end
+
+        def #{sym}
+          @@#{sym}
+        end
+      RUBY
     end
-    RUBY
-          end
+  end unless Class.respond_to?(:cattr_reader)
+
+  # 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
+
+      unless options[:instance_writer] == false
+        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
+        RUBY
       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)
- 
-        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 unless Class.respond_to?(:cattr_writer)
+
+  # 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 unless Class.respond_to?(:cattr_accessor)
+  
+  # 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 extlib_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.dup : ivar
         end
+      RUBY
+      unless instance_reader == false
+        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{ivar}
+            self.class.#{ivar}
+          end
+        RUBY
       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
-          end
+  end unless Class.respond_to?(:extlib_inheritable_reader)
+
+  # 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 extlib_inheritable_writer(*ivars)
+    instance_writer = ivars.pop[: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
- 
-      # 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)
+      RUBY
+      unless instance_writer == false
+        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{ivar}=(obj) self.class.#{ivar} = obj end
+        RUBY
       end
     end
-  end
+  end unless Class.respond_to?(:extlib_inheritable_writer)
+
+  # 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 extlib_inheritable_accessor(*syms)
+    extlib_inheritable_reader(*syms)
+    extlib_inheritable_writer(*syms)
+  end unless Class.respond_to?(:extlib_inheritable_accessor)
 end
 
-Class.send(:include, CouchRest::ClassExtension)

data/lib/couchrest/validation/validation_errors.rb

@@ -60,7 +60,7 @@ module CouchRest
       cattr_writer :default_error_messages
 
       def self.default_error_message(key, field, *values)
-        field = Extlib::Inflection.humanize(field)
+        field = CouchRest.humanize(field)
         @@default_error_messages[key] % [field, *values].flatten
       end
 

data/lib/couchrest/validation/validators/format_validator.rb

@@ -64,7 +64,7 @@ module CouchRest
 
         error_message = @options[:message] || ValidationErrors.default_error_message(:invalid, field_name)
 
-        field = Extlib::Inflection.humanize(field_name)
+        field = CouchRest.humanize(field_name)
         error_message = error_message.call(field, value) if error_message.respond_to?(:call)
 
         add_error(target, error_message, field_name)

data/lib/couchrest/validation/validators/length_validator.rb

@@ -54,7 +54,7 @@ module CouchRest
 
         # XXX: HACK seems hacky to do this on every validation, probably should
         #      do this elsewhere?
-        field = Extlib::Inflection.humanize(field_name)
+        field = CouchRest.humanize(field_name)
         min = @range ? @range.min : @min
         max = @range ? @range.max : @max
         equal = @equal

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)
@@ -570,49 +554,6 @@ describe CouchRest::Database do
     end
   end
   
-  describe "MOVE existing document" do
-    before :each do
-      @r = @db.save_doc({'artist' => 'Zappa', 'title' => 'Muffin Man'})
-      @docid = 'tracks/zappa/muffin-man'
-      @doc = @db.get(@r['id'])
-    end
-    describe "to a new location" do
-      it "should work" do
-        @db.move_doc @doc, @docid
-        newdoc = @db.get(@docid)
-        newdoc['artist'].should == 'Zappa'
-        lambda {@db.get(@r['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-      it "should fail without an _id or _rev" do
-        lambda{@db.move({"not"=>"a real doc"})}.should raise_error(ArgumentError)
-        lambda{@db.move({"_id"=>"not a real doc"})}.should raise_error(ArgumentError)
-      end
-    end
-    describe "to an existing location" do
-      before :each 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)
-        lambda{@db.get(@r['id'])}.should_not raise_error
-      end
-      it "should succeed with a rev" do
-        @to_be_overwritten = @db.get(@docid)
-        @db.move_doc @doc, "#{@docid}?rev=#{@to_be_overwritten['_rev']}"
-        newdoc = @db.get(@docid)
-        newdoc['artist'].should == 'Zappa'
-        lambda {@db.get(@r['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-      it "should succeed given the doc to overwrite" do
-        @to_be_overwritten = @db.get(@docid)
-        @db.move_doc @doc, @to_be_overwritten
-        newdoc = @db.get(@docid)
-        newdoc['artist'].should == 'Zappa'
-        lambda {@db.get(@r['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-    end
-  end
-  
   
   it "should list documents" do
     5.times do

data/spec/couchrest/core/document_spec.rb

@@ -199,50 +199,6 @@ describe CouchRest::Document do
       end
     end
   end
-
-  describe "MOVE existing document" do
-    before :each do
-      @db = reset_test_db!
-      @resp = @db.save_doc({'key' => 'value'})
-      @docid = 'new-location'
-      @doc = @db.get(@resp['id'])
-    end
-    describe "to a new location" do
-      it "should work" do
-        @doc.move @docid
-        newdoc = @db.get(@docid)
-        newdoc['key'].should == 'value'
-        lambda {@db.get(@resp['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-      it "should fail without a database" do
-        lambda{CouchRest::Document.new({"not"=>"a real doc"}).move}.should raise_error(ArgumentError)
-        lambda{CouchRest::Document.new({"_id"=>"not a real doc"}).move}.should raise_error(ArgumentError)
-      end
-    end
-    describe "to an existing location" do
-      before :each 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)
-        lambda{@db.get(@resp['id'])}.should_not raise_error
-      end
-      it "should succeed with a rev" do
-        @to_be_overwritten = @db.get(@docid)
-        @doc.move "#{@docid}?rev=#{@to_be_overwritten['_rev']}"
-        newdoc = @db.get(@docid)
-        newdoc['key'].should == 'value'
-        lambda {@db.get(@resp['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-      it "should succeed given the doc to overwrite" do
-        @to_be_overwritten = @db.get(@docid)
-        @doc.move @to_be_overwritten
-        newdoc = @db.get(@docid)
-        newdoc['key'].should == 'value'
-        lambda {@db.get(@resp['id'])}.should raise_error(RestClient::ResourceNotFound)
-      end
-    end
-  end
 end
 
 describe "dealing with attachments" do

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_subclass_spec.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.join(FIXTURE_PATH, 'more', 'card')
+
+# add a default value
+Card.property :bg_color, :default => '#ccc'
+
+class BusinessCard < Card
+  property :extension_code
+  property :job_title
+end
+
+class DesignBusinessCard < BusinessCard
+  property :bg_color, :default => '#eee'
+end
+
+
+describe "Subclassing an ExtendedDocument" do
+  
+  before(:each) do
+    @card = BusinessCard.new
+  end
+  
+  it "shouldn't messup the parent's properties" do
+    Card.properties.should_not == BusinessCard.properties
+  end
+  
+  it "should share the same db default" do
+    @card.database.uri.should == Card.database.uri
+  end
+  
+  it "should share the same autovalidation details" do
+    @card.auto_validation.should be_true
+  end
+  
+  it "should have kept the validation details" do
+    @card.should_not be_valid
+  end
+  
+  it "should have added the new validation details" do
+    validated_fields = @card.class.validators.contexts[:default].map{|v| v.field_name}
+    validated_fields.should include(:extension_code) 
+    validated_fields.should include(:job_title)
+  end
+  
+  it "should inherit default property values" do
+    @card.bg_color.should == '#ccc'
+  end
+  
+  it "should be able to overwrite a default property" do
+    DesignBusinessCard.new.bg_color.should == '#eee'
+  end
+  
+end
+

data/spec/couchrest/more/extended_doc_view_spec.rb

@@ -190,6 +190,7 @@ describe "ExtendedDocument views" do
 
   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
@@ -203,4 +204,4 @@ describe "ExtendedDocument views" do
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattetti-couchrest
 version: !ruby/object:Gem::Version 
-  version: "0.21"
+  version: "0.22"
 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
@@ -140,10 +141,9 @@ files:
 - 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_subclass_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

data/spec/couchrest/support/class_spec.rb

@@ -1,59 +0,0 @@
-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