trifle-ruby 3.0.1 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50a533193596e6c6aa35b3388449f0b0c1e2962c764a844281d9fe7af71b92ec
-  data.tar.gz: 30d8947c3e24684eba8fc5560383157f1c71d8efc8bd35c0509a7de63e85ae01
+  metadata.gz: 8b971ae3e2273b7b060d1556aa8716015ac92b7c162d8d64e2ce43a9ad18d185
+  data.tar.gz: 9ad14a866e880d9885b4b233be51139283baff70b2af9c09ce85ab882e754a92
 SHA512:
-  metadata.gz: 0cc1904798efdad76a363c27c4247c829baaa9beaf1fd85b7bb9c636b1adad32f4e851c397a3e015c58b4947e7728a95836c0b32ece1700a87d3edc92e3d2ff1
-  data.tar.gz: 52f3ee3f90caeb21e96d44ca9e6c81f4c8639b009cdf91de3e6e0ff77cfe4ff17b4d082fc7f58a029cb5684f661e722b1e807a2e36a1918a44cd148166376dd3
+  metadata.gz: a5ec3d8760a919408b5e16664c16a49ccb8a8e48a3a194e45e3ea997c0d8048a187bcfc53da7ba973ba9afd0d89e402a20a9cf8d47efd9176bc36111351cfd00
+  data.tar.gz: 365cc57ff1247b480decaf732bb0cc7f969c1f7e85e5c3c221598e28ef492d6cfc4483766818f765a595f8254a53fce4611d2d2afd2138f640bf9e3997f03621

data/.github/workflows/ruby.yml

@@ -0,0 +1,37 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '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

data/.gitpod.yml

@@ -0,0 +1,18 @@
+image:
+  file: .gitpod/Dockerfile
+tasks:
+  - init: bundle install
+    command: ./bin/console
+  - command: redis-server
+github:
+  prebuilds:
+    # enable for the master/default branch (defaults to true)
+    master: true
+    # enable for all branches in this repo (defaults to false)
+    branches: false
+    # enable for pull requests coming from this repo (defaults to true)
+    pullRequests: true
+    # add a check to pull requests (defaults to true)
+    addCheck: true
+    # add a "Review in Gitpod" button as a comment to pull requests (defaults to false)
+    addComment: false

data/.gitpod/Dockerfile

@@ -0,0 +1 @@
+FROM trifle/gitpod:0.1.0

data/.gitpod/Dockerfile-base

@@ -0,0 +1,77 @@
+FROM ubuntu:20.04
+
+ENV TZ=Europe/Bratislava
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+RUN useradd gitpod -u 33333
+RUN mkdir -p /home/gitpod && chown gitpod:gitpod /home/gitpod
+
+# install ubuntu packages
+RUN apt-get update -q \
+ && apt-get install -y \
+    build-essential \
+    apt-transport-https \
+    bash \
+    xterm \
+    xvfb \
+    x11vnc \
+    libpq-dev \
+    git \
+    curl \
+    wget \
+    unzip \
+    dirmngr \
+    gpg \
+    gnupg2 \
+    locales \
+    autoconf \
+    libncurses5-dev \
+    libgl1-mesa-dev \
+    libglu1-mesa-dev \
+    libpng-dev \
+    unixodbc-dev \
+    libssl-dev \
+    libreadline-dev \
+    zlib1g-dev \
+    ffmpeg \
+    tmux \
+    runit-systemd \
+    htop \
+    vim \
+ && apt-get clean
+
+#set the locale
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+RUN curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add -
+RUN echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list
+
+RUN apt-get update -q \
+ && apt-get install -y \
+    postgresql postgresql-contrib \
+    # mongodb-org \
+    redis-server \
+    mariadb-server \
+ && apt-get clean
+
+USER gitpod
+
+#install asdf
+ENV ASDF_ROOT /home/gitpod/.asdf
+ENV PATH "${ASDF_ROOT}/bin:${ASDF_ROOT}/shims:$PATH"
+RUN git clone https://github.com/asdf-vm/asdf.git ${ASDF_ROOT} --branch v0.8.0
+
+RUN asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git
+
+# install ruby
+ENV RUBY_VERSION 3.0.0
+RUN ASDF_RUBY_BUILD_VERSION=v20201225 asdf install ruby ${RUBY_VERSION} \
+  && asdf global ruby ${RUBY_VERSION}
+
+# throw errors if Gemfile has been modified since Gemfile.lock
+RUN gem install bundler
+
+CMD ["bash"]

