trifle-stats 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ac85761915230026b6ab5affd1ac6d45236d36d2434a69a4128d8b08c04af12
-  data.tar.gz: e9255ab996fc187925f67459fe3ce93e2af6428e7f1429267de4c1b874d7de4e
+  metadata.gz: a42d81aa9cf531df2abc462167d9b173af444c2089f15f1d53354153b1fb18df
+  data.tar.gz: b5237b9c28ce0779ecdc3f129d26de062084490dd9b470b05ffb975a05ecc293
 SHA512:
-  metadata.gz: 0cd919f5670dba68d02cb477b39a95bd424811c95cef99b54d28b3557aabb738ac39d73a907ca2ce595623af23ddcdf69780403471a49f29a37c05fdf5eeb6f6
-  data.tar.gz: 897e2860a614d65523999b7a3e07395188be479fdec837aabc57ae6f8e2cf252d28a0fed0459505bd96d771af54c1afa3ff4deb7a5c54e21116dbcca4547139e
+  metadata.gz: d835304df2db49efd76728e0de0bb1ae827680a5ec1a5d4a071a9ac60ca4a045441b8afa5628ca6e38e7f07c010c2cd550bdb15b91409e89f9211242bed17527
+  data.tar.gz: '08e5fa3dceb15fd8927c2320efe73ab543801ac4bac99ff80a478ea344e03b0c6f1f78c7ec23a21c5ac18d22912f4a10774f5a6389e2ae5a428402776e057fc5'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trifle-stats (1.1.2)
+    trifle-stats (1.2.0)
       tzinfo (~> 2.0)
 
 GEM

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/postgres.rb

@@ -20,15 +20,13 @@ module Trifle
           keys.map do |key|
             pkey = key.join(separator)
 
-            self.class.pack(hash: values).each do |k, c|
-              _inc_one(key: pkey, name: k, value: c)
-            end
+            _inc_all(key: pkey, data: self.class.pack(hash: values))
           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
+        def _inc_all(key:, data:)
+          query = "INSERT INTO trifle_stats(key, data) VALUES ('#{key}', '#{data.to_json}') ON CONFLICT (key) DO UPDATE SET data = " + # rubocop:disable Layout/LineLength
+                  data.inject('to_jsonb(trifle_stats.data)') { |o, (k, v)| "jsonb_set(#{o}, '{#{k}}', (COALESCE(trifle_stats.data->>'#{k}', '0')::int + #{v})::text::jsonb)" } # rubocop:disable Layout/LineLength
 
           client.exec(query)
         end
@@ -37,37 +35,36 @@ module Trifle
           keys.map do |key|
             pkey = key.join(separator)
 
-            _set_all(key: pkey, **values)
+            _set_all(key: pkey, data: self.class.pack(hash: values))
           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
+        def _set_all(key:, data:)
+          query = "INSERT INTO trifle_stats(key, data) VALUES ('#{key}', '#{data.to_json}') ON CONFLICT (key) DO UPDATE SET data = " + # rubocop:disable Layout/LineLength
+                  data.inject('to_jsonb(trifle_stats.data)') { |o, (k, v)| "jsonb_set(#{o}, '{#{k}}', (#{v})::text::jsonb)" } # rubocop:disable Layout/LineLength
 
           client.exec(query)
         end
 
         def get(keys:)
-          keys.map do |key|
-            pkey = key.join(separator)
-
-            data = _get(key: pkey)
-            return {} if data.nil?
+          pkeys = keys.map { |key| key.join(separator) }
+          data = _get_all(keys: pkeys)
+          map = data.inject({}) { |o, d| o.merge(d['key'] => d['data']) }
 
-            self.class.unpack(hash: data)
-          end
+          pkeys.map { |pkey| self.class.unpack(hash: map[pkey]) || {} }
         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?
+        def _get_all(keys:)
+          results = client.exec_params(
+            "SELECT * FROM #{table_name} WHERE key IN ('#{keys.join("', '")}');"
+          ).to_a
 
-          JSON.parse(result['data'])
-        rescue JSON::ParserError
-          nil
+          results.map do |r|
+            r['data'] = JSON.parse(r['data'])
+            r
+          rescue JSON::ParserError
+            r
+          end
         end
       end
     end

data/lib/trifle/stats/version.rb

@@ -2,6 +2,6 @@
 
 module Trifle
   module Stats
-    VERSION = '1.1.2'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trifle-stats
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Jozef Vaclavik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-30 00:00:00.000000000 Z
+date: 2022-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler