cayuga 0.0.2 → 0.0.3

data/cayuga.gemspec

@@ -1,15 +1,15 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "cayuga/version"
+require 'cayuga/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "cayuga"
-  spec.version       = Cayuga::VERSION
-  spec.authors       = ["patrick"]
-  spec.email         = ["peateas@gmail.com"]
+  spec.name = "cayuga"
+  spec.version = Cayuga::VERSION
+  spec.authors = ["patrick"]
+  spec.email = ["peateas@gmail.com"]
 
-  spec.summary       = %q{Holder for Cayuga applications and utilities.}
-  spec.homepage      = ""
+  spec.summary = %q{Holder for Cayuga applications and utilities.}
+  spec.homepage = ""
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"

data/cayuga.iml

@@ -29,7 +29,7 @@
     <orderEntry type="library" scope="PROVIDED" name="tins (v1.17.0, ruby-2.4.4-p296) [gem]" level="application" />
   </component>
   <component name="RModuleSettingsStorage">
-    <LOAD_PATH number="1" string0="$MODULE_DIR$/lib" />
+    <LOAD_PATH number="2" string0="$MODULE_DIR$/lib" string1="$MODULE_DIR$/spec" />
     <I18N_FOLDERS number="0" />
   </component>
 </module>

data/lib/cayuga/object/constants.rb

@@ -1,16 +1,11 @@
 #
 # Copyright (c) 2018 Patrick Thomas.  All rights reserved.
 #
-require 'cayuga/tools/loggable'
-require 'cayuga/object/object'
-require 'cayuga/object/singleton'
+require 'cayuga'
 
 module Cayuga
   module Object
-    class Constants
-      extend Singleton
-      include Object
-      include Tools::Loggable
+    class Constants < Singleton
 
       def directory(constant)
         directories[constant.symbolize]
@@ -22,11 +17,9 @@ module Cayuga
 
       attr_reader :factory, :directories
 
-      def initialize(factory)
-        @factory = factory
-        factory[Logger].log_log!(self.class, filename: log_file, filter: Regexp.new("#{self.class.stringify}"))
-
-        @directories = factory.directory_constants
+      def initialize(factory, configuration)
+        super
+        @directories = configuration[:directories]
       end
 
     end

data/lib/cayuga/object/factory.rb

@@ -2,15 +2,15 @@
 # Copyright (c) 2018 Patrick Thomas.  All rights reserved.
 #
 require 'json'
-require 'cayuga/tools/string'
-require 'cayuga/tools/symbol'
-require 'cayuga/tools/class'
+require 'cayuga'
 
 module Cayuga
   module Object
     # Cayuga Object Factory
     class Factory
-      attr_reader :configuration_information, :logs_directory
+      include Tools::Loggable
+
+      attr_reader :configuration_name, :logs_directory
 
       def supported?(klass)
         types.key?(klass.symbolize)
@@ -74,17 +74,17 @@ module Cayuga
         end
       end
 
-       def directory_constants
-         @directories.freeze
-       end
+      def directory_constants
+        @directories.freeze
+      end
 
       private
 
       attr_reader :configuration, :types, :instances
 
       def initialize(config)
-        @configuration_information = config
         @configuration = JSON.parse(File.read(config), symbolize_names: true)
+        @configuration_name = configuration[:configuration_name]
         @logs_directory = configuration[:directories][:logs]
         @types = {}
         # register_classes(FACTORIES, :factory)
@@ -120,11 +120,11 @@ module Cayuga
           #     log.info("factory #{klass} created ")
           #   end
           when :singleton
-            object = klass.create(self)
-            # log.info("singleton #{klass} created ")
+            object = klass.create(self, configuration)
+          # log.info("singleton #{klass} created ")
           when :named
-            object = klass.create(self, name)
-            # log.info("#{klass} created with name #{name}")
+            object = klass.create(self, configuration, name)
+          # log.info("#{klass} created with name #{name}")
           else
             raise "unregistered or incorrectly registered class #{klass}"
         end
@@ -132,5 +132,6 @@ module Cayuga
       end
 
     end
+
   end
 end

data/lib/cayuga/object/logger.rb

@@ -2,47 +2,73 @@
 # Copyright (c) 2018 Patrick Thomas.  All rights reserved.
 #
 require 'file-tail'
-require 'cayuga/object/constants'
-require 'cayuga/object/singleton'
-require 'cayuga/tools/loggable'
+require 'cayuga'
 
 module Cayuga
   module Object
-    class Logger
-      extend Singleton
-      include Object
-      include Tools::Loggable
+    class Logger < Singleton
 
       def generic_log_file(name)
         "#{factory.logs_directory}/#{name.stringify.filenamify('.log')}"
       end
 
-      def logs
+      def log_names
         @logs.keys.freeze
       end
 
-      def log_log(name)
+      def log_filename(name)
         @logs[name.symbolize]
       end
 
-      alias [] log_log
+      alias [] log_filename
+
+      def log_appender(name)
+        all = SemanticLogger.appenders.select { |log| log.name == name.stringify }
+        count = all.count
+        raise RuntimeError, "More than one log with name #{name}" if count > 1
+        if count == 1
+          all[0]
+        else
+          nil
+        end
+      end
 
       def log_log?(name)
         not @logs[name.symbolize].nil?
       end
 
-      def log_log!(name, filename: nil, stream: nil, filter: nil)
-        return log_log(name) if log_log?(name)
-        log = nil
-        log = SemanticLogger.add_appender(file_name: filename, filter: filter) unless filename.nil?
-        log = SemanticLogger.add_appender(io: stream, filter: filter) unless stream.nil?
-        raise ArgumentError, "no filename or stream for log #{name.stringify}" if log.nil?
+      def log_log!(name, filename: nil, stream: nil, filter: nil, level: :info)
+        symbol = name.symbolize
+        return log_filename(symbol) if log_log?(symbol)
+        if log_appender_exists?(symbol)
+          logger.warn('no entry for log', payload = { name: symbol })
+          logger.warn('no entry for log', payload = { log: log_names })
+          @logs[symbol] = filename || stream
+          if log_filename(symbol).nil?
+            @logs[symbol] = factory.logs_directory + '/' + name.classify.log_file
+          end
+          return
+        end
+        if filename.nil?
+          if stream.nil?
+            #must be a class
+            filename = factory.logs_directory + '/' + name.classify.log_file
+            log = SemanticLogger.add_appender(file_name: filename, filter: filter)
+          else
+            log = SemanticLogger.add_appender(io: stream, filter: filter)
+          end
+        else
+          log = SemanticLogger.add_appender(file_name: filename, filter: filter)
+        end
         log.name = name.stringify
-        @logs[name.symbolize] = filename || stream
+        log.level = level
+        @logs[name.symbolize] = filename || stream || name.stringify
+        logger.info('logs', payload = { log_names: log_names })
+        logger.info('logs', payload = { count: SemanticLogger.appenders.count })
       end
 
       def tail(name, size: 5)
-        File.open(log_log(name)) do |log|
+        File.open(log_filename(name)) do |log|
           log.extend File::Tail
           log.return_if_eof = true
           log.backward(size).tail(size)
@@ -55,14 +81,25 @@ module Cayuga
 
       attr_reader :factory
 
-      def initialize(factory)
+      def initialize(factory, configuration)
         @factory = factory
         @logs = {}
-        log_log!(:console, stream: $stderr)
+        log_log!(:console, stream: $stderr, level: :warn)
         log_log!(:main, filename: generic_log_file(:main))
-        log_log!(self.class, filename: log_file, filter: Regexp.new(self.class.stringify))
+        log_log!(factory.class, filter: Regexp.new(factory.class.stringify))
+        log_log!(self.class, filter: Regexp.new(self.class.stringify))
+      end
+
+      def log_appender_exists?(name)
+        name = name.symbolize
+        log = log_appender(name)
+        if log.nil?
+          false
+        else
+          true
+        end
       end
 
     end
   end
-end
+end

data/lib/cayuga/object/{named_object_class.rb → named_object.rb}

@@ -3,21 +3,24 @@
 #
 module Cayuga
   module Object
-    # Named Object Class
-    module NamedObjectClass
-      def valid_name?(_factory, name)
+    # Named Object
+    class NamedObject < Object
+      attr_reader :name
+
+      def self.valid_name?(_factory, name)
         name != nil
       end
 
-      def primary?(_name)
+      def self.primary?(_name)
         true
       end
 
-      def primary(name)
+      def self.primary(name)
         name
       end
 
