soulheart 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2377142c9db987586cf7355a75bb41223134b6
-  data.tar.gz: 9d6a719b67686a8be1285fc49d94a0e55bb0cca8
+  metadata.gz: 0a9835278571fb659e0eae5ad1d39918bcd41049
+  data.tar.gz: e3dbbeecea70b9cf11327f012f3d47e02f64f04b
 SHA512:
-  metadata.gz: 5323467ef347623d460b71168ab702533674c790221cef267b5f5422c44a0d5fcb0f59d7f9d2554323e05f76ed57b55fc03800e09b307e2353c5aa1024bac558
-  data.tar.gz: 9c383b627b46a060d6a3cfbfb2fbe91321867007251509478f11d5c9df16a62c8ecc45c918ff15b400512b62c36d49e1571887114287c0b8153539e7c8bd2d00
+  metadata.gz: 01215919be332be2cc67d9885c5bb21380110fa04caf4a424e91f7649aacf696d08c88f24c5a95b0bf88b8329915c93bf1c37976ee3f95b0e96c1cfb7fd2449b
+  data.tar.gz: e5b336efcc86b4250cecdb4d61c8427c831dca3eea2ba25f8bf2e362f2cd7ea00612951da3c1160f9f0eb1f9a0e62833b37aab69d20a7507bfafb3ccfbb105bc

data/bin/soulheart

@@ -32,8 +32,16 @@ parser = OptionParser.new do |opts|
     exit
   end
 
-  opts.on('-b', '--batch-size', 'Number of lines to read at a time') do |size|
-    BATCH_SIZE = size
+  opts.on('-A', '--no-all', 'on load: Do not add items into the "all" category (on load)') do |size|
+    NO_ALL = true
+  end
+
+  opts.on('-C', '--no-combinatorial', 'Do not create combined categories, do not add items to combined categories (on load)') do |size|
+    NO_COMBINATORIAL = true
+  end
+
+  opts.on('-R', '--remove-results', 'Remove results data - breaks the cache, fully clears all loaded data. (on clear)') do |size|
+    REMOVE_RESULTS = true
   end
 
   opts.separator ''
@@ -41,6 +49,8 @@ parser = OptionParser.new do |opts|
   opts.separator '  load   FILE  Loads data from a FILE - can be a local file or a url. Accepted formats are .json, .tsv and .csv'
   opts.separator "  reset        Removes all existing data (optionally pass a file to run load after reset)"
   opts.separator ''
+  opts.separator 'Additional info: https://sethherr.github.io/soulheart/commands/'
+  opts.separator ''
 end
 
 
@@ -58,7 +68,7 @@ def load(file)
 
   start_time = Time.now.to_i
   count = 0
-  loader = Soulheart::Loader.new
+  loader = Soulheart::Loader.new({no_all: NO_ALL, no_combinatorial: NO_COMBINATORIAL})
   lines = []
   begin
     if file.match(/(c|t)sv\z/i)
@@ -87,21 +97,23 @@ def load(file)
     f.close
   end
   loader.load(lines)
-  puts "Loaded a total of #{count} items in #{Time.now.to_i - start_time} second(s)"
+  puts "Total time to load:                                  #{Time.now.to_i - start_time} second(s)"
 end
 
-def clear
-  Soulheart::Loader.new.clear
+def clear(remove_results)
+  Soulheart::Loader.new.clear(remove_results)
 end
 
 parser.parse!
-BATCH_SIZE ||= 1000
 
 case ARGV[0]
 when 'load'
+  BATCH_SIZE ||= 1000
+  NO_ALL ||= false
+  NO_COMBINED_CATEGORIES ||= false
   load ARGV[1]
 when 'reset'
-  clear
+  clear(REMOVE_RESULTS)
   load ARGV[1] if ARGV[1]
 else
   puts parser.help

data/lib/soulheart/base.rb

@@ -20,6 +20,10 @@ module Soulheart
       redis.smembers(categories_id).map { |c| normalize(c) }.uniq.sort
     end
 
+    def hidden_category_array
+      redis.smembers(hidden_categories_id).map { |c| normalize(c) }.uniq.sort
+    end
+
     def combinatored_category_array
       1.upto(sorted_category_array.size).
         flat_map { |n| sorted_category_array.combination(n).
@@ -29,7 +33,7 @@ module Soulheart
     def set_category_combos_array
       redis.expire category_combos_id, 0
       array = combinatored_category_array
-      array.last.replace('all')
+      array.any? ? array.last.replace('all') : array << 'all'
       redis.sadd category_combos_id, array
       array
     end
@@ -46,6 +50,10 @@ module Soulheart
       "#{base_id}categories:"
     end
 
+    def hidden_categories_id
+      "#{categories_id}hidden:"
+    end
+
     def category_id(name = 'all')
       "#{categories_id}#{name}:"
     end

data/lib/soulheart/loader.rb

@@ -1,5 +1,10 @@
 module Soulheart
   class Loader < Base
+    def initialize(defaults={})
+      @no_all           = defaults[:no_all]
+      @no_combinatorial = defaults[:no_combinatorial]
+    end
+
     def default_items_hash(text, category)
       category ||= 'default'
       {
@@ -14,9 +19,19 @@ module Soulheart
       }
     end
 
+    def add_to_categories_array(category)
+      if @no_combinatorial 
+        return if redis.smembers(hidden_categories_id).include?(category)
+        redis.sadd hidden_categories_id, category
+      elsif !redis.smembers(categories_id).include?(category)
+        redis.sadd categories_id, category
+      end
+    end
+
     def delete_categories
       redis.expire category_combos_id, 0
       redis.expire categories_id, 0
+      redis.expire hidden_categories_id, 0
     end
 
     def reset_categories(categories)
@@ -65,12 +80,20 @@ module Soulheart
       end
       set_category_combos_array.each do |category_combo|
         items.each do |item|
-          next unless category_combo.match(item['category']) || category_combo == 'all'
+          if category_combo == item['category']
+            next
+          elsif category_combo == 'all'
+            next if @no_all
+          elsif !category_combo.match(item['category']) 
+            next
+          elsif @no_combinatorial
+            next
+          end
           add_item(item, category_id(category_combo), true) # send it base
           i += 1
         end
       end
-      puts "Total items (including combinatored categories):    #{i}"
+      puts "Total items (including combinatorial categories):    #{i}"
     end
 
     def clean_hash(item)
@@ -87,19 +110,16 @@ module Soulheart
       item.keys.select{ |k| !%w(category priority term aliases data).include?(k) }.each do |key|
         item['data'].merge!({"#{key}" => item.delete(key)})
       end
-      unless redis.smembers(categories_id).include?(item['category'])
-        redis.sadd categories_id, item['category']
-      end  
+      add_to_categories_array(item['category'])
       item
     end
 
     def add_item(item, category_base_id=nil, cleaned=false)
       item = clean(item) unless cleaned
       category_base_id ||= category_id(item['category'])
-
       priority = (-item['priority'])
       redis.pipelined do
-        redis.zadd(no_query_id(category_base_id), priority, item['term']) # Add to master set for queryless searches
+        redis.zadd(no_query_id(category_base_id), priority, item['term'])  # Add to master set for queryless searches
         # store the raw data in a separate key to reduce memory usage, if it's cleaned it's done
         redis.hset(results_hashes_id, item['term'], MultiJson.encode(item['data'])) unless cleaned
         phrase = ([item['term']] + (item['aliases'] || [])).join(' ')

data/lib/soulheart/version.rb

@@ -1,3 +1,3 @@
 module Soulheart
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soulheart
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Seth Herr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simple, fast autocomplete server for Ruby and Rails