data/.rubocop.yml

@@ -1,5 +1,9 @@
+inherit_mode:
+  merge:
+    - Exclude
+
 AllCops:
-  TargetRubyVersion: '3.0.0'
+  TargetRubyVersion: '2.6'
   Exclude:
     - 'bin/**/*'
     - 'Rakefile'
@@ -9,6 +13,3 @@ AllCops:
 
 Style/Documentation:
   Enabled: false
-#
-# Layout/LineLength:
-#   Max: 80

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trifle-ruby (3.0.1)
+    trifle-ruby (3.0.4)
       redis (>= 4.2)
       tzinfo (~> 2.0)
 
@@ -51,6 +51,7 @@ GEM
     unicode-display_width (1.7.0)
 
 PLATFORMS
+  ruby
   x86_64-darwin-20
 
 DEPENDENCIES

data/README.md

@@ -1,6 +1,10 @@
 # Trifle
 
-Trifle - simple analytics backed by Redis, Postgres, MongoDB, Google Analytics, Segment, or whatever. [^1]
+[![Gem Version](https://badge.fury.io/rb/trifle-ruby.svg)](https://badge.fury.io/rb/trifle-ruby)
+![Ruby](https://github.com/trifle-io/trifle-ruby/workflows/Ruby/badge.svg?branch=main)
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/trifle-io/trifle-ruby)
+
+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.
 
@@ -35,28 +39,24 @@ Trifle::Ruby.configure do |config|
 end
 ```
 
+### Track values
+
 Available ranges are `:minute`, `:hour`, `:day`, `:week`, `:month`, `:quarter`, `:year`.
 
 Now track your first metrics
 ```ruby
-Trifle::Ruby.track(key: 'event::logs', at: Time.zone.now, values: {count: 1, duration: 2, lines: 241})
+Trifle::Ruby.track(key: 'event::logs', at: Time.now, values: {count: 1, duration: 2, lines: 241})
 => [{2021-01-25 16:00:00 +0100=>{:count=>1, :duration=>2, :lines=>241}}, {2021-01-25 00:00:00 +0100=>{:count=>1, :duration=>2, :lines=>241}}]
 # or do it few more times
-Trifle::Ruby.track(key: 'event::logs', at: Time.zone.now, values: {count: 1, duration: 1, lines: 56})
+Trifle::Ruby.track(key: 'event::logs', at: Time.now, values: {count: 1, duration: 1, lines: 56})
 => [{2021-01-25 16:00:00 +0100=>{:count=>1, :duration=>1, :lines=>56}}, {2021-01-25 00:00:00 +0100=>{:count=>1, :duration=>1, :lines=>56}}]
-Trifle::Ruby.track(key: 'event::logs', at: Time.zone.now, values: {count: 1, duration: 5, lines: 361})
+Trifle::Ruby.track(key: 'event::logs', at: Time.now, values: {count: 1, duration: 5, lines: 361})
 => [{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 then retrieve your values for specific `range`.
-```ruby
-Trifle::Ruby.values_for(key: 'event::logs', from: Time.now.beginning_of_day, to: Time.now.end_of_day, range: :day)
-=> [{2021-01-25 00:00:00 +0100=>{"count"=>3, "duration"=>8, "lines"=>658}}]
-```
-
 You can also store nested counters like
 ```ruby
-Trifle::Ruby.track(key: 'event::logs', at: Time.zone.now, values: {
+Trifle::Ruby.track(key: 'event::logs', at: Time.now, values: {
   count: 1,
   duration: {
     parsing: 21,
@@ -67,12 +67,63 @@ Trifle::Ruby.track(key: 'event::logs', at: Time.zone.now, values: {
 })
 ```
 
+### Get values
+
+Retrieve your values for specific `range`.
+```ruby
+Trifle::Ruby.values(key: 'event::logs', from: Time.now, to: Time.now, range: :day)
+=> [{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::Ruby::Configuration.new
+configuration.driver = Trifle::Ruby::Driver::Redis.new
+configuration.track_ranges = [:day]
+configuration.time_zone = 'GMT'
+configuration.separator = '#'
+
+# or use different driver
+mongo_configuration = Trifle::Ruby::Configuration.new
+mongo_configuration.driver = Trifle::Ruby::Driver::MongoDB.new
+mongo_configuration.time_zone = 'Asia/Dubai'
+```
+
+You can then pass it into module methods.
+```ruby
+Trifle::Ruby.track(key: 'event#checkout', at: Time.now, values: {count: 1}, config: configuration)
+
+Trifle::Ruby.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-ruby/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-ruby) 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-ruby.

data/lib/trifle/ruby.rb

@@ -3,43 +3,43 @@
 require 'trifle/ruby/driver/redis'
 require 'trifle/ruby/mixins/packer'
 require 'trifle/ruby/nocturnal'
-require 'trifle/ruby/client'
 require 'trifle/ruby/configuration'
-require 'trifle/ruby/resource'
+require 'trifle/ruby/operations/timeseries/increment'
+require 'trifle/ruby/operations/timeseries/values'
 require 'trifle/ruby/version'
 
 module Trifle
   module Ruby
     class Error < StandardError; end
+    class DriverNotFound < Error; end
 
-    def self.config
-      @config ||= Configuration.new
+    def self.default
+      @default ||= Configuration.new
     end
 
     def self.configure
-      yield(config)
+      yield(default)
 
-      config
+      default
     end
 
-    def self.client
-      @client ||= Client.new
+    def self.track(key:, at:, values:, config: nil)
+      Trifle::Ruby::Operations::Timeseries::Increment.new(
+        key: key,
+        at: at,
+        values: values,
+        config: config
+      ).perform
     end
 
-    def self.track(key:, at:, values:)
-      config.ranges.map do |range|
-        Resource.new(
-          key: key,
-          range: range,
-          at: Nocturnal.new(at).send("beginning_of_#{range}")
-        ).increment(**values)
-      end
-    end
-
-    def self.values_for(key:, from:, to:, range:)
-      Nocturnal.timeline(from: from, to: to, range: range).map do |at|
-        Resource.new(key: key, range: range, at: at).values
-      end
+    def self.values(key:, from:, to:, range:, config: nil)
+      Trifle::Ruby::Operations::Timeseries::Values.new(
+        key: key,
+        from: from,
+        to: to,
+        range: range,
+        config: config
+      ).perform
     end
   end
 end

data/lib/trifle/ruby/configuration.rb

@@ -5,19 +5,21 @@ require 'tzinfo'
 module Trifle
   module Ruby
     class Configuration
-      attr_accessor :driver, :track_ranges, :separator, :time_zone,
+      attr_writer :driver
+      attr_accessor :track_ranges, :separator, :time_zone,
                     :beginning_of_week
 
       def initialize
         @separator = '::'
         @ranges = %i[minute hour day week month quarter year]
         @beginning_of_week = :monday
+        @time_zone = 'GMT'
       end
 
       def tz
         TZInfo::Timezone.get(@time_zone)
       rescue TZInfo::InvalidTimezoneIdentifier => e
-        puts "Trifle: #{e} - #{time_zone_name}; Defaulting to GMT."
+        puts "Trifle: #{e} - #{time_zone}; Defaulting to GMT."
 
         TZInfo::Timezone.get('GMT')
       end
@@ -28,6 +30,12 @@ module Trifle
         @ranges & track_ranges
       end
 
+      def driver
+        raise DriverNotFound if @driver.nil?
+
+        @driver
+      end
+
       private
 
       def blank?(obj)

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

@@ -0,0 +1,59 @@
+# 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::Ruby::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::Ruby::Configuration.new
+=> #<Trifle::Ruby::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]
+
+irb(main):013:0> Trifle::Ruby.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}}]
+
+irb(main):014:0> Trifle::Ruby.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}}]
+```

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

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require 'redis'
+require_relative '../mixins/packer'
 
 module Trifle
   module Ruby
     module Driver
       class Redis
+        include Mixins::Packer
         attr_accessor :prefix
 
         def initialize(client = ::Redis.current, prefix: 'trfl')
@@ -15,14 +17,18 @@ module Trifle
 
         def inc(key:, **values)
           pkey = [@prefix, key].join('::')
-          values.each do |k, c|
+
+          self.class.pack(hash: values).each do |k, c|
             @client.hincrby(pkey, k, c)
           end
         end
 
         def get(key:)
           pkey = [@prefix, key].join('::')
-          @client.hgetall(pkey)
+
+          self.class.unpack(
+            hash: @client.hgetall(pkey)
+          )
         end
       end
     end

data/lib/trifle/ruby/nocturnal.rb

@@ -2,25 +2,31 @@
 
 module Trifle
   module Ruby
-    class Nocturnal
+    class Nocturnal # rubocop:disable Metrics/ClassLength
       DAYS_INTO_WEEK = {
         sunday: 0, monday: 1, tuesday: 2, wednesday: 3,
         thursday: 4, friday: 5, saturday: 6
       }.freeze
 
-      def self.timeline(from:, to:, range:)
+      def self.timeline(from:, to:, range:, config: nil)
         list = []
-        item = new(from).send("beginning_of_#{range}")
-        while item < to
+        from = new(from, config: config).send(range)
+        to = new(to, config: config).send(range)
+        item = from.dup
+        while item <= to
           list << item
-          item = Nocturnal.new(list.last).send("next_#{range}")
+          item = Nocturnal.new(item, config: config).send("next_#{range}")
         end
         list
       end
 
-      def initialize(at)
+      def initialize(at, config: nil)
         @at = at
-        @tz = Trifle::Ruby.config.tz
+        @config = config
+      end
+
+      def config
+        @config || Trifle::Ruby.default
       end
 
       def change(**fractions)
@@ -31,71 +37,76 @@ module Trifle
           fractions.fetch(:hour, @at.hour),
           fractions.fetch(:minute, @at.min),
           0, # second
-          @tz.utc_offset
+          config.tz.utc_offset
         )
       end
 
-      def beginning_of_minute
+      def minute
         change
       end
 
       def next_minute
         Nocturnal.new(
-          beginning_of_minute + 60
-        ).beginning_of_minute
+          minute + 60,
+          config: config
+        ).minute
       end
 
-      def beginning_of_hour
+      def hour
         change(minute: 0)
       end
 
       def next_hour
         Nocturnal.new(
-          beginning_of_hour + 60 * 60
-        ).beginning_of_hour
+          hour + 60 * 60,
+          config: config
+        ).hour
       end
 
-      def beginning_of_day
+      def day
         change(hour: 0, minute: 0)
       end
 
       def next_day
         Nocturnal.new(
-          beginning_of_day + 60 * 60 * 24
-        ).beginning_of_day
+          day + 60 * 60 * 24,
+          config: config
+        ).day
       end
 
