paulcarey-relaxdb 0.3.0 → 0.3.1

data/README.textile

@@ -1,8 +1,11 @@
 h3. What's New?
 
-RelaxDB 0.3 released - compatible with CouchDB 0.9. 
+* 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
 
-Version 0.3 includes many breaking changes. Most notable are simplified view syntax changes and the requirement that a design doc be specified up front.
+* 2009-03-31
+** RelaxDB 0.3 released - compatible with CouchDB 0.9. 
 
 h2. Overview
 
@@ -102,17 +105,18 @@ puts ix.sender.name # prints sofa, a single CouchDB request made
 
 idup = i.dup
 i.save!
-idup.save # conflict printed
+idup.save     # conflict printed
 
 # Saving with and without validations
 
-i = Invite.new :sender => sofa, :name => "daily show"
-i.save! rescue :ok # save! throws an exception on validation failure or conflict
-i.save # returns false rather than throwing an exception
-puts i.errors.inspect # {:recipient=>"invalid:"}
+i = Invite.new :sender => sofa, :event_name => "CouchCamp"
 
-i.validation_skip_list << :recipient # Any and all validations may be skipped
-i.save # succeeds
+i.save! rescue :ok      # save! throws an exception on validation failure or conflict
+i.save                  # returns false rather than throwing an exception
+puts i.errors.inspect   # prints {:recipient=>"invalid:"}
+
+i.validation_skip_list << :recipient  # Any and all validations may be skipped
+i.save                                # succeeds
 
 </code>
 </pre>

data/Rakefile

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

data/lib/relaxdb/document.rb

@@ -141,7 +141,7 @@ module RelaxDB
         # 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$/].inject(nil) { |i, r| i ||= (key =~ r) }
+        if [/_at$/, /_on$/, /_date$/, /_time$/].inject(nil) { |i, r| i ||= (key =~ r) }
             val = Time.parse(val).utc rescue val
         end
         
@@ -210,7 +210,7 @@ module RelaxDB
     end
     
     def pre_save
-      set_created_at if new_document?
+      set_timestamps
       return false unless validates?
       return false unless before_save            
       true 
@@ -300,11 +300,13 @@ module RelaxDB
     end
     alias_method :id, :to_param
     
-    def set_created_at
-      if methods.include? "created_at"
+    def set_timestamps
+      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?
       end
+      
+      @updated_at = Time.now if respond_to?(:updated_at)
     end
        
     def create_or_get_proxy(klass, relationship, opts=nil)

data/lib/relaxdb/net_http_server.rb

@@ -0,0 +1,61 @@
+module RelaxDB
+
+  class Server
+      
+    def initialize(host, port)
+      @host = host
+      @port = port
+    end
+
+    def delete(uri)
+      request(Net::HTTP::Delete.new(uri))
+    end
+
+    def get(uri)
+      request(Net::HTTP::Get.new(uri))
+    end
+
+    def put(uri, json)
+      req = Net::HTTP::Put.new(uri)
+      req["content-type"] = "application/json"
+      req.body = json
+      request(req)
+    end
+
+    def post(uri, json)
+      req = Net::HTTP::Post.new(uri)
+      req["content-type"] = "application/json"
+      req.body = json
+      request(req)
+    end
+
+    def request(req)
+      res = Net::HTTP.start(@host, @port) {|http|
+        http.request(req)
+      }
+      if (not res.kind_of?(Net::HTTPSuccess))
+        handle_error(req, res)
+      end
+      res
+    end
+  
+    def to_s
+      "http://#{@host}:#{@port}/"
+    end
+  
+    private
+
+    def handle_error(req, res)
+      msg = "#{res.code}:#{res.message}\nMETHOD:#{req.method}\nURI:#{req.path}\n#{res.body}"
+      begin
+        klass = RelaxDB.const_get("HTTP_#{res.code}")
+        e = klass.new(msg)
+      rescue
+        e = RuntimeError.new(msg)
+      end
+
+      raise e
+    end
+  end
+  
+end

data/lib/relaxdb/server.rb

