riak-ruby-ledger 0.0.4 → 0.0.5

data/test/lib/ledger_test.rb

@@ -104,39 +104,53 @@ describe Riak::Ledger do
     assert @ledger1.has_transaction? "txn10"
     assert @ledger1.has_transaction? "txn11"
   end
-  #
-  #it "must merge a two actors" do
-  #  @ledger1.debit!("txn1", 10)
-  #  @ledger1.credit!("txn2", 10)
-  #  @ledger1.credit!("txn3", 10)
-  #  @ledger1.credit!("txn4", 10)
-  #  @ledger1.credit!("txn5", 10)
-  #  @ledger2.debit!("txn6", 10)
-  #  @ledger2.credit!("txn7", 10)
-  #  @ledger2.credit!("txn8", 10)
-  #  @ledger2.credit!("txn9", 10)
-  #  @ledger2.credit!("txn10", 10)
-  #
-  #  @ledger1.credit!("txn11", 10)
-  #  @ledger1.credit!("txn11", 10)
-  #  @ledger2.credit!("txn11", 10)
-  #  @ledger2.credit!("txn11", 10)
-  #
-  #  assert_equal 110, @ledger1.value
-  #  #1st 6 transactions were merged into total
-  #  assert_equal 60, @ledger1.counter.p.counts["ACTOR1"]["total"]
-  #
-  #  refute @ledger1.has_transaction? "txn1"
-  #  refute @ledger1.has_transaction? "txn2"
-  #  refute @ledger1.has_transaction? "txn3"
-  #  refute @ledger1.has_transaction? "txn4"
-  #  refute @ledger1.has_transaction? "txn5"
-  #  refute @ledger1.has_transaction? "txn6"
-  #  assert @ledger1.has_transaction? "txn7"
-  #  assert @ledger1.has_transaction? "txn8"
-  #  assert @ledger1.has_transaction? "txn9"
-  #  assert @ledger1.has_transaction? "txn10"
-  #  assert @ledger1.has_transaction? "txn11"
-  #end
+
+  it "must merge two actors" do
+    @ledger1.debit!("txn1", 10) #-10
+    @ledger1.credit!("txn2", 10) #0 p1
+    @ledger1.credit!("txn3", 10) #10 p2
+    @ledger1.credit!("txn4", 10) #20 p3
+    @ledger1.credit!("txn5", 10) #30 p4
+    @ledger2.debit!("txn6", 10) #20
+    @ledger2.credit!("txn7", 10) #30 p1
+    @ledger2.credit!("txn8", 10) #40 p2
+    @ledger2.credit!("txn9", 10) #50 p3
+    @ledger2.credit!("txn10", 10) #60 p4
+
+    @ledger1.credit!("txn11", 10) #70 p5
+    @ledger1.credit!("txn11", 10) #70 #ignore
+    @ledger2.credit!("txn11", 10) #70 #ignore
+    @ledger2.credit!("txn11", 10) #70 #ignore
+
+    @ledger2.credit!("txn12", 10) #80 p5
+    @ledger2.credit!("txn13", 10) #90 p6
+    @ledger2.credit!("txn14", 10) #100 p7
+
+    assert_equal 70, @ledger1.value #premerge
+    @ledger1 = Riak::Ledger.find!(@bucket, @key, options1)
+    assert_equal 100, @ledger1.value #postmerge
+
+    assert_equal 100, @ledger2.value
+
+    #1st 6 transactions were merged into total
+    assert_equal 10, @ledger2.counter.p.counts["ACTOR2"]["total"] #merged 1
+    @ledger2 = Riak::Ledger.find!(@bucket, @key, options2)
+    assert_equal 20, @ledger2.counter.p.counts["ACTOR2"]["total"] #merged 2
+
+    #pickup 2's merges
+    @ledger1 = Riak::Ledger.find!(@bucket, @key, options1)
+
+    assert_equal true, (@ledger1.has_transaction? "txn1")
+    assert_equal true, (@ledger1.has_transaction? "txn2")
+    assert_equal true, (@ledger1.has_transaction? "txn3")
+    assert_equal true, (@ledger1.has_transaction? "txn4")
+    assert_equal true, (@ledger1.has_transaction? "txn5")
+    assert_equal true, (@ledger1.has_transaction? "txn6")
+    assert_equal false, (@ledger1.has_transaction? "txn7")
+    assert_equal false, (@ledger1.has_transaction? "txn8")
+    assert_equal true, (@ledger1.has_transaction? "txn9")
+    assert_equal true, (@ledger1.has_transaction? "txn10")
+    assert_equal true, (@ledger1.has_transaction? "txn11")
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riak-ruby-ledger
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - drewkerrigan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,8 +66,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A PNCounter CRDT based ledger with support for transaction ids and tunable
-  write idempotence
+description: An alternative to Riak Counters with idempotent writes within a client
+  defined window
 email:
 - dkerrigan@basho.com
 executables: []
@@ -79,15 +79,19 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- docs/implementation.md
+- docs/release_notes.md
+- docs/riak_counter_drift.md
+- docs/usage.md
 - lib/crdt/tgcounter.rb
 - lib/crdt/tpncounter.rb
 - lib/ledger.rb
 - lib/ledger/version.rb
 - riak-ruby-ledger.gemspec
+- test/lib/crdt/tgcounter_test.rb
+- test/lib/crdt/tpncounter_test.rb
 - test/lib/ledger/version_test.rb
 - test/lib/ledger_test.rb
-- test/lib/tgcounter_test.rb
-- test/lib/tpncounter_test.rb
 - test/test_helper.rb
 homepage: https://github.com/drewkerrigan/riak-ruby-ledger
 licenses:
@@ -112,14 +116,13 @@ rubyforge_project:
 rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: This gem attempts to provide a tunable Counter option by combining non-idempotent
-  GCounters and a partially idempotent GSet for calculating a running counter or ledger.
-  By allowing clients to set how many transactions to keep in the counter object as
-  well as set a retry policy on the Riak actions performed on the counter, a good
-  balance can be achieved.
+summary: The data type implemented is a PNCounter CRDT with an ordered array of transactions
+  for each GCounter actor. Transaction ids are stored with the GCounter, so operations
+  against this counter are idempotent while the transaction remains in any actor's
+  array.
 test_files:
+- test/lib/crdt/tgcounter_test.rb
+- test/lib/crdt/tpncounter_test.rb
 - test/lib/ledger/version_test.rb
 - test/lib/ledger_test.rb
-- test/lib/tgcounter_test.rb
-- test/lib/tpncounter_test.rb
 - test/test_helper.rb