cayuga 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e62fad7d7f3e9b0396f5f7c00ffb2864e3e6e30b910354e3b0d263e8f0c5b3
-  data.tar.gz: dbae9f83ac4d82e3eeef83369db8cf891546f592b6625e844771d85521110145
+  metadata.gz: 430452b5bb1b78cc0488ce009950ac22abf7dc1d4b205cb00b96c56c66659bcd
+  data.tar.gz: f9f40f73d0a1ce4e45476b3475019f6c90e958aee7e81554ef1f0f29c5cfb8e0
 SHA512:
-  metadata.gz: b5785b29a139bae584cc212c0079eb959e208dc76eca5ec4446a47f33eaa4f7215ee9ea3d66fbeff56b8483d25faf2f04cf4ee00f0c3b5dd9f6943870cdb60d9
-  data.tar.gz: 57495c25d3b9cf85c7f1e4c6ca86fd46e3f389a64bba870555bdba90f39667c5b802d9d29f526fdf189687e40f81a4137d432f38a3316022e9688bb2cd8e5fd1
+  metadata.gz: 9c44f742eff1b66145b88d38adc3b3417333607699ef27323c2b9b5598eca03ef0d731509efbdfcf0f86448e2c881e9153665bf210b3e66bf7d68d585987a7ab
+  data.tar.gz: 9fd2307742f597387bede455dcfa3a51dbebfb43e27e7cb8840e2fe70e3a613e2e4ad8ad6aa39dfbba83070499c197ee3162b2a5ec3c9b50235c83bf556759b0

data/lib/cayuga/object/factory.rb

@@ -5,11 +5,13 @@ require 'json'
 require 'ice_nine'
 require 'ice_nine/core_ext/object'
 require 'cayuga'
+require_relative 'factory_helper.rb'
 
 module Cayuga
   module Object
     # Cayuga Object Factory
     class Factory
+      include Cayuga::Object::FactoryHelper
       include Tools::Loggable
 
       attr_reader :configuration_name, :logs_directory
@@ -28,14 +30,9 @@ module Cayuga
 
       def register(instance, klass, name = nil)
         key = klass.symbolize
-        unless lookup_registered_instances(key, name).nil?
-          value = name.nil? ? klass.string : "#{klass.string}[#{name}]"
-          raise "instance for #{value} already registered}"
-        end
         type = type(key)
+        generate_registration_errors(klass, name, key, type)
         case type
-          when :singleton # , :factory
-            instances[key] = instance
           when :named
             value = instances[key]
             if value.nil?
@@ -44,7 +41,7 @@ module Cayuga
             end
             value[name] = instance
           else
-            raise "bad type '#{type}'"
+            instances[key] = instance
         end
         instance
       end
@@ -81,10 +78,6 @@ module Cayuga
 
       private
 
-      OBJECTS = {
-        singletons: %w[Cayuga::Object::Logger Cayuga::Object::Constants]
-      }.deep_freeze
-
       attr_reader :configuration, :types, :instances
 
       def initialize(config)
@@ -97,46 +90,6 @@ module Cayuga
         @directories = configuration[:directories].freeze
       end
 
-      def setup_types
-        @types = {}
-        register_classes(configuration[:object_classes], :object)
-        register_classes(OBJECTS[:singletons], :singleton)
-        register_classes(configuration[:singleton_classes], :singleton)
-        register_classes(
-          configuration[:named_object_classes], :named
-        )
-      end
-
-      def register_classes(list, type)
-        return if list.nil?
-        list.each do |klass|
-          types[klass.symbolize] = type
-        end
-      end
-
-      def lookup_registered_instances(key, name)
-        value = instances[key]
-        if !value.nil? && !name.nil?
-          value = value[name]
-        end
-        value
-      end
-
-      def create_instance(type, klass, name)
-        case type
-          when :object, :singleton
-            object = klass.create(self, configuration)
-          # log.info("singleton #{klass} created ")
-          when :named
-            object = klass.create(self, configuration, name)
-          # log.info("#{klass} created with name #{name}")
-          else
-            raise "unregistered or incorrectly registered class #{klass}"
-        end
-        object
-      end
-
     end
-
   end
 end

data/lib/cayuga/object/factory_helper.rb

@@ -0,0 +1,66 @@
+#
+# 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
+    module FactoryHelper
+      private
+
+      OBJECTS = {
+        singletons: %w[Cayuga::Object::Logger Cayuga::Object::Constants]
+      }.deep_freeze
+
+      def setup_types
+        @types = {}
+        register_classes(configuration[:object_classes], :object)
+        register_classes(OBJECTS[:singletons], :singleton)
+        register_classes(configuration[:singleton_classes], :singleton)
+        register_classes(
+          configuration[:named_object_classes], :named
+        )
+      end
+
+      def register_classes(list, type)
+        return if list.nil?
+        list.each do |klass|
+          types[klass.symbolize] = type
+        end
+      end
+
+      def lookup_registered_instances(key, name)
+        value = instances[key]
+        if !value.nil? && !name.nil?
+          value = value[name]
+        end
+        value
+      end
+
+      def generate_registration_errors(klass, name, key, type)
+        unless lookup_registered_instances(key, name).nil?
+          value = name.nil? ? klass.string : "#{klass.string}[#{name}]"
+          raise "instance for #{value} already registered}"
+        end
+        types = %i[singleton named]
+        raise "can't register type '#{type}'" unless types.include? type
+      end
+
+      def create_instance(type, klass, name)
+        case type
+          when :object, :singleton
+            object = klass.create(self, configuration)
+          # log.info("singleton #{klass} created ")
+          when :named
+            object = klass.create(self, configuration, name)
+          # log.info("#{klass} created with name #{name}")
+          else
+            raise "unregistered or incorrectly registered class #{klass}"
+        end
+        object
+      end
+    end
+  end
+end

