services 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5badc829e3bbaa1e7dfde3b0578580a95c590cdd
-  data.tar.gz: 245f341ba15aa65aebb1707fdf7301727ac45d0d
+  metadata.gz: 5d81b81f1b90d4c408865594ca48558fe9469e7d
+  data.tar.gz: a33b8e7d9007b638feddadd7270780756a083a0f
 SHA512:
-  metadata.gz: 7ac343f2d578b4a90424d65dea68526d73e7383466f91c5be9160045e06791796537f80c584e5edeb30b045b4b07960f4a3e0b898853e24399cff134abdb8848
-  data.tar.gz: 32759e41c136880fe9aa566fca32035f9b5815a1e31c4bae45a5df556d74a172d1d8ed2223c2b450d1e779ad8010c687be6cd42fa62bde00565055894681d10e
+  metadata.gz: 28c253c6305653cd64b7fed56a905d6b4215f6ca579500ac3c0015f6ed0c682958478771b7a7b45bd90360b86b745bfa8c19b1d5814e845476d65bb1e107747f
+  data.tar.gz: 0942c38383e122fdf186cde9fd278c684d1e2fe8211b82724fb306f6bd168bf8b587abe362c61927a87752326276ef488d331227e856ceabfb39def0453fcb72

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.0
+
+* Allow only certain classes in Redis logger meta (NilClass, TrueClass, FalseClass, Symbol, String, Numeric)
+
 ## 1.2.0
 
 * Convert log time to time object when fetching logs

data/lib/services/logger/file.rb

@@ -9,7 +9,7 @@ module Services
         @logger.clear_tags!
       end
 
-      def log(message, meta = {}, severity = :info)
+      def log(message, meta = {}, severity = 'info')
         tags = meta.map do |k, v|
           [k, v].join('=')
         end

data/lib/services/logger/redis.rb

@@ -1,16 +1,30 @@
 module Services
   module Logger
     class Redis
+      META_CLASSES = [
+        NilClass,
+        TrueClass,
+        FalseClass,
+        Symbol,
+        String,
+        Numeric
+      ]
+
+      InvalidMetaError = Class.new(StandardError)
+
       def initialize(redis, key = 'logs')
         @redis, @key = redis, key
       end
 
-      def log(message, meta = {}, severity = :info)
+      def log(message, meta = {}, severity = 'info')
+        # Allow only simple data types in meta
+        raise InvalidMetaError, "Meta keys and values must be of one of the following classes: #{META_CLASSES.join(', ')}" if meta_includes_invalid_values?(meta)
+
         value = {
           time:     Time.now.to_i,
           message:  message.to_s,
           severity: severity.to_s,
-          meta:     meta.map { |k, v| [k.to_s, v.to_s] }.to_h
+          meta:     meta
         }
         @redis.lpush @key, value.to_json
       end
@@ -37,6 +51,16 @@ module Services
         data['time'] = Time.at(data['time'])
         data
       end
+
+      def meta_includes_invalid_values?(meta)
+        [meta.values, meta.keys].any? do |elements|
+          elements.any? do |element|
+            META_CLASSES.none? do |klass|
+              element.class <= klass
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/services/modules/call_logger.rb

@@ -20,8 +20,8 @@ module Services
 
       private
 
-      def log(message, severity = :info)
-        Services.configuration.logger.log message, { service: self.class, id: @id }, severity
+      def log(message, severity = 'info')
+        Services.configuration.logger.log message, { service: self.class.to_s, id: @id }, severity
       end
 
       def log_exception(e, cause = false)

data/lib/services/version.rb

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

data/spec/services/logger/redis_spec.rb

@@ -12,14 +12,18 @@ describe Services::Logger::Redis do
         severity: :info,
         meta: {
           foo:    'bar',
-          class:  Services::Base,
-          object: redis
+          class:  Services::Base.to_s,
+          object: redis.to_s
         }
       }, {
         time:     Date.new(2014, 10, 10),
         message:  "Oh baby, we'll be old",
         severity: :warning,
-        meta:     {}
+        meta:     {
+          true:  true,
+          false: false,
+          nil:   nil
+        }
       }, {
         time:     Date.new(2014, 11, 17),
         message:  'And think of all the stories',
@@ -42,7 +46,7 @@ describe Services::Logger::Redis do
         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
+        log[:meta].stringify_keys
       else
         {}
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake