trifle-stats 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43ed8b8a05c933e5397b59bce9dc18eaee146ac62d2df67eccfbd9a53caad619
-  data.tar.gz: 59f6d4ceba6de8977fcedf6f153fd621bd78a7055102080475c0d1f0e98f952f
+  metadata.gz: a42d81aa9cf531df2abc462167d9b173af444c2089f15f1d53354153b1fb18df
+  data.tar.gz: b5237b9c28ce0779ecdc3f129d26de062084490dd9b470b05ffb975a05ecc293
 SHA512:
-  metadata.gz: 3a6fc973aaedd3167ea5c1b4d2f2cb7ebd8376de153f212005aae43320e59acb992d1034f8a83c5d6063e9b314f916603cd98714ecb9d0a66b02e4dd8dc8fb33
-  data.tar.gz: adfbb9e6625f1f05b20c7f420c6a029b94086882ebd7e02fb3223449fbbc22c6b42c2ad49218b76ad8406570b1c9e2263b677ae93150fe1a6200e00dadddc8e1
+  metadata.gz: d835304df2db49efd76728e0de0bb1ae827680a5ec1a5d4a071a9ac60ca4a045441b8afa5628ca6e38e7f07c010c2cd550bdb15b91409e89f9211242bed17527
+  data.tar.gz: '08e5fa3dceb15fd8927c2320efe73ab543801ac4bac99ff80a478ea344e03b0c6f1f78c7ec23a21c5ac18d22912f4a10774f5a6389e2ae5a428402776e057fc5'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trifle-stats (1.0.0)
+    trifle-stats (1.2.0)
       tzinfo (~> 2.0)
 
 GEM
@@ -49,7 +49,7 @@ GEM
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
 

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

@@ -6,12 +6,13 @@ module Trifle
   module Stats
     class Configuration
       attr_writer :driver
-      attr_accessor :track_ranges, :time_zone, :beginning_of_week
+      attr_accessor :track_ranges, :time_zone, :beginning_of_week, :designator
 
       def initialize
         @ranges = %i[minute hour day week month quarter year]
         @beginning_of_week = :monday
         @time_zone = 'GMT'
+        @designator = nil
       end
 
       def tz

data/lib/trifle/stats/designator/custom.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Trifle
+  module Stats
+    class Designator
+      class Custom
+        attr_reader :buckets
+
+        def initialize(buckets:)
+          @buckets = buckets.sort
+        end
+
+        def designate(value:)
+          return buckets.first.to_s if value <= buckets.first
+          return "#{buckets.last}+" if value > buckets.last
+
+          (buckets.find { |b| value.ceil < b }).to_s
+        end
+      end
+    end
+  end
+end

data/lib/trifle/stats/designator/geometric.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Trifle
+  module Stats
+    class Designator
+      class Geometric
+        attr_reader :min, :max
+
+        def initialize(min:, max:)
+          @min = min.negative? ? 0 : min
+          @max = max
+        end
+
+        def designate(value:) # rubocop:disable Metrics/AbcSize
+          return min.to_f.to_s if value <= min
+          return "#{max.to_f}+" if value > max
+          return (10**value.floor.to_s.length).to_f.to_s if value > 1
+          return 1.0.to_s if value > 0.1 # ugh?
+
+          (1.0 / 10**value.to_s.gsub('0.', '').split(/[1-9]/).first.length).to_s
+        end
+      end
+    end
+  end
+end

data/lib/trifle/stats/designator/linear.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Trifle
+  module Stats
+    class Designator
+      class Linear
+        attr_reader :min, :max, :step
+
+        def initialize(min:, max:, step:)
+          @min = min
+          @max = max
+          @step = step.to_i
+        end
+
+        def designate(value:) # rubocop:disable Metrics/AbcSize
+          return min.to_s if value <= min
+          return "#{max}+" if value > max
+
+          (value.ceil / step * step + ((value.ceil % step).zero? ? 0 : step)).to_s
+        end
+      end
+    end
+  end
+end

data/lib/trifle/stats/driver/README.md

@@ -2,8 +2,8 @@
 
 Driver is a wrapper class that persists and retrieves values from backend. It needs to implement:
 