data/lib/cayuga/object/logger.rb

@@ -74,10 +74,10 @@ module Cayuga
       end
 
       def create_logs
-        log_log!(:console, stream: $stderr, level: :warn)
         log_log!(:main, filename: generic_log_file(:main))
-        log_log!(factory.class, filter: Regexp.new(factory.class.stringify))
-        log_log!(self.class, filter: Regexp.new(self.class.stringify))
+        log_log!(self.class, filter: Regexp.new(self.class.name))
+        log_log!(:console, stream: $stderr, level: :warn)
+        log_log!(factory.class, filter: Regexp.new(factory.class.name))
       end
 
       def log_appender_exists?(name)

data/lib/cayuga/object/object.rb

@@ -32,7 +32,7 @@ module Cayuga
         @configuration_name = factory.configuration_name
         return if self.class == Logger
         factory[Logger]
-          .log_log!(self.class, filter: Regexp.new(self.class.stringify))
+          .log_log!(self.class, filter: Regexp.new(self.class.name))
       end
 
     end

data/lib/cayuga/tools/class.rb

@@ -1,17 +1,17 @@
 #
 # Copyright (c) 2018 Patrick Thomas.  All rights reserved.
 #
-
 module Cayuga
   module Tools
     # Cayuga Tools Class
     module Class
       def stringify
-        name
+        symbolize.stringify
       end
 
       def symbolize
-        name.to_sym
+        # noinspection RubyResolve
+        name.methodize.to_sym
       end
 
       def classify
@@ -19,7 +19,7 @@ module Cayuga
       end
 
       def filenamify(extension = nil)
-        stringify.filenamify(extension)
+        symbolize.filenamify(extension)
       end
 
     end

data/lib/cayuga/tools/string.rb

@@ -2,7 +2,7 @@
 # Copyright (c) 2018 Patrick Thomas.  All rights reserved.
 #
 # noinspection RubyResolve
-require 'facets/string/pathize'
+require 'facets/string/methodize'
 
 module Cayuga
   module Tools
@@ -13,7 +13,7 @@ module Cayuga
       end
 
       def symbolize
-        to_sym
+        standardize.tr('-', '_').gsub('::', '__').to_sym
       end
 
       def classify
@@ -21,16 +21,45 @@ module Cayuga
       end
 
       def filenamify(extension = nil)
-        # noinspection RubyResolve
-        result = pathize.tr('/', '#')
-        unless extension.nil? || extension.empty?
-          result += extension[0] == '.' ? '' : '.'
-          result += extension.stringify
+        symbolize.filenamify(extension)
+      end
+
+      private
+
+      def alternative?
+        match(/[A-Z]/)
+      end
+
+      def standardize
+        return self unless alternative?
+        standardize_string(self)
+      end
+
+      def standardize_string(string)
+        return string if string.empty?
+        string =~ /^([^A-Za-z0-9]+)?([A-Za-z0-9]+)?(.*)$/
+        my_matches = []
+        (1..3).each do |i|
+          last = Regexp.last_match(i)
+          my_matches << (last.nil? ? '' : last)
+        end
+        my_matches[0] +
+          standardize_word(my_matches[1]) +
+          standardize_string(my_matches[2])
+      end
+
+      def standardize_word(word)
+        case word
+          when /[A-Z][a-z]/
+            # noinspection RubyResolve
+            word.methodize
+          else
+            word
         end
-        result
       end
 
     end
+
   end
 end
 

data/lib/cayuga/tools/symbol.rb

@@ -1,13 +1,15 @@
 #
 # Copyright (c) 2018 Patrick Thomas.  All rights reserved.
 #
+# noinspection RubyResolve
+require 'facets/string/modulize'
 
 module Cayuga
   module Tools
     # Cayuga Tools Symbol
     module Symbol
       def stringify
-        to_s
+        to_s.gsub('__', '::').tr('_', '-')
       end
 
       def symbolize
@@ -15,13 +17,20 @@ module Cayuga
       end
 
       def classify
-        klass = Object.const_get(to_s)
+        # noinspection RubyResolve
+        klass = Object.const_get(to_s.modulize)
         raise NameError, "wrong class name '#{klass}'" unless klass.is_a?(Class)
         klass
       end
 
       def filenamify(extension = nil)
-        stringify.filenamify(extension)
+        # noinspection RubyResolve
+        result = to_s
+        unless extension.nil? || extension.empty?
+          result += extension[0] == '.' ? '' : '.'
+          result += extension.stringify
+        end
+        result
       end
 
     end

data/lib/cayuga/version.rb

@@ -1,3 +1,3 @@
 module Cayuga
-  VERSION = '0.0.13'.freeze
+  VERSION = '0.0.14'.freeze
 end

metadata

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