lib/rico.rb in rico-0.0.1 vs lib/rico.rb in rico-0.1.0

@@ -6,14 +6,24 @@
 require "rico/list"
 require "rico/set"
 require "rico/sorted_set"
 require "rico/value"
 
+require "rico/resolver"
+
 require "rico/version"
 
 module Rico
 
+  TYPES = {
+    "Array" => "array",
+    "List" => "list",
+    "Set" => "set",
+    "SortedSet" => "sset",
+    "Value" => "value"
+  }
+
   def self.configure
     yield self if block_given?
   end
 
   def self.bucket(key)
@@ -36,5 +46,7 @@
 
   def self.riak=(riak)
     @riak = riak
   end
 end
+
+Riak::RObject.on_conflict(&Rico::Resolver.to_proc)