relaxdb 0.3.5 → 0.5

data/README.textile

@@ -1,16 +1,15 @@
 h3. What's New?
 
-* 2009-08-15
-** A few tweaks, patches and fixes push the version to 0.3.5, compatible with CouchDB 0.9.1 and the 0.10 branch.
-** The Rails error_messages_for helper is now supported. Thanks to "Balint Erdi":http://github.com/balinterdi.
-* 2009-05-27
-** Added minimal support for data migrations. Although CouchDB's nature removes the necessity for migrations, certain knowledge that all objects possess a particular property can simplify client logic. This desire for simplification is the rationale behind this change.
-* 2009-04-19 
-** Defaults to taf2-curb, falling back to Net/HTTP if it taf2-curb can't be loaded. Thanks to "Fred Cheung":http://www.spacevatican.org/2009/4/13/fun-with-ruby-http-clients.
-** For those interested in using RelaxDB with an ETag based cache, "look here":http://github.com/fcheung/relaxdb/commit/1d9acfd5f6b3c23da0d275252b6a6e064865440e
-
-* 2009-03-31
-** RelaxDB 0.3 released - compatible with CouchDB 0.9. 
+* 2010-04-10
+** RelaxDB 0.4 released. Supports Ruby 1.9.1 and CouchDB 0.11.0.
+** Auto-generated views no longer emit the document as a value by default 
+** Erlang view shorthand supported e.g. _sum and _count
+** Added single query pagination
+** Performance improvements
+** Time.to_json fix. Thanks to "Karmi":http://github.com/karmi
+** *Note*: This release includes a number of breaking changes. Please see the "release notes":http://github.com/paulcarey/relaxdb/blob/master/RELEASE_NOTES.textile for upgrading notes.
+
+For those interested in using RelaxDB with an ETag based cache, please see "Fred Cheung's work":http://github.com/fcheung/relaxdb/commit/1d9acfd5f6b3c23da0d275252b6a6e064865440e
 
 h2. Overview
 
@@ -22,8 +21,6 @@ A basic merb plugin, "merb_relaxdb":http://github.com/paulcarey/merb_relaxdb/tre
 
 For more complete documentation take a look at docs/spec_results.html and the corresponding specs.
 
-*Note*: While RelaxDB 0.3 is explicitly compatible with CouchDB 0.9, HEAD typically tracks CouchDB HEAD.
-
 h2. Details
 
 h3. Getting started
@@ -36,7 +33,9 @@ h3. Getting started
   RelaxDB.configure :host => "localhost", :port => 5984, :design_doc => "app"
   RelaxDB.use_db "relaxdb_scratch"
   
-  RelaxDB.enable_view_creation # creates views when class definition is executed
+  RelaxDB.enable_view_creation  # creates views when class definition is executed
+  
+  RelaxDB::View.design_doc.save # save views to CouchDB after executing class definitions
 </code>
 </pre>
 
@@ -65,8 +64,9 @@ class Invite < RelaxDB::Document
   property :sender_name,
    :derived => [:sender, lambda { |p, o| o.sender.name } ]
   
-  view_by :sender_name
-  view_by :sender_id
+  view_by :sender_name        # Emits 1 as the map value
+  view_docs_by :sender_id     # Emits the doc as the map value
+  
   view_by :recipient_id, :created_at, :descending => true
   
   def on_update_conflict
@@ -95,10 +95,11 @@ i.save!
 il = RelaxDB.load i._id
 puts i == il # true
 
-ir = Invite.by_sender_name "sofa"
+ir = Invite.by_sender_name "sofa" 
 puts i == ir # true
 
-ix = Invite.by_sender_name(:key => "sofa").first
+ix_ids = Invite.by_sender_name :key => "sofa"
+ix = ix_ids.load!.first
 puts i == ix # true
 
 # Denormalization
@@ -162,12 +163,9 @@ h3. Creating views by hand
       emit(doc.state, doc);
   }
 
+  // Uses the CouchDB builtin to invoke an Erlang reduce fun
   function Invites_by_state-reduce(keys, values, rereduce) {
-    if (rereduce) {
-      return sum(values);
-    } else {
-      return values.length;
-    }
+    _count
   }
   $
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'spec/rake/spectask'
 
 PLUGIN = "relaxdb"
 NAME = "relaxdb"
