ree_lib 1.0.3 → 1.0.6

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/http_delete.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "http_delete",
   "path": "packages/ree_http/package/ree_http/functions/http_delete.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/http_exec.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "http_exec",
   "path": "packages/ree_http/package/ree_http/functions/http_exec.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/http_get.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "http_get",
   "path": "packages/ree_http/package/ree_http/functions/http_get.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/http_head.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "http_head",
   "path": "packages/ree_http/package/ree_http/functions/http_head.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/http_options.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "http_options",
   "path": "packages/ree_http/package/ree_http/functions/http_options.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/http_patch.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "http_patch",
   "path": "packages/ree_http/package/ree_http/functions/http_patch.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/http_post.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "http_post",
   "path": "packages/ree_http/package/ree_http/functions/http_post.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/http_put.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "http_put",
   "path": "packages/ree_http/package/ree_http/functions/http_put.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/set_default_logger.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "set_default_logger",
   "path": "packages/ree_http/package/ree_http/functions/set_default_logger.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/get.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "get",
   "path": "packages/ree_http/package/ree_http/get.rb",
   "mount_as": "object",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/get_http.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "get_http",
   "path": "packages/ree_http/package/ree_http/get_http.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/http_delete.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "http_delete",
   "path": "packages/ree_http/package/ree_http/http_delete.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/http_get.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "http_get",
   "path": "packages/ree_http/package/ree_http/http_get.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/http_patch.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "http_patch",
   "path": "packages/ree_http/package/ree_http/http_patch.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/http_post.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "http_post",
   "path": "packages/ree_http/package/ree_http/http_post.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/http_put.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "http_put",
   "path": "packages/ree_http/package/ree_http/http_put.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/post.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "post",
   "path": "packages/ree_http/package/ree_http/post.rb",
   "mount_as": "object",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/post_http.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "post_http",
   "path": "packages/ree_http/package/ree_http/post_http.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_http/schemas/ree_http/response.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "0.1.0",
+  "schema_version": "1.0",
   "name": "response",
   "path": "packages/ree_http/package/ree_http/response.rb",
   "mount_as": "object",

