config_templates 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fea41b43ab1e4aa04064072c84739edaae30424
-  data.tar.gz: 1f983e8528f0bdec2a5d472fd9fe8dce2af49bb4
+  metadata.gz: e66c47dca61de3ce9695b3650d08c201bed7f1c1
+  data.tar.gz: 6526fa9950e98b668a134af33f2e49098b2bfd75
 SHA512:
-  metadata.gz: f53d36f5f37d87ed7cc3d4fea3b8ca1244db8e2d6947e720051d5d332c1d742418768b5b1410cfbff9f71613791cb2acec65ac36cf2d2b618b521427533dbc63
-  data.tar.gz: ef51cafcc3f71dc9c7849bd8d939e831774bba20bbba3f44ec374a6af60ec41c76adbed99853cf191a102d22d2e9b71f58e345a0a3282785c8d373f0b1483e68
+  metadata.gz: ac03e9885abf6a5bcc39b18630a7add0913fa4b04924fde186b86a651d970550fa6b65ca936fbabaee7361c0b2a0b27da98ae06c53b8da54b8ef612f9245a35e
+  data.tar.gz: b2c4f27c584a088e5aa110752e5584fc983c9cf9911ebfedcf5cf74c7678704f9831b04e511766cf2b49d3c603ac8b326ab0c800f3299df41e093edb42c16779

data/lib/autoload.rb

@@ -1,12 +1,9 @@
-require 'erb'
-require 'yaml'
-require 'fileutils'
-
 module ConfigTemplates
   module Contexts; end
   module Criteria; end
   module Engines; end
-  module Models; end
+  module Filesystem; end
+  module Templates; end
   module Outputs; end
   module Repositories; end
   module Validators; end

data/lib/config_templates.rb

@@ -1,13 +1,16 @@
-require_relative 'autoload'
+require 'erb'
+require 'yaml'
+require 'fileutils'
 
 module ConfigTemplates
-  class << self
-    def configure
-      yield config
-    end
+  def self.configure
+    yield container.resolve(:config)
+  end
 
-    def config
-      @config ||= Config.new
-    end
+  def self.container
+    @container ||= ::Dry::Container.new
   end
 end
+
+require_relative 'ioc_config'
+require_relative 'autoload'

data/lib/config_templates/config.rb

@@ -1,15 +1,21 @@
 module ConfigTemplates
   class Config
+    include ConfigTemplates::Inject[
+      'repositories.validators',
+      'repositories.engines',
+      'repositories.outputs'
+    ]
+
     attr_accessor :templates_path, :destination_path
     attr_accessor :settings_path, :settings_file_basename
     attr_accessor :stages
     attr_reader :stage
 
-    def initialize
+    def initialize(validators, engines, outputs)
       @stages = []
-      @outputs = ::ConfigTemplates::Repositories::Outputs.new
-      @engines = ::ConfigTemplates::Repositories::Engines.new
-      @validators = ::ConfigTemplates::Repositories::Validators.new
+      @engines = engines
+      @outputs = outputs
+      @validators = validators
     end
 
     def stage=(stage)
@@ -20,26 +26,14 @@ module ConfigTemplates
       end
     end
 
-    def output(name)
-      @outputs.find_by_name name
-    end
-
     def outputs(outputs)
       @outputs.add outputs
     end
 
-    def engine(extension)
-      @engines.find_by_extension extension
-    end
-
     def engines(engines)
       @engines.add engines
     end
 
-    def validator(file_name)
-      @validators.find_by_file_name file_name
-    end
-
     def validators(validators)
       @validators.add validators
     end

data/lib/config_templates/contexts/compilation.rb

@@ -1,8 +1,15 @@
 module ConfigTemplates::Contexts
   class Compilation
-    def initialize
-      @templates = ::ConfigTemplates::Repositories::Templates.new
-      @settings = ::ConfigTemplates::Repositories::Settings.new
+    include ConfigTemplates::Inject[
+      'repositories.templates',
+      'repositories.validators',
+      'repositories.engines'
+    ]
+
+    def initialize(templates, validators, engines)
+      @templates = templates
+      @validators = validators
+      @engines = engines
       @criteria = ::ConfigTemplates::Criteria::Composite.new
     end
 
@@ -10,16 +17,16 @@ module ConfigTemplates::Contexts
       @criteria = ::ConfigTemplates::Criteria::Composite.new @criteria, criteria
     end
 
-    def renderers
+    def components
       @templates.find_all_by(@criteria).map do |template|
-        ::ConfigTemplates::Models::Renderer.new template, renderer_context
+        ::ConfigTemplates::Models::Component.new template, context, @validators, @engines
       end
     end
 
     private
 