-- `inc(key:, **values)` method increment values
-- `set(key:, **values)` method set values
+- `inc(keys:, **values)` method increment values
+- `set(keys:, **values)` method set values
 - `get(keys:)` method to retrieve values
 
 ## Documentation

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

@@ -16,24 +16,27 @@ module Trifle
           @separator = '::'
         end
 
-        def inc(key:, **values)
-          pkey = key.join(separator)
+        def inc(keys:, **values)
+          data = self.class.pack(hash: { data: values })
 
           collection.bulk_write(
-            [upsert_operation('$inc', pkey: pkey, values: values)]
+            keys.map do |key|
+              upsert_operation('$inc', pkey: key.join(separator), data: data)
+            end
           )
         end
 
-        def set(key:, **values)
-          pkey = key.join(separator)
+        def set(keys:, **values)
+          data = self.class.pack(hash: { data: values })
 
           collection.bulk_write(
-            [upsert_operation('$set', pkey: pkey, values: values)]
+            keys.map do |key|
+              upsert_operation('$set', pkey: key.join(separator), data: data)
+            end
           )
         end
 
-        def upsert_operation(operation, pkey:, values:)
-          data = self.class.pack(hash: { data: values })
+        def upsert_operation(operation, pkey:, data:)
           {
             update_many: {
               filter: { key: pkey },

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

@@ -16,54 +16,55 @@ module Trifle
           @separator = '::'
         end
 
-        def inc(key:, **values)
-          pkey = key.join(separator)
+        def inc(keys:, **values)
+          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)
+            _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
 
-        def set(key:, **values)
-          pkey = key.join(separator)
+        def set(keys:, **values)
+          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.try(:fetch, '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/driver/process.rb

@@ -12,19 +12,23 @@ module Trifle
           @separator = '::'
         end
 
-        def inc(key:, **values)
-          self.class.pack(hash: values).each do |k, c|
-            d = @data.fetch(key.join(@separator), {})
-            d[k] = d[k].to_i + c
-            @data[key.join(@separator)] = d
+        def inc(keys:, **values)
+          keys.map do |key|
+            self.class.pack(hash: values).each do |k, c|
+              d = @data.fetch(key.join(@separator), {})
+              d[k] = d[k].to_i + c
+              @data[key.join(@separator)] = d
+            end
           end
         end
 
-        def set(key:, **values)
-          self.class.pack(hash: values).each do |k, c|
-            d = @data.fetch(key.join(@separator), {})
-            d[k] = c
-            @data[key.join(@separator)] = d
+        def set(keys:, **values)
+          keys.map do |key|
+            self.class.pack(hash: values).each do |k, c|
+              d = @data.fetch(key.join(@separator), {})
+              d[k] = c
+              @data[key.join(@separator)] = d
+            end
           end
         end
 

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

@@ -16,18 +16,22 @@ module Trifle
           @separator = '::'
         end
 
-        def inc(key:, **values)
-          pkey = ([prefix] + key).join(separator)
+        def inc(keys:, **values)
+          keys.map do |key|
+            pkey = ([prefix] + key).join(separator)
 
-          self.class.pack(hash: values).each do |k, c|
-            client.hincrby(pkey, k, c)
+            self.class.pack(hash: values).each do |k, c|
+              client.hincrby(pkey, k, c)
+            end
           end
         end
 
-        def set(key:, **values)
-          pkey = ([prefix] + key).join(separator)
+        def set(keys:, **values)
+          keys.map do |key|
+            pkey = ([prefix] + key).join(separator)
 
-          client.hmset(pkey, *self.class.pack(hash: values))
+            client.hmset(pkey, *self.class.pack(hash: values))
+          end
         end
 
         def get(keys:)

data/lib/trifle/stats/operations/timeseries/classify.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Trifle
+  module Stats
+    module Operations
+      module Timeseries
+        class Classify
+          attr_reader :key, :values
+
+          def initialize(**keywords)
+            @key = keywords.fetch(:key)
+            @at = keywords.fetch(:at)
+            @values = keywords.fetch(:values)
+            @config = keywords[:config]
+          end
+
+          def config
+            @config || Trifle::Stats.default
+          end
+
+          def deep_classify(hash)
+            hash.transform_values do |value|
+              next deep_classify(value) if value.is_a?(Hash)
+
+              { classify(value) => 1 }
+            end
+          end
+
+          def classify(value)
+            config.designator.designate(value: value).to_s.gsub('.', '_')
+          end
+
+          def key_for(range:)
+            at = Nocturnal.new(@at, config: config).send(range)
+            [key, range, at.to_i]
+          end
+
+          def perform
+            config.driver.inc(
+              keys: config.ranges.map { |range| key_for(range: range) },
+              **deep_classify(values)
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trifle/stats/operations/timeseries/increment.rb

@@ -18,14 +18,16 @@ module Trifle
             @config || Trifle::Stats.default
           end
 
+          def key_for(range:)
+            at = Nocturnal.new(@at, config: config).send(range)
+            [key, range, at.to_i]
+          end
+
           def perform
-            config.ranges.map do |range|
-              at = Nocturnal.new(@at, config: config).send(range)
-              config.driver.inc(
-                key: [key, range, at.to_i],
-                **values
-              )
-            end
+            config.driver.inc(
+              keys: config.ranges.map { |range| key_for(range: range) },
+              **values
+            )
           end
         end
       end

data/lib/trifle/stats/operations/timeseries/set.rb

@@ -18,14 +18,16 @@ module Trifle
             @config || Trifle::Stats.default
           end
 
+          def key_for(range:)
+            at = Nocturnal.new(@at, config: config).send(range)
+            [key, range, at.to_i]
+          end
+
           def perform
-            config.ranges.map do |range|
-              at = Nocturnal.new(@at, config: config).send(range)
-              config.driver.set(
-                key: [key, range, at.to_i],
-                **values
-              )
-            end
+            config.driver.set(
+              keys: config.ranges.map { |range| key_for(range: range) },
+              **values
+            )
           end
         end
       end

data/lib/trifle/stats/version.rb

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

data/lib/trifle/stats.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'trifle/stats/designator/custom'
+require 'trifle/stats/designator/geometric'
+require 'trifle/stats/designator/linear'
 require 'trifle/stats/driver/mongo'
 require 'trifle/stats/driver/postgres'
 require 'trifle/stats/driver/process'
@@ -7,6 +10,7 @@ require 'trifle/stats/driver/redis'
 require 'trifle/stats/mixins/packer'
 require 'trifle/stats/nocturnal'
 require 'trifle/stats/configuration'
+require 'trifle/stats/operations/timeseries/classify'
 require 'trifle/stats/operations/timeseries/increment'
 require 'trifle/stats/operations/timeseries/set'
 require 'trifle/stats/operations/timeseries/values'
@@ -45,6 +49,15 @@ module Trifle
       ).perform
     end
 
+    def self.assort(key:, at:, values:, config: nil)
+      Trifle::Stats::Operations::Timeseries::Classify.new(
+        key: key,
+        at: at,
+        values: values,
+        config: config
+      ).perform
+    end
+
     def self.values(key:, from:, to:, range:, config: nil)
       Trifle::Stats::Operations::Timeseries::Values.new(
         key: key,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trifle-stats
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jozef Vaclavik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-18 00:00:00.000000000 Z
+date: 2022-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -183,6 +183,9 @@ files:
 - bin/setup
 - lib/trifle/stats.rb
 - lib/trifle/stats/configuration.rb
+- lib/trifle/stats/designator/custom.rb
+- lib/trifle/stats/designator/geometric.rb
+- lib/trifle/stats/designator/linear.rb
 - lib/trifle/stats/driver/README.md
 - lib/trifle/stats/driver/mongo.rb
 - lib/trifle/stats/driver/postgres.rb
@@ -190,6 +193,7 @@ files:
 - lib/trifle/stats/driver/redis.rb
 - lib/trifle/stats/mixins/packer.rb
 - lib/trifle/stats/nocturnal.rb
+- lib/trifle/stats/operations/timeseries/classify.rb
 - lib/trifle/stats/operations/timeseries/increment.rb
 - lib/trifle/stats/operations/timeseries/set.rb
 - lib/trifle/stats/operations/timeseries/values.rb