msgthr 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5482fc1e20bf45ed07ee4b3eacc93eccd28c3f28195550d1629cb5d21919f42b
-  data.tar.gz: eaca3d5d6ef9840154d6b5fd70033382bdbb9fe3863f726585b7ef6d0d7dfae1
+  metadata.gz: 56db4fab8d4e41d33e1ed27c204951ef6cecda14043fcb63d6e6b801d587935d
+  data.tar.gz: e221116c16f9eb8afbfaaa2e1e6f6e8217216f27f5ec9440d7a65e99221960ea
 SHA512:
-  metadata.gz: e73d95955bd492e97bd2c129986da0658df78fe82e185218195a769e77643b858bee1c64de84c94bb8e7baf6b5a611cad08ac492072ad25812c70821563dfc66
-  data.tar.gz: f12ec74ea787a1d09ccd20c191429bfafe0f291dfffa3fded5e4966efa1b8b82aad0e8653c06c1728e0a6ba06ee4703f63ffe2cf5a40e58a1cdb6d63c56c84d8
+  metadata.gz: 27c95fed5bfedc2bbc14cb19c2e42254337fb491730dfad26f4d59f7e6d9c5a7e90d81c1d0414ad746b7b8ad8267b061aef3f67740cf206e1aa8a8df4877954d
+  data.tar.gz: ad141c93c430a0600ff00b7c504a3237682858abd4238b8820830348f54527674d662e81445470821b4c68cbeba4ffdc51a6b149cc8e0a1a720a1981337b1990

data/GNUmakefile

@@ -4,7 +4,7 @@ all::
 pkg = msgthr
 RUBY = ruby
 lib := lib
-VERSION := 1.1.0
+VERSION := 1.2.0
 RSYNC_DEST := 80x24.org:/srv/80x24/msgthr/
 
 RSYNC = rsync

data/lib/msgthr.rb

@@ -148,7 +148,18 @@ class Msgthr
   # If +mid+ is a String, it is recommended to freeze the string before
   # calling this method to avoid wasting memory on hash keys.  Likewise
   # is true for any String objects in +refs+.
-  def add(mid, refs, msg)
+  #
+  # Adding a message could link 2 messages in Msgthr,
+  # by making one message a child of the other.
+  # It's possible to have a callback called when a child is added
+  # by passing a block to this method.
+  # This block can access the child and parent messages. E.g.
+  #
+  #   msgthr.add(0, nil, '0')
+  #   msgthr.add(1, [0], '1') do |parent, child|
+  #     puts "#{parent.mid} -> #{child.mid}"
+  #   end
+  def add(mid, refs, msg) # :yields: parent, child
     @state == :init or raise StateError, "cannot add when already #@state"
 
     cur = @id_table[mid] ||= Msgthr::Container.new(mid)
@@ -166,12 +177,16 @@ class Msgthr
       # but do not change existing links or loop
       if prev && !cont.parent && !cont.has_descendent(prev)
         prev.add_child(cont)
+        yield(prev, cont) if block_given?
       end
       prev = cont
     end
 
     # set parent of this message to be the last element in refs
-    prev.add_child(cur) if prev
+    if prev
+      prev.add_child(cur)
+      yield(prev, cur) if block_given?
+    end
   end
 end
 

data/msgthr.gemspec

@@ -4,7 +4,7 @@
 Gem::Specification.new do |s|
   manifest = File.read('.manifest').split(/\n/)
   s.name = %q{msgthr}
-  s.version = ENV['VERSION'] || '1.1.0'
+  s.version = ENV['VERSION'] || '1.2.0'
   s.authors = ['msgthr hackers']
   s.summary = 'container-agnostic, non-recursive message threading'
   s.description = File.read('README').split(/\n\n/)[1].strip

data/test/test_msgthr.rb

@@ -6,8 +6,15 @@ require 'msgthr'
 class TestMsgthr < Test::Unit::TestCase
   def test_msgthr
     thr = Msgthr.new
+    parent_child = ''
+    # Note that C is added after B,
+    # hence it's message will be empty after adding B
+    expected_parent_child = '->B'
     thr.add('a', %w(c b), 'abc')
-    thr.add('b', %w(c), 'B')
+    thr.add('b', %w(c), 'B') do |parent, child|
+      parent_child = "#{parent.msg}->#{child.msg}"
+    end
+    assert_equal parent_child, expected_parent_child
     thr.add('c', nil, 'c')
     thr.add('D', nil, 'D')
     thr.add('d', %w(missing), 'd')
@@ -95,4 +102,46 @@ EOF
 EOF
     assert_equal exp, out
   end
+
+  def test_add_child_callback
+    thr = Msgthr.new
+    threads = {}
+    [1, 11, 12, 2, 21, 211].each{ |id| threads[id] = [id]}
+    my_add = lambda do |id, refs, msg|
+      thr.add(id, refs, msg) do |parent, child|
+        threads[child.mid] = threads[parent.mid]
+      end
+    end
+    # Create the following structure
+    # 1
+    #  \
+    #  | 1.1
+    #  \
+    #    1.2
+    # 2
+    #   \
+    #    2.1
+    #       \
+    #         2.1.1
+    my_add.call(1, nil, '1')
+    my_add.call(11, [1], '1.1')
+    my_add.call(12, [1], '1.2')
+    my_add.call(2, nil, '2')
+    my_add.call(21, [2], '2.1')
+    my_add.call(211, [21], '2.1.1')
+
+    thr.thread!
+    thr.rootset.each do |cnt|
+      threads[cnt.mid][0] = cnt.msg
+    end
+
+    assert_equal threads[1], threads[11]
+    assert_equal threads[1], threads[12]
+    assert_equal threads[2], threads[21]
+    assert_equal threads[2], threads[211]
+    assert_equal threads[21], threads[211]
+    assert_equal threads[1][0], '1'
+    assert_equal threads[2][0], '2'
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgthr
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - msgthr hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-31 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Pure Ruby message threading based on the algorithm described by