trifle-stats 0.2.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64e5b8835413e4d664240d8b3bcb30f66bc886c139870c5849a1ef0d48ddcdc6
-  data.tar.gz: 8e499def09294e6b76ec07ea8f906d1b210145a305a82ffabf65665d777786d9
+  metadata.gz: 532f2b7afd34d3f6a1d634578157b4a12396d5e6b2d5ab679a792dc7245928be
+  data.tar.gz: 482944111799367469b5c831f2703a0f80f50b252301f03a60401d08752ae0ae
 SHA512:
-  metadata.gz: e4e9c33a1921fed870c398370e1fc0eeeb1c4f1d33ad1e030ef8a1555cdc5930a4541e2aeae2409ef0738c4b76437a16c195a019cdc8e73752e8e5ae9fda8a78
-  data.tar.gz: 7b76bf3d1900c3db9c5038ec6c6a4245cfb0ea056385f3dc77f552f6b08f5f0f90816692b21c0763fa91d9ad85c44c0820e85f7824c9b895ed6ecbb54f2adc24
+  metadata.gz: 16805ed32667f648efd688bb8be1ea03fa6f04abe837bd0f483bb53fb9d730563932fd4036bfa36e93d1a35a01a802557303beec0835dbe3d17de486d75b396f
+  data.tar.gz: 13044b35325c973667c73827fce1b3146a51846ac186f9b8e6e8a5631653afe2f07e7ae461068729d19c8be81c311c44a5a1e10119534c093c723c438956309e

data/.github/workflows/ruby.yml

@@ -9,29 +9,28 @@ name: Ruby
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ["3.0"]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Rspec
-      run: bundle exec rspec
-    - name: Rubocop
-      run: bundle exec rubocop
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+        # change this to (see https://github.com/ruby/setup-ruby#versioning):
+        # uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Rspec
+        run: bundle exec rspec
+      - name: Rubocop
+        run: bundle exec rubocop

data/Gemfile.lock

@@ -1,7 +1,9 @@
 PATH
   remote: .
   specs:
-    trifle-stats (0.2.1)
+    trifle-stats (0.4.1)
+      mongo (>= 2.14.0)
+      pg (>= 1.2)
       redis (>= 4.2)
       tzinfo (~> 2.0)
 
@@ -9,16 +11,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    bson (4.12.1)
     byebug (11.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     dotenv (2.7.6)
+    mongo (2.14.0)
+      bson (>= 4.8.2, < 5.0.0)
     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)
+    redis (4.3.1)
     regexp_parser (2.0.3)
     rexml (3.2.4)
     rspec (3.10.0)

data/lib/trifle/stats.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'trifle/stats/driver/redis'
+require 'trifle/stats/driver/mongo'
+require 'trifle/stats/driver/postgres'
 require 'trifle/stats/driver/process'
+require 'trifle/stats/driver/redis'
 require 'trifle/stats/mixins/packer'
 require 'trifle/stats/nocturnal'
 require 'trifle/stats/configuration'

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

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

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'mongo'
+require_relative '../mixins/packer'
+
+module Trifle
+  module Stats
+    module Driver
+      class Mongo
+        include Mixins::Packer
+        attr_accessor :client, :collection_name, :separator
+
+        def initialize(client, collection_name: 'trifle_stats')
+          @client = client
+          @collection_name = collection_name
+          @separator = '::'
+        end
+
+        def inc(key:, **values)
+          pkey = key.join(separator)
+
+          collection.bulk_write(
+            [upsert_operation('$inc', pkey: pkey, values: values)]
+          )
+        end
+
+        def set(key:, **values)
+          pkey = key.join(separator)
+
+          collection.bulk_write(
+            [upsert_operation('$set', pkey: pkey, values: values)]
+          )
+        end
+
+        def upsert_operation(operation, pkey:, values:)
+          data = self.class.pack(hash: { data: values })
+          {
+            update_many: {
+              filter: { key: pkey },
+              update: { operation => data },
+              upsert: true
+            }
+          }
+        end
+
+        def get(key:)
+          pkey = key.join(separator)
+
+          data = collection.find(key: pkey).limit(1).first
+          return {} if data.nil? || data['data'].nil?
+
+          data['data']
+        end
+
+        private
+
+        def collection
+          client[collection_name]
+        end
+      end
+    end
+  end
+end

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,27 +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, {})
+            d = @data.fetch(key.join(@separator), {})
             d[k] = c
-            @data[key] = d
+            @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,32 +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('::')
+          pkey = ([prefix] + key).join(separator)
 
-          @client.hmset(pkey, *self.class.pack(hash: values))
+          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

@@ -22,7 +22,7 @@ module Trifle
             config.ranges.map do |range|
               at = Nocturnal.new(@at, config: config).send(range)
               config.driver.set(
-                key: [key, range, at.to_i].join(config.separator),
+                key: [key, range, at.to_i],
                 **values
               )
             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.2.1'
+    VERSION = '0.4.1'
   end
 end

data/trifle-stats.gemspec

@@ -12,7 +12,8 @@ Gem::Specification.new do |spec|
                        '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.homepage      = 'https://trifle.io'
+  spec.licenses      = ['MIT']
   spec.required_ruby_version = Gem::Requirement.new('>= 2.6')
 
   spec.metadata['homepage_uri'] = spec.homepage
@@ -33,6 +34,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rake', '~> 13.0')
   spec.add_development_dependency('rspec', '~> 3.2')
   spec.add_development_dependency('rubocop', '1.0.0')
+
+  spec.add_runtime_dependency('mongo', '>= 2.14.0')
+  spec.add_runtime_dependency('pg', '>= 1.2')
   spec.add_runtime_dependency('redis', '>= 4.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.2.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Jozef Vaclavik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+- !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: redis
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +178,8 @@ files:
 - lib/trifle/stats.rb
 - lib/trifle/stats/configuration.rb
 - lib/trifle/stats/driver/README.md
+- lib/trifle/stats/driver/mongo.rb
+- lib/trifle/stats/driver/postgres.rb
 - lib/trifle/stats/driver/process.rb
 - lib/trifle/stats/driver/redis.rb
 - lib/trifle/stats/mixins/packer.rb
@@ -160,7 +190,8 @@ files:
 - lib/trifle/stats/version.rb
 - trifle-stats.gemspec
 homepage: https://trifle.io
-licenses: []
+licenses:
+- MIT
 metadata:
   homepage_uri: https://trifle.io
   source_code_uri: https://github.com/trifle-io/trifle-stats