templater 0.1.4 → 0.1.5

data/lib/templater.rb

@@ -40,6 +40,6 @@ module Templater
   class MalformattedArgumentError < ArgumentError #:nodoc:
   end
   
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
   
 end

data/lib/templater/cli/generator.rb

@@ -4,10 +4,9 @@ module Templater
     
     class Generator
 
-      def initialize(generator_name, destination_root, manifold, name, version)
-        @destination_root, @manifold, @name, @version = destination_root, manifold, name, version
-        @generator_name = generator_name
-        @generator_class = @manifold.generator(@generator_name)
+      def initialize(generator_name, generator_class, destination_root, name, version)
+        @destination_root, @generator_name, @generator_class = destination_root, generator_name, generator_class
+        @name, @version = name, version
       end
 
       def version

data/lib/templater/cli/manifold.rb

@@ -17,8 +17,8 @@ module Templater
 
         if arguments.first and not arguments.first =~ /^-/ and not arguments.first == "help"
           generator_name = arguments.shift
-          if manifold.generator(generator_name)
-            Generator.new(generator_name, destination_root, manifold, name, version).run(arguments)
+          if generator_class = manifold.generator(generator_name)
+            Generator.new(generator_name, generator_class, destination_root, name, version).run(arguments)
           else
             Manifold.new(destination_root, manifold, name, version).run(arguments)
           end

data/lib/templater/generator.rb

@@ -332,7 +332,7 @@ module Templater
           unless ::File.directory?(action)
             action = action.sub("#{source_root}/", '')
             
-            if template_extensions.include?(::File.extname(action)[1..-1]) or template_extensions.include?(::File.basename(action))
+            if template_extensions.include?(::File.extname(action.sub(/\.%.+%$/,''))[1..-1]) or template_extensions.include?(::File.basename(action))
               template(action.downcase.gsub(/[^a-z0-9]+/, '_').to_sym, action, action)
             else
               file(action.downcase.gsub(/[^a-z0-9]+/, '_').to_sym, action, action)
@@ -499,7 +499,15 @@ module Templater
     
     # Invokes the templates for this generator
     def invoke!
-      templates.each { |t| t.invoke! }
+      actions.each { |t| t.invoke! }
+    end
+    
+    # Renders all actions in this generator. Use this to verify that rendering templates raises no errors.
+    #
+    # === Returns
+    # [String]:: The results of the rendered actions
+    def render!
+      actions.map { |t| t.render }
     end
     
     # Returns this generator's source root

data/spec/generator/glob_spec.rb

@@ -69,13 +69,26 @@ describe Templater::Generator, '.glob!' do
     
     @instance.templates.map { |t| t.name }.should == [
       :arg_js,
+      :hellothar_html_feh_,
       :readme,
       :subfolder_monkey_rb,
-      :test_rb
+      :test_rb,
     ]
     @instance.files.map { |f| f.name }.should == [
+      :hellothar_feh_,
       :subfolder_jessica_alba_jpg
     ]
   end
   
+  it "should ignore ending '.%..%' and look at the extension preceding it" do
+    @generator_class.glob!
+    
+    @instance = @generator_class.new('/tmp/destination')
+    
+    @instance.template(:hellothar_html_feh_).source.should == template_path("glob/hellothar.html.%feh%")
+    @instance.template(:hellothar_html_feh_).destination.should == "/tmp/destination/hellothar.html.%feh%"
+    
+    @instance.file(:hellothar_feh_).source.should == template_path("glob/hellothar.%feh%")
+    @instance.file(:hellothar_feh_).destination.should == "/tmp/destination/hellothar.%feh%"
+  end
 end

data/spec/generator/invoke_spec.rb

@@ -94,13 +94,13 @@ describe Templater::Generator, '#invoke!' do
     @generator_class = Class.new(Templater::Generator)
   end
 
-  it "should invoke all templates" do
+  it "should invoke all actions" do
     template1 = mock('a template')
     template2 = mock('another template')
     
     instance = @generator_class.new('/tmp')
     
-    instance.should_receive(:templates).and_return([template1, template2])
+    instance.should_receive(:actions).and_return([template1, template2])
     template1.should_receive(:invoke!)
     template2.should_receive(:invoke!)
 

data/spec/generator/render_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Templater::Generator, '#render!' do
+
+  before do
+    @generator_class = Class.new(Templater::Generator)
+  end
+
+  it "should render all actions and return an array of the results" do
+    template1 = mock('a template')
+    template2 = mock('another template')
+    
+    instance = @generator_class.new('/tmp')
+    
+    instance.should_receive(:actions).and_return([template1, template2])
+    template1.should_receive(:render).and_return("oh my")
+    template2.should_receive(:render).and_return("monkey")
+
+    instance.render!.should == ["oh my", "monkey"]
+  end
+end

data/spec/templates/glob/hellothar.%feh%

@@ -0,0 +1 @@
+meh

data/spec/templates/glob/hellothar.html.%feh%

@@ -0,0 +1 @@
+<a href="hello.jpg">hello thar</a>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: templater
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire: templater
 bindir: bin
 cert_chain: []
 
-date: 2008-08-02 00:00:00 +02:00
+date: 2008-08-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - spec/generator/invocations_spec.rb
 - spec/generator/invoke_spec.rb
 - spec/generator/option_spec.rb
+- spec/generator/render_spec.rb
 - spec/generator/source_root_getter_spec.rb
 - spec/generator/source_root_spec.rb
 - spec/generator/template_getter_spec.rb
@@ -108,6 +109,8 @@ files:
 - spec/templates/erb.rbt
 - spec/templates/glob
 - spec/templates/glob/arg.js
+- spec/templates/glob/hellothar.%feh%
+- spec/templates/glob/hellothar.html.%feh%
 - spec/templates/glob/README
 - spec/templates/glob/subfolder
 - spec/templates/glob/subfolder/jessica_alba.jpg