-    def renderer_context
-      ::ConfigTemplates::Contexts::Renderer.new @settings
+    def context
+      ::ConfigTemplates::Contexts::Rendering.new
     end
   end
 end

data/lib/config_templates/contexts/{renderer.rb → rendering.rb}

@@ -1,8 +1,10 @@
 module ConfigTemplates::Contexts
-  class Renderer
-    def initialize(settings)
+  class Rendering
+    include ::ConfigTemplates::Inject['repositories.settings', 'config']
+
+    def initialize(settings, config)
       @settings = settings
-      @config = ::ConfigTemplates.config
+      @config = config
     end
 
     def param(path, default = nil)

data/lib/config_templates/filesystem/locator.rb

@@ -0,0 +1,16 @@
+module ConfigTemplates::Filesystem
+  class Locator
+    include ::ConfigTemplates::Inject['config']
+
+    def templates
+      ::Dir[::File.join(config.templates_path, '**', '*')].lazy.select { |path| ::File.file? path }
+    end
+
+    def settings
+      ::Dir[
+        ::File.join(config.settings_path, "#{config.settings_file_basename}.yml"),
+        ::File.join(config.settings_path, "#{config.settings_file_basename}.#{config.stage}.yml")
+      ]
+    end
+  end
+end

data/lib/config_templates/models/compilation.rb

@@ -1,7 +1,9 @@
 module ConfigTemplates::Models
   class Compilation
-    def initialize
-      @config = ::ConfigTemplates.config
+    include ::ConfigTemplates::Inject['repositories.outputs']
+
+    def initialize(outputs)
+      @outputs = outputs
       @context = ::ConfigTemplates::Contexts::Compilation.new
     end
 
@@ -16,10 +18,10 @@ module ConfigTemplates::Models
     end
 
     def send_to(output_name)
-      @context.renderers.tap do |renderers|
-        output = @config.output output_name
-        renderers.each &:validate!
-        renderers.each { |renderer| output.print renderer }
+      @context.components.tap do |components|
+        output = outputs.find_by_name output_name
+        components.each &:validate!
+        components.each { |component| output.print component }
       end
     end
   end

data/lib/config_templates/models/component.rb

@@ -0,0 +1,34 @@
+module ConfigTemplates::Models
+  class Component
+    def initialize(template, context, validators, engines)
+      @template = template
+      @context = context
+      @validators = validators
+      @engines = engines
+    end
+
+    def destination
+      engine.output_file_name @template.destination
+    end
+
+    def validate!
+      unless validator.valid? render
+        raise ::ConfigTemplates::Errors::InvalidTemplate, @template.path
+      end
+    end
+
+    def render
+      @render ||= engine.evaluate @template.content, @context
+    end
+
+    private
+
+    def validator
+      @validator ||= @validators.find_by_file_name @template.path
+    end
+
+    def engine
+      @engine ||= @engines.find_by_extension @template.extension
+    end
+  end
+end

data/lib/config_templates/models/template.rb

@@ -2,9 +2,9 @@ module ConfigTemplates::Models
   class Template
     attr_reader :path
 
-    def initialize(path)
+    def initialize(path, config)
       @path = path
-      @config = ::ConfigTemplates.config
+      @config = config
     end
 
     def content
@@ -16,19 +16,7 @@ module ConfigTemplates::Models
     end
 
     def destination
-      engine.output_file_name ::File.join(
-        @config.destination_path,
-        @config.stage.to_s,
-        @path.sub(@config.templates_path, '')
-      )
-    end
-
-    def validator
-      @config.validator @path
-    end
-
-    def engine
-      @config.engine extension
+      ::File.join @config.destination_path, @config.stage.to_s, @path.sub(@config.templates_path, '')
     end
   end
 end

data/lib/config_templates/outputs/filesystem.rb

@@ -1,9 +1,9 @@
 module ConfigTemplates::Outputs
   class Filesystem
-    def print(renderer)
-      destination = renderer.template.destination
+    def print(component)
+      destination = component.destination
       ::FileUtils.mkdir_p ::File.dirname destination
-      ::File.write destination, renderer.render
+      ::File.write destination, component.render
     end
   end
 end

data/lib/config_templates/outputs/stdout.rb

@@ -1,7 +1,7 @@
 module ConfigTemplates::Outputs
   class Stdout
-    def print(renderer)
-      ::Kernel.puts renderer.render
+    def print(component)
+      ::Kernel.puts component.render
     end
   end
 end

data/lib/config_templates/repositories/settings.rb

@@ -1,7 +1,9 @@
 module ConfigTemplates::Repositories
   class Settings
-    def initialize
-      @locator = ::ConfigTemplates::FileLocator.new
+    include ::ConfigTemplates::Inject['files.locator']
+
+    def initialize(locator)
+      @locator = locator
     end
 
     def find_all

