cayuga 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28806f913a01ae797e4751924b71bbdead9a425575051711c430c8327e75b1cb
-  data.tar.gz: ece3a5e21f131ee8f490bb3ac42b22afdd94741a5574a7b42371314e34a305bd
+  metadata.gz: 1dd3c6bc284e88b29c92830f3c61bbc8daf0c0fb8ea3c897ec944dfb4bd00d37
+  data.tar.gz: 48025310872a2af12849560ad82ab0610e7109001039192d8dfa33356d096f15
 SHA512:
-  metadata.gz: dd7623054ed934575f1455a6430c793c6ee82eea54890730a87a38316cea06b1a0f0549e7fc8cc96a4cb57900bea157eb8bca048cc6849767004c460ddc9f4e5
-  data.tar.gz: '01792132b0cbf8eb613a35c8d0b5d0d05dac6ab10453c39e615b2396a30ca01cc37cf02b5fdd426939efa74fe9620bf2b673e8382cf57c19771a832aa20367c5'
+  metadata.gz: 5971b7e037f68c0254bdab4abe8729039dc7ddb59c326ef879af231528361df3e9de9b2590b5ed5716eaa8011e6fa3613119613145c88583c7e21e58f1a2e5d4
+  data.tar.gz: c282550d6ccc7d9759be9a7db75ff23680632a1a15da2ff0fd04b2804543289d04307a084a1976e8f2b2a2ea71ad2679e2521c372227f37514055093d8e08560

data/lib/cayuga/object/constants.rb

@@ -2,14 +2,11 @@
 # Copyright (c) 2018 Patrick Thomas.  All rights reserved.
 #
 require 'cayuga'
-require 'cayuga/object/factory_helper_shared'
 
 module Cayuga
   module Object
     # noinspection RubyModuleAsSuperclassInspection
     class Constants < Singleton
-      include FactoryHelperShared
-
       def constant(constant)
         constants[constant.symbolize]
       end
@@ -32,9 +29,9 @@ module Cayuga
 
       def initialize(factory, configuration)
         super
-        @constants = primary_configuration(:constants)
-        @directories = primary_configuration(:directories)
-        @files = primary_configuration(:files)
+        @constants = configuration[:constants]
+        @directories = configuration[:directories]
+        @files = configuration[:files]
       end
 
     end

data/lib/cayuga/object/factory.rb

@@ -5,7 +5,6 @@ require 'json'
 require 'ice_nine'
 require 'ice_nine/core_ext/object'
 require 'cayuga'
-require 'cayuga/object/factory_helper_shared'
 require 'cayuga/object/factory_helper'
 
 module Cayuga
@@ -13,10 +12,9 @@ module Cayuga
     # Cayuga Object Factory
     class Factory
       include Tools::Loggable
-      include FactoryHelperShared
       include FactoryHelper
 
-      attr_reader :configuration_name, :logs_directory
+      attr_reader :configuration_name
 
       def logger
         @logger ||= self[Cayuga::Object::Logger]
@@ -84,16 +82,16 @@ module Cayuga
 
       private
 
-      attr_reader :configuration, :types, :instances, :directories
+      attr_reader :configuration, :types, :instances
 
       def initialize(config)
         @configuration =
           JSON.parse(File.read(config), symbolize_names: true).deep_freeze
-        @configuration_name = primary_configuration(:configuration_name, type: String)
+        @configuration_name = :configuration_name
         setup_types
         @instances = {}
-        @directories = primary_configuration(:directories).freeze
-        @logs_directory = directories[:logs]
+        setup_primary_configurations
+        log_missing_keys unless missing_keys.empty?
       end
 
     end

data/lib/cayuga/object/factory_helper.rb

@@ -8,12 +8,57 @@ module Cayuga
   module Object
     # Cayuga Object Factory Helper
     module FactoryHelper
+      attr_reader :_constants, :_directories, :_files
+      attr_reader :_logs_annotation_marker, :_logs_directory
+
       private
 
+      attr_reader :missing_keys
+
       OBJECTS = {
         singletons: %w[Cayuga::Object::Logger Cayuga::Object::Constants]
       }.deep_freeze
 
