tdc 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2887adedbcb323e7d03e75b65538c2afc1edbe5f4ea84c0555e50dda77bc1305
-  data.tar.gz: a8be475b6e7edcd72ab2047cab59a198e984b921d4893ca5bac25ef0476540ea
+  metadata.gz: 40158a1118d92cb453c0197da1eea7850c19ba2bba98306806bf920f167d16b8
+  data.tar.gz: '09f31030294fadabb38f88c6976d56774670b636ec43bb2ae4d62a96ad234087'
 SHA512:
-  metadata.gz: f1aaaf060b8e5b85ab96487279471521b9a04738a63cf360473905a6834d08bfc3bd3ddef01c5b2e571736b87177b74a21ee5cba24860e56bcdb206e208e3962
-  data.tar.gz: dc9cd3002213b1b5c2f6d95f09b986249c30fe239a28e788f06462d00f496b02a3cbc707d5236bd987d44ea435e9b516adbb777f480cce24a0ca22a06b59fe52
+  metadata.gz: 40758219403185741dbc04f645f5f7d19a07ff004514cf5c5d9c7a4312085d4918d8d2694204c643bcb97f808c8c958b002b7c2e684748d8d1621e1b9f49f182
+  data.tar.gz: 41777ff45589fc3de09026e86e0e26220cd863a95861fd866a337f53b23ec0211f4d4ced7d0feac6cabbf563175f6b6234888b441c80d30bd848bad2f42cef16

data/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.9] - 2020-08-12
+
+#### Breaking Changes
+
+- Collapse `ConfigurableGenerator` into `StandardGenerator`
+
 ## [0.3.8] - 2020-08-11
 
 #### New Features

data/lib/tdc.rb

@@ -39,7 +39,6 @@ require "tdc/generators/definition_sourcable"
 
 # Generator Hierarchy
 require "tdc/generators/generator_base"
-require "tdc/generators/configurable_generator"
 require "tdc/generators/standard_generator"
 
 #

data/lib/tdc/generators/standard_generator.rb

@@ -1,11 +1,15 @@
 module Tdc
   module Generators
     #
-    # Abstract class for defining generators that define a collection of model instances.
+    # Knows how to provide a configurable instance definition.
     #
-    # See also SingularGenerator.
-    #
-    class StandardGenerator < Tdc::Generators::ConfigurableGenerator
+    class StandardGenerator < Tdc::Generators::GeneratorBase
+      include Tdc::Generators::DefinitionSourcable
+
+      attr_reader :instance_definition
+
+      source_definition_from :instance_definition
+
       def generate
         CatalogEntries.new.tap do |catalog_entries|
           instance_definitions.each do |instance_definition|
@@ -21,6 +25,43 @@ module Tdc
           end
         end
       end
+
+      def run_resolvers_and_generate_instance
+        run_extended_attribute_interpreters(instance_definition)
+        run_definition_resolvers(instance_definition)
+
+        generate_instance
+      end
+
+      #
+      # Hook method: subclasses are expected to define how to generate a model instance.
+      #
+      def generate_instance
+        raise Tdc::MissingOverrideError, "Implement the 'generate_instance' method"
+      end
+
+      #
+      # Hook method: subclasses may include the DefinitionResolvable concern to override.
+      #
+      def run_definition_resolvers(_instance_definition)
+        # Do nothing
+      end
+
+      private
+
+      def configure_instance_definition(instance_definition)
+        @instance_definition = instance_definition
+
+        configure_definition_source(instance_definition)
+      end
+
+      def run_extended_attribute_interpreters(instance_definition)
+        interpreters.each { |interpreter| interpreter.interpret(instance_definition) }
+      end
+
+      def interpreters
+        Tdc::ExtendedAttributes::InterpreterRegistry.instance.interpreters
+      end
     end
   end
 end

data/lib/tdc/version.rb

@@ -1,3 +1,3 @@
 module Tdc
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdc
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Alistair McKinnell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -138,7 +138,6 @@ files:
 - lib/tdc/fatal_error.rb
 - lib/tdc/generators.rb
 - lib/tdc/generators/catalog_entries.rb
-- lib/tdc/generators/configurable_generator.rb
 - lib/tdc/generators/definition_resolvable.rb
 - lib/tdc/generators/definition_sourcable.rb
 - lib/tdc/generators/generation_context.rb

data/lib/tdc/generators/configurable_generator.rb

@@ -1,51 +0,0 @@
-module Tdc
-  module Generators
-    #
-    # Knows how to provide a configurable instance definition.
-    #
-    class ConfigurableGenerator < Tdc::Generators::GeneratorBase
-      include Tdc::Generators::DefinitionSourcable
-
-      attr_reader :instance_definition
-
-      source_definition_from :instance_definition
-
-      def run_resolvers_and_generate_instance
-        run_extended_attribute_interpreters(instance_definition)
-        run_definition_resolvers(instance_definition)
-
-        generate_instance
-      end
-
-      #
-      # Hook method: subclasses are expected to define how to generate a model instance.
-      #
-      def generate_instance
-        raise Tdc::MissingOverrideError, "Implement the 'generate_instance' method"
-      end
-
-      #
-      # Hook method: subclasses may include the DefinitionResolvable concern to override.
-      #
-      def run_definition_resolvers(_instance_definition)
-        # Do nothing
-      end
-
-      private
-
-      def configure_instance_definition(instance_definition)
-        @instance_definition = instance_definition
-
-        configure_definition_source(instance_definition)
-      end
-
-      def run_extended_attribute_interpreters(instance_definition)
-        interpreters.each { |interpreter| interpreter.interpret(instance_definition) }
-      end
-
-      def interpreters
-        Tdc::ExtendedAttributes::InterpreterRegistry.instance.interpreters
-      end
-    end
-  end
-end