paulcarey-relaxdb 0.3.3 → 0.3.4

data/README.textile

@@ -1,5 +1,7 @@
 h3. What's New?
 
+* 2009-08-15
+** A few minor tweaks and patches push the version to 0.3.4, compatible with CouchDB 0.9.1.
 * 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 

data/Rakefile

@@ -4,7 +4,7 @@ require 'spec/rake/spectask'
 
 PLUGIN = "relaxdb"
 NAME = "relaxdb"
-GEM_VERSION = "0.3.3"
+GEM_VERSION = "0.3.4"
 AUTHOR = "Paul Carey"
 EMAIL = "paul.p.carey@gmail.com"
 HOMEPAGE = "http://github.com/paulcarey/relaxdb/"

data/lib/relaxdb/document.rb

@@ -24,7 +24,7 @@ module RelaxDB
     class_inheritable_accessor :__view_by_list__
     self.__view_by_list__ = []
     
-    class_inheritable_accessor :belongs_to_rels, :reder => true
+    class_inheritable_accessor :belongs_to_rels, :reader => true
     self.belongs_to_rels = {}
             
     def self.property(prop, opts={})
@@ -306,12 +306,13 @@ module RelaxDB
     alias_method :id, :to_param
     
     def set_timestamps
+      now = Time.now
       if new_document? && respond_to?(:created_at)
         # Don't override it if it's already been set
-        @created_at = Time.now if @created_at.nil?
+        @created_at = now if @created_at.nil?
       end
       
-      @updated_at = Time.now if respond_to?(:updated_at)
+      @updated_at = now if respond_to?(:updated_at)
     end
        
     def create_or_get_proxy(klass, relationship, opts=nil)
@@ -372,7 +373,7 @@ module RelaxDB
       @has_many_rels << relationship
       
       if RelaxDB.create_views?
-        target_class = opts[:class]
+        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      

data/lib/relaxdb/paginator.rb

@@ -50,19 +50,28 @@ module RelaxDB
     end
     
     def create_next(doc, view_keys)
-      next_key = view_keys.map { |a| a.is_a?(Symbol) ? doc.send(a) : a }
+      next_key = view_keys_to_vals doc, view_keys
       next_key = next_key.length == 1 ? next_key[0] : next_key
       next_key_docid = doc._id
       { :startkey => next_key, :startkey_docid => next_key_docid, :descending => @orig_paginate_params.descending }
     end
     
     def create_prev(doc, view_keys)
-      prev_key = view_keys.map { |a| a.is_a?(Symbol) ? doc.send(a) : a }
+      prev_key = view_keys_to_vals doc, view_keys
       prev_key = prev_key.length == 1 ? prev_key[0] : prev_key
       prev_key_docid = doc._id
       prev_params = { :startkey => prev_key, :startkey_docid => prev_key_docid, :descending => !@orig_paginate_params.descending }
     end
     
+    def view_keys_to_vals doc, view_keys
+      view_keys.map do |k|
+        if k.is_a?(Symbol) then doc.send(k)
+        elsif k.is_a?(Proc) then k.call(doc)
+        else k
+        end
+      end
+    end
+    
     def orig_offset(view_name)
       if @paginate_params.order_inverted?
         params = {:startkey => @orig_paginate_params.endkey, :descending => !@orig_paginate_params.descending}

data/lib/relaxdb/relaxdb.rb

@@ -114,6 +114,7 @@ module RelaxDB
     #
     # Examples:
     #   RelaxDB.load "foo", :conflicts => true
+    #   RelaxDB.load "foo", :revs => true
     #   RelaxDB.load ["foo", "bar"]
     #
     def load(ids, atts={})

data/lib/relaxdb/views.rb