-      def create(factory, name)
+      def self.create(factory, configuration, name)
+        raise "#{self.stringify}[#{name}] already registered" if factory.registered?(self, name)
         if primary?(name)
           primary = name
           alternate = nil
@@ -26,14 +29,20 @@ module Cayuga
           alternate = name
         end
         verify_name_validity(factory, primary, alternate)
-        instance = create_primary(factory, primary(name))
+        instance = create_primary(factory, configuration, primary(name))
         factory.register(instance, self, alternate) unless alternate.nil?
         instance
       end
 
       private
 
-      def verify_name_validity(factory, name, alternate)
+      def initialize(factory, configuration, name)
+        super(factory, configuration)
+        @name = name
+        # Todo:  alternative names
+      end
+
+      def self.verify_name_validity(factory, name, alternate)
         # check validity of name
         unless valid_name?(factory, name)
           raise "'#{self}['#{name}'] is not a valid #{self}"
@@ -49,16 +58,20 @@ module Cayuga
         true
       end
 
-      def create_primary(factory, name)
+      private_class_method :verify_name_validity
+
+      def self.create_primary(factory, configuration, name)
         if factory.registered?(self, name)
           instance = factory[self, name]
         else
-          instance = new(factory, name)
+          instance = new(factory, configuration, name)
           factory.register(instance, self, name)
         end
         instance
       end
 
+      private_class_method :create_primary
+
     end
   end
-end
+end

data/lib/cayuga/object/object.rb

@@ -2,18 +2,35 @@
 # Copyright (c) 2018 Patrick Thomas.  All rights reserved.
 #
 #
-require 'cayuga/tools/string'
-require 'cayuga/tools/symbol'
-require 'cayuga/tools/class'
-require 'cayuga/tools/loggable'
+require 'cayuga'
 
 module Cayuga
+  # noinspection RubyConstantNamingConvention
+  RootObject = Object
+
   module Object
-    module Object
-      def log_file
-        @log_file ||= "#{factory.logs_directory}/#{self.class.filenamify('.log')}"
+    class Object
+      include Tools::Loggable
+
+      attr_reader :configuration_name
+
+      private_class_method :new
+
+      private
+
+      attr_reader :factory, :configuration
+
+      def initialize(factory, configuration)
+        @factory = factory
+        @configuration = configuration
+        @configuration_name = factory.configuration_name
+        factory[Logger].log_log!(
+          self.class,
+          filter: Regexp.new(self.class.stringify)
+        ) unless self.class == Logger
       end
 
     end
   end
-end
+end
+

data/lib/cayuga/object/singleton.rb

@@ -4,13 +4,11 @@
 module Cayuga
   module Object
     # Cayuga Object Singleton
-    module Singleton
-
-      def create(factory)
+    class Singleton < Object
+      def self.create(factory, configuration)
         raise "#{self.stringify} already registered" if factory.registered?(self)
-        factory.register(new(factory), self)
+        factory.register(new(factory, configuration), self)
       end
-
     end
   end
-end
+end

data/lib/cayuga/tools/loggable.rb

@@ -13,7 +13,13 @@ module Cayuga
           class << self
             alias_method :log, :logger
           end
+
           alias_method :log, :logger
+
+          def self.log_file
+            "#{self.filenamify('.log')}"
+          end
+
         end
       end
     end

data/lib/cayuga/version.rb

@@ -1,3 +1,3 @@
 module Cayuga
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/cayuga.rb

@@ -1,5 +1,12 @@
-require "cayuga/version"
+require 'cayuga/version'
+require 'cayuga/tools/string'
+require 'cayuga/tools/symbol'
+require 'cayuga/tools/class'
+require 'cayuga/tools/loggable'
+require 'cayuga/object/object'
+require 'cayuga/object/singleton'
+require 'cayuga/object/constants'
+require 'cayuga/object/logger'
+require 'cayuga/object/named_object'
+require 'cayuga/object/factory'
 
-module Cayuga
-  # Your code goes here...
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cayuga
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - patrick
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ files:
 - lib/cayuga/object/constants.rb
 - lib/cayuga/object/factory.rb
 - lib/cayuga/object/logger.rb
-- lib/cayuga/object/named_object_class.rb
+- lib/cayuga/object/named_object.rb
 - lib/cayuga/object/object.rb
 - lib/cayuga/object/singleton.rb
 - lib/cayuga/tools/class.rb