trifle-stats 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2ab7e87008ccd472bcbb2f821db69a304c0d2be078827150d828459c62b9ffa
-  data.tar.gz: 7e6b5b77c70845d2c2d7b5b29f7a9811bba32f166f3a6204fb13e931c29ab90e
+  metadata.gz: 1a496a80a0581a3fb0ab818d86132fd9b1e7377ff271b25e654e91a543c35eb5
+  data.tar.gz: 85eba8c25e377e2d30b17b092a91bf5f5ef13f8eddbe39c5b5d910ef7f092050
 SHA512:
-  metadata.gz: 49870c3899c775ce1a91a857cc39f9cc92c05b6bb7ffe211ecf52adf033436942f5db44942cd4e2f84143b8111e586b25254f88f4d9c4cf8c9123adac20503e8
-  data.tar.gz: 3dee093eed89e39a2dbc0c867dba0529359a9cba84f11c021fad8a78246e2e0d1115119ee896658e8ed917546757423432078faece8c582f559923b973170938
+  metadata.gz: f8f68bd3587f76c996ea3707815d2779e74e68a25a4da0cf74fb27ae592ea66d702e654b39accf11eb3bb03e67d62f16033cc4aa949e396d9e19a3f5bc8c87f1
+  data.tar.gz: ae59825f8565c8ac8cd404f43088fccb42f645a9dcf1519e3fe370d46e181062bce7f31420ddd5cfc3539c852a609551bbbacbe4aa1203b1e69a9f826f0f26ba

data/.devops/docker/codespaces/Dockerfile

@@ -1 +1 @@
-FROM trifle/environment:1.0.2
+FROM trifle/environment:1.0.4

data/.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 /.byebug_history
+stats.db

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trifle-stats (1.1.1)
+    trifle-stats (1.3.0)
       tzinfo (~> 2.0)
 
 GEM
