rico 0.0.1 → 0.1.0

data/.rspec

@@ -1 +1 @@
---color
+--tty --color --format nested

data/Guardfile

@@ -0,0 +1,5 @@
+guard "rspec" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1].split("/").last}_spec.rb" }
+  watch("spec/spec_helper.rb")  { "spec" }
+end

data/lib/rico/array.rb

@@ -4,7 +4,7 @@ module Rico
     include Enumerable
     extend Forwardable
 
-    def_delegators :members, :each, :[]
+    def_delegators :members, :each, :[], :length, :count
 
     public
 
@@ -14,7 +14,7 @@ module Rico
     #
     # Returns the result of the store operation
     def add(*items)
-      mutate compute_add(items)
+      mutate build_map_add(items)
     end
 
     # Removes the requested items from the array and stores the object
@@ -23,14 +23,14 @@ module Rico
     #
     # Returns the result of the store operation
     def remove(*items)
-      mutate compute_remove(items)
+      mutate build_map_remove(items)
     end
 
     # Obtains the items in the array
     #
     # Returns the data in the object as an array
     def members
-      Array(data)
+      Array((data || {})["_values"])
     end
 
     # Tests whether or not an item exists in the array
@@ -42,16 +42,38 @@ module Rico
       members.include? item
     end
 
-    # Returns the number of items in the array
+    # Resolve conflict between one or more RObject siblings
     #
-    # Returns an Integer
-    def length
-      members.length
+    # robjects - array of RObjects to merge
+    #
+    # Returns a single RObject result or nil
+    def self.resolve(robject)
+      siblings = robject.siblings
+      values = siblings.map {|r| Array(r.data["_values"]) }
+      deletions = siblings.map {|r| Array(r.data["_deletes"]) }.flatten
+
+      result = []
+      values.each do |v|
+        result += (v - result)
+      end
+
+      result -= deletions
+
+      obj = Riak::RObject.new(robject.bucket, robject.key)
+      obj.data = { "_values" => result, "_deletes" => deletions }
+      obj
     end
-    alias_method :count, :length
 
     protected
 
+    def build_map_add(items)
+      { "_type" => type_key, "_values" => compute_add(items) }
+    end
+
+    def build_map_remove(items)
+      { "_type" => type_key, "_values" => compute_remove(items), "_deletes" => items }
+    end
+
     def compute_add(items)
       members + items
     end

data/lib/rico/object.rb

@@ -2,7 +2,7 @@ module Rico
   module Object
     extend Forwardable
 
-    def_delegators :riak_object, :store, :delete
+    def_delegators :riak_object, :conflict?, :delete, :store
 
     # Initialize an object with a bucket and key
     #
@@ -26,7 +26,7 @@ module Rico
     def mutate(value)
       @data = value
       riak_object.data = value
-      riak_object.store
+      store
     end
 
     # Determine whether an object exists or not
@@ -38,6 +38,11 @@ module Rico
 
     protected
 
+    def type_key
+      name = self.class.name.split("::").last
+      Rico::TYPES[name]
+    end
+
     def riak_object
       @riak_object ||= Rico.bucket(@bucket).get_or_new @key
     end

data/lib/rico/resolver.rb

@@ -0,0 +1,18 @@
+module Rico
+  class Resolver
+    def self.to_proc
+      @to_proc ||= lambda do |robject|
+        klasses = robject.siblings.map{|s| s.data && s.data["_type"] }.compact.uniq
+        return nil unless klasses.length == 1
+
+        klass_name = Rico::TYPES.invert[klasses.first]
+        return nil unless klass_name
+
+        klass = Rico.const_get(klass_name)
+        return nil unless klass.respond_to?(:resolve)
+
+        klass.resolve(robject.siblings)
+      end
+    end
+  end
+end

data/lib/rico/value.rb

@@ -20,12 +20,25 @@ module Rico
     #
     # Returns true if stored, false if not
     def setnx(value)
-      if redis_object.exists?
+      if exists?
         false
       else
         set value
         true
       end
     end
+
+    # Resolve conflict between one or more RObject siblings
+    #
+    # This currently just returns the first sibling
+    #
+    # robjects - array of RObjects to resolve
+    #
+    # Returns a single RObject result or nil
+    def self.resolve(robject)
+      obj = Riak::RObject.new(robject.bucket, robject.key)
+      obj.data = robject.siblings.first.data
+      obj
+    end
   end
 end

data/lib/rico/version.rb

@@ -1,3 +1,3 @@
 module Rico
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/rico.rb

@@ -8,10 +8,20 @@ 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
@@ -38,3 +48,5 @@ module Rico
     @riak = riak
   end
 end
+
+Riak::RObject.on_conflict(&Rico::Resolver.to_proc)

data/rico.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency              "riak-client", "~> 1.1"
   gem.add_development_dependency  "rspec", "~> 2.12"
+  gem.add_development_dependency  "guard-rspec", "~> 2.3"
 end

data/spec/array_spec.rb

@@ -133,6 +133,29 @@ describe Rico::Array do
     end
   end
 
+  describe ".resolve" do
+    it "properly resolves missing values" do
+      datas = [
+        { "_type" => "array", "_values" => [1,2,3] },
+        { "_type" => "array", "_values" => [1,2,3,4] }
+      ]
+      conflicted = RiakHelpers.build_conflicted_robject "array_resolve_simple", datas
+      result = Rico::Array.resolve(conflicted)
+      result.data["_values"].should eql [1,2,3,4]
+    end
+
+    it "properly deletes deleted values after resolve" do
+      datas = [
+        { "_type" => "array", "_values" => [1,2,3,4] },
+        { "_type" => "array", "_values" => [1,2,3], "_deletes" => [4] }
+      ]
+      conflicted = RiakHelpers.build_conflicted_robject "array_resolve_delete", datas
+      result = Rico::Array.resolve(conflicted)
+      result.data["_values"].should eql [1,2,3]
+      result.data["_deletes"].should eql [4]
+    end
+  end
+
   it "is enumerable" do
     a = Rico::Array.new RiakHelpers.bucket, "enumerable"
     a.add(3, 1, 4, 1, 5, 9)

data/spec/resolver_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+
+describe Rico::Resolver do
+  describe ".to_proc" do
+    it "returns nil for data without type" do
+      datas = [
+        { "a" => "b" },
+        { "c" => "d" },
+        { "f" => "e" }
+      ]
+      conflicted = RiakHelpers.build_conflicted_robject "resolver_proc_no_type", datas
+      Rico::Resolver.to_proc.call(conflicted).should eql nil
+    end
+
+    it "returns nil for data with conflicted types" do
+      datas = [
+        { "_type" => "array", "_values" => [1,2,3,4,1] },
+        { "_type" => "set", "_values" => [1,2,3,4] }
+      ]
+      conflicted = RiakHelpers.build_conflicted_robject "resolver_proc_conflicted_types", datas
+      Rico::Resolver.to_proc.call(conflicted).should eql nil
+    end
+
+    it "returns nil for data without a known rico class" do
+      datas = [
+        { "_type" => "unknown", "_values" => [1,2,3] },
+        { "_type" => "unknown", "_values" => [1,2,3,4] }
+      ]
+      conflicted = RiakHelpers.build_conflicted_robject "resolver_proc_unknown_type", datas
+      Rico::Resolver.to_proc.call(conflicted).should eql nil
+    end
+
+    it "returns the result of the resolve function on known types" do
+      datas = [
+        { "_type" => "array", "_values" => [1,2,3] },
+        { "_type" => "array", "_values" => [1,2,3,4] }
+      ]
+      conflicted = RiakHelpers.build_conflicted_robject "resolver_proc_no_resolve_function", datas
+
+      Rico::Array.stub(:resolve).and_return(conflicted.siblings.last)
+      Rico::Resolver.to_proc.call(conflicted).should eql conflicted.siblings.last
+      Rico::Array.unstub(:resolve)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -17,5 +17,30 @@ module RiakHelpers
     b.keys.each do |k|
       b.delete k
     end
+
+    a = Rico::Array.new bucket, "visual_array"
+    a.add 1,2,3,4,5,6
+    a.remove 6
+  end
+
+  def self.build_conflicted_robject(key, values)
+    bucket = Rico.bucket RiakHelpers.bucket
+    o = Riak::RObject.new bucket, key
+    siblings = values.map do |v|
+      x = Riak::RObject.new bucket, key
+      x.data = v
+      x
+    end
+
+    o = Riak::RObject.new bucket, key
+    o.siblings = siblings
+    o
+  end
+
+  def self.build_conflicted_rico_object(klass, key, values=["v1", "v2", "v3"])
+    o = build_conflicted_robject key, values
+    v = klass.new RiakHelpers.bucket, key
+    v.instance_variable_set("@riak_object", o)
+    v
   end
 end

data/spec/value_spec.rb

@@ -42,6 +42,25 @@ describe Rico::Value do
     end
   end
 
+  describe "#setnx" do
+    it "writes the value, returns true if new" do
+      a = Rico::Value.new RiakHelpers.bucket, "setnx_new"
+      a.setnx("value").should eql true
+      b = Rico::Value.new RiakHelpers.bucket, "setnx_new"
+      b.get.should eql "value"
+    end
+
+    it "does nothing, returns false if the value exists" do
+      a = Rico::Value.new RiakHelpers.bucket, "setnx_exists"
+      a.set "value"
+      b = Rico::Value.new RiakHelpers.bucket, "setnx_exists"
+      b.setnx("other").should eql false
+      b.get.should eql "value"
+      c = Rico::Value.new RiakHelpers.bucket, "setnx_exists"
+      c.get.should eql "value"
+    end
+  end
+
   describe "#delete" do
     it "deletes an existing object" do
       a = Rico::Value.new RiakHelpers.bucket, "delete_existing"
@@ -52,4 +71,25 @@ describe Rico::Value do
       b.get.should eql nil
     end
   end
+
+  describe ".resolve" do
+    it "just returns the first sibling" do
+      datas = ["Tom", "Jerry"]
+      conflicted = RiakHelpers.build_conflicted_robject "value_resolve_simple", datas
+      result = Rico::Value.resolve(conflicted)
+      result.data.should eql "Tom"
+    end
+
+    it "properly deletes deleted values after resolve" do
+      datas = [
+        { "_type" => "array", "_values" => [1,2,3,4] },
+        { "_type" => "array", "_values" => [1,2,3], "_deletes" => [4] }
+      ]
+      conflicted = RiakHelpers.build_conflicted_robject "array_resolve_delete", datas
+      result = Rico::Array.resolve(conflicted)
+      result.data["_values"].should eql [1,2,3]
+      result.data["_deletes"].should eql [4]
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rico
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: Primative data types on Riak
 email:
 - jcoene@gmail.com
@@ -53,6 +69,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -61,6 +78,7 @@ files:
 - lib/rico/counter.rb
 - lib/rico/list.rb
 - lib/rico/object.rb
+- lib/rico/resolver.rb
 - lib/rico/set.rb
 - lib/rico/sorted_set.rb
 - lib/rico/value.rb
@@ -68,6 +86,7 @@ files:
 - rico.gemspec
 - spec/array_spec.rb
 - spec/list_spec.rb
+- spec/resolver_spec.rb
 - spec/rico_spec.rb
 - spec/set_spec.rb
 - spec/sorted_set_spec.rb
@@ -100,6 +119,7 @@ summary: Primative data types on Riak
 test_files:
 - spec/array_spec.rb
 - spec/list_spec.rb
+- spec/resolver_spec.rb
 - spec/rico_spec.rb
 - spec/set_spec.rb
 - spec/sorted_set_spec.rb