-      def beginning_of_week
-        today = beginning_of_day
+      def week
+        today = day
 
         (today.to_date - days_to_week_start).to_time
       end
 
       def next_week
         Nocturnal.new(
-          beginning_of_week + 60 * 60 * 24 * 7
-        ).beginning_of_week
+          week + 60 * 60 * 24 * 7,
+          config: config
+        ).week
       end
 
       def days_to_week_start
         start_day_number = DAYS_INTO_WEEK.fetch(
-          Trifle::Ruby.config.beginning_of_week
+          config.beginning_of_week
         )
 
         (@at.wday - start_day_number) % 7
       end
 
-      def beginning_of_month
+      def month
         change(day: 1, hour: 0, minute: 0)
       end
 
       def next_month
         Nocturnal.new(
-          beginning_of_month + 60 * 60 * 24 * 31
-        ).beginning_of_month
+          month + 60 * 60 * 24 * 31,
+          config: config
+        ).month
       end
 
-      def beginning_of_quarter
+      def quarter
         first_quarter_month = @at.month - (2 + @at.month) % 3
 
         change(
@@ -108,18 +119,20 @@ module Trifle
 
       def next_quarter
         Nocturnal.new(
-          beginning_of_quarter + 60 * 60 * 24 * 31 * 3
-        ).beginning_of_quarter
+          quarter + 60 * 60 * 24 * 31 * 3,
+          config: config
+        ).quarter
       end
 
