trifle-stats 0.1.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd4c1f777b76f6684d0ba5bbe2e3931585506325b4984192754570631d0c988
-  data.tar.gz: 11b7dafeaead2148f1659c663335b6a0d6e4f4daba8dd7b9dbf339783d757db6
+  metadata.gz: 1172a6216efbeaad062de0f482b9fd3b4bc19173326c9eb1f51c88c9d59889f2
+  data.tar.gz: d971dafe8147352aa04162ea7437b88eaf3f94b4cbd7939bda187eb9a2bb0d9d
 SHA512:
-  metadata.gz: 8a84f59fe3277ce49ab4608a2fd47e7238488ae98e616d071c290900843b13ce33560a46d10a94d402cf33416b417f22f39c1bebfeb4340d6d5aae33753d7655
-  data.tar.gz: 6f4b533bebe8f4fb2cda97d40b7e3b7d503033be99441194dfe5266eec35462c3b4db1641742c67a035692e618c3b9411fcb29471ef2592a74e0bd705401de89
+  metadata.gz: 20e2bcef27f5a2cce12574ac3b92c13972e8fda1cae6437d6b1ced58fc4d877032048c9650080719d9da68fccd75643379021dddda8de375a380d334a2ae9ed3
+  data.tar.gz: 4db1a6c31ec03fc22f519f5f6d508af8ce6ad44b2a9ec15b9b845808b038db297d8dc9551e298865401ee7fa837c9c1f50546c9bbdee710cfd7b64cd9ec218ce

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    trifle-stats (0.1.0)
+    trifle-stats (0.3.2)
+      pg (>= 1.2)
       redis (>= 4.2)
       tzinfo (~> 2.0)
 
@@ -16,6 +17,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
+    pg (1.2.3)
     rainbow (3.0.0)
     rake (12.3.3)
     redis (4.2.5)

data/README.md

@@ -1,4 +1,4 @@
-# Trifle
+# Trifle::Stats
 
 [![Gem Version](https://badge.fury.io/rb/trifle-stats.svg)](https://badge.fury.io/rb/trifle-stats)
 ![Ruby](https://github.com/trifle-io/trifle-stats/workflows/Ruby/badge.svg?branch=main)
@@ -6,9 +6,13 @@
 
 Simple analytics backed by Redis, Postgres, MongoDB, Google Analytics, Segment, or whatever. [^1]
 
-Trifle is a _way too_ simple timeline analytics that helps you track custom metrics. Automatically increments counters for each enabled range. It supports timezones and different week beginning.
+`Trifle::Stats` is a _way too_ simple timeline analytics that helps you track custom metrics. Automatically increments counters for each enabled range. It supports timezones and different week beginning.
 
-[^1] TBH only Redis for now 💔.
+[^1]: TBH only Redis for now 💔.
+
+## Documentation
+
+You can find guides and documentation at https://trifle.io/docs/stats
 
 ## Installation
 
@@ -54,19 +58,6 @@ Trifle::Stats.track(key: 'event::logs', at: Time.now, values: {count: 1, duratio
 => [{2021-01-25 16:00:00 +0100=>{:count=>1, :duration=>5, :lines=>361}}, {2021-01-25 00:00:00 +0100=>{:count=>1, :duration=>5, :lines=>361}}]
 ```
 
-You can also store nested counters like
-```ruby
-Trifle::Stats.track(key: 'event::logs', at: Time.now, values: {
-  count: 1,
-  duration: {
-    parsing: 21,
-    compression: 8,
-    upload: 1
-  },
-  lines: 25432754
-})
-```
-
 ### Get values
 
 Retrieve your values for specific `range`.
@@ -75,55 +66,6 @@ Trifle::Stats.values(key: 'event::logs', from: Time.now, to: Time.now, range: :d
 => [{2021-01-25 00:00:00 +0100=>{"count"=>3, "duration"=>8, "lines"=>658}}]
 ```
 
-### Configuration
-
-Configuration allows you to specify:
-- `driver` - backend driver used to persist and retrieve data.
-- `track_ranges` - list of timeline ranges you would like to track. Value must be list of symbols, defaults to `[:minute, :hour, :day, :week, :month, :quarter, :year]`.
-- `separator` - keys can get serialized in backend, separator is used to join these values. Value must be string, defaults to `::`.
-- `time_zone` - TZInfo zone to properly generate range for timeline values. Value must be valid TZ string identifier, otherwise it defaults and fallbacks to `'GMT'`.
-- `beginning_of_week` - first day of week. Value must be string, defaults to `:monday`.
-
-Gem expecs global configuration to be present. You can do this by creating initializer, or calling it on the beginning of your ruby script.
-
-Custom configuration can be passed as a keyword argument to `Resource` objects and all module methods (`track`, `values`). This way you can pass different driver or ranges for different type of data youre storing - ie set different ranges or set expiration date on your data.
-
-```ruby
-configuration = Trifle::Stats::Configuration.new
-configuration.driver = Trifle::Stats::Driver::Redis.new
-configuration.track_ranges = [:day]
-configuration.time_zone = 'GMT'
-configuration.separator = '#'
-
-# or use different driver
-mongo_configuration = Trifle::Stats::Configuration.new
-mongo_configuration.driver = Trifle::Stats::Driver::MongoDB.new
-mongo_configuration.time_zone = 'Asia/Dubai'
-```
-
-You can then pass it into module methods.
-```ruby
-Trifle::Stats.track(key: 'event#checkout', at: Time.now, values: {count: 1}, config: configuration)
-
-Trifle::Stats.track(key: 'event#checkout', at: Time.now, values: {count: 1}, config: mongo_configuration)
-```
-
-### Driver
-
-Driver is a wrapper around existing client libraries that talk to DB or API. It is used to store and retrieve values. You can read more in [Driver Readme](https://github.com/trifle-io/trifle-stats/tree/main/lib/trifle/ruby/driver).
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Gitpod
-
-This repository comes Gitpod ready. If you wanna try and get your hands dirty with Trifle, click [here](https://gitpod.io/#https://github.com/trifle-io/trifle-stats) and watch magic happening.
-
-It launches from custom base image that includes Redis, MongoDB, Postgres & MariaDB. This should give you enough playground to launch `./bin/console` and start messing around. You can see the Gitpod image in the [hub](https://hub.docker.com/r/trifle/gitpod).
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/trifle-io/trifle-stats.

data/lib/trifle/stats.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require 'trifle/stats/driver/redis'
+require 'trifle/stats/driver/postgres'
 require 'trifle/stats/driver/process'
 require 'trifle/stats/mixins/packer'
 require 'trifle/stats/nocturnal'
 require 'trifle/stats/configuration'
 require 'trifle/stats/operations/timeseries/increment'
+require 'trifle/stats/operations/timeseries/set'
 require 'trifle/stats/operations/timeseries/values'
 require 'trifle/stats/version'
 
@@ -33,6 +35,15 @@ module Trifle
       ).perform
     end
 
+    def self.assert(key:, at:, values:, config: nil)
+      Trifle::Stats::Operations::Timeseries::Set.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,

data/lib/trifle/stats/configuration.rb

@@ -6,11 +6,9 @@ module Trifle
   module Stats
     class Configuration
       attr_writer :driver
-      attr_accessor :track_ranges, :separator, :time_zone,
-                    :beginning_of_week
+      attr_accessor :track_ranges, :time_zone, :beginning_of_week
 
       def initialize
-        @separator = '::'
         @ranges = %i[minute hour day week month quarter year]
         @beginning_of_week = :monday
         @time_zone = 'GMT'

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

@@ -1,59 +1,11 @@
 # Driver
 
 Driver is a wrapper class that persists and retrieves values from backend. It needs to implement:
-- `inc(key:, **values)` method to store values
-- `get(key:)` method to retrieve values
-
-## Packer Mixin
-
-Some databases cannot store nested hashes/values. Or they cannot perform increment on nested values that does not exist. For this reason you can use Packer mixin that helps you convert values to dot notation.
-
-```ruby
-class Sample
-  include Trifle::Stats::Mixins::Packer
-end
-
-values = { a: 1, b: { c: 22, d: 33 } }
-=> {:a=>1, :b=>{:c=>22, :d=>33}}
-
-packed = Sample.pack(hash: values)
-=> {"a"=>1, "b.c"=>22, "b.d"=>33}
-
-Sample.unpack(hash: packed)
-=> {"a"=>1, "b"=>{"c"=>22, "d"=>33}}
-```
 
-## Dummy driver
-
-Sample of using custom driver that does, well, nothing useful.
-
-```ruby
-irb(main):001:1* class Dummy
-irb(main):002:2*   def inc(key:, **values)
-irb(main):003:2*     puts "Dumping #{key} => #{values}"
-irb(main):004:1*   end
-irb(main):005:2*   def get(key:)
-irb(main):006:2*     puts "Random for #{key}"
-irb(main):007:2*     { count: rand(1000) }
-irb(main):008:1*   end
-irb(main):009:0> end
-=> :get
-
-irb(main):010:0> c = Trifle::Stats::Configuration.new
-=> #<Trifle::Stats::Configuration:0x00007fe179aed848 @separator="::", @ranges=[:minute, :hour, :day, :week, :month, :quarter, :year], @beginning_of_week=:monday, @time_zone="GMT">
-
-irb(main):011:0> c.driver = Dummy.new
-=> #<Dummy:0x00007fe176302ac8>
-
-irb(main):012:0> c.track_ranges = [:minute, :hour]
-=> [:minute, :hour]
+- `inc(key:, **values)` method add values
+- `set(key:, **values)` method set values
+- `get(key:)` method to retrieve values
 
-irb(main):013:0> Trifle::Stats.track(key: 'sample', at: Time.now, values: {count: 1}, config: c)
-Dumping sample::minute::1611696240 => {:count=>1}
-Dumping sample::hour::1611694800 => {:count=>1}
-=> [{2021-01-26 21:24:00 +0000=>{:count=>1}}, {2021-01-26 21:00:00 +0000=>{:count=>1}}]
+## Documentation
 
-irb(main):014:0> Trifle::Stats.values(key: 'sample', from: Time.now, to: Time.now, range: :hour, config: c)
-Random for sample::hour::1611694800
-=> [{2021-01-26 21:00:00 +0000=>{:count=>405}}]
-```
+For more details about Drivers, please refer to https://trifle.io/docs/stats/drivers

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

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'pg'
+require_relative '../mixins/packer'
+
+module Trifle
+  module Stats
+    module Driver
+      class Postgres
+        include Mixins::Packer
+        attr_accessor :client, :table_name, :separator
+
+        def initialize(client = PG::Connection.new, table_name: 'trifle_stats')
+          @client = client
+          @table_name = table_name
+          @separator = '::'
+        end
+
+        def inc(key:, **values)
+          pkey = key.join(separator)
+
+          self.class.pack(hash: values).each do |k, c|
+            _inc_one(key: pkey, name: k, value: c)
+          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)
+        end
+
+        def set(key:, **values)
+          pkey = key.join(separator)
+
+          _set_all(key: pkey, **values)
+        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)
+        end
+
+        def get(key:)
+          pkey = key.join(separator)
+
+          data = _get(key: pkey)
+          return {} if data.nil?
+
+          self.class.unpack(hash: data)
+        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
+        end
+      end
+    end
+  end
+end

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

@@ -9,19 +9,28 @@ module Trifle
         include Mixins::Packer
         def initialize
           @data = {}
+          @separator = '::'
         end
 
         def inc(key:, **values)
           self.class.pack(hash: values).each do |k, c|
-            d = @data.fetch(key, {})
+            d = @data.fetch(key.join(@separator), {})
             d[k] = d[k].to_i + c
-            @data[key] = d
+            @data[key.join(@separator)] = d
+          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
           end
         end
 
         def get(key:)
           self.class.unpack(
-            hash: @data.fetch(key, {})
+            hash: @data.fetch(key.join(@separator), {})
           )
         end
       end

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

@@ -8,26 +8,33 @@ module Trifle
     module Driver
       class Redis
         include Mixins::Packer
-        attr_accessor :prefix
+        attr_accessor :client, :prefix, :separator
 
         def initialize(client = ::Redis.current, prefix: 'trfl')
           @client = client
           @prefix = prefix
+          @separator = '::'
         end
 
         def inc(key:, **values)
-          pkey = [@prefix, key].join('::')
+          pkey = ([prefix] + key).join(separator)
 
           self.class.pack(hash: values).each do |k, c|
-            @client.hincrby(pkey, k, c)
+            client.hincrby(pkey, k, c)
           end
         end
 
+        def set(key:, **values)
+          pkey = ([prefix] + key).join(separator)
+
+          client.hmset(pkey, *self.class.pack(hash: values))
+        end
+
         def get(key:)
-          pkey = [@prefix, key].join('::')
+          pkey = ([prefix] + key).join(separator)
 
           self.class.unpack(
-            hash: @client.hgetall(pkey)
+            hash: client.hgetall(pkey)
           )
         end
       end

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

@@ -22,7 +22,7 @@ module Trifle
             config.ranges.map do |range|
               at = Nocturnal.new(@at, config: config).send(range)
               config.driver.inc(
-                key: [key, range, at.to_i].join(config.separator),
+                key: [key, range, at.to_i],
                 **values
               )
             end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Trifle
+  module Stats
+    module Operations
+      module Timeseries
+        class Set
+          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 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
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -27,7 +27,7 @@ module Trifle
             timeline.map do |at|
               {
                 at => config.driver.get(
-                  key: [key, range, at.to_i].join(config.separator)
+                  key: [key, range, at.to_i]
                 )
               }
             end

data/lib/trifle/stats/version.rb

@@ -2,6 +2,6 @@
 
 module Trifle
   module Stats
-    VERSION = '0.1.0'
+    VERSION = '0.3.2'
   end
 end

data/trifle-stats.gemspec

@@ -6,15 +6,17 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Jozef Vaclavik']
   spec.email         = ['jozef@hey.com']
 
-  spec.summary       = 'Simple analytics for tracking events and status counts'
-  spec.description   = 'Trifle Stats allows you to submit counters and'\
-                       'automatically storing them for each range.'\
-                       'Supports multiple backend drivers.'
-  spec.homepage      = "https://github.com/trifle-io/trifle-stats"
+  spec.summary       = 'Simple analytics backed by Redis, Postgres, MongoDB, '\
+                       'Google Analytics, Segment, or whatever.'
+  spec.description   = 'Trifle::Stats is a way too simple timeline analytics '\
+                       'that helps you track custom metrics. Automatically '\
+                       'increments counters for each enabled range. '\
+                       'It supports timezones and different week beginning.'
+  spec.homepage      = "https://trifle.io"
   spec.required_ruby_version = Gem::Requirement.new('>= 2.6')
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = "https://github.com/trifle-io/trifle-stats"
+  spec.metadata['source_code_uri'] = 'https://github.com/trifle-io/trifle-stats'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -32,5 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rspec', '~> 3.2')
   spec.add_development_dependency('rubocop', '1.0.0')
   spec.add_runtime_dependency('redis', '>= 4.2')
+  spec.add_runtime_dependency('pg', '>= 1.2')
   spec.add_runtime_dependency('tzinfo', '~> 2.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trifle-stats
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Jozef Vaclavik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-30 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -122,8 +136,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: Trifle Stats allows you to submit counters andautomatically storing them
-  for each range.Supports multiple backend drivers.
+description: Trifle::Stats is a way too simple timeline analytics that helps you track
+  custom metrics. Automatically increments counters for each enabled range. It supports
+  timezones and different week beginning.
 email:
 - jozef@hey.com
 executables: []
@@ -139,7 +154,6 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".tool-versions"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -150,18 +164,20 @@ files:
 - lib/trifle/stats.rb
 - lib/trifle/stats/configuration.rb
 - lib/trifle/stats/driver/README.md
+- lib/trifle/stats/driver/postgres.rb
 - lib/trifle/stats/driver/process.rb
 - lib/trifle/stats/driver/redis.rb
 - lib/trifle/stats/mixins/packer.rb
 - lib/trifle/stats/nocturnal.rb
 - lib/trifle/stats/operations/timeseries/increment.rb
+- lib/trifle/stats/operations/timeseries/set.rb
 - lib/trifle/stats/operations/timeseries/values.rb
 - lib/trifle/stats/version.rb
 - trifle-stats.gemspec
-homepage: https://github.com/trifle-io/trifle-stats
+homepage: https://trifle.io
 licenses: []
 metadata:
-  homepage_uri: https://github.com/trifle-io/trifle-stats
+  homepage_uri: https://trifle.io
   source_code_uri: https://github.com/trifle-io/trifle-stats
 post_install_message:
 rdoc_options: []
@@ -181,5 +197,6 @@ requirements: []
 rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
-summary: Simple analytics for tracking events and status counts
+summary: Simple analytics backed by Redis, Postgres, MongoDB, Google Analytics, Segment,
+  or whatever.
 test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.0
-before_install: gem install bundler -v 2.1.4