soulheart 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 701b63e892265647a1615c790e81ab3e4132bb0a
-  data.tar.gz: baa1a417ca1bedf0efff4cd795a5f0f6679c60e8
+  metadata.gz: eb5870c5f1cf50c4ebac25363602c2f3cf0c4dd8
+  data.tar.gz: ab86a41e246856d395eacc5b896f36f2cb0ed254
 SHA512:
-  metadata.gz: 37fdeb72ef3cb8179b4aafc1eb9860e8d96a469a7fe866b51160004fb8298da877496b22d46df5537f0b4f10dd35fb927720c1d3420b7a489179c0a3537b5c46
-  data.tar.gz: 8580e37cbd146a1b03d15dbb4ddd913ed1e30c4d4c08c79f7fa4b7b6b46cc63013c0bd47a4902216235491fc9c3b61e5a41fd6b08cb47ee9f8dff0d5ee744a86
+  metadata.gz: 83fff39abcf059750d36f89a5aae935e2a8cc579cbfa248b0ede8abe29b2d79316ec25f486415132c8570e4a6a05f8a9300d5a8f41eea1517aeaeaede5830d31
+  data.tar.gz: 5f1ec6654a3b373ea5a4ab686005b85484e4a11d2ffd7b7e00d39932121736475d5d8176801f8f3823500780c14d4283f6c749ab663caed75ebefe0337f59ef1

data/bin/soulheart

@@ -96,14 +96,33 @@ def generate(type, file)
 end
 
 def load(file)
-  if File.exists?(file)
-    start_time = Time.now.to_i
-    loader = Soulheart::Loader.new
-
-    puts "Loading items in batches of #{BATCH_SIZE} ..."
-    count = 0
-    begin
-      f = File.open(file)
+  require 'uri'
+  if file =~ URI::regexp
+    require 'open-uri'
+    f = open(file)
+  elsif File.exists?(file)
+    f = File.open(file)
+  else
+    puts "Couldn't open file: #{file}"
+    return true
+  end
+
+  start_time = Time.now.to_i
+  count = 0
+  loader = Soulheart::Loader.new
+  lines = []
+  begin
+    if file.match(/(c|t)sv\z/i)
+      puts "Reading a CSV"
+      require 'csv'
+      sep = file.match(/tsv\z/i) ? "\t" : ","
+      CSV.foreach(f, headers: true, col_sep: sep) do |row|
+        lines << row.to_hash
+        count += 1
+      end
+    elsif file.match(/json\z/i)
+      puts "Reading JSON"
+      puts "Loading items in batches of #{BATCH_SIZE} ..."
       while !f.eof?
         lines = []
         BATCH_SIZE.times do
@@ -111,16 +130,15 @@ def load(file)
           lines << MultiJson.decode(f.gets)
           count += 1
         end
-        loader.load(lines)
-        puts "Loaded #{count} items ..." unless f.eof?
       end
-    ensure
-      f.close
+    else
+      puts "unknown File type"
     end
-    puts "Loaded a total of #{count} items in #{Time.now.to_i - start_time} second(s)"
-  else
-    puts "Couldn't open file: #{file}"
+  ensure
+    f.close
   end
+  loader.load(lines)
+  puts "Loaded a total of #{count} items in #{Time.now.to_i - start_time} second(s)"
 end
 
 def add(type)

data/lib/soulheart/base.rb

@@ -48,7 +48,7 @@ module Soulheart
     end
 
     def cache_id(type='all')
-      "#{base_id}:cache:#{type}:"
+      "#{base_id}cache:#{type}:"
     end
   end
 end

data/lib/soulheart/loader.rb

@@ -60,6 +60,7 @@ module Soulheart
       raise 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'] }.
+        tap{ |i| i['priority'] = item.delete('priority').to_f if item['priority'] }.
         merge item
     end
 

data/lib/soulheart/matcher.rb

@@ -8,7 +8,7 @@ module Soulheart
 
     def self.default_params_hash
       {
-        'page' => 0,
+        'page' => 1,
         'per_page' => 5,
         'categories' => [],
         'query' => '',
@@ -36,7 +36,7 @@ module Soulheart
     end
 
     def cache_id_from_opts
-      "#{cache_id(categories_string)}#{@opts['query'].join(':')}:"
+      "#{cache_id(categories_string)}#{@opts['query'].join(':')}"
     end
 
     def interkeys_from_opts(cid)
@@ -53,9 +53,11 @@ module Soulheart
         redis.zinterstore(cachekey, interkeys)
         redis.expire(cachekey, cache_length) # cache_length is set in base.rb
       end
-      page = @opts['page'].to_i
-      per_page = @opts['per_page'].to_i
-      ids = redis.zrevrange(cachekey, page*per_page, per_page-1) # Using 'ids', even though keys are now terms - because clarity?
+      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.zrevrange(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{ |r| r.nil? } # handle cached results for ids which have since been deleted

data/lib/soulheart/server.rb

@@ -17,7 +17,7 @@ module Soulheart
         
     get '/' do
       matches = Matcher.new(params).matches
-      MultiJson.encode({ results:  matches })
+      MultiJson.encode({ matches:  matches })
     end
 
     get '/status' do 

data/lib/soulheart/version.rb

@@ -1,3 +1,3 @@
 module Soulheart
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/soulheart/loader_spec.rb

@@ -15,7 +15,7 @@ describe Soulheart::Loader do
     it "doesn't overwrite the submitted params" do 
       item = {
         'text' => 'Cool ',
-        'priority' => 50,
+        'priority' => '50',
         'category' => 'Gooble',
         'data' => {
           'id' => 199

data/spec/soulheart/matcher_spec.rb

@@ -72,6 +72,33 @@ describe Soulheart::Matcher do
       expect(matches.count).to eq(2)
       expect(matches[0]['text']).to eq('Jannd')
     end
+
+    it "Gets pages and uses them" do
+      # Pagination wrecked my mind, hence the multitude of tests
+      items = [
+        {"text" => 'First item', 'priority' => '11000' },
+        {"text" => 'Second item', 'priority' => '1999' },
+        {"text" => 'Third item', 'priority' => 1900 },
+        {"text" => 'Fourth item', 'priority' => 1800 },
+        {"text" => 'Fifth item', 'priority' => 1750 },
+        {"text" => 'Sixth item', 'priority' => 1700 },
+        {"text" => 'Seventh item', 'priority' => 1699 }
+      ]
+      loader = Soulheart::Loader.new
+      loader.delete_categories
+      loader.load(items)
+
+      page1 = Soulheart::Matcher.new({'per_page' => 1, 'cache' => false}).matches
+      expect(page1[0]['text']).to eq('First item')
+      
+      page2 = Soulheart::Matcher.new({'per_page' => 1, 'page' => 2, 'cache' => false}).matches
+      expect(page2.count).to eq(1)
+      expect(page2[0]['text']).to eq('Second item')
+
+      page3 = Soulheart::Matcher.new({'per_page' => 2, 'page' => 3, 'cache' => false}).matches
+      expect(page3[0]['text']).to eq('Fifth item')
+      expect(page3[1]['text']).to eq('Sixth item')
+    end
   end
 
 end

metadata

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