soulheart 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7614d5a25688e37c96f1934f0e431048603771d
-  data.tar.gz: 7bede6c0cd14ddb287636f8194d641eb1842625c
+  metadata.gz: 5c3a5a5f5c2e5fdce0a5270fa703ab31a72196a1
+  data.tar.gz: 96bad6202e435d62d9b25b32b1a7c96b333f8fe3
 SHA512:
-  metadata.gz: 6380d4fa61e9101397e254afc09b4fe8b765f396728f2b68ad358224bf6ac09f36dad401c0079cf0dc7b28bccd22b4ab0a1c2fa9bc0e7f7868aa47a7d16714eb
-  data.tar.gz: 5c1700b08f56ef30e12fdef6520f1d5b89641b2e6480a2489edb75ba67b8b6e786b15f9ff20f2a63dccca12766db6981253ecc15ba0854fed6f7ea5e5cb13da9
+  metadata.gz: c8a67e56e9c167a820f0bba16d1437e5f84be7f971629f548939a17598cdbf32b07ff15542bb4d5b869448d0539634bbacc9502a781e2ce4d0c547dbdd541b89
+  data.tar.gz: 24d1d651a927629d63d06a1ea4d3038d056d9555d2baf6820dd4292d505d4174009495856801c69b76af9b9e17cb0d049a5d4227e32b07a4ef6a92708e5956a2

data/lib/soulheart/base.rb

@@ -8,7 +8,7 @@ module Soulheart
       Soulheart.redis
     end
 
-    def cache_length
+    def cache_duration
       10 * 60 # Setting to 10 minutes, but making it possible to edit down the line
     end
 
@@ -16,13 +16,22 @@ module Soulheart
       ENV['RACK_ENV'] != 'test' ? 'soulheart:' : 'soulheart_test:'
     end
 
+    def sorted_category_array
+      redis.smembers(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).
+        map { |el| el.join('') } }
+    end
+
     def set_category_combos_array
       redis.expire category_combos_id, 0
-      ar = redis.smembers(categories_id).map { |c| normalize(c) }.uniq.sort
-      ar = 1.upto(ar.size).flat_map { |n| ar.combination(n).map { |el| el.join('') } }
-      ar.last.replace('all')
-      redis.sadd category_combos_id, ar
-      ar
+      array = combinatored_category_array
+      array.last.replace('all')
+      redis.sadd category_combos_id, array
+      array
     end
 
     def category_combos_id

data/lib/soulheart/loader.rb

@@ -67,7 +67,7 @@ module Soulheart
       end
     end
 
-    def clean(item)
+    def clean_hash(item)
       fail ArgumentError, 'Items must have text' unless item['text']
       default_items_hash(item.delete('text'), item.delete('category'))
         .tap { |i| i['data'].merge!(item.delete('data')) if item['data'] }
@@ -75,17 +75,21 @@ module Soulheart
         .merge item
     end
 
-    def add_item(item, category_base_id=nil, cleaned=false)
-      unless cleaned
-        item = clean(item)
-        category_base_id ||= category_id(item['category'])
-        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
+    def clean(item)
+      item = clean_hash(item)
+      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  
+      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

data/lib/soulheart/matcher.rb

@@ -1,8 +1,7 @@
 module Soulheart
   class Matcher < Base
     def initialize(params = {})
-      @opts = self.class.default_params_hash.merge params
-      clean_opts
+      set_clean_opts(params)
     end
 
     attr_accessor :opts
@@ -17,17 +16,28 @@ module Soulheart
       }
     end
 
+    def sort_categories(categories)
+      return [] if categories.empty?
+      categories = categories.split(/,|\+/) unless categories.is_a?(Array)
+      categories = categories.map { |s| normalize(s) }.uniq.sort
+      categories = [] if categories.length == redis.scard(categories_id)
+      categories
+    end
+
     def clean_opts
-      unless @opts['categories'] == '' || @opts['categories'] == []
-        @opts['categories'] = @opts['categories'].split(/,|\+/) unless @opts['categories'].is_a?(Array)
-        @opts['categories'] = @opts['categories'].map { |s| normalize(s) }.uniq.sort
-        @opts['categories'] = [] if @opts['categories'].length == redis.scard(categories_id)
-      end
+      @opts['categories'] = sort_categories(@opts['categories'])
       @opts['q'] = normalize(@opts['q']).split(' ') unless @opts['q'].is_a?(Array)
       # .reject{ |i| i && i.length > 0 } .split(' ').reject{  Soulmate.stop_words.include?(w) }
       @opts
     end
 
+    def set_clean_opts(params)
+      @opts = self.class.default_params_hash.merge params
+      clean_opts
+      @cachekey = cache_id_from_opts
+      @cid = category_id_from_opts
+    end
+
     def categories_string
       @opts['categories'].empty? ? 'all' : @opts['categories'].join('')
     end
@@ -40,32 +50,31 @@ module Soulheart
       "#{cache_id(categories_string)}#{@opts['q'].join(':')}"
     end
 
-    def interkeys_from_opts(cid)
+    def interkeys_from_opts
       # If there isn't a query, we use a special key in redis
-      @opts['q'].empty? ? [no_query_id(cid)] : @opts['q'].map { |w| "#{cid}#{w}" }
+      @opts['q'].empty? ? [no_query_id(@cid)] : @opts['q'].map { |w| "#{@cid}#{w}" }
     end
 
-    def matches
-      cachekey = cache_id_from_opts
-      cid = category_id_from_opts
+    def cache_it_because
+      redis.zinterstore(@cachekey, interkeys_from_opts)
+      redis.expire(@cachekey, cache_duration) # cache_duration is set in base.rb
+    end
 
-      if !@opts['cache'] || !redis.exists(cachekey) || redis.exists(cachekey) == 0
-        interkeys = interkeys_from_opts(cid)
-        redis.zinterstore(cachekey, interkeys)
-        redis.expire(cachekey, cache_length) # cache_length is set in base.rb
-      end
+    def matching_hashes(ids)
+      return [] unless ids.size > 0
+      results = redis.hmget(results_hashes_id, *ids)
+      results = results.reject(&:nil?) # handle cached results for ids which have since been deleted
+      results.map { |r| MultiJson.decode(r) }
+    end
+
+    def matches
+      cache_it_because if !@opts['cache'] || !redis.exists(@cachekey) || redis.exists(@cachekey) == 0
       offset = (@opts['page'].to_i - 1) * @opts['per_page'].to_i
       limit = @opts['per_page'].to_i + offset - 1
 
       limit = 0 if limit < 0
-      ids = redis.zrange(cachekey, offset, limit) # Using 'ids', even though keys are now terms
-      if ids.size > 0
-        results = redis.hmget(results_hashes_id, *ids)
-        results = results.reject(&:nil?) # handle cached results for ids which have since been deleted
-        results.map { |r| MultiJson.decode(r) }
-      else
-        []
-      end
+      ids = redis.zrange(@cachekey, offset, limit) # Using 'ids', even though keys are now terms
+      matching_hashes(ids)      
     end
   end
 end

data/lib/soulheart/version.rb

@@ -1,3 +1,3 @@
 module Soulheart
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soulheart
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Seth Herr