riaktor 0.0.2 → 0.0.3

data/lib/riaktor/client.rb

@@ -68,11 +68,12 @@ module Riaktor
         op['params']["dw"] ||= 0
         op['params']["returnbody"] ||= true
         op['headers']["Content-Type"]    ||= "text/plain"
+        op['headers']["Accept"]          ||= "text/plain"
         op['headers']["X-Riak-ClientId"] ||= self.client_id
         request = Typhoeus::Request.new(self.build_url(op['bucket'],op['key']),
           :method => :put, :headers => op['headers'], :params => op['params'], :body => op['value'].to_s)
         request.on_complete do |response|
-          results[[op["bucket"],op["key"]]] = { "headers" => response.headers_hash, 
+          results[[op["bucket"],op["key"]]] = { "raw_headers" => response.headers, "headers" => response.headers_hash, 
             "body" => response.body, "code" => response.code }
         end
         hydra.queue request
@@ -96,11 +97,12 @@ module Riaktor
       operations.each do |op|
         op['params']["r"]  ||= 2
         op['headers']["Content-Type"]    ||= "text/plain"
+        op['headers']["Accept"]          ||= "text/plain"
         op['headers']["X-Riak-ClientId"] ||= self.client_id
         request = Typhoeus::Request.new(self.build_url(op['bucket'],op['key']),
           :method => :get, :headers => op['headers'], :params => op['params'])
         request.on_complete do |response|
-          results[[op["bucket"], op["key"]]] = { "headers" => response.headers_hash, 
+          results[[op["bucket"], op["key"]]] = { "raw_headers" => response.headers, "headers" => response.headers_hash, 
             "body" => response.body, "code" => response.code }
         end
         hydra.queue request
@@ -123,10 +125,11 @@ module Riaktor
       hydra = Typhoeus::Hydra.new(:max_concurrency => self.max_concurrency)
       operations.each do |op|
         op['headers']["X-Riak-ClientId"] ||= self.client_id
+        op['headers']["Accept"]          ||= "text/plain"
         request = Typhoeus::Request.new(self.build_url(op['bucket'],op['key']),
           :method => :delete, :headers => op['headers'], :params => op['params'])
         request.on_complete do |response|
-          results[[op["bucket"], op["key"]]] = { "headers" => response.headers_hash, 
+          results[[op["bucket"], op["key"]]] = { "raw_headers" => response.headers, "headers" => response.headers_hash, 
             "body" => response.body, "code" => response.code }
         end
         hydra.queue request

data/lib/riaktor/r_object/persistence.rb

@@ -40,16 +40,18 @@ module Riaktor
                                :value => decode_value(resp["body"]),
                                :vector_clock => resp["headers"]["X-Riak-Vclock"],
                                :links => Link.from_header(resp["headers"]["Link"]),
-                               :new => false)
+                               :new => false,
+                               :raw_response => resp)
             when 300 then
               found[key] = new(:key => key, 
                                :bucket => bucket,
                                :value => nil,
                                :vector_clock => resp["headers"]["X-Riak-Vclock"],
                                :links => Link.from_header(resp["headers"]["Link"]),
-                               :new => false)
+                               :new => false,
+                               :raw_response => resp)
               vtags = resp["body"].split("\n")[1..-1]
-              found[key].load_siblings(vtags,{"r" => opts["r"] || 2})
+              found[key].load_siblings_from_vtags(vtags,{"r" => opts["r"] || 2})
             else
               found[key] = nil
             end
@@ -78,7 +80,13 @@ module Riaktor
       end # ClassMethods
       
       module InstanceMethods
-        def load_siblings(vtags,params={})
+        def load_siblings_from_multipart_response(resp)
+          #puts resp.inspect + "\n\n"
+          Riaktor::Utils.parse_multipart(resp)
+          @siblings = {}
+        end
+        
+        def load_siblings_from_vtags(vtags,params={})
           params["r"] ||= 2
           @siblings     = {}
           
@@ -103,7 +111,7 @@ module Riaktor
         
         def save(opts={})
           raise(SaveError, "cannot save with siblings present") if self.in_conflict?
-          if changed? or opts[:force] == true
+          if new_record? || changed? or opts[:force] == true
             op = {}
             op["bucket"]  = self.bucket
             op["key"]     = self.key
@@ -115,6 +123,7 @@ module Riaktor
             if [204,404].include?(resp["code"])
               resp = Riaktor::Client.get(op)
             end
+            @raw_response = resp
             case resp["code"]
             when 200 then
               @links = Link.from_header(resp["headers"]["Link"])
@@ -125,7 +134,7 @@ module Riaktor
               @vector_clock = resp["headers"]["X-Riak-Vclock"]
               @new = false
               vtags = resp["body"].split("\n")[1..-1]
-              load_siblings(vtags,{"r" => op["params"]["r"]})
+              load_siblings_from_vtags(vtags,{"r" => op["params"]["r"]})
             else
               raise(SaveError, resp["code"])
             end # case
@@ -142,6 +151,7 @@ module Riaktor
           op["params"]  = { "dw" => opts[:dw] || 0, "w" => opts[:w] || 2, "r" => opts[:r] || 2 }
           op["headers"] = { "X-Riak-Vclock" => self.vector_clock } if self.vector_clock
           resp = Riaktor::Client.delete(op)
+          @raw_response = resp
           case resp["code"]
           when 204 then
             @deleted = true

data/lib/riaktor/r_object.rb

@@ -4,7 +4,8 @@ module Riaktor
   class RObject
     include Persistence
 