data/lib/ree_lib/packages/ree_i18n/Package.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "package",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "ree_i18n",
   "entry_path": "packages/ree_i18n/package/ree_i18n.rb",
   "tags": [

data/lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/add_load_path.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "add_load_path",
   "path": "packages/ree_i18n/package/ree_i18n/functions/add_load_path.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/get_default_locale.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "get_default_locale",
   "path": "packages/ree_i18n/package/ree_i18n/functions/get_default_locale.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/get_locale.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "get_locale",
   "path": "packages/ree_i18n/package/ree_i18n/functions/get_locale.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/set_default_locale.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "set_default_locale",
   "path": "packages/ree_i18n/package/ree_i18n/functions/set_default_locale.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/set_locale.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "set_locale",
   "path": "packages/ree_i18n/package/ree_i18n/functions/set_locale.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/t.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "t",
   "path": "packages/ree_i18n/package/ree_i18n/functions/t.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_i18n/schemas/ree_i18n/functions/with_locale.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "with_locale",
   "path": "packages/ree_i18n/package/ree_i18n/functions/with_locale.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_json/Package.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "package",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "ree_json",
   "entry_path": "packages/ree_json/package/ree_json.rb",
   "tags": [

data/lib/ree_lib/packages/ree_json/schemas/ree_json/functions/from_json.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "from_json",
   "path": "packages/ree_json/package/ree_json/functions/from_json.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_json/schemas/ree_json/functions/to_json.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "to_json",
   "path": "packages/ree_json/package/ree_json/functions/to_json.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_logger/Package.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "package",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "ree_logger",
   "entry_path": "packages/ree_logger/package/ree_logger.rb",
   "tags": [
@@ -16,6 +16,9 @@
     {
       "name": "ree_object"
     },
+    {
+      "name": "ree_swagger"
+    },
     {
       "name": "ree_validator"
     }

data/lib/ree_lib/packages/ree_logger/package/ree_logger/appenders/rollbar_appender.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require_relative 'appender'
+require 'digest'
+
+class ReeLogger::RollbarAppender < ReeLogger::Appender
+  include Ree::LinkDSL
+
+  link 'ree_logger/log_event', -> { LogEvent }
+
+  contract(
+    Symbol,
+    Kwargs[
+      access_token: String,
+      environment: String,
+    ],
+    Ksplat[
+      branch?: Nilor[String],
+      host?: Nilor[String],
+    ] =>  Any
+  )
+  def initialize(level, access_token:, environment:, **opts)
+    super(level, nil)
+
+    require 'rollbar'
+
+    Rollbar.configure do |config|
+      config.enabled = true
+      config.access_token = access_token
+      config.environment = environment
+      config.branch = opts[:branch] if opts[:branch]
+      config.host = opts[:host] if opts[:host]
+    end
+  end
+
+  contract(LogEvent, Nilor[String] => nil)
+  def append(event, progname = nil)
+    rollbar_level =
+      case event.level
+      when :fatal
+        'critical'
+      when :unknown
+        'critical'
+      else
+        event.level.to_s
+      end
+
+    fingerprint = event.message.to_s
+
+    if event.exception
+      fingerprint += event.exception.class.to_s
+    end
+
+    scope = {}
+    parameters = event.parameters.dup
+
+    if parameters.key?(:rollbar_scope) && parameters[:rollbar_scope].is_a?(Hash)
+      scope = scope.merge(
+        parameters.delete(:rollbar_scope)
+      )
+    end
+
+    if !scope[:fingerprint]
+      fingerprint = event.message.to_s
+
+      if event.exception
+        fingerprint += event.exception.class.to_s
+      end
+
+      scope[:fingerprint] = Digest::MD5.new.update(fingerprint).to_s
+    end
+
+    Rollbar.scoped(scope) do
+      Rollbar.log(rollbar_level, event.message, event.exception, parameters)
+    end
+
+    nil
+  end
+end

data/lib/ree_lib/packages/ree_logger/package/ree_logger/beans/logger.rb

@@ -14,6 +14,7 @@ class ReeLogger::Logger
     link 'ree_logger/rate_limiter', -> { RateLimiter }
     link 'ree_logger/appenders/file_appender', -> { FileAppender }
     link 'ree_logger/appenders/stdout_appender', -> { StdoutAppender }
+    link 'ree_logger/appenders/rollbar_appender', -> { RollbarAppender }
   end
 
   def build
@@ -35,6 +36,19 @@ class ReeLogger::Logger
       )
     end
 
+    if config.rollbar.enabled
+      opts = {}
+      opts[:branch] = config.rollbar.branch if config.rollbar.branch
+      opts[:host] = config.rollbar.host if config.rollbar.host
+
+      appenders << RollbarAppender.new(
+        config.levels.rollbar,
+        access_token: config.rollbar.access_token,
+        environment: config.rollbar.environment,
+        **opts
+      )
+    end
+
     build_logger(
       appenders,
       ENV['APP_NAME'],

data/lib/ree_lib/packages/ree_logger/package/ree_logger/config.rb

@@ -17,12 +17,22 @@ class ReeLogger::Config
   RATE_LIMIT_MAX_COUNT = 600
 
   def build
+    is_rollbar_enabled = parse_bool_string(ENV['LOG_ROLLBAR_ENABLED'])
+
     to_obj({
       file_path: ENV['LOG_FILE_PATH'],
       file_auto_flush: parse_bool_string(ENV['LOG_FILE_AUTO_FLUSH']),
       levels: {
         file: parse_level(ENV['LOG_LEVEL_FILE']),
         stdout: parse_level(ENV['LOG_LEVEL_STDOUT']),
+        rollbar: is_rollbar_enabled ? parse_level(ENV['LOG_LEVEL_ROLLBAR']) : nil,
+      },
+      rollbar: {
+        enabled: is_rollbar_enabled,
+        access_token: is_rollbar_enabled ? ENV.fetch('LOG_ROLLBAR_ACCESS_TOKEN') : nil,
+        environment: is_rollbar_enabled ? ENV.fetch('LOG_ROLLBAR_ENVIRONMENT') : nil,
+        branch: ENV['LOG_ROLLBAR_BRANCH'],
+        host: ENV['LOG_ROLLBAR_HOST']
       },
       rate_limit: {
         interval: get_int_value('LOG_RATE_LIMIT_INTERVAL', RATE_LIMIT_INTERVAL),

data/lib/ree_lib/packages/ree_logger/package/ree_logger/multi_logger.rb

@@ -134,6 +134,14 @@ class ReeLogger::MultiLogger < Logger
       end
     end
 
+    parameters = transform_values(parameters) do |k, v|
+      if @filter_words.any? { k.to_s.include?(_1) }
+        'FILTERED'
+      else
+        v
+      end
+    end
+
     event = LogEvent.new(level, message, exception, parameters)
 
     appenders.each do |appender|

data/lib/ree_lib/packages/ree_logger/package/ree_logger.rb

@@ -11,6 +11,7 @@ module ReeLogger
     depends_on :ree_datetime
     depends_on :ree_validator
     depends_on :ree_hash
+    depends_on :ree_swagger
 
     env_var 'LOG_FILE_PATH'
     env_var 'LOG_LEVEL_FILE'

data/lib/ree_lib/packages/ree_logger/schemas/ree_logger/beans/logger.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "logger",
   "path": "packages/ree_logger/package/ree_logger/beans/logger.rb",
   "mount_as": "object",

data/lib/ree_lib/packages/ree_logger/schemas/ree_logger/config.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "config",
   "path": "packages/ree_logger/package/ree_logger/config.rb",
   "mount_as": "object",

data/lib/ree_lib/packages/ree_logger/schemas/ree_logger/formatters/colorized_formatter.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "colorized_formatter",
   "path": "packages/ree_logger/package/ree_logger/formatters/colorized_formatter.rb",
   "mount_as": "object",

data/lib/ree_lib/packages/ree_logger/schemas/ree_logger/formatters/default_formatter.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "default_formatter",
   "path": "packages/ree_logger/package/ree_logger/formatters/default_formatter.rb",
   "mount_as": "object",

data/lib/ree_lib/packages/ree_logger/schemas/ree_logger/functions/build_logger.schema.json

@@ -1,6 +1,6 @@
 {
   "schema_type": "object",
-  "ree_version": "1.0.1",
+  "schema_version": "1.0",
   "name": "build_logger",
   "path": "packages/ree_logger/package/ree_logger/functions/build_logger.rb",
   "mount_as": "fn",

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/appenders/rollbar_appender_spec.rb

@@ -0,0 +1,33 @@
+#frozen_string_literal = true
+
+package_require('ree_logger/appenders/rollbar_appender')
+
+RSpec.describe ReeLogger::RollbarAppender do
+  let(:rollbar_appender) { described_class }
+
+  let(:log_event) {
+    ReeLogger::LogEvent.new(
+      :info,
+      "Some message",
+      nil,
+      {}
+    )
+  }
+
+  # comment "before" block to test sending to api
+  before do
+    allow(Rollbar).to receive(:log)
+  end
+
+  it "sends log event to Rollbar" do
+    appender = rollbar_appender.new(
+      :info,
+      access_token: ENV['LOG_ROLLBAR_ACCESS_TOKEN'],
+      environment: ENV['LOG_ROLLBAR_ENVIRONMENT']
+    )
+
+    expect(appender).to respond_to(:append)
+    expect { appender.append(log_event) }.not_to raise_error
+    expect(Rollbar).to have_received(:log)
+  end
+end

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/beans/logger_spec.rb

@@ -8,12 +8,16 @@ RSpec.describe :logger do
 
   before(:all) do
     tmp_file_log = ENV['LOG_FILE_PATH']
-    
+
     if !is_blank(tmp_file_log)
       File.open(tmp_file_log, 'w') {|file| file.truncate(0) }
     end
   end
 
+  before(:each) do
+    allow(Rollbar).to receive(:log)
+  end
+
   let(:log_file_path) { ENV['LOG_FILE_PATH'] }
 
   let(:exception) {
@@ -22,21 +26,25 @@ RSpec.describe :logger do
 
   it {
     expect { logger.info('hello world') }.to output(/hello world/).to_stdout
+    expect(Rollbar).to have_received(:log)
     expect(File.read(log_file_path)).to match("hello world")
   }
 
   it {
-    expect { logger.info('hello world', { param: 1, another_param: { name: 'John'} }) }.to output(/John/).to_stdout
+    expect { logger.info('hello world', { rollbar_scope: {fingerprint: 'test', test: 'test'}, param: 1, another_param: { name: 'John'} }) }.to output(/John/).to_stdout
+    expect(Rollbar).to have_received(:log)
     expect(File.read(log_file_path)).to match("John")
   }
-  
+
   it {
     expect { logger.debug('debug message') }.to_not output(/debug message/).to_stdout
+    expect(Rollbar).not_to have_received(:log)
     expect(File.read(log_file_path)).to_not match("debug")
   }
 
   it {
     expect { logger.warn('warning message') }.to output(/warning message/).to_stdout
+    expect(Rollbar).to have_received(:log)
     expect(File.read(log_file_path)).to match("warning message")
   }
 
@@ -46,17 +54,20 @@ RSpec.describe :logger do
     }
     expect(output).to match(/some error message/)
     expect(output).to_not match(/method|args/)
+    expect(Rollbar).to have_received(:log)
     expect(File.read(log_file_path)).to match("some error message")
     expect(File.read(log_file_path)).to_not match("PARAMETERS: {:method=>{:name=>:call, :args=>{:block=>{}}}}")
   }
 
   it {
     expect { logger.fatal('some fatal message', {}, exception) }.to output(/some fatal message/).to_stdout
+    expect(Rollbar).to have_received(:log)
     expect(File.read(log_file_path)).to match("some fatal message")
   }
 
   it {
     expect { logger.unknown('unknown message') }.to output(/unknown message/).to_stdout
+    expect(Rollbar).to have_received(:log)
     expect(File.read(log_file_path)).to match("unknown message")
   }
 end