tdc 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '047929ba6cb08c87ebab328779a9ad41c9860ad953ebe559f5d47bbc1d7ef53b'
-  data.tar.gz: 83864de78f6680541319688a7a3e9a523dea3e87f5eeb6c2b234114c954842b3
+  metadata.gz: 3ea4c40daa383ebc80a1109132a3a8ded7bb6f89a77cb49b928bed2db838fbf6
+  data.tar.gz: fda5f7f22c87bcb36a7b4c072ad85809bb1f1f78e7bb621396fa746511c34dd0
 SHA512:
-  metadata.gz: fd7913a43b6ca6c179b2b8b839db1f744a89bfe1cd563347290633e79bd46bb5ed58597da994ffd70e6245f68b8313490a1624769150561f80b359a93516255e
-  data.tar.gz: 45d2f32e3030bd93bf1ddb3665bb1e6491849bcb3ebaf9b7bf32caddd4df3ec76f8289519a92abc83842ad86ea173d25d4d7aaa5709723011c566b2d4063748f
+  metadata.gz: d085e28662d3038b7609fb58d7e8b50fceca95a624cc9d0192b27d803f31bbaa1fff87996a93500a91557a8c45fc1b5adad26f4f6b6fe4dbf7bffafb11782640
+  data.tar.gz: 1ae1baacafb85ec5fbc8ed58d7f2de790cf68b75fa84461712f0b7e3cbf7f361335005cfdb8c23dd8e3c39576bdc496aa27b9272ef059f54ef2fb8f6f9638a73

data/.rubocop.yml

@@ -68,6 +68,9 @@ Style/BlockDelimiters:
 Style/Documentation:
   Enabled: false
 
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
 Style/ExponentialNotation:
   Enabled: true
 

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.3] - 2020-05-21
+
+- Update the diagram in the README
+
 ## [0.2.2] - 2020-05-20
 
 - Adding specs

data/lib/tdc.rb

@@ -1,23 +1,35 @@
 require "ostruct"
 require "yaml"
 
+require "active_support"
 require "active_support/concern"
-require "active_support/core_ext/hash/indifferent_access"
+require "active_support/core_ext"
 
+require "tdc/version"
+
+# Errors
+require "tdc/fatal_error"
+require "tdc/missing_override_error"
+
+# Data Definition Hierarchy
 require "tdc/data_definition"
 require "tdc/data_definition_file_reader"
-require "tdc/fatal_error"
 require "tdc/in_memory_data_definition"
-require "tdc/missing_override_error"
-require "tdc/version"
 require "tdc/with_indifferent_access_decorator"
 
+# Generators
 require "tdc/generators"
+
+# Current Catalog
 require "tdc/generators/catalog_entries"
+
+# Concerns
 require "tdc/generators/definition_resolvable"
 require "tdc/generators/definition_sourcable"
+
+# Generator Hierarchy
 require "tdc/generators/generator_base"
-require "tdc/generators/instance_definition_configurable"
+require "tdc/generators/configurable_generator"
 require "tdc/generators/singular_generator"
 require "tdc/generators/standard_generator"
 

data/lib/tdc/generators/{instance_definition_configurable.rb → configurable_generator.rb}

@@ -5,23 +5,12 @@ module Tdc
     #
     # Shared implementation between the StandardGenerator and the SingularGenerator abstract classes.
     #
-    module InstanceDefinitionConfigurable
-      extend ActiveSupport::Concern
+    class ConfigurableGenerator < Tdc::Generators::GeneratorBase
+      include Tdc::Generators::DefinitionSourcable
 
-      included do
-        include Tdc::Generators::DefinitionSourcable
+      attr_reader :instance_definition
 
-        attr_reader :instance_definition
-
-        source_definition_from :instance_definition
-      end
-
-      private
-
-      def configure_instance_definition(instance_definition)
-        @instance_definition = instance_definition
-        configure_definition_source(instance_definition)
-      end
+      source_definition_from :instance_definition
 
       def run_resolvers_and_generate_instance
         run_atx_resolvers(instance_definition)
@@ -44,6 +33,14 @@ module Tdc
         # Do nothing
       end
 
+      private
+
+      def configure_instance_definition(instance_definition)
+        @instance_definition = instance_definition
+
+        configure_definition_source(instance_definition)
+      end
+
       def run_atx_resolvers(instance_definition)
         atx_definitions = instance_definition.select { |k, _v| /_atx$/ =~ k }
 

data/lib/tdc/generators/definition_sourcable.rb

@@ -35,13 +35,13 @@ module Tdc
       def method_missing(method, *args)
         key = transform_method_to_definition_source_key(method)
 
-        definition_source.key?(key) ? definition_source.fetch(key) : super
+        definition_source&.key?(key) ? definition_source.fetch(key) : super
       end
 
       def respond_to_missing?(method, include_all = false)
         key = transform_method_to_definition_source_key(method)
 
-        definition_source.key?(key) ? true : super
+        definition_source&.key?(key) ? true : super
       end
 
       def transform_method_to_definition_source_key(method)

data/lib/tdc/generators/singular_generator.rb

@@ -5,9 +5,7 @@ module Tdc
     #
     # See also StandardGenerator.
     #
-    class SingularGenerator < Tdc::Generators::GeneratorBase
-      include Tdc::Generators::InstanceDefinitionConfigurable
-
+    class SingularGenerator < Tdc::Generators::ConfigurableGenerator
       def initialize(data_definition, current_catalog)
         super
 
@@ -32,7 +30,7 @@ module Tdc
         all_instance_definitions = instance_definitions
 
         if all_instance_definitions.many?
-          raise Tdc::FatalError, "For the moment we only generate a single model instance"
+          raise Tdc::FatalError, "A singular generator only generates a single model instance"
         end
 
         # Delete the tag so that the models do not need to filter it out.

data/lib/tdc/generators/standard_generator.rb

@@ -5,9 +5,7 @@ module Tdc
     #
     # See also SingularGenerator.
     #
-    class StandardGenerator < Tdc::Generators::GeneratorBase
-      include Tdc::Generators::InstanceDefinitionConfigurable
-
+    class StandardGenerator < Tdc::Generators::ConfigurableGenerator
       def generate
         CatalogEntries.new.tap do |catalog_entries|
           instance_definitions.each do |instance_definition|

data/lib/tdc/version.rb

@@ -1,3 +1,3 @@
 module Tdc
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdc
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Alistair McKinnell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -131,10 +131,10 @@ 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/generator_base.rb
-- lib/tdc/generators/instance_definition_configurable.rb
 - lib/tdc/generators/singular_generator.rb
 - lib/tdc/generators/standard_generator.rb
 - lib/tdc/in_memory_data_definition.rb