@@ -3,64 +3,6 @@ module RelaxDB
   class HTTP_404 < StandardError; end
   class HTTP_409 < StandardError; end
   class HTTP_412 < StandardError; end
-
-  class Server
-        
-    def initialize(host, port)
-      @host = host
-      @port = port
-    end
-
-    def delete(uri)
-      request(Net::HTTP::Delete.new(uri))
-    end
-
-    def get(uri)
-      request(Net::HTTP::Get.new(uri))
-    end
-
-    def put(uri, json)
-      req = Net::HTTP::Put.new(uri)
-      req["content-type"] = "application/json"
-      req.body = json
-      request(req)
-    end
-
-    def post(uri, json)
-      req = Net::HTTP::Post.new(uri)
-      req["content-type"] = "application/json"
-      req.body = json
-      request(req)
-    end
-
-    def request(req)
-      res = Net::HTTP.start(@host, @port) {|http|
-        http.request(req)
-      }
-      if (not res.kind_of?(Net::HTTPSuccess))
-        handle_error(req, res)
-      end
-      res
-    end
-    
-    def to_s
-      "http://#{@host}:#{@port}/"
-    end
-    
-    private
-
-    def handle_error(req, res)
-      msg = "#{res.code}:#{res.message}\nMETHOD:#{req.method}\nURI:#{req.path}\n#{res.body}"
-      begin
-        klass = RelaxDB.const_get("HTTP_#{res.code}")
-        e = klass.new(msg)
-      rescue
-        e = RuntimeError.new(msg)
-      end
-
-      raise e
-    end
-  end
       
   class CouchDB
 
@@ -97,8 +39,9 @@ module RelaxDB
     def replicate_db(source, target)
       @logger.info("Replicating from #{source} to #{target}")
       create_db_if_non_existant target      
-      data = { "source" => source, "target" => target}
-      @server.post("/_replicate", data.to_json)
+      # Manual JSON encoding to allow for dbs containing a '/'
+      data = %Q({"source":"#{source}","target":"#{target}"})       
+      @server.post("/_replicate", data)
     end
 
     def delete(path=nil)

data/lib/relaxdb/taf2_curb_server.rb

@@ -0,0 +1,62 @@
+module RelaxDB
+
+  class Server
+    class Response
+      attr_reader :body
+      def initialize body
+        @body = body
+      end
+    end
+
+    def initialize(host, port)
+      @host, @port = host, port
+    end
+
+    def delete(uri)
+      request(uri, 'delete'){ |c| c.http_delete}
+    end
+
+    def get(uri)
+      request(uri, 'get'){ |c| c.http_get}
+    end
+
+    def put(uri, json)
+      request(uri, 'put') do |c|
+        c.headers['content-type'] = 'application/json'
+        c.http_put json
+      end
+    end
+
+    def post(uri, json)
+      request(uri, 'post') do |c|
+        c.headers['content-type'] = 'application/json'
+        c.http_post json
+      end
+    end
+
+    def request(uri, method)
+      c = Curl::Easy.new "http://#{@host}:#{@port}#{uri}"
+      yield c
+
+      if c.response_code < 200 || c.response_code >= 300
+        status_line = c.header_str.split('\r\n').first
+        msg = "#{c.response_code}:#{status_line}\nMETHOD:#{method}\nURI:#{uri}\n#{c.body_str}"
+        begin
+          klass = RelaxDB.const_get("HTTP_#{c.response_code}")
+          e = klass.new(msg)
+        rescue
+          e = RuntimeError.new(msg)
+        end
+
+        raise e
+      end
+      Response.new c.body_str
+    end
+
+    def to_s
+      "http://#{@host}:#{@port}/"
+    end
+
+  end
+  
+end

data/lib/relaxdb.rb

@@ -15,6 +15,14 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'relaxdb/validators'
 
+begin
+  gem 'taf2-curb'
+  require 'curb'
+  require 'relaxdb/taf2_curb_server'
+rescue LoadError
+  require 'relaxdb/net_http_server'
+end
+
 require 'relaxdb/all_delegator'
 require 'relaxdb/belongs_to_proxy'
 require 'relaxdb/design_doc'

data/readme.rb

