madness 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b8bd26b9b5e653feb97ff0a0b5cc2859729cfd5014d7a2fbeaaf3c7a5de7381
-  data.tar.gz: 13c24f4c4af034814918d9cd7543adb770ab62e13d819eb0d4d006b99629a64a
+  metadata.gz: c755fffb873e0721cf789a8f3ea205bdcb03379c1338cb40482899940d6d0f99
+  data.tar.gz: f87ec8c17f1b38a69b028ededcf0a140b9ff59724d937fca10b79f19d5953929
 SHA512:
-  metadata.gz: e346d93cc0b23989fcfcb66f1d3f65325420fe3999c3a0d37b9afee2d2954e14c51b5e7f77aaa6b990bda3d9cd7b0cb7057ab6b85ae046481aab56e475c2833a
-  data.tar.gz: ed1e9e6b986c450596d3853d7f45b3ecbd2da2bbca3032155f069434c5ea0542c18df02d90c8333402f76204e9e4f350d2ebf0a95524fe49d56a6f2453da9c44
+  metadata.gz: 022c102699a039bd18e4e6209f4ba88afb2fbe6f5e0aeb0ff9d4175f56cb101ff5e1feed4091dd038179b3ca5617d3319c11bf8c4048b28dcbd375d764567e1e
+  data.tar.gz: 2be131708f7e75f97bb47064972ef4a9beb957ea96c49873056fb0429dd2c6db4ed0b592b43f1a22e4124d10ff5da1b73b010252939ef8bf29e1b679f1d514dd

data/lib/madness/refinements/string_refinements.rb

@@ -1,8 +1,12 @@
 module Madness
   module StringRefinements
     refine String do
+      def remove(regex)
+        gsub regex, ''
+      end
+
       def to_slug
-        downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
+        downcase.strip.gsub(' ', '-').remove(/[^\w-]/)
       end
 
       # This is here so we can have one place that defines how to convert
@@ -12,7 +16,7 @@ module Madness
       # just removes any numbers followed by a dot at the beginning of the 
       # string, in order to allow "The Invisible Sorting Hand".
       def to_label
-        gsub(/^\d+\.\s+/, '').gsub(/\.md$/, '')
+        remove(/^\d+\.\s+/).remove(/\.md$/)
       end
     end
   end

data/lib/madness/search.rb

@@ -21,7 +21,8 @@ module Madness
       index = Index.new path: index_dir, create: true
 
       Dir["#{@path}/**/*.md"].each do |file|
-        index << { file: file, content: searchable_content(file) }
+        record = { file: file, content: searchable_content(file) }
+        index << record unless skip_index? file
       end
 
       index.optimize()                                
@@ -40,7 +41,7 @@ module Madness
         
         results << { 
           score: score, 
-          file: filename,
+          file: file_url(filename),
           label: file_label(filename),
           highlights: highlights
         }
@@ -61,17 +62,37 @@ module Madness
 
     private
 
+    # We are going to avoid indexing of README.md when there is also an
+    # index.md in the same directory, to keep behavior consistent with the 
+    # display logic
+    def skip_index?(file)
+      if file.end_with? 'README.md'
+        dir = File.dirname file
+        File.exist? "#{dir}/index.md"
+      else
+        false
+      end
+    end
+
     # This is poor-mans markdown strip.
     # Convert to HTML, strip tags and return plain text suitable to act as
     # the content for the search index.
     def searchable_content(file)
       content = File.read file
       content = CommonMarker.render_html content
-      content.gsub(/<\/?[^>]*>/, "").gsub("\n", " ")
+      content.remove(/<\/?[^>]*>/).gsub("\n", " ")
     end
 
     def file_label(filename)
-      filename.split('/').map { |i| i.to_label }.join(' / ')
+      filename
+        .remove(/\/(index|README)$/)
+        .split('/')
+        .map { |i| i.to_label }
+        .join(' / ')
+    end
+
+    def file_url(filename)
+      filename.remove(/\/(index|README)$/)
     end
   end
 end

data/lib/madness/version.rb

@@ -1,3 +1,3 @@
 module Madness
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: madness
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay