relaxdb 0.5 → 0.5.1

data/README.textile

@@ -1,5 +1,8 @@
 h3. What's New?
 
+* 2010-05-04
+** RelaxDB 0.5 released. This is a leaner version of RelaxDB with significant performance improvements and breaking changes. See the "release notes":http://github.com/paulcarey/relaxdb/blob/master/RELEASE_NOTES.textile for upgrading notes.
+
 * 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 

data/Rakefile

@@ -22,9 +22,8 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   
-  s.add_dependency "extlib", ">=0.9.4"
-  s.add_dependency "json"
-  s.add_dependency "uuid"
+  s.add_dependency "extlib", "~> 0.9.4"
+  s.add_dependency "json", "~> 1.4"
   
   s.require_path = 'lib'
   s.autorequire = PLUGIN

data/lib/relaxdb.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'extlib'
 require 'json'
-require 'uuid'
 
 require 'cgi'
 require 'net/http'

data/lib/relaxdb/document.rb

@@ -125,11 +125,11 @@ 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
@@ -192,7 +192,7 @@ module RelaxDB
     
     alias_method :to_s, :inspect
             
-    def to_json      
+    def to_json(*args)      
       ref_rels = self.class.references_rels.map { |k, v| k.to_s }
       @data.delete_if { |k,v| ref_rels.include? k }      
       

data/lib/relaxdb/extlib.rb

@@ -16,7 +16,7 @@ class Time
   # Ensure that all Times are stored as UTC
   # Times in the following format may be passed directly to
   # Date.new in a JavaScript runtime
-  def to_json(options={})
+  def to_json(*args)
     utc
     %Q("#{strftime "%Y/%m/%d %H:%M:%S +0000"}")
   end

data/lib/relaxdb/net_http_server.rb

@@ -5,7 +5,6 @@ module RelaxDB
     def initialize(host, port)
       @host = host
       @port = port
-      @cx = Net::HTTP.start(@host, @port)
     end
 
     def delete(uri)
@@ -31,26 +30,9 @@ module RelaxDB
     end
 
     def request(req)