+      def log_missing_keys
+        logger
+        missing_keys.each do |key|
+          log.warn('missing key', key: key, configuration: configuration_name)
+        end
+      end
+
+      def setup_primary_configurations
+        @missing_keys = Set.new
+        @configuration_name = setup_constant(
+          configuration, :configuration_name, 'Missing Name'
+        )
+        setup_primary_keys
+        setup_log_configuration
+      end
+
+      def setup_primary_keys
+        @_constants = setup_constant(configuration, :constants, {}).deep_freeze
+        @_directories =
+          setup_constant(configuration, :directories, {}).deep_freeze
+        @_files = setup_constant(configuration, :files, {}).deep_freeze
+      end
+
+      def setup_log_configuration
+        @_logs_annotation_marker = setup_constant(
+          _constants, :log_annotation_marker, '-missing-marker'
+        ).freeze
+        @_logs_directory = setup_constant(_directories, :logs, 'logs').freeze
+      end
+
+      def setup_constant(source, key, default)
+        case source.key?(key)
+          when true
+            source[key]
+          else
+            @missing_keys.add(key)
+            default
+        end
+      end
+
       def setup_types
         @types = {}
         register_classes(configuration[:object_classes], :object)

data/lib/cayuga/object/logger.rb

@@ -12,7 +12,7 @@ module Cayuga
 
       def generic_log_file(name)
         filename = name.stringify.filenamify('.log')
-        "#{factory.logs_directory}/#{filename}"
+        "#{factory._logs_directory}/#{filename}"
       end
 
       def log_names
@@ -46,10 +46,10 @@ module Cayuga
         unless log_log?(name)
           remove_any_orphan_appender(name)
           make_appender(name, filename, stream, filter, level)
+          logger.info('log created', name: name, annotation: fetch_annotation)
+          logger.debug('logs', log_names: log_names)
+          logger.debug('logs', count: SemanticLogger.appenders.count)
         end
-        logger.info('log created', name: name)
-        logger.debug('logs', log_names: log_names)
-        logger.debug('logs', count: SemanticLogger.appenders.count)
         log_filename(name)
       end
 
@@ -69,8 +69,7 @@ module Cayuga
       end
 
       def fetch_annotation
-        value = configuration[:constants][:log_annotation_marker]
-        value.nil? ? '' : value
+        factory._logs_annotation_marker
       end
 
       def create_logs
@@ -87,7 +86,7 @@ module Cayuga
       def make_appender(name, filename, stream, filter, level)
         if stream.nil?
           if filename.nil?
-            filename = factory.logs_directory + '/' + name.classify.log_file
+            filename = factory._logs_directory + '/' + name.classify.log_file
           end
           log = SemanticLogger.add_appender(file_name: filename, filter: filter)
         else
@@ -102,7 +101,11 @@ module Cayuga
       def remove_any_orphan_appender(name)
         return if log_log?(name)
         return unless log_appender_exists?(name)
-        logger.warn('log without registration', name: name)
+        logger.warn(
+          'log without registration',
+          name: name,
+          configuration: configuration_name
+        )
         logger.debug('log without registration', log: log_names)
         SemanticLogger.remove_appender(log_appender(name))
       end

data/lib/cayuga/version.rb

@@ -1,3 +1,3 @@
 module Cayuga
-  VERSION = '0.0.17'.freeze
+  VERSION = '0.0.18'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cayuga
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - patrick
@@ -129,7 +129,6 @@ files:
 - lib/cayuga/object/constants.rb
 - lib/cayuga/object/factory.rb
 - lib/cayuga/object/factory_helper.rb
-- lib/cayuga/object/factory_helper_shared.rb
 - lib/cayuga/object/logger.rb
 - lib/cayuga/object/named_object.rb
 - lib/cayuga/object/object.rb

data/lib/cayuga/object/factory_helper_shared.rb

@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2018 Patrick Thomas.  All rights reserved.
-#
-require 'ice_nine'
-require 'ice_nine/core_ext/object'
-
-module Cayuga
-  module Object
-    # Cayuga Object Factory Helper Shared
-    module FactoryHelperShared
-      private
-
-      def primary_configuration(key, type: Hash)
-        if configuration.key? key
-          configuration[key]
-        else
-          log.warn('missing key in configuration', key: key, type: type.name )
-          type.new
-        end
-      end
-
-    end
-  end
-end