Merge branch 'master' into fix-specs

Author: oldmoe

BENCHMARKS.md

@@ -125,16 +125,16 @@ On average, Litecable is quite faster than the Redis based version and offers be
 
 > ![litesearch](https://github.com/oldmoe/litestack/blob/master/assets/litesearch_logo_teal.png?raw=true)
 
-Litesearch was benchmarked against Mielsearch, both using their respective ActiveRecord integrations. Mielsearch was running on the same machine as the benchmark script and was using the default configuration options. The dataset used for testing was the infamous Enron email corpus. Redisearch was not benchmarked due to the clients being not Rails 7.1 compatible (yet), will probably bench Redisearch when they are.
+Litesearch was benchmarked against Meilisearch, both using their respective ActiveRecord integrations. Meilisearch was running on the same machine as the benchmark script and was using the default configuration options. The dataset used for testing was the infamous Enron email corpus. Redisearch was not benchmarked due to the clients being not Rails 7.1 compatible (yet), will probably bench Redisearch when they are.
 
 ### Building the index
 
-||MieliSearch|Litesearch|
+||Meilisearch|Litesearch|
 |-:|-:|-:|
 |Time to insert 10K docs|265.42 seconds|29.06 seconds|
 |Inserted docs/second|38|344|
 |Search latency (3 terms)|7.51 ms| 0.051ms|
 |Searches/second|133|19608|
 |Index rebuild|0.822|0.626|
 
-We only limited the test to 10K documents becuause MieliSearch was taking a long time to index, so we decided to stop at a reasonable sample size. The search numbers for litesearch were double checked, event against a 100K document set and they remained virtually the same. It is clear that litesearch is much faster than MieliSearch in both indexing and searching, this could be partially attributed to litesearch being a simpler text search engine, but still, the difference is huge! For rebuilding the index though, Litesearch is not that much faster than Mielisearch.
+We only limited the test to 10K documents becuause Meilisearch was taking a long time to index, so we decided to stop at a reasonable sample size. The search numbers for litesearch were double checked, event against a 100K document set and they remained virtually the same. It is clear that litesearch is much faster than Meilisearch in both indexing and searching, this could be partially attributed to litesearch being a simpler text search engine, but still, the difference is huge! For rebuilding the index though, Litesearch is not that much faster than Meilisearch.

bin/liteboard

@@ -2,6 +2,9 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require 'erb'
+require 'yaml'
+require 'rackup'
 require_relative '../lib/litestack/liteboard/liteboard'
 DEFAULTS = {
   config_path: Litemetric::DEFAULT_OPTIONS[:config_path],
@@ -15,7 +18,7 @@ options = {
   Port: 9292,
   Host: 'localhost',
   environment: 'production',
-  pid: 'tmp/pids/liteboard.pid',
+  pid: './liteboard.pid',
   quiet: false
 }
 
@@ -49,14 +52,14 @@ check_database(options[:path]) if options[:path]
 config = nil
 if options[:config_path]
   begin
-    config = Yaml.load_file(options[:config_path])
+    config = YAML.load(ERB.new(File.read(options[:config_path])).result)
   rescue
     puts "liteboard: missing or bad config file, please ensure the config file path is correct"
     puts "liteboard: exiting"
     exit
   end
 else # no config path! use the default
-  config = Yaml.load_file(DEFAULTS[:config_path]) rescue nil
+  config = YAML.load(ERB.new(File.read(DEFAULTS[:config_path])).result) rescue nil 
 end
 
 if config
@@ -78,4 +81,4 @@ options[:app] = Liteboard.app
 require_relative '../lib/litestack'
 puts "Starting Liteboard version #{Litestack::VERSION}"
 
-Rack::Server.start(options)
+Rackup::Server.start(options)

lib/litestack/liteboard/liteboard.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "hanami/router"
+require "rack"
 require "tilt"
 require "erubi"
 
@@ -11,37 +11,32 @@ class Liteboard
   @@resolutions = {"minute" => [300, 12], "hour" => [3600, 24], "day" => [3600 * 24, 7], "week" => [3600 * 24 * 7, 53], "year" => [3600 * 24 * 365, 100]}
   @@res_mapping = {"hour" => "minute", "day" => "hour", "week" => "day", "year" => "week"}
   @@templates = {}
-  @@app = Hanami::Router.new do
-    get "/", to: ->(env) do
+  @@app = proc do |env|
+    case path = env["PATH_INFO"]
+    when "/"
       Liteboard.new(env).call(:index)
-    end
-
-    get "/topics/Litejob", to: ->(env) do
+    when "/topics/Litejob"
       Liteboard.new(env).call(:litejob)
-    end
-
-    get "/topics/Litecache", to: ->(env) do
+    when "/topics/Litecache"
       Liteboard.new(env).call(:litecache)
-    end
-
-    get "/topics/Litedb", to: ->(env) do
+    when "/topics/Litedb"
       Liteboard.new(env).call(:litedb)
-    end
-
-    get "/topics/Litecable", to: ->(env) do
+    when "/topics/Litecable"
       Liteboard.new(env).call(:litecable)
     end
+
   end
 
   def initialize(env)
     @env = env
-    @params = @env["router.params"]
+    @req = Rack::Request.new(@env)
+    @params = @req.params 
     @running = true
     @lm = Litemetric.instance
   end
 
   def params(key)
-    URI.decode_uri_component(@params[key].to_s)
+    URI.decode_uri_component(@params[key.to_s].to_s)
   end
 
   def call(method)
@@ -227,9 +222,9 @@ def litejob
     @topic = "Litejob"
     @events = @lm.events_summaries(@topic, @resolution, @order, @dir, @search, @step * @count)
     @events.each do |event|
-      data_points = @lm.event_data_points(@step, @count, @resolution, @topic, event["name"])
+      data_points = @lm.event_data_points(@step, @count, @resolution, @topic, event[:name])
       event["counts"] = data_points.collect { |r| [r["rtime"], r["rcount"] || 0] }
-      event["values"] = data_points.collect { |r| [r["rtime"], r["rtotal"] || 0] }
+      event["values"] = data_points.collect { |r| [r["rtime"], (r["rtotal"] || 0.0)] }
     end
     @snapshot = read_snapshot(@topic)
     @size = begin
@@ -391,6 +386,7 @@ def round(float)
   end
 
   def format(float)
+    float = float.round(3)
     string = float.to_s
     whole, decimal = string.split(".")
     whole = whole.chars.reverse.each_slice(3).map(&:join).join(",").reverse

lib/litestack/litejobqueue.rb

@@ -141,15 +141,16 @@ def stop
 
   def exit_callback
     @running = false # stop all workers
-    return unless @jobs_in_flight > 0
-    puts "--- Litejob detected an exit, cleaning up"
-    index = 0
-    while @jobs_in_flight > 0 && index < 30 # 3 seconds grace period for jobs to finish
-      puts "--- Waiting for #{@jobs_in_flight} jobs to finish"
-      sleep 0.1
-      index += 1
+    if @jobs_in_flight > 0
+      puts "--- Litejob detected an exit, cleaning up"
+      index = 0
+      while @jobs_in_flight > 0 && index < 30 # 3 seconds grace period for jobs to finish
+        puts "--- Waiting for #{@jobs_in_flight} jobs to finish"
+        sleep 0.1
+        index += 1
+      end
+      puts " --- Exiting with #{@jobs_in_flight} jobs in flight"
     end
-    puts " --- Exiting with #{@jobs_in_flight} jobs in flight"
   end
 
   def setup
@@ -179,6 +180,7 @@ def schedule(spawn = false, &block)
 
   # create a worker according to environment
   def create_worker
+    return if defined?(Rails) && !defined?(Rails::Server)
     Litescheduler.spawn do
       worker_sleep_index = 0
       while @running

lib/litestack/litemetric.rb

@@ -148,10 +148,11 @@ def run_stmt_hash(stmt, *args)
   end
 
   def exit_callback
-    return unless @collector.count > 0
-    warn "--- Litemetric detected an exit, flushing metrics"
     @running = false
-    @collector.flush
+    if @collector.count > 0
+      warn "--- Litemetric detected an exit, flushing metrics"
+      @collector.flush
+    end
   end
 
   def setup
@@ -203,8 +204,8 @@ def collect_metrics
     def create_snapshotter
       Litescheduler.spawn do
         while @running
-          sleep @litemetric.options[:snapshot_interval]
           capture_snapshot
+          sleep @litemetric.options[:snapshot_interval]
         end
       end
     end

lib/litestack/litesupport.rb

@@ -6,6 +6,7 @@
 require "yaml"
 require "pathname"
 require "fileutils"
+require "erb"
 
 require_relative "litescheduler"
 
@@ -14,7 +15,7 @@ class Error < StandardError; end
 
   # Detect the Rack or Rails environment.
   def self.detect_environment
-    if defined? Rails
+    if defined?(Rails) && Rails.respond_to?(:env)
       Rails.env
     elsif ENV["RACK_ENV"]
       ENV["RACK_ENV"]
@@ -182,7 +183,7 @@ def configure(options = {})
       end
       @options = defaults.merge(options)
       config = begin
-        YAML.load_file(@options[:config_path])
+        YAML.load(ERB.new(File.read(@options[:config_path])).result)
       rescue
         {}
       end # an empty hash won't hurt

lib/litestack/railtie.rb

@@ -3,8 +3,10 @@
 module Litestack
   class Railtie < ::Rails::Railtie
     initializer :disable_production_sqlite_warning do |app|
-      # The whole point of this gem is to use sqlite3 in production.
-      app.config.active_record.sqlite3_production_warning = false
+      if config.active_record.key?(:sqlite3_production_warning)
+        # The whole point of this gem is to use sqlite3 in production.
+        app.config.active_record.sqlite3_production_warning = false
+      end
     end
   end
 end

lib/litestack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Litestack
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

litestack.gemspec

@@ -33,10 +33,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sqlite3"
   spec.add_dependency "oj"
   spec.add_dependency "rack"
-  spec.add_dependency "hanami-router", "~> 2.0"
+  spec.add_dependency "rackup"
   spec.add_dependency "tilt"
   spec.add_dependency "erubi"
-
+  spec.add_development_dependency "activerecord"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "activerecord"
   spec.add_development_dependency "railties"

test/test_configuration.rb

@@ -0,0 +1,38 @@
+require "minitest/autorun"
+require_relative "../lib/litestack/litesupport"
+
+class SampleLiteComponent
+  include Litesupport::Liteconnection
+
+  def initialize(options = {})
+    init(options)
+  end
+end
+
+class TestConfiguration < Minitest::Test
+  def test_yaml_with_no_erb
+    config_file = Tempfile.new(['litecomponent', '.yml'])
+    config_file.write('path: ":memory:"')
+    
+    config_file.read
+    
+    sample_component = SampleLiteComponent.new({config_path: config_file.path})
+
+    assert_equal sample_component.options[:path], ":memory:"
+
+    config_file.close!
+  end
+
+  def test_yaml_with_erb
+    config_file = Tempfile.new(['litecomponent', '.yml'])
+    config_file.write('path: "<%= ":memory:" %>"')
+    
+    config_file.read
+    
+    sample_component = SampleLiteComponent.new({config_path: config_file.path})
+
+    assert_equal sample_component.options[:path], ":memory:"
+
+    config_file.close!
+  end
+end

test/test_jobqueue.rb

@@ -28,8 +28,8 @@ def teardown
   def test_push
     @jobqueue.push(MyJob.name, [Time.now.to_i], 0, "test")
     assert @jobqueue.count != 0
-    sleep 1.2
-    assert @jobqueue.count == 0
+    assert 0..2, @jobqueue.count == 0
+    @jobqueue.clear
   end
 
   def test_delete
@@ -47,8 +47,8 @@ def test_push_with_delay
     assert @jobqueue.count != 0
     sleep 0.1
     assert @jobqueue.count != 0
-    sleep 2
-    assert @jobqueue.count == 0
+    assert 0..2, @jobqueue.count == 0
+    @jobqueue.clear
   end
 
   def test_retry
@@ -57,14 +57,13 @@ def test_retry
     assert @jobqueue.count != 0
     sleep 0.1
     assert @jobqueue.count != 0
-    sleep 2.5
-    assert @jobqueue.count("test") == 0
+    assert 0..3, @jobqueue.count("test") == 0
     # should fail forever
     @jobqueue.push(MyJob.name, [Time.now.to_i + 3], 0, "test")
     assert @jobqueue.count != 0
     sleep 0.1
     assert @jobqueue.count != 0
-    sleep 2.1
-    assert @jobqueue.count("test") == 0
+    assert 0..3, @jobqueue.count("test") == 0
+    @jobqueue.clear
   end
 end