-      res = Net::HTTP.start(@host, @port) { |http|
+      res = Net::HTTP.start(@host, @port) {|http|
         http.request(req)
       }
-      
-      #
-      # When using this chunk of code, as opposed to the one above, CouchDB
-      # started throwing emfile errors. I can't imagine they're related,
-      # but worth noting nonetheless. On second thoughts, I think they are!
-      #
-      # The tests don't close the cx after they run - just open new ones, this
-      # could be causing CouchDB to run out of handles.
-      #
-      # begin
-      #   # @cx = Net::HTTP.start(@host, @port) unless @cx.active?
-      #   res = @cx.request(req)
-      # rescue
-      #   @cx = Net::HTTP.start(@host, @port)
-      #   res = @cx.request(req)
-      # end
-      
       if (not res.kind_of?(Net::HTTPSuccess))
         handle_error(req, res)
       end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  version: "0.5"
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Paul Carey
@@ -13,7 +14,7 @@ autorequire: relaxdb
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +01:00
+date: 2010-05-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +22,7 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -35,64 +36,51 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        version: "1.4"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: uuid
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-description: RelaxDB provides a simple interface to CouchDB
+description: 
 email: paul.p.carey@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
-- LICENSE
+extra_rdoc_files: []
+
 files: 
 - LICENSE
 - README.textile
 - readme.rb
 - Rakefile
 - docs/spec_results.html
-- lib/more/grapher.rb
 - lib/relaxdb/all_delegator.rb
 - lib/relaxdb/design_doc.rb
 - lib/relaxdb/document.rb
 - lib/relaxdb/extlib.rb
+- lib/relaxdb/net_http_server.rb
 - lib/relaxdb/migration.rb
 - lib/relaxdb/migration_version.rb
-- lib/relaxdb/net_http_server.rb
 - lib/relaxdb/paginate_params.rb
 - lib/relaxdb/paginator.rb
 - lib/relaxdb/query.rb
 - lib/relaxdb/references_proxy.rb
 - lib/relaxdb/relaxdb.rb
 - lib/relaxdb/server.rb
-- lib/relaxdb/taf2_curb_server.rb
 - lib/relaxdb/uuid_generator.rb
+- lib/relaxdb/taf2_curb_server.rb
 - lib/relaxdb/validators.rb
 - lib/relaxdb/view_by_delegator.rb
 - lib/relaxdb/view_object.rb
 - lib/relaxdb/view_result.rb
 - lib/relaxdb/view_uploader.rb
 - lib/relaxdb/views.rb
+- lib/more/grapher.rb
 - lib/relaxdb.rb
-- spec/all_delegator_spec.rb
 - spec/callbacks_spec.rb
 - spec/derived_properties_spec.rb
 - spec/design_doc_spec.rb
@@ -102,7 +90,6 @@ files:
 - spec/migration_version_spec.rb
 - spec/paginate_params_spec.rb
 - spec/paginate_spec.rb
-- spec/qpaginate_spec.rb
 - spec/query_spec.rb
 - spec/references_proxy_spec.rb
 - spec/relaxdb_spec.rb
@@ -111,7 +98,6 @@ files:
 - spec/spec_helper.rb
 - spec/spec_models.rb
 - spec/uuid_generator_spec.rb
-- spec/view_by_spec.rb
 - spec/view_docs_by_spec.rb
 - spec/view_object_spec.rb
 has_rdoc: true

data/spec/all_delegator_spec.rb

@@ -1,52 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-require File.dirname(__FILE__) + '/spec_models.rb'
-
-describe RelaxDB::AllDelegator do
-  
-  before(:all) do
-    setup_test_db
-  end
-
-  describe "size" do
-  
-    it "should return the total count for a given class" do
-      docs = (1..101).map { |i| Primitives.new :num => i }
-      RelaxDB.bulk_save! *docs
-      Primitives.all.size.should == 101
-    end
-    
-  end
-  
-  describe "all" do
-    
-    it "should return the ids for the given class" do
-      docs = (1..3).map { |i| Primitives.new :_id => "p#{i}" }
-      RelaxDB.bulk_save! *docs
-      Primitives.all.should == %w(p1 p2 p3)
-    end
-    
-  end
-  
-  describe "load" do
-    
-    it "should load all docs for the given class" do
-      docs = (1..3).map { |i| Primitives.new :num => i }
-      RelaxDB.bulk_save! *docs
-      pms = Primitives.all.load!
-      pms.map { |p| p.num }.inject(&:+).should == 6
-    end
-    
-  end
-  
-  describe "destroy" do
-    
-    it "should destroy all docs for the given class" do
-      docs = (1..3).map { |i| Primitives.new :num => i }
-      RelaxDB.bulk_save! *docs
-      Primitives.all.destroy!
-      Primitives.all.load!.should == []
-    end
-    
-  end
-
-end

data/spec/qpaginate_spec.rb

@@ -1,88 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-require File.dirname(__FILE__) + '/spec_models.rb'
-
-describe "RelaxDB Pagination" do
-    
-  before(:each) do
-    setup_test_db    
-    
-    letters = [ 
-      ["a", 1], ["a", 2], ["a", 3],
-      ["b", 1], ["b", 2], ["b", 3], ["b", 4], ["b", 5], 
-      ["c", 1], ["c", 2] 
-    ].map { |o| Letter.new :letter => o[0], :number => o[1], :_id => "#{o[0]}#{o[1]}" }
-
-    RelaxDB.bulk_save *letters        
-  end
-
-  # helper function
-  def s(letters)
-    letters.map { |l| "#{l.letter}#{l.number}"}.join(", ")
-  end
-  
-  def n(letters)
-    letters.map { |l| "#{l.number}"}.join(", ")
-  end
-    
-  describe "functional tests" do
-
-    it "should navigate through a series" do
-      query = lambda do |page_params|
-        RelaxDB.qpaginate_view "Letter_by_letter_and_number", :page_params => page_params,
-           :startkey => ["a"], :endkey => ["a",{}], :limit => 2,
-           :attributes => [:letter, :number]
-      end
-    
-      letters = query.call({})
-      s(letters).should == "a1, a2"
-      letters.prev_params.should be_false
-          
-      letters = query.call(letters.next_params)
-      s(letters).should == "a3"
-      letters.next_params.should be_false
-          
-      letters = query.call(letters.prev_params)
-      s(letters).should == "a1, a2"
-      letters.next_params.should be    
-    end
-    
-  end
-  
-  describe "Non emitted docs" do
-    
-    before(:each) do
-      map = <<-FUNC
-        function (doc) {
-          if (doc.relaxdb_class === "Letter") {
-            emit([doc.letter, doc.number], null);
-          }
-        }
-      FUNC
-      
-      view_name = "Letter_by_letter_and_number_v2"
-      RelaxDB::DesignDocument.get(RelaxDB.dd).add_map_view(view_name, map).save      
-    end
-    
-    it "should navigate through a series when 1 emitted as val" do
-      query = lambda do |page_params|
-        RelaxDB.qpaginate_docs "Letter_by_letter_and_number_v2", :page_params => page_params,
-           :startkey => ["a"], :endkey => ["a",{}], :limit => 2,
-           :attributes => [:letter, :number]
-      end
-    
-      letters = query.call({})
-      s(letters).should == "a1, a2"
-      letters.prev_params.should be_false
-          
-      letters = query.call(letters.next_params)
-      s(letters).should == "a3"
-      letters.next_params.should be_false
-          
-      letters = query.call(letters.prev_params)
-      s(letters).should == "a1, a2"
-      letters.next_params.should be    
-    end    
-    
-  end
-    
-end

data/spec/view_by_spec.rb

@@ -1,84 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-require File.dirname(__FILE__) + '/spec_models.rb'
-
-describe "view_by" do
-    
-  before(:each) do
-    setup_test_db
-                                                                      
-    docs = (1..10).map { |i| Primitives.new :_id => "id#{i}", :str => i.to_s }
-    RelaxDB.bulk_save! *docs
-  end
-    
-  it "should return an array of doc ids for a key" do
-    docs = Primitives.by_str :key => "5"
-    docs.first.should == "id5"
-  end
-  
-  it "should obey startkey and endkey directives" do
-    docs = Primitives.by_str :startkey => "3", :endkey => "6"
-    docs.should == %w(id3 id4 id5 id6)
-  end
-  
-  it "should return all when none specified" do
-    docs = Primitives.by_str 
-    docs.size.should == 10
-  end
-  
-  it "should return arrays that behave normally" do
-    p1 = Primitives.by_str :key => "1"
-    p2 = Primitives.by_str :key => "2"
-    RelaxDB.load!(p1 + p2).map { |p| p.str }.join.should == "12" 
-  end
-  
-  describe "delegator" do
-    
-    it "should load the returned doc ids" do
-      docs = Primitives.by_str :key => "5"
-      docs.load!.first.str.should == "5"
-    end
-    
-    it "should load the doc for a single param" do
-      res = Primitives.by_str "8"
-      res.str.should == "8"
-    end
-    
-    it "should return the delegator when no params given" do
-      docs = Primitives.by_str.load!
-      docs.map { |d| d.str }.join.length.should == 11
-    end
-        
-  end
-  
-  describe "request count" do
-    
-    before(:each) do
-      RelaxDB.db.reset_req_count
-    end
-    
-    it "should not issue any requests before accessingn the delegator" do
-      doc_ids = Primitives.by_str 
-      RelaxDB.db.req_count.should == 0
-    end
-        
-    it "should issue a single request when retrieving ids only" do
-      doc_ids = Primitives.by_str 
-      doc_ids[0]
-      RelaxDB.db.req_count.should == 1
-    end
-    
-    it "should make two requests when loading docs after touching ids" do
-      doc_ids = Primitives.by_str 
-      doc_ids[0].should == "id1"
-      doc_ids.load!
-      RelaxDB.db.req_count.should == 2
-    end
-    
-    it "should issue a single request when retrieving docs directly" do
-      Primitives.by_str.load!
-      RelaxDB.db.req_count.should == 1
-    end    
-    
-  end
-    
-end