-      def beginning_of_year
+      def year
         change(month: 1, day: 1, hour: 0, minute: 0)
       end
 
       def next_year
         Nocturnal.new(
-          beginning_of_year + 60 * 60 * 24 * 31 * 12
-        ).beginning_of_year
+          year + 60 * 60 * 24 * 31 * 12,
+          config: config
+        ).year
       end
     end
   end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Trifle
+  module Ruby
+    module Operations
+      module Timeseries
+        class Increment
+          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::Ruby.default
+          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].join(config.separator),
+                **values
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Trifle
+  module Ruby
+    module Operations
+      module Timeseries
+        class Values
+          attr_reader :key, :range
+
+          def initialize(**keywords)
+            @key = keywords.fetch(:key)
+            @from = keywords.fetch(:from)
+            @to = keywords.fetch(:to)
+            @range = keywords.fetch(:range)
+            @config = keywords[:config]
+          end
+
+          def config
+            @config || Trifle::Ruby.default
+          end
+
+          def timeline
+            Nocturnal.timeline(from: @from, to: @to, range: range)
+          end
+
+          def perform
+            timeline.map do |at|
+              {
+                at => config.driver.get(
+                  key: [key, range, at.to_i].join(config.separator)
+                )
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trifle/ruby/version.rb

@@ -2,6 +2,6 @@
 
 module Trifle
   module Ruby
-    VERSION = '3.0.1'
+    VERSION = '3.0.4'
   end
 end

data/trifle-ruby.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
                        'automatically storing them for each range.'\
                        'Supports multiple backend drivers.'
   spec.homepage      = "https://github.com/trifle-io/trifle-ruby"
-  spec.required_ruby_version = Gem::Requirement.new('>= 3.0')
+  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-ruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trifle-ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.4
 platform: ruby
 authors:
 - Jozef Vaclavik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,7 +130,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".gitpod.yml"
+- ".gitpod/Dockerfile"
+- ".gitpod/Dockerfile-base"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -144,12 +148,13 @@ files:
 - bin/console
 - bin/setup
 - lib/trifle/ruby.rb
-- lib/trifle/ruby/client.rb
 - lib/trifle/ruby/configuration.rb
+- lib/trifle/ruby/driver/README.md
 - lib/trifle/ruby/driver/redis.rb
 - lib/trifle/ruby/mixins/packer.rb
 - lib/trifle/ruby/nocturnal.rb
-- lib/trifle/ruby/resource.rb
+- lib/trifle/ruby/operations/timeseries/increment.rb
+- lib/trifle/ruby/operations/timeseries/values.rb
 - lib/trifle/ruby/version.rb
 - trifle-ruby.gemspec
 homepage: https://github.com/trifle-io/trifle-ruby
@@ -165,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/trifle/ruby/client.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Trifle
-  module Ruby
-    class Client
-      def get(key:)
-        driver.get(key: key)
-      end
-
-      def inc(key:, **values)
-        driver.inc(key: key, **values)
-      end
-
-      private
-
-      def driver
-        @driver ||= Trifle::Ruby.config.driver
-      end
-    end
-  end
-end

data/lib/trifle/ruby/resource.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Trifle
-  module Ruby
-    class Resource
-      include Mixins::Packer
-      attr_accessor :key, :range, :at
-
-      def initialize(key:, range:, at:)
-        @key = key
-        @range = range
-        @at = at
-      end
-
-      def full_key
-        [key, range, at.to_i].join(Trifle::Ruby.config.separator)
-      end
-
-      def increment(**values)
-        packed = self.class.pack(hash: values)
-        Trifle::Ruby.client.inc(key: full_key, **packed)
-        {
-          at => values
-        }
-      end
-
-      def values
-        {
-          at => self.class.unpack(
-            hash: Trifle::Ruby.client.get(key: full_key)
-          )
-        }
-      end
-    end
-  end
-end