reality-generators 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e76ea1052bc46ab01b49553d2836611c6da83c1b
-  data.tar.gz: d5e6e663a5580a87a61ace92b2836e440620187f
+  metadata.gz: 6322e54d0c9bacedc3edb469578c543d94dadebd
+  data.tar.gz: 7fb99a4f8c009f5bcd3be891caf512cc93788765
 SHA512:
-  metadata.gz: 9c88db3db21c9c4c81c604043edd85df6681244cee76d95916d02767949a6c4cfbc9732d5ee6187935114bf1615aa31ac33c7fd75e7817528e548504f2a4273e
-  data.tar.gz: 3b038a2cf2b0b66c936e9ba4f862cca89bf8eb93b5571d4e9b3a09e86271a092562fefe678607d60081e3b7fc3645edd651c2d3aee667f329bb7ff96575594cd
+  metadata.gz: 8ad82eca218ba25ceb6eae4d8febc07e97cac46e28d51cd3346268c8189de32997956d6957a878f5ca2a878c8228f0a0b08ddf41227dfb79d55c9a684d5ed8d7
+  data.tar.gz: 9be8bca65a4dd993d484368e47c0dab6e3b309a5a92eb7d070136681867fbe4123323036cc9e3f2c885d358d2c273cf16d36a3bc8970ee512ddba83b4ac37c8f

data/lib/reality/generators/generator.rb

@@ -37,6 +37,7 @@ module Reality #nodoc
       # traverses all elements that are contained transitively by the root element.
       # The templates then generate files from traversed elements.
       def generate(element_type, element, directory, templates, filter)
+        templates = load_templates_from_template_sets(templates) if templates.any? {|t| t.is_a?(Symbol)}
         unprocessed_files = (Dir["#{directory}/**/*.*"] + Dir["#{directory}/**/*"]).uniq
 
         Generators.debug "Templates to process: #{templates.collect { |t| t.name }.inspect}"

data/lib/reality/generators/rake_integration.rb

@@ -79,13 +79,12 @@ module Reality #nodoc
           @generator_keys = generator_keys
           @namespace_key = self.default_namespace_key
           @filter = nil
-          @template_map = {}
           # Turn on verbose messages if buildr is turned on tracing
           @verbose = trace?
           @target_dir = target_dir
           yield self if block_given?
           define
-          @templates = self.generator_container.generator.load_templates_from_template_sets(generator_keys)
+          @templates = self.template_set_container.generator.load_templates_from_template_sets(generator_keys)
           Reality::Generators::Buildr.configure_buildr_project(buildr_project, task_name, @templates, target_dir)
         end
 
@@ -95,8 +94,8 @@ module Reality #nodoc
           Generators.error('default_namespace_key should be implemented')
         end
 
-        def generator_container
-          Generators.error('generator_container should be implemented')
+        def template_set_container
+          Generators.error('template_set_container should be implemented')
         end
 
         def root_element_type
@@ -160,7 +159,7 @@ module Reality #nodoc
                                             Reality::Generators::Logger,
                                             Reality::Facets::Logger) do
                   self.log_container.info "Generator started: Generating #{self.generator_keys.inspect}"
-                  self.generator_container.generator.
+                  self.template_set_container.generator.
                     generate(self.root_element_type, self.root_element, self.target_dir, @templates, self.filter)
                 end
               rescue Reality::Generators::GeneratorError => e

data/reality-generators.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{reality-generators}
-  s.version            = '1.9.0'
+  s.version            = '1.10.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reality-generators
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reality-core