cuvva_log 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8c256c0b317b2d1705ba6c0ab87c68ca9be0742
-  data.tar.gz: b08b23ee272258f86b493c21efee5c1222c2e579
+  metadata.gz: 0bd7378f01d66b6a681e794724f2ee3785a08edf
+  data.tar.gz: 958324e423948843689e0cac2866bd3e49a1910e
 SHA512:
-  metadata.gz: 7e3de01174a658e1ea53ab7e460caad935612e854fca40a7de54f8381e2e33fddac131b794cb832cd9b42586c97f3569636601b0e51b0e1da19ad663f001239f
-  data.tar.gz: 7fa3a0ad51c279016d6826b8f9ced49706712554be984f3f81c6c615736782983dfb69e20e8f2245236b4b7aa9ef9bcb232537d8994d6b35b9e65f7c3024f40f
+  metadata.gz: bccf3402936a94223657131aaa9eca3b51401bf366a67fe1b5df20a710f0496684d6356ec7bd15bc5df75b96e0cc637a3fb5c30e1e815df7865136bbafbae810
+  data.tar.gz: a37741335070a1b75f4e4528ec12d951d40033eff05c62ff4b428fe030072da71df31acc87635fe8be248f380c888f8598aa9c34e1047c76f4c6d6e63cd28959

data/lib/cuvva_error.rb

@@ -1,13 +1,8 @@
-require 'json'
-
 class CuvvaError < StandardError
-	@@http_status_map = { }
-
 	attr_accessor :code
 	attr_accessor :reasons
 	attr_accessor :meta
 	attr_reader :stack
-	attr_reader :http_status
 
 	def initialize(*args)
 		code, reasons, meta = args
@@ -21,23 +16,17 @@ class CuvvaError < StandardError
 		@reasons = reasons
 		@meta = meta
 		@stack = caller
-		@http_status = CuvvaError.http_status_map.has_key?(code) &&
-					CuvvaError.http_status_map[code] ?
-						CuvvaError.http_status_map[code] :
-						500
-	end
-
-	def to_json
-		JSON.generate(to_hash)
 	end
 
-	def self.http_status_map
-		@@http_status_map
+	def to_hash
+		{
+			code: self.code,
+			reasons: self.reasons ? self.reasons.to_hash : nil,
+			meta: self.meta ? self.meta.to_hash : nil,
+		}
 	end
 
-	private
-
-	def to_hash
-		{ :code => self.code, :reasons => self.reasons, :meta => self.meta }
+	def to_json(*args)
+		to_hash.to_json(*args)
 	end
 end

data/lib/cuvva_log.rb

@@ -1,24 +1,34 @@
 require 'cuvva_error'
-require 'cuvva_log_handler'
+require 'json'
 
 class Log
 	ERROR_LEVELS = {
-		:debug => 0,
-		:info => 1,
-		:warn => 2,
-		:error => 3,
-		:fatal => 4,
+		debug: 0,
+		info: 1,
+		warn: 2,
+		error: 3,
+		fatal: 4,
 	}
 
-	def self.get_level(level_name)
-		ERROR_LEVELS[level_name]
+	@@conf_min_log_level = :info
+	@@conf_handlers = {}
+
+	def self.set_handler(*args)
+		if args.length == 1
+			handler = args[0]
+
+			for level in ERROR_LEVELS.keys
+				@@conf_handlers[level] = handler
+			end
+		else
+			level, handler = args
+			@@conf_handlers[level] = handler
+		end
 	end
 
-	@@min_log_level = get_level(:info)
-	@@default_handler = LogHandler.new
-	@@handlers = Hash[ [:debug, :info, :warn, :error, :fatal].collect do |a|
-							[a, @@default_handler]
-						end ]
+	def self.set_min_log_level(level)
+		@@conf_min_log_level = level
+	end
 
 	def self.debug(*args)
 		make_error(:debug, *args)
@@ -34,48 +44,39 @@ class Log
 
 	def self.error(*args)
 		make_error(:error, *args)
-	end 
+	end
 
 	def self.fatal(*args)
 		make_error(:fatal, *args)
 	end
 
-	def self.min_log_level
-		@@min_log_level
-	end
-
-	def self.min_log_level=(log_level)
-		@@min_log_level = get_level(log_level)
-	end
+	private
 
-	def self.set_http_statuses(error_descriptor)
-		error_descriptor.each do |key, val|
-			CuvvaError.http_status_map[key] = Integer(val[:httpStatus]) rescue 500
-		end
+	def self.make_error(level, *args)
+		error = args[0].is_a?(CuvvaError) ? args[0] : CuvvaError.new(*args)
+		handle_error(level, error)
+		error
 	end
 
-	def self.set_handler(*args)
-		if args.length == 1
-			handler = args[0]
+	def self.handle_error(level, error)
+		handler = @@conf_handlers[level]
 
-			for level in ERROR_LEVELS.keys
-				set_handler(level, handler)
-			end
+		if handler
+			handler.handle(level, error)
 		else
-			level, handler = args
-			@@handlers[level] = handler
+			default_handler(level, error)
 		end
 	end
 
-	private
+	def self.default_handler(level, error)
+		return if ERROR_LEVELS[level] < ERROR_LEVELS[@@conf_min_log_level]
 
-	def self.handle_error(level, error)
-		@@handlers[level].handle(level, error)
-	end
+		error_string = "#{level}:#{JSON.generate(error)}"
 
-	def self.make_error(level, *args)
-		error = args[0].is_a?(CuvvaError) ? args[0] : CuvvaError.new(*args)
-		handle_error(level, error)
-		error
+		if [:warn, :error, :fatal].include?(level)
+			STDERR.puts error_string
+		else
+			puts error_string
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuvva_log
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jack Fransham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies: []
 description: Super-simple logs for the Ruby-based Cuvva systems
 email: jack.fransham@cuvva.co
@@ -18,7 +18,6 @@ extra_rdoc_files: []
 files:
 - lib/cuvva_error.rb
 - lib/cuvva_log.rb
-- lib/cuvva_log_handler.rb
 homepage: https://github.com/cuvva/cuvva-log-ruby
 licenses:
 - MIT
@@ -39,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Super-simple logs for the Ruby-based Cuvva systems

data/lib/cuvva_log_handler.rb

@@ -1,15 +0,0 @@
-require 'cuvva_log'
-
-class LogHandler
-	def handle(level, error)
-		return if Log.get_level(level) < Log.min_log_level 
-
-		error_string = "#{level}:#{error.to_json}"
-
-		if [ :warn, :error, :fatal ].include?(level)
-			STDERR.puts error_string
-		else
-			puts error_string 
-		end
-	end
-end