@@ -25,7 +25,7 @@ module RelaxDB
       map = <<-QUERY
       function(doc) {
         var class_match = #{kls_check kls}
-        if(class_match && #{prop_check}) {
+        if (class_match && #{prop_check}) {
           emit(#{key}, doc);
         }
       }
@@ -39,7 +39,7 @@ module RelaxDB
     def self.has_n(client_class, relationship, target_class, relationship_to_client)
       map = <<-QUERY
         function(doc) {
-          if(doc.relaxdb_class == "#{target_class}" && doc.#{relationship_to_client}_id)
+          if (doc.relaxdb_class == "#{target_class}" && doc.#{relationship_to_client}_id)
             emit(doc.#{relationship_to_client}_id, doc);
         }
       QUERY
@@ -51,7 +51,7 @@ module RelaxDB
     def self.references_many(client_class, relationship, target_class, peers)
       map = <<-QUERY
         function(doc) {
-          if(doc.relaxdb_class == "#{target_class}" && doc.#{peers}) {
+          if (doc.relaxdb_class == "#{target_class}" && doc.#{peers}) {
             var i;
             for(i = 0; i < doc.#{peers}.length; i++) {
               emit(doc.#{peers}[i], doc);

data/spec/belongs_to_spec.rb

@@ -8,7 +8,7 @@ describe RelaxDB::BelongsToProxy do
   end
 
   describe "belongs_to" do
-    
+  
     it "should return nil when accessed before assignment" do
       r = Rating.new
       r.photo.should == nil

data/spec/document_spec.rb

@@ -165,11 +165,19 @@ describe RelaxDB::Document do
 
   describe "user defined property writer" do
     
-    it "should not be used" do
+    it "should not be used to modify state" do
       o = BespokeWriter.new(:val => 101).save
       o = RelaxDB.load o._id
       o.val.should == 81
     end
+    
+    it "may be used if effectively idempotent" do
+      o = BespokeWriter.new(:tt => "2009/04/01").save
+      RelaxDB.reload(o).tt.should == Time.parse("2009/04/01")
+      
+      o = BespokeWriter.new(:tt => Time.now).save
+      RelaxDB.reload(o).tt.should be_close(Time.now, 1)
+    end
         
   end
   
@@ -254,8 +262,7 @@ describe RelaxDB::Document do
     end
   
     it "should return an empty array when no instances exist" do
-      Atom.all.should be_an_instance_of(Array)
-      Atom.all.should be_empty
+      Atom.all.should == []
     end
     
   end

data/spec/has_many_spec.rb

@@ -8,6 +8,35 @@ describe RelaxDB::HasManyProxy do
   end
 
   describe "has_many" do
+
+
+    describe "target_class in the generated view" do
+      it "should infer the class name from the relationship if not supplied" do
+        view = mock(:view).as_null_object
+        RelaxDB::ViewCreator.should_receive(:has_n).with(
+          "",           # client_class
+          :foo_bars,    # relationship          
+          "FooBar",     # target_class
+          ""            # relationship_to_client
+        ).and_return view
+        klass = Class.new(RelaxDB::Document) do
+          has_many :foo_bars
+        end
+      end 
+
+      it "should use the class name if supplied" do
+        view = mock(:view).as_null_object
+        RelaxDB::ViewCreator.should_receive(:has_n).with(
+          "",         # client_class
+          :foo_bars,  # relationship          
+          "Bar",     # target_class
+          ""          # relationship_to_client
+        ).and_return view
+        klass = Class.new(RelaxDB::Document) do
+          has_many :foo_bars, :class => "Bar"
+        end
+      end 
+    end    
     
     it "should be considered enumerable" do
       u = User.new.save

data/spec/paginate_spec.rb

@@ -346,6 +346,15 @@ describe "RelaxDB Pagination" do
       navigate_b_series query
     end
     
+    it "should pass using lambdas as view_keys" do
+      query = lambda do |page_params|
+        RelaxDB.paginate_view "Letter_by_letter_and_number", :page_params => page_params,
+          :startkey => ["b"], :endkey => ["b", {}], :limit => 2, 
+          :attributes => ["b", lambda { |l| l.number } ]
+      end
+      navigate_b_series query
+    end    
+    
   end
     
 end

data/spec/relaxdb_spec.rb

@@ -217,8 +217,9 @@ describe RelaxDB do
       ns = (0...100).map { rand(1_000_000_000).to_s }
       objs = ns.map { |n| Primitives.new :_id => n }
       RelaxDB.bulk_save! *objs
+      ns = ns.reverse
       objs = RelaxDB.load! ns
-      (0...100).each do |i|
+      99.downto(0) do |i|
         ns[i].should == objs[i]._id
       end
     end
@@ -249,7 +250,7 @@ describe RelaxDB do
     it "should request a view and return an array" do
       RelaxDB::DesignDocument.get(RelaxDB.dd).add_view("simple", "map", map_func).save
       data = RelaxDB.view("simple")
-      data.should be_instance_of(Array)
+      data.should == []
     end
 
     it "may accept query params" do

data/spec/spec_models.rb

@@ -35,7 +35,9 @@ end
 
 class BespokeWriter < RelaxDB::Document
   property :val
+  property :tt
   def val=(v); @val = v - 10; end
+  def tt=(t); @tt = t.is_a?(String) ? Time.parse(t) : t; end
 end
 
 class Invite < RelaxDB::Document

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paulcarey-relaxdb
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Paul Carey
@@ -9,7 +9,7 @@ autorequire: relaxdb
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 -07:00
+date: 2009-08-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,6 +107,7 @@ files:
 - spec/view_spec.rb
 has_rdoc: false
 homepage: http://github.com/paulcarey/relaxdb/
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: RelaxDB provides a simple interface to CouchDB