@@ -66,14 +66,15 @@ puts ix.sender.name # prints sofa, a single CouchDB request made
 
 idup = i.dup
 i.save!
-idup.save # conflict printed
+idup.save     # conflict printed
 
 # Saving with and without validations
 
-i = Invite.new :sender => sofa, :name => "daily show"
-i.save! rescue :ok # save! throws an exception on validation failure or conflict
-i.save # returns false rather than throwing an exception
-puts i.errors.inspect # {:recipient=>"invalid:"}
+i = Invite.new :sender => sofa, :event_name => "CouchCamp"
 
-i.validation_skip_list << :recipient # Any and all validations may be skipped
-i.save # succeeds
+i.save! rescue :ok        # save! throws an exception on validation failure or conflict
+i.save                    # returns false rather than throwing an exception
+puts i.errors.inspect     # prints {:recipient=>"invalid:"}
+
+i.validation_skip_list << :recipient  # Any and all validations may be skipped
+i.save                                # succeeds

data/spec/document_spec.rb

@@ -80,12 +80,32 @@ describe RelaxDB::Document do
       p.save      
     end
     
-    it "should set created_at when first saved" do
-      now = Time.now
-      created_at = Post.new.save.created_at
-      now.should be_close(created_at, 1)  
+    it "should set created_at on first save only" do
+      ts = Time.now
+      p = Post.new
+      
+      created_at = p.save.created_at
+      created_at.should be_close(ts, 1)  
+      
+      roll_clock_forward(60) do
+        created_at = p.save.created_at
+        created_at.should be_close(ts, 1)  
+      end
     end
     
+    it "should set updated_at on each save" do
+      ts = Time.now
+      p = Primitives.new
+      
+      updated_at = p.save.updated_at
+      updated_at.should be_close(ts, 1)  
+      
+      roll_clock_forward(60) do
+        updated_at = p.save.updated_at
+        updated_at.should be_close(Time.at(ts.to_i + 60), 1)  
+      end      
+    end
+        
     it "should set created_at when first saved unless supplied to the constructor" do
       back_then = Time.now - 1000
       p = Post.new(:created_at => back_then).save
@@ -185,7 +205,7 @@ describe RelaxDB::Document do
 
     it "should prevent the object from being resaved" do
       p = Atom.new.save.destroy!
-    # Exepcted failure - see http://issues.apache.org/jira/browse/COUCHDB-292      
+      # Exepcted failure - see http://issues.apache.org/jira/browse/COUCHDB-292      
       lambda { p.save! }.should raise_error
     end
     

data/spec/spec_helper.rb

@@ -42,3 +42,20 @@ def create_base_db
   require File.dirname(__FILE__) + '/spec_models.rb'
   puts "Created relaxdb_spec_base"
 end
+
+def roll_clock_forward(distance)
+  Time.meta_class.instance_eval do
+    define_method(:future_now) do
+      standard_now + distance
+    end
+    alias_method :standard_now, :now
+    alias_method :now, :future_now
+    begin
+      yield
+    rescue => e
+      raise e
+    ensure
+      alias_method :now, :standard_now
+    end
+  end
+end

data/spec/spec_models.rb

@@ -18,6 +18,7 @@ class Primitives < RelaxDB::Document
   property :true_bool
   property :false_bool
   property :created_at
+  property :updated_at
   property :empty
   
   view_by :num

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paulcarey-relaxdb
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Paul Carey
@@ -64,6 +64,7 @@ files:
 - lib/relaxdb/extlib.rb
 - lib/relaxdb/has_many_proxy.rb
 - lib/relaxdb/has_one_proxy.rb
+- lib/relaxdb/net_http_server.rb
 - lib/relaxdb/paginate_params.rb
 - lib/relaxdb/paginator.rb
 - lib/relaxdb/query.rb
@@ -71,6 +72,7 @@ files:
 - lib/relaxdb/relaxdb.rb
 - lib/relaxdb/server.rb
 - lib/relaxdb/uuid_generator.rb
+- lib/relaxdb/taf2_curb_server.rb
 - lib/relaxdb/validators.rb
 - lib/relaxdb/view_object.rb
 - lib/relaxdb/view_result.rb