@@ -49,7 +49,8 @@ GEM
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
-    tzinfo (2.0.4)
+    sqlite3 (1.4.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
 
@@ -67,6 +68,7 @@ DEPENDENCIES
   redis (>= 4.2)
   rspec (~> 3.0)
   rubocop (= 1.0.0)
+  sqlite3 (>= 1.4.4)
   trifle-stats!
 
 BUNDLED WITH

data/README.md

@@ -12,7 +12,7 @@ Simple analytics backed by Redis, Postgres, MongoDB, Google Analytics, Segment,
 
 ## Documentation
 
-You can find guides and documentation at https://trifle.io/docs/stats
+You can find guides and documentation at https://trifle.io/trifle-stats
 
 ## Installation
 

data/bin/console

@@ -2,6 +2,7 @@
 
 require "bundler/setup"
 require "trifle/stats"
+require "byebug"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/trifle/stats/driver/mongo.rb

@@ -16,6 +16,11 @@ module Trifle
           @separator = '::'
         end
 
+        def self.setup!(client, collection_name: 'trifle_stats')
+          client[collection_name].create
+          client[collection_name].indexes.create_one({ key: 1 }, unique: true)
+        end
+
         def inc(keys:, **values)
           data = self.class.pack(hash: { data: values })
 

data/lib/trifle/stats/driver/postgres.rb

@@ -16,58 +16,68 @@ module Trifle
           @separator = '::'
         end
 
-        def inc(keys:, **values)
-          keys.map do |key|
-            pkey = key.join(separator)
+        def self.setup!(client = PG::Connection.new, table_name: 'trifle_stats')
+          client.exec("CREATE TABLE #{table_name} (key VARCHAR(255) PRIMARY KEY, data JSONB NOT NULL DEFAULT '{}'::jsonb)") # rubocop:disable Layout/LineLength
+        end
 
-            self.class.pack(hash: values).each do |k, c|
-              _inc_one(key: pkey, name: k, value: c)
+        def inc(keys:, **values)
+          data = self.class.pack(hash: values)
+          client.transaction do |c|
+            keys.map do |key|
+              pkey = key.join(separator)
+              c.exec(inc_query(key: pkey, data: data))
             end
           end
         end
 
-        def _inc_one(key:, name:, value:)
-          data = { name => value }
-          query = "INSERT INTO trifle_stats(key, data) VALUES ('#{key}', '#{data.to_json}') ON CONFLICT (key) DO UPDATE SET data = jsonb_set(to_jsonb(trifle_stats.data), '{#{name}}', (COALESCE(trifle_stats.data->>'#{name}','0')::int + #{value})::text::jsonb)" # rubocop:disable Metric/LineLength
-
-          client.exec(query)
+        def inc_query(key:, data:)
+          <<-SQL
+            INSERT INTO #{table_name} (key, data) VALUES ('#{key}', '#{data.to_json}')
+            ON CONFLICT (key) DO UPDATE SET data =
+            #{data.inject("to_jsonb(#{table_name}.data)") { |o, (k, v)| "jsonb_set(#{o}, '{#{k}}', (COALESCE(trifle_stats.data->>'#{k}', '0')::int + #{v})::text::jsonb)" }};
+          SQL
         end
 
         def set(keys:, **values)
-          keys.map do |key|
-            pkey = key.join(separator)
-
-            _set_all(key: pkey, **values)
+          data = self.class.pack(hash: values)
+          client.transaction do |c|
+            keys.map do |key|
+              pkey = key.join(separator)
+              c.exec(set_query(key: pkey, data: data))
+            end
           end
         end
 
-        def _set_all(key:, **values)
-          data = self.class.pack(hash: values)
-          query = "INSERT INTO trifle_stats(key, data) VALUES ('#{key}', '#{data.to_json}') ON CONFLICT (key) DO UPDATE SET data = '#{data.to_json}'" # rubocop:disable Metric/LineLength
-
-          client.exec(query)
+        def set_query(key:, data:)
+          <<-SQL
+            INSERT INTO #{table_name} (key, data) VALUES ('#{key}', '#{data.to_json}')
+            ON CONFLICT (key) DO UPDATE SET data =
+            #{data.inject("to_jsonb(#{table_name}.data)") { |o, (k, v)| "jsonb_set(#{o}, '{#{k}}', (#{v})::text::jsonb)" }}
+          SQL
         end
 
         def get(keys:)
-          keys.map do |key|
-            pkey = key.join(separator)
+          pkeys = keys.map { |key| key.join(separator) }
+          data = get_all(keys: pkeys)
+          map = data.inject({}) { |o, d| o.merge(d[:key] => d[:data]) }
 
-            data = _get(key: pkey)
-            return {} if data.nil?
+          pkeys.map { |pkey| self.class.unpack(hash: map.fetch(pkey, {})) }
+        end
+
+        def get_all(keys:)
+          results = client.exec_params(get_query(keys: keys)).to_a
 
-            self.class.unpack(hash: data)
+          results.map do |r|
+            { key: r['key'], data: JSON.parse(r['data']) }
+          rescue JSON::ParserError
+            { key: r['key'], data: {} }
           end
         end
 
-        def _get(key:)
-          result = client.exec_params(
-            "SELECT * FROM #{table_name} WHERE key = $1 LIMIT 1;", [key]
-          ).to_a.first
-          return nil if result.nil?
-
-          JSON.parse(result.try(:fetch, 'data'))
-        rescue JSON::ParserError
-          nil
+        def get_query(keys:)
+          <<-SQL
+            SELECT * FROM #{table_name} WHERE key IN ('#{keys.join("', '")}');
+          SQL
         end
       end
     end

data/lib/trifle/stats/driver/sqlite.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'sqlite3'
+require_relative '../mixins/packer'
+
+module Trifle
+  module Stats
+    module Driver
+      class Sqlite
+        include Mixins::Packer
+        attr_accessor :client, :table_name, :separator
+
+        def initialize(client = SQLite3::Database.new('stats.db'), table_name: 'trifle_stats')
+          @client = client
+          @table_name = table_name
+          @separator = '::'
+        end
+
+        def self.setup!(client = SQLite3::Database.new('stats.db'), table_name: 'trifle_stats')
+          client.execute("CREATE TABLE #{table_name} (key varchar(255), data json);")
+          client.execute("CREATE UNIQUE INDEX idx_#{table_name}_key ON #{table_name} (key);")
+        end
+
+        def inc(keys:, **values)
+          data = self.class.pack(hash: values)
+          client.transaction do |c|
+            keys.each do |key|
+              pkey = key.join(separator)
+              c.execute(inc_query(key: pkey, data: data))
+            end
+          end
+        end
+
+        def inc_query(key:, data:)
+          <<-SQL
+            INSERT INTO #{table_name} (key, data) values('#{key}', json('#{data.to_json}'))
+            ON CONFLICT (key) DO UPDATE SET data =
+            #{data.inject('data') { |o, (k, v)| "json_set(#{o}, '$.#{k}', IFNULL(json_extract(data, '$.#{k}'), 0) + #{v})" }};
+          SQL
+        end
+
+        def set(keys:, **values)
+          data = self.class.pack(hash: values)
+          client.transaction do |c|
+            keys.each do |key|
+              pkey = key.join(separator)
+              c.execute(set_query(key: pkey, data: data))
+            end
+          end
+        end
+
+        def set_query(key:, data:)
+          <<-SQL
+            INSERT INTO #{table_name} (key, data) values('#{key}', json('#{data.to_json}'))
+            ON CONFLICT (key) DO UPDATE SET data =
+            #{data.inject('data') { |o, (k, v)| "json_set(#{o}, '$.#{k}', #{v})" }};
+          SQL
+        end
+
+        def get(keys:)
+          pkeys = keys.map { |key| key.join(separator) }
+          data = get_all(keys: pkeys)
+          map = data.inject({}) { |o, d| o.merge(d[:key] => d[:data]) }
+
+          pkeys.map { |pkey| map.fetch(pkey, {}) }
+        end
+
+        def get_all(keys:)
+          results = client.execute(get_query(keys: keys)).to_a
+
+          results.map do |key, data|
+            { key: key, data: JSON.parse(data) }
+          rescue JSON::ParserError
+            { key: key, data: {} }
+          end
+        end
+
+        def get_query(keys:)
+          <<-SQL
+            SELECT key, data FROM #{table_name} WHERE key IN ('#{keys.join("', '")}');
+          SQL
+        end
+      end
+    end
+  end
+end

data/lib/trifle/stats/version.rb

@@ -2,6 +2,6 @@
 
 module Trifle
   module Stats
-    VERSION = '1.1.1'
+    VERSION = '1.3.0'
   end
 end

data/lib/trifle/stats.rb

@@ -7,6 +7,7 @@ require 'trifle/stats/driver/mongo'
 require 'trifle/stats/driver/postgres'
 require 'trifle/stats/driver/process'
 require 'trifle/stats/driver/redis'
+require 'trifle/stats/driver/sqlite'
 require 'trifle/stats/mixins/packer'
 require 'trifle/stats/nocturnal'
 require 'trifle/stats/configuration'

data/trifle-stats.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('byebug', '>= 0')
   spec.add_development_dependency('dotenv')
   spec.add_development_dependency('mongo', '>= 2.14.0')
+  spec.add_development_dependency('sqlite3', '>= 1.4.4')
   spec.add_development_dependency('pg', '>= 1.2')
   spec.add_development_dependency('rake', '~> 13.0')
   spec.add_development_dependency('redis', '>= 4.2')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trifle-stats
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jozef Vaclavik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +205,7 @@ files:
 - lib/trifle/stats/driver/postgres.rb
 - lib/trifle/stats/driver/process.rb
 - lib/trifle/stats/driver/redis.rb
+- lib/trifle/stats/driver/sqlite.rb
 - lib/trifle/stats/mixins/packer.rb
 - lib/trifle/stats/nocturnal.rb
 - lib/trifle/stats/operations/timeseries/classify.rb