fluorescent 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18c8a78e868d8e98f41b90aacffb1d8382bc3928
-  data.tar.gz: 722e204650ee3978f02c2cf1730bee6ad54f9d44
+  metadata.gz: 1f6908fe9d74e9c6ff92248c064aaa777e2c6e11
+  data.tar.gz: 97960713c3cde86ae2cf5ca31b76834147b94b73
 SHA512:
-  metadata.gz: 69a75bdd56007068c5efbfbf003da3320e5e9a4811cddc02e4c185cb4942406d62fa9264eb6d78be9017b3830de119c226c360ff2affba6a029961046d478ab9
-  data.tar.gz: 571a4f29225c9d847ef43ccd82db8a244765bc83662df9d0d647b1f723584136075751de6320c43c4ecbd2b76152d67868570a4429c15c201d97d6b3f391c158
+  metadata.gz: eef1ea24dfbed1ad5ff5c62e5ee1c240d9cf6adf6e01107a25d393c8275abd54e8124b299355da0512114ff594319685b25c8062e12983990ad0326388b49506
+  data.tar.gz: a9f0a1e5a7f8f53ea87de472e016200726d74de404dc1223cf4d8c94632d20c67b8c6e647ae338300322d0a82024a2451bbc9d36dae8f048f8d37cfdf66cb1f2

data/lib/fluorescent.rb

@@ -17,15 +17,21 @@ class Fluorescent
     end
   end
 
+  def column_names_to_h r
+    row = {}
+    # make sure we get the rest of the column names in the hash
+    r.class.column_names.each do |c|
+      row[c] = r.send(c)
+    end
+    row
+  end
+
   # distill search result down to n characters before and after
   # search terms
   def distill
     @results.each do |r|
-      row = {}
-      # make sure we get the rest of the column names in the hash
-      r.class.column_names.each do |c|
-        row[c] = r.send(c)
-      end
+      row = column_names_to_h(r)
+      
       @columns.each do |c|
         # 1. highlight the search terms
         # 2. replace the search terms in the results with bold text
@@ -34,16 +40,25 @@ class Fluorescent
         string = r.send(c).to_s
         row[c] = highlight string # need to find a better way to do this
         if @to_filter.include? c
-          row[c]   = highlight string[
-            string.index(@terms[0]), 
-            string.index(@terms[0]) + @terms.length + @padding
-          ] << "..."
+          # if nothing matches, we don't want to try to highlight
+          if string.index(@terms[0]) != nil
+            row[c]   = highlight string[
+              string.index(@terms[0]), 
+              string.index(@terms[0]) + string.length + @padding
+            ] << "..."
+          end
         end
       end
-      @formatted_results.push(row)
+
+      # symbolize hash keys
+      @formatted_results.push(symbolize_keys(row))
     end
   end
 
+  def symbolize_keys row
+    row.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+  end
+
   # highlight the search terms in the result
   def highlight(string)
     string.gsub @terms, "<b>#{@terms}</b>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluorescent
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Devin Austin