-GEM_VERSION = "0.3.5"
+GEM_VERSION = "0.5"
 AUTHOR = "Paul Carey"
 EMAIL = "paul.p.carey@gmail.com"
 HOMEPAGE = "http://github.com/paulcarey/relaxdb/"
@@ -37,7 +37,7 @@ end
 
 desc "Install"
 task :install => [:package] do
-  sh %{sudo gem install --local pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
+  sh %{gem install --no-rdoc --no-ri --local pkg/#{NAME}-#{GEM_VERSION}}
 end
 
 desc "Run specs"
@@ -51,11 +51,6 @@ Spec::Rake::SpecTask.new('spec:html') do |t|
   t.spec_opts = ["--format", "html:docs/spec_results.html"]
 end
 
-desc "Supports atomic bulk save"
-task :atomic_bulk_save_support do |t|
-  require 'lib/more/atomic_bulk_save_support.rb'
-end
-
 desc "Create base spec db"
 task :create_base_db do
   require 'spec/spec_helper'

data/docs/spec_results.html

@@ -183,7 +183,7 @@ a {
 </div>
 <div class="example_group">
   <dl>
-  <dt id="example_group_2">RelaxDB::BelongsToProxy belongs_to</dt>
+  <dt id="example_group_2">RelaxDB::BelongsToProxy references</dt>
     <script type="text/javascript">moveProgressBar('0.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should return nil when accessed before assignment</span></dd>
     <script type="text/javascript">moveProgressBar('0.9');</script>
@@ -208,7 +208,7 @@ a {
 </div>
 <div class="example_group">
   <dl>
-  <dt id="example_group_3">RelaxDB::BelongsToProxy belongs_to validator</dt>
+  <dt id="example_group_3">RelaxDB::BelongsToProxy references validator</dt>
     <script type="text/javascript">moveProgressBar('5.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be passed the _id and object</span></dd>
     <script type="text/javascript">moveProgressBar('5.5');</script>
@@ -620,7 +620,7 @@ a {
   <dl>
   <dt id="example_group_42">RelaxDB::HasManyProxy has_many#delete</dt>
     <script type="text/javascript">moveProgressBar('51.8');</script>
-    <dd class="spec passed"><span class="passed_spec_name">should nullify the belongs_to relationship</span></dd>
+    <dd class="spec passed"><span class="passed_spec_name">should nullify the references relationship</span></dd>
   </dl>
 </div>
 <div class="example_group">
@@ -988,12 +988,12 @@ a {
 </div>
 <div class="example_group">
   <dl>
-  <dt id="example_group_80">view_by</dt>
+  <dt id="example_group_80">view_docs_by</dt>
   </dl>
 </div>
 <div class="example_group">
   <dl>
-  <dt id="example_group_81">view_by view_by</dt>
+  <dt id="example_group_81">view_docs_by view_docs_by</dt>
     <script type="text/javascript">moveProgressBar('93.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should create corresponding views</span></dd>
     <script type="text/javascript">moveProgressBar('93.9');</script>

data/lib/more/grapher.rb

@@ -30,7 +30,7 @@ module RelaxDB
         
         dot << %Q%#{doc._id} [ label ="#{atts}"];\n%
         
-        doc.class.belongs_to_rels.each do |relationship, opts|
+        doc.class.references_rels.each do |relationship, opts|
           id = doc.instance_variable_get("@#{relationship}_id".to_sym)
           dot << %Q%#{id} -> #{doc._id} [ label = "#{relationship}"];\n% if id
         end

data/lib/relaxdb.rb

@@ -6,7 +6,7 @@ require 'uuid'
 require 'cgi'
 require 'net/http'
 require 'logger'
-require 'parsedate'
+require 'parsedate' if RUBY_VERSION.to_f < 1.9
 require 'pp'
 require 'tempfile'
 
@@ -24,20 +24,18 @@ rescue LoadError
 end
 
 require 'relaxdb/all_delegator'
-require 'relaxdb/belongs_to_proxy'
 require 'relaxdb/design_doc'
 require 'relaxdb/document'
 require 'relaxdb/extlib'
-require 'relaxdb/has_many_proxy'
-require 'relaxdb/has_one_proxy'
 require 'relaxdb/migration'
 require 'relaxdb/paginate_params'
 require 'relaxdb/paginator'
 require 'relaxdb/query'
-require 'relaxdb/references_many_proxy'
+require 'relaxdb/references_proxy'
 require 'relaxdb/relaxdb'
 require 'relaxdb/server'
 require 'relaxdb/uuid_generator'
+require 'relaxdb/view_by_delegator'
 require 'relaxdb/view_object'
 require 'relaxdb/view_result'
 require 'relaxdb/view_uploader'

data/lib/relaxdb/all_delegator.rb

@@ -15,10 +15,21 @@ module RelaxDB
     end
     
     def __getobj__
-      unless @objs
-        @objs = RelaxDB.rf_view "#{@class_name}_all", @params
+      unless @ids
+        params = {:raw => true}.merge @params
+        result = RelaxDB.rf_view "#{@class_name}_all", params
+        @ids = RelaxDB.ids_from_view result
       end
-      @objs
+      @ids
+    end
+    
+    def __setobj__ obj
+      # Intentionally empty
+    end
+    
+    def load!
+      __getobj__
+      @objs = RelaxDB.load! @ids
     end
 
     def size
@@ -26,17 +37,12 @@ module RelaxDB
       size || 0
     end
     
-    # TODO: destroy in a bulk_save if feasible
     def destroy!
-      __getobj__
-      @objs.each do |o| 
-        # A reload is required for deleting objects with a self referential references_many relationship
-        # This makes all.destroy! very slow. Change if needed
-        # obj = RelaxDB.load(o._id)
-        # obj.destroy!
-        
-        o.destroy!
-      end
+      load!
+      @objs.each { |o| o.data["_deleted"] = true }
+      # Direct post rather than bulk save as we don't want validators to be run
+      resp = RelaxDB.db.post("_bulk_docs", {"docs" => @objs}.to_json)
+      JSON.parse resp.body
     end    
             
   end

data/lib/relaxdb/document.rb

@@ -8,41 +8,57 @@ module RelaxDB
     attr_accessor :errors
     
     # A call issued to save_all will save this object and the
-    # contents of the save_list. This allows secondary object to
+    # contents of the save_list. This allows secondary objects to
     # be saved at the same time as this object.
     attr_accessor :save_list
     
     # Attribute symbols added to this list won't be validated on save
     attr_accessor :validation_skip_list
     
+    # Not part of the public API - should only be used by clients with caution.
+    # The data keys are Strings as this is what JSON.parse gives us.
+    attr_accessor :data
+    
     class_inheritable_accessor :properties, :reader => true
     self.properties = []
 
     class_inheritable_accessor :derived_prop_writers
     self.derived_prop_writers = {}
     
+    class_inheritable_accessor :__view_docs_by_list__
+    self.__view_docs_by_list__ = []
+    
     class_inheritable_accessor :__view_by_list__
-    self.__view_by_list__ = []
+    self.__view_by_list__ = []    
     
-    class_inheritable_accessor :belongs_to_rels, :reader => true
-    self.belongs_to_rels = {}
+    class_inheritable_accessor :references_rels, :reader => true
+    self.references_rels = {}    
             
     def self.property(prop, opts={})
       properties << prop
-
-      define_method(prop) do
-        instance_variable_get("@#{prop}".to_sym)        
-      end
+      
+      if prop.to_s =~ /_at$|_on$|_date$|_time$/ 
+        define_method(prop) do                
+          val = @data[prop.to_s]
+          Time.parse(val).utc rescue val
+        end
+      else
+        define_method(prop) do                
+          @data[prop.to_s]
+        end
+      end        
 
       define_method("#{prop}=") do |val|
-        instance_variable_set("@#{prop}".to_sym, val)
+        @data[prop.to_s] = val
       end
       
       if opts[:default]
-        define_method("set_default_#{prop}") do
-          default = opts[:default]
-          default = default.is_a?(Proc) ? default.call : default
-          instance_variable_set("@#{prop}".to_sym, default)
+        define_method("__set_default_#{prop}__") do
+          if @data[prop.to_s].nil?
+            default = opts[:default]
+            val = default.is_a?(Proc) ? default.call : default
+            @data[prop.to_s] = val
+          end
         end
       end
       
@@ -69,11 +85,15 @@ module RelaxDB
         v.arity == 1 ?
           define_method(method_name) { |att_val| v.call(att_val) } :
           define_method(method_name) { |att_val| v.call(att_val, self) }
-      elsif instance_methods.include? "validator_#{v}"
-        define_method(method_name) { |att_val| send("validator_#{v}", att_val, self) }
       else
-        define_method(method_name) { |att_val| send(v, att_val) }
-      end          
+        v_meths = instance_methods.select { |m| m =~ /validator_/ }
+        v_meths.map! { |m| m.to_sym } if RUBY_VERSION.to_f < 1.9
+        if v_meths.include? "validator_#{v}".to_sym
+          define_method(method_name) { |att_val| send("validator_#{v}", att_val, self) }
+        else
+          define_method(method_name) { |att_val| send(v, att_val) }
+        end          
+      end
     end
     
     def self.create_validation_msg(att, validation_msg)
@@ -82,7 +102,7 @@ module RelaxDB
           define_method("#{att}_validation_msg") { |att_val| validation_msg.call(att_val) } :
           define_method("#{att}_validation_msg") { |att_val| validation_msg.call(att_val, self) } 
       else  
-        define_method("#{att}_validation_msg") { validation_msg } 
+        define_method("#{att}_validation_msg") { |att_val| validation_msg } 
       end
     end
     
@@ -105,62 +125,64 @@ module RelaxDB
       if writers 
         writers.each do |prop, writer|
           current_val = send(prop)
-          begin
+          # begin
             send("#{prop}=", writer.call(current_val, self)) 
-          rescue => e
-            RelaxDB.logger.error "Deriving #{prop} from #{source} raised #{e}"
-          end
+          # rescue => e
+          #   RelaxDB.logger.error "Deriving #{prop} from #{source} raised #{e}"
+          # end
         end
       end
     end
     
-    def initialize(hash={})
-      unless hash["_id"]
-        self._id = UuidGenerator.uuid 
-      end
-      
+    def initialize(hash={})      
       @errors = Errors.new
       @save_list = []
       @validation_skip_list = []
-
-      # Set default properties if this object isn't being loaded from CouchDB
-      unless hash["_rev"]
+      
+      # hash.dup because assigning references properties and defaults both 
+      # modify the internal representation - @data. This messes with the 
+      # iterator below that assigns vals to @data.
+      params = hash.dup
+      
+      # If there's no rev, it's a new document
+      if hash["_rev"].nil?
+        # Clients may use symbols as keys so convert all to strings first. 
+        @data = hash.map { |k,v| [k.to_s, v] }.to_hash
+      else
+        @data = hash
+      end
+      
+      unless @data["_id"]
+        @data["_id"] = UuidGenerator.uuid
+      end      
+      
+      # It's a new doc, set default properties. We only do this after ensuring
+      # this obj first has an _id.
+      unless @data["_rev"]
+        default_methods = methods.select { |m| m =~ /__set_default/ }
+        default_methods.map! { |m| m.to_sym } if RUBY_VERSION.to_f < 1.9
         properties.each do |prop|
-         if methods.include?("set_default_#{prop}")
-           send("set_default_#{prop}")
-         end
+          if default_methods.include? "__set_default_#{prop}__".to_sym
+            send("__set_default_#{prop}__")
+          end
         end
-      end
-            
-      @set_derived_props = hash["_rev"] ? false : true
-      set_attributes(hash)
-      @set_derived_props = true
-    end
-    
-    def set_attributes(data)
-      data.each do |key, val|
-        # Only set instance variables on creation - object references are resolved on demand
-
-        # If the variable name ends in _at, _on or _date try to convert it to a Time
-        if [/_at$/, /_on$/, /_date$/, /_time$/].inject(nil) { |i, r| i ||= (key =~ r) }
-            val = Time.parse(val).utc rescue val
+        
+        params.each do |key, val|
+          send("#{key}=".to_sym, val)
         end
         
-        # Ignore param keys that don't have a corresponding writer
-        # This allows us to comfortably accept a hash containing superflous data 
-        # such as a params hash in a controller 
-        send("#{key}=".to_sym, val) if methods.include? "#{key}="
+        @data["relaxdb_class"] = self.class.name        
       end
-    end  
-            
+    end
+    
     def inspect
       s = "#<#{self.class}:#{self.object_id}"
       properties.each do |prop|
-        prop_val = instance_variable_get("@#{prop}".to_sym)
+        prop_val = @data[prop.to_s]
         s << ", #{prop}: #{prop_val.inspect}" if prop_val
       end
-      self.class.belongs_to_rels.each do |relationship, opts|
-        id = instance_variable_get("@#{relationship}_id".to_sym)
+      self.class.references_rels.each do |relationship, opts|
+        id = @data["#{relationship}_id"]
         s << ", #{relationship}_id: #{id}" if id
       end
       s << ", errors: #{errors.inspect}" unless errors.empty?
@@ -170,19 +192,12 @@ module RelaxDB
     
     alias_method :to_s, :inspect
             
-    def to_json
-      data = {}
-      self.class.belongs_to_rels.each do |relationship, opts|
-        id = instance_variable_get("@#{relationship}_id".to_sym)
-        data["#{relationship}_id"] = id if id
-      end
-      properties.each do |prop|
-        prop_val = instance_variable_get("@#{prop}".to_sym)
-        data["#{prop}"] = prop_val if prop_val
-      end
-      data["errors"] = errors unless errors.empty?
-      data["relaxdb_class"] = self.class.name
-      data.to_json      
+    def to_json      
+      ref_rels = self.class.references_rels.map { |k, v| k.to_s }
+      @data.delete_if { |k,v| ref_rels.include? k }      
+      
+      @data["errors"] = errors unless errors.empty?
+      @data.to_json      
     end
             
     # Not yet sure of final implemention for hooks - may lean more towards DM than AR
@@ -251,18 +266,20 @@ module RelaxDB
             
     def validates?
       props = properties - validation_skip_list
-      prop_vals = props.map { |prop| instance_variable_get("@#{prop}") }
+      prop_vals = props.map { |prop| @data[prop.to_s] }
       
-      rels = self.class.belongs_to_rels.keys - validation_skip_list
-      rel_vals = rels.map { |rel| instance_variable_get("@#{rel}_id") }
+      rels = self.class.references_rels.keys - validation_skip_list
+      rel_vals = rels.map { |rel| @data["#{rel}_id"] }
       
       att_names = props + rels
       att_vals =  prop_vals + rel_vals
       
-      total_success = true      
+      total_success = true
+      validate_methods = methods.select { |m| m =~ /validate_/ }
+      validate_methods.map! { |m| m.to_sym } if RUBY_VERSION.to_f < 1.9
       att_names.each_index do |i|
         att_name, att_val = att_names[i], att_vals[i]
-        if methods.include? "validate_#{att_name}"
+        if validate_methods.include? "validate_#{att_name}".to_sym
           total_success &= validate_att(att_name, att_val)
         end
       end
@@ -280,7 +297,9 @@ module RelaxDB
       end
 
       unless success
-        if methods.include? "#{att_name}_validation_msg"
+        v_msg_meths = methods.select { |m | m =~ /_validation_msg/ }
+        v_msg_meths.map! { |m| m.to_sym } if RUBY_VERSION.to_f < 1.9
+        if v_msg_meths.include? "#{att_name}_validation_msg".to_sym
           begin
             @errors[att_name] = send("#{att_name}_validation_msg", att_val)
           rescue => e
@@ -296,7 +315,7 @@ module RelaxDB
     end
             
     def new_document?
-      @_rev.nil?
+      self._rev.nil?
     end
     alias_method :new_record?, :new_document?
     alias_method :unsaved?, :new_document?
@@ -310,10 +329,10 @@ module RelaxDB
       now = Time.now
       if new_document? && respond_to?(:created_at)
         # Don't override it if it's already been set
-        @created_at = now if @created_at.nil?
+        @data["created_at"] = now if @data["created_at"].nil?
       end
       
-      @updated_at = now if respond_to?(:updated_at)
+      @data["updated_at"] = now if respond_to?(:updated_at)
     end
        
     def create_or_get_proxy(klass, relationship, opts=nil)
@@ -330,117 +349,28 @@ module RelaxDB
     def ==(other)
       other && _id == other._id
     end
-   
-    # If you're using this method, read the specs and make sure you understand
-    # how it can be used and how it shouldn't be used
-    def self.references_many(relationship, opts={})
-      # Treat the representation as a standard property 
-      properties << relationship
-      
-      # Keep track of the relationship so peers can be disassociated on destroy
-      @references_many_rels ||= []
-      @references_many_rels << relationship
-     
-      id_arr_sym = "@#{relationship}".to_sym
-      
-      if RelaxDB.create_views?
-        target_class = opts[:class]
-        relationship_as_viewed_by_target = opts[:known_as].to_s
-        ViewCreator.references_many(self.name, relationship, target_class, relationship_as_viewed_by_target).save
-      end            
-     
-      define_method(relationship) do
-        instance_variable_set(id_arr_sym, []) unless instance_variable_defined? id_arr_sym
-        create_or_get_proxy(ReferencesManyProxy, relationship, opts)
-      end
-      
-      define_method("#{relationship}_ids") do
-        instance_variable_set(id_arr_sym, []) unless instance_variable_defined? id_arr_sym
-        instance_variable_get(id_arr_sym)
-      end
-    
-      define_method("#{relationship}=") do |val|
-        # Don't invoke this method unless you know what you're doing
-        instance_variable_set(id_arr_sym, val)
-      end           
-    end
-   
-    def self.references_many_rels
-      @references_many_rels ||= []
-    end
-   
-    def self.has_many(relationship, opts={})
-      @has_many_rels ||= []
-      @has_many_rels << relationship
-      
-      if RelaxDB.create_views?
-        target_class = opts[:class] || relationship.to_s.singularize.camel_case
-        relationship_as_viewed_by_target = (opts[:known_as] || self.name.snake_case).to_s
-        ViewCreator.has_n(self.name, relationship, target_class, relationship_as_viewed_by_target).save
-      end      
-      
-      define_method(relationship) do
-        create_or_get_proxy(HasManyProxy, relationship, opts)
-      end
-      
-      define_method("#{relationship}=") do |children|
-        create_or_get_proxy(HasManyProxy, relationship, opts).children = children
-        write_derived_props(relationship) if @set_derived_props
-        children
-      end      
-    end
-
-    def self.has_many_rels
-      # Don't force clients to check its instantiated
-      @has_many_rels ||= []
-    end
-            
-    def self.has_one(relationship)
-      @has_one_rels ||= []
-      @has_one_rels << relationship
-      
-      if RelaxDB.create_views?
-        target_class = relationship.to_s.camel_case      
-        relationship_as_viewed_by_target = self.name.snake_case      
-        ViewCreator.has_n(self.name, relationship, target_class, relationship_as_viewed_by_target).save
-      end
-      
-      define_method(relationship) do      
-        create_or_get_proxy(HasOneProxy, relationship).target
-      end
-      
-      define_method("#{relationship}=") do |new_target|
-        create_or_get_proxy(HasOneProxy, relationship).target = new_target
-        write_derived_props(relationship) if @set_derived_props
-        new_target
-      end
-    end
-    
-    def self.has_one_rels
-      @has_one_rels ||= []      
-    end
-            
-    def self.belongs_to(relationship, opts={})
-      belongs_to_rels[relationship] = opts
+               
+    def self.references(relationship, opts={})
+      references_rels[relationship] = opts
 
       define_method(relationship) do
-        create_or_get_proxy(BelongsToProxy, relationship).target
+        create_or_get_proxy(ReferencesProxy, relationship).target
       end
       
       define_method("#{relationship}=") do |new_target|
-        create_or_get_proxy(BelongsToProxy, relationship).target = new_target
-        write_derived_props(relationship) if @set_derived_props
+        create_or_get_proxy(ReferencesProxy, relationship).target = new_target
+        write_derived_props(relationship)
       end
       
       # Allows all writers to be invoked from the hash passed to initialize 
       define_method("#{relationship}_id=") do |id|
-        instance_variable_set("@#{relationship}_id".to_sym, id)
-        write_derived_props(relationship) if @set_derived_props
+        @data["#{relationship}_id"] = id
+        write_derived_props(relationship)
         id
       end
 
       define_method("#{relationship}_id") do
-        instance_variable_get("@#{relationship}_id")
+        @data["#{relationship}_id"]
       end
       
       create_validator(relationship, opts[:validator]) if opts[:validator]
@@ -449,39 +379,11 @@ module RelaxDB
       create_validation_msg(relationship, opts[:validation_msg]) if opts[:validation_msg]
     end
   
-    class << self
-      alias_method :references, :belongs_to
-    end
-    
-    self.belongs_to_rels = {}
-    
-    def self.all_relationships
-      belongs_to_rels + has_one_rels + has_many_rels + references_many_rels
-    end
-        
     def self.all params = {}
       AllDelegator.new self.name, params
     end
                     
-    # destroy! nullifies all relationships with peers and children before deleting 
-    # itself in CouchDB
-    # The nullification and deletion are not performed in a transaction
-    #
-    # TODO: Current implemention may be inappropriate - causing CouchDB to try to JSON
-    # encode undefined. Ensure nil is serialized? See has_many_spec#should nullify its child relationships
     def destroy!
-      self.class.references_many_rels.each do |rel|
-        send(rel).clear
-      end
-      
-      self.class.has_many_rels.each do |rel|
-        send(rel).clear
-      end
-      
-      self.class.has_one_rels.each do |rel|
-        send("#{rel}=".to_sym, nil)
-      end
-      
       # Implicitly prevent the object from being resaved by failing to update its revision
       RelaxDB.db.delete("#{_id}?rev=#{_rev}")
       self
@@ -523,15 +425,15 @@ module RelaxDB
     end
                     
     #
-    # Creates the corresponding view and stores it in CouchDB
+    # Creates the corresponding view, emitting the doc as the val
     # Adds by_ and paginate_by_ methods to the class
     #
-    def self.view_by *atts
+    def self.view_docs_by *atts
       opts = atts.last.is_a?(Hash) ? atts.pop : {}
-      __view_by_list__ << atts
+      __view_docs_by_list__ << atts
       
       if RelaxDB.create_views?
-        ViewCreator.by_att_list([self.name], *atts).save
+        ViewCreator.docs_by_att_list([self.name], *atts).add_to_design_doc
       end
       
       by_name = "by_#{atts.join "_and_"}"
@@ -539,11 +441,11 @@ module RelaxDB
         define_method by_name do |*params|
           view_name = "#{self.name}_#{by_name}"
           if params.empty?
-            res = RelaxDB.rf_view view_name, opts
+            RelaxDB.rf_view view_name, opts
           elsif params[0].is_a? Hash
-            res = RelaxDB.rf_view view_name, opts.merge(params[0])
+            RelaxDB.rf_view view_name, opts.merge(params[0])
           else
-            res = RelaxDB.rf_view(view_name, :key => params[0]).first
+            RelaxDB.rf_view(view_name, :key => params[0]).first
           end            
         end
       end
@@ -559,12 +461,38 @@ module RelaxDB
       end
     end
     
+    #
+    # Creates the corresponding view, emitting 1 as the val
+    # Adds a by_ method to this class, but does not add a 
+    # paginate method.
+    #
+    def self.view_by *atts
+      opts = atts.last.is_a?(Hash) ? atts.pop : {}
+      opts = opts.merge :reduce => false 
+      __view_by_list__ << atts
+      
+      if RelaxDB.create_views?
+        ViewCreator.by_att_list([self.name], *atts).add_to_design_doc
+      end
+      
+      by_name = "by_#{atts.join "_and_"}"
+      meta_class.instance_eval do
+        define_method by_name do |*params|
+          view_name = "#{self.name}_#{by_name}"
+          if params.empty?
+            ViewByDelegator.new(view_name, opts)
+          elsif params[0].is_a? Hash
+            ViewByDelegator.new(view_name, opts.merge(params[0]))
+          else
+            ViewByDelegator.new(view_name, opts.merge(:key => params[0])).load!.first
+          end            
+        end
+      end      
+    end
+        
     # Create a view allowing all instances of a particular class to be retreived    
     def self.create_all_by_class_view
-      if RelaxDB.create_views?        
-        view = ViewCreator.all
-        view.save unless view.exists?
-      end        
+      ViewCreator.all.add_to_design_doc if RelaxDB.create_views?        
     end          
     
     def self.inherited subclass
@@ -588,10 +516,14 @@ module RelaxDB
       @hierarchy.uniq!
 
       if RelaxDB.create_views?
-        ViewCreator.all(@hierarchy).save
-        __view_by_list__.each do |atts|
-          ViewCreator.by_att_list(@hierarchy, *atts).save
+        ViewCreator.all(@hierarchy).add_to_design_doc
+        __view_docs_by_list__.each do |atts|
+          ViewCreator.docs_by_att_list(@hierarchy, *atts).add_to_design_doc
         end
+        
+        __view_by_list__.each do |atts|
+          ViewCreator.by_att_list(@hierarchy, *atts).add_to_design_doc
+        end        
       end
     end