msgthr 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56db4fab8d4e41d33e1ed27c204951ef6cecda14043fcb63d6e6b801d587935d
-  data.tar.gz: e221116c16f9eb8afbfaaa2e1e6f6e8217216f27f5ec9440d7a65e99221960ea
+  metadata.gz: 3f71ba28241da92db06de185e52be789597cdd41f3c138f6ab6e1b75c06450fc
+  data.tar.gz: c5c3d60a79603f1eeee436c6a7a93e505b4ac66ef5ccd7b86678e298e6f751c4
 SHA512:
-  metadata.gz: 27c95fed5bfedc2bbc14cb19c2e42254337fb491730dfad26f4d59f7e6d9c5a7e90d81c1d0414ad746b7b8ad8267b061aef3f67740cf206e1aa8a8df4877954d
-  data.tar.gz: ad141c93c430a0600ff00b7c504a3237682858abd4238b8820830348f54527674d662e81445470821b4c68cbeba4ffdc51a6b149cc8e0a1a720a1981337b1990
+  metadata.gz: 978e8c20322dae07355915e9e12c1fbb450b36a08bae3c76c5d9202fc27393a604c9af1f567ae0a9301ade48593df5fd4d8afdee2107df3f3e3b44363cf66ecc
+  data.tar.gz: 0a74be8f5ccad900ac1181b6db4b9e197c6f6956c7ef1af975883fa7f52c8b029e423c6d359155de889479e255ced3a284559be5da8c9a81bba8e607fbded80a

data/GNUmakefile

@@ -4,7 +4,7 @@ all::
 pkg = msgthr
 RUBY = ruby
 lib := lib
-VERSION := 1.2.0
+VERSION := 1.2.2
 RSYNC_DEST := 80x24.org:/srv/80x24/msgthr/
 
 RSYNC = rsync
@@ -33,7 +33,7 @@ gem: $(pkggem)
 install-gem: $(pkggem)
 	gem install --local $(CURDIR)/$<
 
-$(pkggem): .manifest
+$(pkggem): .manifest NEWS
 	VERSION=$(VERSION) gem build $(pkg).gemspec
 	mkdir -p pkg
 	mv $(@F) $@
@@ -47,12 +47,13 @@ pkg_extra :=
 package: $(pkggem)
 
 NEWS: .olddoc.yml
-	$(OLDDOC) prepare
+	$(OLDDOC) prepare || echo 'See https://80x24.org/msgthr/NEWS' >$@
 LATEST: NEWS
 
 doc:: .document .olddoc.yml
 	-find lib -type f -name '*.rbc' -exec rm -f '{}' ';'
 	$(RM) -r doc
+	$(OLDDOC) prepare
 	$(RDOC) -f oldweb
 
 # this requires GNU coreutils variants

data/lib/msgthr.rb

@@ -183,7 +183,7 @@ class Msgthr
     end
 
     # set parent of this message to be the last element in refs
-    if prev
+    if prev && !cur.has_descendent(prev)
       prev.add_child(cur)
       yield(prev, cur) if block_given?
     end

data/lib/msgthr/container.rb

@@ -64,9 +64,10 @@ class Msgthr::Container
   end
 
   def has_descendent(child) # :nodoc:
-    seen = Hash.new(0)
+    seen = {}
     while child
-      return true if self == child || (seen[child] += 1) != 0
+      return true if self == child || seen[child]
+      seen[child] = true
       child = child.parent
     end
     false

data/msgthr.gemspec

@@ -3,8 +3,9 @@
 
 Gem::Specification.new do |s|
   manifest = File.read('.manifest').split(/\n/)
+  manifest << 'NEWS' if File.exist?('NEWS')
   s.name = %q{msgthr}
-  s.version = ENV['VERSION'] || '1.2.0'
+  s.version = ENV['VERSION'] || '1.2.2'
   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

@@ -144,4 +144,34 @@ EOF
     assert_equal threads[2][0], '2'
   end
 
+  def test_no_lost_root
+    ids = [
+      [ 8, [] ],
+      [ 7, [8] ],
+      [ 6, [8, 7] ],
+      [ 3, [6, 7, 8] ],
+      [ 2, [6, 7, 8, 3] ],
+      [ 10, [8, 7, 6] ],
+      [ 9, [6, 3] ],
+      [ 5, [6, 7, 8, 3, 2] ],
+      [ 4, [2, 3] ],
+      [ 1, [2, 3, 4] ],
+      [ 'a', ],
+      [ 'b', ['a'] ],
+    ]
+    [ [ :forward, ids, 2 ],
+      [ :backwards, ids.reverse, 3 ],
+      [ :shuffle, ids.shuffle, nil ],
+    ].each do |desc,msgs,exp|
+      thr = Msgthr.new
+      msgs.each { |id| thr.add(id[0], id[1], id[0]) }
+      seen0 = nr = 0
+      thr.walk_thread do |level, _, _|
+        seen0 += 1 if level == 0
+        nr += 1
+      end
+      assert_equal nr, msgs.size, 'no lost messages'
+      assert_equal exp, seen0, "single root #{desc}" if exp
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgthr
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - msgthr hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Pure Ruby message threading based on the algorithm described by
@@ -25,6 +25,7 @@ files:
 - ".olddoc.yml"
 - COPYING
 - GNUmakefile
+- NEWS
 - README
 - lib/msgthr.rb
 - lib/msgthr/container.rb
@@ -53,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: container-agnostic, non-recursive message threading