services 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7004c57ec38e0a50c485274eb889a7d86eb3604
-  data.tar.gz: 8d2295ec5857505fffdb5bbf1a745ff5b3cdc505
+  metadata.gz: 5badc829e3bbaa1e7dfde3b0578580a95c590cdd
+  data.tar.gz: 245f341ba15aa65aebb1707fdf7301727ac45d0d
 SHA512:
-  metadata.gz: 9c79defb87ccc2c3f4b6b52e91273248de62c5c38853912299d240a0949d05571beb51032c8c30e6bbcd169d8ef63e5b73a0d20c13dd5091c7f34769029dc941
-  data.tar.gz: 377da1dd477a4a80a5bd9f3ab0175b5389969fa2e9d5a7f8a9e7469bc00aa77da31adb102d932b92bb8db26d24b8b1f49f9ac2e2cc3960c7482e70efff16273e
+  metadata.gz: 7ac343f2d578b4a90424d65dea68526d73e7383466f91c5be9160045e06791796537f80c584e5edeb30b045b4b07960f4a3e0b898853e24399cff134abdb8848
+  data.tar.gz: 32759e41c136880fe9aa566fca32035f9b5815a1e31c4bae45a5df556d74a172d1d8ed2223c2b450d1e779ad8010c687be6cd42fa62bde00565055894681d10e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.0
+
+* Convert log time to time object when fetching logs
+
 ## 1.1.1
 
 * When logging to Redis, convert all values to strings first

data/lib/services/logger/redis.rb

@@ -20,18 +20,22 @@ module Services
       end
 
       def fetch
-        @redis.lrange(@key, 0, -1).map do |json|
-          JSON.load json
-        end
+        @redis.lrange(@key, 0, -1).map(&method(:log_entry_from_json))
       end
 
       def clear
         @redis.multi do
           @redis.lrange @key, 0, -1
           @redis.del @key
-        end.first.map do |json|
-          JSON.load json
-        end
+        end.first.map(&method(:log_entry_from_json))
+      end
+
+      private
+
+      def log_entry_from_json(json)
+        data = JSON.load(json)
+        data['time'] = Time.at(data['time'])
+        data
       end
     end
   end

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/spec/services/logger/redis_spec.rb

@@ -1,69 +1,103 @@
 require 'spec_helper'
 
 describe Services::Logger::Redis do
-  let(:meta)        { { foo: 'bar', class: Services::Base, object: redis } }
-  let(:message)     { "One day baby we'll be old" }
-  let(:severity)    { 'critical' }
-  let(:key)         { 'custom_log_key' }
-  let(:redis)       { Redis.new }
-  let(:logger)      { described_class.new(redis, key) }
-
-  def log_entries
-    redis.lrange(key, 0, -1).map do |json|
-      JSON.load json
+  let(:key)    { 'custom_log_key' }
+  let(:redis)  { Redis.new }
+  let(:logger) { described_class.new(redis, key) }
+  let(:logs) {
+    [
+      {
+        time:     Date.new(2014, 9, 15),
+        message:  "One day baby we'll be old",
+        severity: :info,
+        meta: {
+          foo:    'bar',
+          class:  Services::Base,
+          object: redis
+        }
+      }, {
+        time:     Date.new(2014, 10, 10),
+        message:  "Oh baby, we'll be old",
+        severity: :warning,
+        meta:     {}
+      }, {
+        time:     Date.new(2014, 11, 17),
+        message:  'And think of all the stories',
+        severity: :critical,
+        meta: {
+          one:    2,
+          three:  3.14
+        }
+      }, {
+        time:     Date.new(2014, 11, 17),
+        message:  'That we could have told',
+        severity: :debug
+      }
+    ]
+  }
+  let(:fetched_logs) {
+    logs.reverse.map do |log|
+      log[:time] = log[:time].to_time
+      %i(message severity).each do |k|
+        log[k] = log[k].try(:to_s) || ''
+      end
+      log[:meta] = if log.has_key?(:meta)
+        log[:meta].map { |k, v| [k.to_s, v.to_s] }.to_h
+      else
+        {}
+      end
+      log.stringify_keys
     end
-  end
+  }
 
   def create_logs
-    (2.days.ago.to_i..Time.now.to_i).step(1.hour) do |timestamp|
-      time = Time.at(timestamp)
-      Timecop.freeze time do
-        logger.log time.to_s(:long), weekday: time.strftime('%a')
+    logs.each do |log|
+      Timecop.freeze log[:time] do
+        args = [log[:message]]
+        args.push log[:meta] || {}
+        args.push log[:severity] if log.has_key?(:severity)
+        logger.log *args
       end
     end
   end
 
-  describe '#log' do
-    it 'logs properly' do
-      Timecop.freeze do
-        payload = {
-          'time'     => Time.now.to_i,
-          'message'  => message,
-          'severity' => severity,
-          'meta'     => meta.map { |k, v| [k.to_s, v.to_s] }.to_h
-        }
-        expect do
-          logger.log message, meta, severity
-        end.to change { log_entries }.from([]).to([payload])
-      end
+  def logs_in_db
+    redis.lrange(key, 0, -1).map do |json|
+      data = JSON.load(json)
+      data['time'] = Time.at(data['time'])
+      data
     end
   end
 
+  before do
+    redis.del key
+  end
+
   context 'when logs are present' do
     before do
       create_logs
-      expect(log_entries.size).to be > 0
+      expect(logs_in_db.size).to eq(logs.size)
     end
 
     describe '#size' do
       it 'returns the amount of logs' do
-        expect(logger.size).to eq(log_entries.size)
+        expect(logger.size).to eq(logs.size)
       end
     end
 
     describe '#fetch' do
       it 'returns all logs' do
-        expect(logger.fetch).to eq(log_entries)
+        expect(logger.fetch).to eq(fetched_logs)
       end
     end
 
     describe '#clear' do
       it 'returns all logs' do
-        expect(log_entries).to eq(logger.clear)
+        expect(fetched_logs).to eq(logger.clear)
       end
 
       it 'clears all log entries' do
-        expect { logger.clear }.to change { log_entries }.to([])
+        expect { logger.clear }.to change { logs_in_db }.to([])
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Manuel Meurer