clwiki 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f9344403a22fcc1f022cdb2d7a023c9191536582d1958086ea1940894cb1faa
-  data.tar.gz: 218ca25cd36ddde93e100e736c8c8d3cfd05cf9252fb63381b3e9b336f8f23e7
+  metadata.gz: 414fdabdc5406f4b2527abedd8055725bbe0667fbd9ee38faf1b1a7df9921703
+  data.tar.gz: 57b042cf9eea3182e395c818bee40841881196e24f514b9929b8c21180a070aa
 SHA512:
-  metadata.gz: 5df4fb72afe638ef2540c0d1902e393c07fbac903702650f5348ab6c64f551e79fb92eccb2808356f3195c948a329cf1a668dd3f266cf7e5621e114340fab2aa
-  data.tar.gz: 130223c53778d46bf85fb337cd2d7ad943e5d62eb9a7f8be93b5b95c70a415eb01e1087fe99307372fe1d9ca31f662344090d1b3e1a223da91f260d6f03ddd68
+  metadata.gz: 223e97e93fe030cf97c17efadc17bf7b62e1b481a484e57e7a85982ce309bc05b90b744a9f3b7589cf86c35661b7bd8698d2ee87441826124f6137252f485a4d
+  data.tar.gz: e5d1e709cc9ce76f71660e3a0d77388956da2af9b0ce857b133eeae82d188ebb8a059f4b1860f3fb248ac630c139985cc0f4a57501ff1ab569d9d508978178dd

data/lib/cl_wiki/index.rb

@@ -35,7 +35,7 @@ module ClWiki
 
     def do_puts(text)
       if @fn
-        File.open(@fn, 'a+') do |f|
+        ::File.open(@fn, 'a+') do |f|
           f.puts text
         end
       else
@@ -80,12 +80,7 @@ module ClWiki
         else
           formatter = ClWiki::PageFormatter.new(pg.raw_content, fullName)
           formatter.formatLinks do |word|
-            if formatter.is_wiki_name?(word)
-              word = formatter.expand_path(word, fullName)
-            else
-              word.downcase!
-            end
-            add_to_index(word, fullName)
+            add_to_index(word.downcase, fullName)
           end
           add_to_index(fullName, fullName)
           add_to_pages(fullName)
@@ -110,19 +105,19 @@ module ClWiki
     end
 
     def hits_filename
-      ::File.join(::File.expand_path('.'), 'hits.dat')
+      ::File.join(::File.expand_path($wiki_path), 'hits.dat')
     end
 
     def index_filename
-      ::File.join(::File.expand_path('.'), 'index.dat')
+      ::File.join(::File.expand_path($wiki_path), 'index.dat')
     end
 
     def recent_filename
-      ::File.join(::File.expand_path('.'), 'recent.dat')
+      ::File.join(::File.expand_path($wiki_path), 'recent.dat')
     end
 
     def pages_filename
-      ::File.join(::File.expand_path('.'), 'pages.dat')
+      ::File.join(::File.expand_path($wiki_path), 'pages.dat')
     end
 
     def remove_page_from_index(fullPageName)
@@ -314,10 +309,18 @@ module ClWiki
       end
     end
 
-    def reindex_page(fullPageName)
+    def reindex_page_and_save_async(fullPageName)
       @indexer.reindex_and_save_async(fullPageName)
     end
 
+    def reindex_page(full_page_name)
+      @indexer.reindex_page(full_page_name)
+    end
+
+    def save
+      @indexer.save
+    end
+
     def search(term, titles_only=false)
       hits = @indexer.search(term).flatten
       if titles_only

data/lib/cl_wiki/page.rb

@@ -168,7 +168,7 @@ module ClWiki
       wikiFile.content = newcontent
       if $wiki_conf.useIndex != ClWiki::Configuration::USE_INDEX_NO
         wikiIndexClient = ClWiki::IndexClient.new
-        wikiIndexClient.reindex_page(@full_name)
+        wikiIndexClient.reindex_page_and_save_async(@full_name)
       end
     end
 

data/lib/cl_wiki/version.rb

@@ -1,3 +1,3 @@
 module ClWiki
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/lib/tasks/index.rake

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+def pct_done(done, total)
+  pct = ((done.to_f / total.to_f) * 100).to_i
+  pct.to_s.rjust(3) + '%'
+end
+
+task reindex: :environment do
+  indexer = ClWiki::IndexClient.new
+
+  entries = Dir[File.join($wiki_path, "*#{$wikiPageExt}")]
+  entries.each_with_index.map do |fn, idx|
+    if idx.divmod(100)[1].zero?
+      puts
+      print "#{pct_done(idx, entries.length)}: "
+    end
+
+    page_name = File.basename(fn, $wikiPageExt)
+    indexer.reindex_page(page_name)
+    print '.'
+  end
+  puts
+  puts '100%'
+
+  indexer.save
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clwiki
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - chrismo
@@ -28,16 +28,16 @@ dependencies:
   name: clindex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: Old, tired, crappy wiki, reborn as a Rails 4 Engine.
 email:
 - chrismo@clabs.org
@@ -82,6 +82,7 @@ files:
 - lib/cl_wiki/tools/test/singlepagetest.rb
 - lib/cl_wiki/tools/thunderbird.rb
 - lib/cl_wiki/version.rb
+- lib/tasks/index.rake
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js