-    attr_accessor :key, :bucket, :value, :orig_value, :links, :siblings, :vector_clock, :deleted
+    attr_accessor :key, :bucket, :value, :orig_value, :links, :siblings, :vector_clock, :deleted,
+      :raw_response
     
     def self.encoder
       @encoder || :yaml
@@ -23,6 +24,7 @@ module Riaktor
       @new          = opts[:new].nil? ? true : opts[:new]
       @orig_value   = @new == true ? nil : @value.dup rescue nil
       @vector_clock = opts[:vector_clock]
+      @raw_response = opts[:raw_response]
     end
     
     alias :id :key

data/lib/riaktor.rb

@@ -17,7 +17,7 @@ gem "activemodel", '= 3.0.0.beta'
 require "active_model"
   
 module Riaktor
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end
 
 require "#{File.dirname(__FILE__)}/riaktor/client"

data/test/test_riaktor.rb

@@ -161,63 +161,6 @@ class TestRiaktor < Test::Unit::TestCase
     assert p.updated_at.value > t1
   end
   
-  def test_siblings
-    props = Riaktor::Client.bucket_props("person")
-    props["props"]["allow_mult"] = true
-    assert Riaktor::Client.set_bucket_props("person", props)
-    props = Riaktor::Client.bucket_props("person")
-    assert props["props"]["allow_mult"] == true
-    
-    if p = Person.find("test_siblings")
-      assert p.resolved!
-      assert p.age.resolved!
-      assert p.updated_at.resolved!
-      assert p.destroy
-      sleep(0.1)
-      assert_nil Person.find("test_siblings")
-    end
-    
-    Riaktor::Client.client_id = "client1"
-    unless client1_p = Person.find("test_siblings")
-      client1_p = Person.new
-      client1_p.key = "test_siblings"
-      client1_p.value = "client1 value"
-      client1_p.age.value = 20
-    end
-    assert client1_p.save
-    
-    client2_p = Person.find("test_siblings")
-    assert_equal 20, client2_p.age.value
-    assert_equal "client1 value", client2_p.value
-
-    Riaktor::Client.client_id = "client1"
-    client1_p.value = "client1 value II"
-    client1_p.age.value = 21
-    assert client1_p.save
-    
-    Riaktor::Client.client_id = "client2"
-    client2_p.value = "client2 value"
-    client2_p.age.value = 22
-    assert client2_p.save
-    
-    assert_equal 2, client2_p.siblings.keys.size
-    assert_equal 2, client2_p.age.siblings.keys.size
-    assert_equal 2, client2_p.updated_at.siblings.keys.size
-    assert client2_p.in_conflict?
-    client2_p.value = "client2 value"
-    client2_p.resolved!
-    assert client2_p.in_conflict?
-    client2_p.age.value = 23
-    client2_p.age.resolved!
-    client2_p.updated_at.resolved!
-    assert !client2_p.in_conflict?
-    assert client2_p.save
-    
-    p = Person.find("test_siblings")
-    assert_equal "client2 value", p.value
-    assert_equal 23, p.age.value
-  end
-  
   def test_indexes
     if p = Person.find("test_indexes")
       assert p.destroy

data/test/test_siblings.rb

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestRiaktor < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def test_siblings
+    props = Riaktor::Client.bucket_props("person")
+    props["props"]["allow_mult"] = true
+    assert Riaktor::Client.set_bucket_props("person", props)
+    props = Riaktor::Client.bucket_props("person")
+    assert props["props"]["allow_mult"] == true
+
+    if p = Person.find("test_siblings")
+      assert p.resolved!
+      assert p.age.resolved!
+      assert p.updated_at.resolved!
+      assert p.destroy
+      sleep(0.1)
+      assert_nil Person.find("test_siblings")
+    end
+  
+    Riaktor::Client.client_id = "client1"
+    unless client1_p = Person.find("test_siblings")
+      client1_p = Person.new
+      client1_p.key = "test_siblings"
+      client1_p.value = "client1 value"
+      client1_p.age.value = 20
+    end
+    assert client1_p.save
+  
+    client2_p = Person.find("test_siblings")
+    assert_equal 20, client2_p.age.value
+    assert_equal "client1 value", client2_p.value
+
+    Riaktor::Client.client_id = "client1"
+    client1_p.value = "client1 value II"
+    client1_p.age.value = 21
+    pre_vclock = client1_p.vector_clock.dup
+    assert client1_p.save
+    post_vclock = client1_p.vector_clock.dup
+    assert pre_vclock != post_vclock
+  
+    Riaktor::Client.client_id = "client2"
+    client2_p.value = "client2 value"
+    client2_p.age.value = 22
+    assert_equal pre_vclock, client2_p.vector_clock
+    assert client2_p.save
+    assert_equal 2, client2_p.siblings.keys.size
+    assert_equal 2, client2_p.age.siblings.keys.size
+    assert_equal 2, client2_p.updated_at.siblings.keys.size
+    assert client2_p.in_conflict?
+    client2_p.value = "client2 value"
+    client2_p.resolved!
+    assert client2_p.in_conflict?
+    client2_p.age.value = 23
+    client2_p.age.resolved!
+    client2_p.updated_at.resolved!
+    assert !client2_p.in_conflict?
+    assert client2_p.save
+  
+    p = Person.find("test_siblings")
+    assert_equal "client2 value", p.value
+    assert_equal 23, p.age.value
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ben Myles
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -07:00
+date: 2010-03-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -202,3 +202,4 @@ summary: Riaktor is a Ruby client and object mapper for Riak (http://riak.basho.
 test_files: 
 - test/test_helper.rb
 - test/test_riaktor.rb
+- test/test_siblings.rb