reality-generators 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6322e54d0c9bacedc3edb469578c543d94dadebd
-  data.tar.gz: 7fb99a4f8c009f5bcd3be891caf512cc93788765
+  metadata.gz: 5b53895e619304dc52428b481c0b1922695039ae
+  data.tar.gz: 3d4aa146c64150afce33a34dc43d9a538b9337cb
 SHA512:
-  metadata.gz: 8ad82eca218ba25ceb6eae4d8febc07e97cac46e28d51cd3346268c8189de32997956d6957a878f5ca2a878c8228f0a0b08ddf41227dfb79d55c9a684d5ed8d7
-  data.tar.gz: 9be8bca65a4dd993d484368e47c0dab6e3b309a5a92eb7d070136681867fbe4123323036cc9e3f2c885d358d2c273cf16d36a3bc8970ee512ddba83b4ac37c8f
+  metadata.gz: 4aae8b67f7bab3ab657620070fddb640789a2b610063ffa5ef9419ba124b639d1c5fb1bcdbf1b33b177e9d537ea38c1c10e5a2b4c00c27b5e0cb614f4afd0f21
+  data.tar.gz: aa5c5fad5e2ff7a0b0af90a32c5b341ac6e7e3aa5297d62efb72ef9e89226a55717e032240166f7808b6ce482bebb7c0c3c61f0f1500ee471cc8b3d530701fda

data/lib/reality/generators/generator.rb

@@ -37,9 +37,11 @@ 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)}
+        templates = load_templates_from_template_sets(templates) if templates.any? {|t| t.is_a?(Symbol) || t.is_a?(String)}
         unprocessed_files = (Dir["#{directory}/**/*.*"] + Dir["#{directory}/**/*"]).uniq
 
+        element.pre_generate if element.respond_to?(:pre_generate)
+
         Generators.debug "Templates to process: #{templates.collect { |t| t.name }.inspect}"
 
         targets = {}

data/reality-generators.gemspec

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

data/test/generators/test_generator.rb

@@ -239,6 +239,45 @@ class Reality::Generators::TestGenerator < Reality::TestCase
     assert_equal false, File.exist?("#{target_directory}/main/java/MyRepo/MyEntityB/MyAttr4.java")
   end
 
+  class Repository2 < Reality.base_element(:name => true)
+      def pre_generate
+        @pre_generate_called = true
+      end
+
+      def pre_generate_called?
+        @pre_generate_called ||= false
+      end
+  end
+
+  class Repository2Template < Reality::Generators::SingleFileOutputTemplate
+    def render_to_string(context_binding)
+      eval('"Repository: #{repository2.name}"', context_binding)
+    end
+  end
+
+  def test_generate_with_pre_generate_hook
+    repository = Repository2.new(:MyRepo)
+
+    TestTemplateSetContainer.target_manager.target(:repository2)
+
+    template_set = TestTemplateSetContainer.template_set(:test) do |t|
+      Repository2Template.new(t, [], :repository2, 'repository.java', 'main/java/#{repository2.name}.java')
+    end
+
+    target_directory = "#{temp_dir}/generated/erb_template"
+
+    # Call toString on template name to ensure it is possible to pass string in
+    TestTemplateSetContainer.generator.
+      generate(:repository2, repository, target_directory, [template_set.name.to_s], nil)
+
+    repo_file = "#{target_directory}/main/java/MyRepo.java"
+
+    assert_equal true, repository.pre_generate_called?
+    assert_equal true, File.directory?("#{target_directory}/main/java")
+    assert_equal true, File.exist?(repo_file)
+    assert_equal 'Repository: MyRepo', IO.read(repo_file)
+  end
+
   def test_load_templates_from_template_sets
 
     TestTemplateSetContainer.target_manager.target(:repository)
@@ -268,7 +307,7 @@ class Reality::Generators::TestGenerator < Reality::TestCase
       AttributeTemplate.new(template_set, [], :attribute, 'attribute4.java', 'main/java/#{attribute.qualified_name.gsub(".","/")}4.java')
     end
 
-    template_set_keys = [:template_set_1, :template_set_4]
+    template_set_keys = [:template_set_1, 'template_set_4']
     templates = TestTemplateSetContainer.generator.load_templates_from_template_sets(template_set_keys)
 
     assert_equal 6, templates.size

metadata

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