data/lib/config_templates/repositories/templates.rb

@@ -1,13 +1,16 @@
 module ConfigTemplates::Repositories
   class Templates
-    def initialize
-      @locator = ::ConfigTemplates::FileLocator.new
+    include ::ConfigTemplates::Inject['config', 'files.locator']
+
+    def initialize(config, locator)
+      @config = config
+      @locator = locator
     end
 
     def find_all_by(criteria)
       @locator.templates
         .select { |filename| criteria.matches? filename }
-        .map { |filename| ::ConfigTemplates::Models::Template.new filename }
+        .map { |filename| ::ConfigTemplates::Models::Template.new filename, @config }
     end
   end
 end

data/lib/config_templates/version.rb

@@ -1,3 +1,3 @@
 module ConfigTemplates
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/ioc_config.rb

@@ -0,0 +1,20 @@
+require 'dry-auto_inject'
+require 'dry-container'
+
+::ConfigTemplates::Inject = ::Dry::AutoInject(::ConfigTemplates.container).args
+
+::ConfigTemplates.container.tap do |container|
+  container.register(:config, memoize: true) { ::ConfigTemplates::Config.new }
+
+  container.namespace :files do
+    register(:locator, memoize: true) { ::ConfigTemplates::Filesystem::Locator.new }
+  end
+
+  container.namespace :repositories do
+    register(:engines, memoize: true) { ::ConfigTemplates::Repositories::Engines.new }
+    register(:outputs, memoize: true) { ::ConfigTemplates::Repositories::Outputs.new }
+    register(:settings, memoize: true) { ::ConfigTemplates::Repositories::Settings.new }
+    register(:templates, memoize: true) { ::ConfigTemplates::Repositories::Templates.new }
+    register(:validators, memoize: true) { ::ConfigTemplates::Repositories::Validators.new }
+  end
+end

data/spec/templates_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe ::ConfigTemplates do
 
   it 'renders selected template using configs and environment metadata' do
     compilation = ::ConfigTemplates::Models::Compilation.new
-    compilation.reject(/.*/).select('kapacitor/config.erb').send_to(:test)
+    compilation.reject(/.*/).select(Regexp.new 'kapacitor/config.erb').send_to(:test)
     expect(@output_mock.result.strip).to eq('true')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - g.ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-31 00:00:00.000000000 Z
+date: 2018-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-auto_inject
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -77,15 +105,15 @@ files:
 - lib/config_templates.rb
 - lib/config_templates/config.rb
 - lib/config_templates/contexts/compilation.rb
-- lib/config_templates/contexts/renderer.rb
+- lib/config_templates/contexts/rendering.rb
 - lib/config_templates/criteria/composite.rb
 - lib/config_templates/criteria/name.rb
 - lib/config_templates/engines/erb.rb
 - lib/config_templates/engines/text.rb
 - lib/config_templates/errors.rb
-- lib/config_templates/file_locator.rb
+- lib/config_templates/filesystem/locator.rb
 - lib/config_templates/models/compilation.rb
-- lib/config_templates/models/renderer.rb
+- lib/config_templates/models/component.rb
 - lib/config_templates/models/template.rb
 - lib/config_templates/outputs/filesystem.rb
 - lib/config_templates/outputs/stdout.rb
@@ -96,6 +124,7 @@ files:
 - lib/config_templates/repositories/validators.rb
 - lib/config_templates/validators/composite.rb
 - lib/config_templates/version.rb
+- lib/ioc_config.rb
 - spec/fixtures/dest/production/kapacitor/config
 - spec/fixtures/settings/settings.production.yml
 - spec/fixtures/settings/settings.yml

data/lib/config_templates/file_locator.rb

@@ -1,18 +0,0 @@
-module ConfigTemplates
-  class FileLocator
-    def initialize
-      @config = ::ConfigTemplates.config
-    end
-
-    def templates
-      ::Dir[::File.join(@config.templates_path, '**', '*')].lazy.select { |path| ::File.file? path }
-    end
-
-    def settings
-      ::Dir[
-        ::File.join(@config.settings_path, "#{@config.settings_file_basename}.yml"),
-        ::File.join(@config.settings_path, "#{@config.settings_file_basename}.#{@config.stage}.yml")
-      ]
-    end
-  end
-end

data/lib/config_templates/models/renderer.rb

@@ -1,20 +0,0 @@
-module ConfigTemplates::Models
-  class Renderer
-    attr_reader :template
-
-    def initialize(template, context)
-      @template = template
-      @context = context
-    end
-
-    def validate!
-      unless @template.validator.valid? render
-        raise ::ConfigTemplates::Errors::InvalidTemplate, @template.path
-      end
-    end
-
-    def render
-      @render ||= @template.engine.evaluate @template.content, @context
-    end
-  end
-end