cayuga 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d50fe8ce3348011a524be668a3409de19f144d9ed54150c3d6e0991c143f95a
-  data.tar.gz: 29057f914e65f8b68d02e4ad76ac89a1a5dd5077426bae2e291ea393e1939824
+  metadata.gz: 28806f913a01ae797e4751924b71bbdead9a425575051711c430c8327e75b1cb
+  data.tar.gz: ece3a5e21f131ee8f490bb3ac42b22afdd94741a5574a7b42371314e34a305bd
 SHA512:
-  metadata.gz: 0d3d861a7da42d38e39ea709a74ecd66369d3a0091dbbbb0482b9feedba7142882138b6787c15693975adc45e263122c3261181fccce57e0a45f5cf7278c44a4
-  data.tar.gz: e74fd9bda2736773e5640e0963716387e8d22ed8a4fdb774763622189c9f4226ab633ed7cb923a578775ddc3e14ad76f3d3f5ff000e27e367084c83919847c2e
+  metadata.gz: dd7623054ed934575f1455a6430c793c6ee82eea54890730a87a38316cea06b1a0f0549e7fc8cc96a4cb57900bea157eb8bca048cc6849767004c460ddc9f4e5
+  data.tar.gz: '01792132b0cbf8eb613a35c8d0b5d0d05dac6ab10453c39e615b2396a30ca01cc37cf02b5fdd426939efa74fe9620bf2b673e8382cf57c19771a832aa20367c5'

data/lib/cayuga/object/constants.rb

@@ -2,11 +2,14 @@
 # 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
@@ -21,10 +24,6 @@ module Cayuga
         files[constant.symbolize]
       end
 
-      def repository(constant)
-        repositories[constant.symbolize]
-      end
-
       private_class_method :new
 
       private
@@ -33,10 +32,9 @@ module Cayuga
 
       def initialize(factory, configuration)
         super
-        @constants = configuration[:constants]
-        @directories = configuration[:directories]
-        @files = configuration[:files]
-        @repositories = configuration[:repositories]
+        @constants = primary_configuration(:constants)
+        @directories = primary_configuration(:directories)
+        @files = primary_configuration(:files)
       end
 
     end

data/lib/cayuga/object/factory.rb

@@ -5,14 +5,16 @@ require 'json'
 require 'ice_nine'
 require 'ice_nine/core_ext/object'
 require 'cayuga'
-require_relative 'factory_helper.rb'
+require 'cayuga/object/factory_helper_shared'
+require 'cayuga/object/factory_helper'
 
 module Cayuga
   module Object
     # Cayuga Object Factory
     class Factory
-      include Cayuga::Object::FactoryHelper
       include Tools::Loggable
+      include FactoryHelperShared
+      include FactoryHelper
 
       attr_reader :configuration_name, :logs_directory
 
@@ -82,16 +84,16 @@ module Cayuga
 
       private
 
-      attr_reader :configuration, :types, :instances
+      attr_reader :configuration, :types, :instances, :directories
 
       def initialize(config)
         @configuration =
           JSON.parse(File.read(config), symbolize_names: true).deep_freeze
-        @configuration_name = configuration[:configuration_name]
-        @logs_directory = configuration[:directories][:logs]
+        @configuration_name = primary_configuration(:configuration_name, type: String)
         setup_types
         @instances = {}
-        @directories = configuration[:directories].freeze
+        @directories = primary_configuration(:directories).freeze
+        @logs_directory = directories[:logs]
       end
 
     end

data/lib/cayuga/object/factory_helper_shared.rb

@@ -0,0 +1,24 @@
+#
+# 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

data/lib/cayuga/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cayuga
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - patrick
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-01 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -129,6 +129,7 @@ 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