templater 0.1.6 → 0.2

data/spec/generator/arguments_spec.rb

@@ -101,7 +101,7 @@ describe Templater::Generator, '.argument' do
   end
   
   it "should assign an argument when a block appended to an argument does not throw :invalid" do
-    @generator_class.argument(0, :monkey) do
+    @generator_class.argument(0, :monkey) do |argument|
       1 + 1
     end
     @generator_class.argument(1, :elephant) do
@@ -118,8 +118,10 @@ describe Templater::Generator, '.argument' do
   end
   
   it "should raise an error with the throw message, when a block is appended to an argument and throws :invalid" do
-    @generator_class.argument(0, :monkey) do
-      throw :invalid, 'this is not a valid monkey, bad monkey!'
+    @generator_class.argument(0, :monkey) do |argument|
+      if argument != 'monkey'
+        throw :invalid, 'this is not a valid monkey, bad monkey!'
+      end
     end
     
     lambda { @generator_class.new('/tmp', {}, 'blah') }.should raise_error(Templater::ArgumentError, 'this is not a valid monkey, bad monkey!')
@@ -127,6 +129,8 @@ describe Templater::Generator, '.argument' do
     instance = @generator_class.new('/tmp')
     
     lambda { instance.monkey = :anything }.should raise_error(Templater::ArgumentError, 'this is not a valid monkey, bad monkey!')
+    
+    lambda { instance.monkey = 'monkey' }.should_not raise_error
   end
 
 end

data/spec/generator/empty_directories_spec.rb

@@ -26,8 +26,8 @@ describe Templater::Generator, ".empty_directory" do
   end
   
   it "should add an empty directory with a block" do
-    @generator_class.empty_directory(:my_empty_directory) do
-      destination "gurr#{Process.pid.to_s}.rb"
+    @generator_class.empty_directory(:my_empty_directory) do |action|
+      action.destination = "gurr#{Process.pid.to_s}.rb"
     end
     @instance = @generator_class.new('/tmp/destination')
     
@@ -36,8 +36,8 @@ describe Templater::Generator, ".empty_directory" do
   end
   
   it "should add an empty directory with a complex block" do
-    @generator_class.empty_directory(:my_empty_directory) do
-      destination 'gurr', "gurr#{something}.rb"
+    @generator_class.empty_directory(:my_empty_directory) do |action|
+      action.destination = 'gurr' / "gurr#{something}.rb"
     end
     @instance = @generator_class.new('/tmp/destination')
     
@@ -54,6 +54,14 @@ describe Templater::Generator, ".empty_directory" do
     @instance.empty_directory(:my_empty_directory).destination.should == "/tmp/destination/template/%some_method%.rb"
     @instance.empty_directory(:my_empty_directory).should be_an_instance_of(Templater::Actions::EmptyDirectory)
   end
+  
+  it "should pass options on to the empty_directory" do
+    @generator_class.empty_directory(:my_empty_directory, 'path/to/destination.rb', :before => :monkey, :after => :donkey)
+    @instance = @generator_class.new('/tmp/destination')
+    
+    @instance.empty_directory(:my_empty_directory).options[:before].should == :monkey
+    @instance.empty_directory(:my_empty_directory).options[:after].should == :donkey
+  end
 end
 
 describe Templater::Generator, '#empty_directories' do

data/spec/generator/files_spec.rb

@@ -4,14 +4,13 @@ describe Templater::Generator, '.file' do
 
   before do
     @generator_class = Class.new(Templater::Generator)
+    @generator_class.stub!(:source_root).and_return('/tmp/source')
   end
 
   it "should add a file with source and destination" do
     @generator_class.file(:my_template, 'path/to/source.rbt', 'path/to/destination.rb')
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
-    
     @instance.file(:my_template).source.should == '/tmp/source/path/to/source.rbt'
     @instance.file(:my_template).destination.should == '/tmp/destination/path/to/destination.rb'
     @instance.file(:my_template).should be_an_instance_of(Templater::Actions::File)
@@ -21,36 +20,31 @@ describe Templater::Generator, '.file' do
     @generator_class.file(:my_template, 'path/to/file.rb')
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
-    
     @instance.file(:my_template).source.should == '/tmp/source/path/to/file.rb'
     @instance.file(:my_template).destination.should == '/tmp/destination/path/to/file.rb'
     @instance.file(:my_template).should be_an_instance_of(Templater::Actions::File)
   end
   
   it "should add a file with a block" do
-    @generator_class.file(:my_file) do
-      source 'blah.rbt'
-      destination "gurr#{Process.pid.to_s}.rb"
+    @generator_class.file(:my_file) do |file|
+      file.source = 'blah.rbt'
+      file.destination = "gurr#{Process.pid.to_s}.rb"
     end
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
-    
     @instance.file(:my_file).source.should == '/tmp/source/blah.rbt'
     @instance.file(:my_file).destination.should == "/tmp/destination/gurr#{Process.pid.to_s}.rb"
     @instance.file(:my_file).should be_an_instance_of(Templater::Actions::File)
   end
   
   it "should add a file with a complex block" do
-    @generator_class.file(:my_file) do
-      source 'blah', 'blah.rbt'
-      destination 'gurr', "gurr#{something}.rb"
+    @generator_class.file(:my_file) do |file|
+      file.source = 'blah' / 'blah.rbt'
+      file.destination = 'gurr' / "gurr#{something}.rb"
     end
     @instance = @generator_class.new('/tmp/destination')
     
     @instance.stub!(:something).and_return('anotherthing')
-    @instance.stub!(:source_root).and_return('/tmp/source')
     
     @instance.file(:my_file).source.should == '/tmp/source/blah/blah.rbt'
     @instance.file(:my_file).destination.should == "/tmp/destination/gurr/gurranotherthing.rb"
@@ -61,7 +55,6 @@ describe Templater::Generator, '.file' do
     @generator_class.file(:my_template, 'template/%some_method%.rbt', 'template/%another_method%.rb')
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
     @instance.should_not_receive(:some_method)
     @instance.should_receive(:another_method).at_least(:once).and_return('beast')
     
@@ -74,11 +67,17 @@ describe Templater::Generator, '.file' do
     @generator_class.file(:my_template, 'template/blah.rbt', 'template/%some_method%.rb')
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
-    
     @instance.file(:my_template).destination.should == "/tmp/destination/template/%some_method%.rb"
     @instance.file(:my_template).should be_an_instance_of(Templater::Actions::File)
   end
+  
+  it "should pass options on to the file" do
+    @generator_class.file(:my_template, 'path/to/destination.rb', :before => :monkey, :after => :donkey)
+    @instance = @generator_class.new('/tmp/destination')
+    
+    @instance.file(:my_template).options[:before].should == :monkey
+    @instance.file(:my_template).options[:after].should == :donkey
+  end
 end
 
 describe Templater::Generator, '.file_list' do
@@ -116,11 +115,7 @@ describe Templater::Generator, '#files' do
 
   before do
     @generator_class = Class.new(Templater::Generator)
-    @generator_class.class_eval do
-      def source_root
-        '/tmp/source'
-      end
-    end
+    @generator_class.stub!(:source_root).and_return('/tmp/source')
   end
 
   it "should return all files" do
@@ -163,11 +158,7 @@ describe Templater::Generator, '#file' do
 
   before do
     @generator_class = Class.new(Templater::Generator)
-    @generator_class.class_eval do
-      def source_root
-        '/tmp/source'
-      end
-    end
+    @generator_class.stub!(:source_root).and_return('/tmp/source')
   end
 
   it "should find a file by name" do

data/spec/generator/templates_spec.rb

@@ -4,14 +4,13 @@ describe Templater::Generator, '.template' do
 
   before do
     @generator_class = Class.new(Templater::Generator)
+    @generator_class.stub!(:source_root).and_return('/tmp/source')
   end
 
   it "should add a template with source and destination" do
     @generator_class.template(:my_template, 'path/to/source.rbt', 'path/to/destination.rb')
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
-    
     @instance.template(:my_template).source.should == '/tmp/source/path/to/source.rbt'
     @instance.template(:my_template).destination.should == '/tmp/destination/path/to/destination.rb'
     @instance.template(:my_template).should be_an_instance_of(Templater::Actions::Template)
@@ -21,8 +20,6 @@ describe Templater::Generator, '.template' do
     @generator_class.template(:my_template, '/path/to/source.rbt', '/path/to/destination.rb')
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
-    
     @instance.template(:my_template).source.should == '/path/to/source.rbt'
     @instance.template(:my_template).destination.should == '/path/to/destination.rb'
     @instance.template(:my_template).should be_an_instance_of(Templater::Actions::Template)
@@ -32,36 +29,31 @@ describe Templater::Generator, '.template' do
     @generator_class.template(:my_template, 'path/to/destination.rb')
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
-    
     @instance.template(:my_template).source.should == '/tmp/source/path/to/destination.rbt'
     @instance.template(:my_template).destination.should == '/tmp/destination/path/to/destination.rb'
     @instance.template(:my_template).should be_an_instance_of(Templater::Actions::Template)
   end
   
   it "should add a template with a block" do
-    @generator_class.template(:my_template) do
-      source 'blah.rbt'
-      destination "gurr#{Process.pid.to_s}.rb"
+    @generator_class.template(:my_template) do |template|
+      template.source = 'blah.rbt'
+      template.destination = "gurr#{Process.pid.to_s}.rb"
     end
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
-    
     @instance.template(:my_template).source.should == '/tmp/source/blah.rbt'
     @instance.template(:my_template).destination.should == "/tmp/destination/gurr#{Process.pid.to_s}.rb"
     @instance.template(:my_template).should be_an_instance_of(Templater::Actions::Template)
   end
   
   it "should add a template with a complex block" do
-    @generator_class.template(:my_template) do
-      source 'blah', 'blah.rbt'
-      destination 'gurr', "gurr#{something}.rb"
+    @generator_class.template(:my_template) do |template|
+      template.source = 'blah' / 'blah.rbt'
+      template.destination = 'gurr' / "gurr#{something}.rb"
     end
     @instance = @generator_class.new('/tmp/destination')
     
     @instance.stub!(:something).and_return('anotherthing')
-    @instance.stub!(:source_root).and_return('/tmp/source')
     
     @instance.template(:my_template).source.should == '/tmp/source/blah/blah.rbt'
     @instance.template(:my_template).destination.should == "/tmp/destination/gurr/gurranotherthing.rb"
@@ -72,7 +64,6 @@ describe Templater::Generator, '.template' do
     @generator_class.template(:my_template, 'template/%some_method%.rbt', 'template/%another_method%.rb')
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
     @instance.should_not_receive(:some_method)
     @instance.should_receive(:another_method).at_least(:once).and_return('beast')
     
@@ -85,12 +76,18 @@ describe Templater::Generator, '.template' do
     @generator_class.template(:my_template, 'template/blah.rbt', 'template/%some_method%.rb')
     @instance = @generator_class.new('/tmp/destination')
     
-    @instance.stub!(:source_root).and_return('/tmp/source')
-    
     @instance.template(:my_template).destination.should == "/tmp/destination/template/%some_method%.rb"
     @instance.template(:my_template).should be_an_instance_of(Templater::Actions::Template)
   end
   
+  it "should pass options on to the template" do
+    @generator_class.template(:my_template, 'path/to/destination.rb', :before => :monkey, :after => :donkey)
+    @instance = @generator_class.new('/tmp/destination')
+    
+    @instance.template(:my_template).options[:before].should == :monkey
+    @instance.template(:my_template).options[:after].should == :donkey
+  end
+  
 end
 
 describe Templater::Generator, '.template_list' do
@@ -128,11 +125,7 @@ describe Templater::Generator, '#templates' do
 
   before do
     @generator_class = Class.new(Templater::Generator)
-    @generator_class.class_eval do
-      def source_root
-        '/tmp/source'
-      end
-    end
+    @generator_class.stub!(:source_root).and_return('/tmp/source')
   end
 
   it "should return all templates" do
@@ -175,11 +168,7 @@ describe Templater::Generator, '#template' do
 
   before do
     @generator_class = Class.new(Templater::Generator)
-    @generator_class.class_eval do
-      def source_root
-        '/tmp/source'
-      end
-    end
+    @generator_class.stub!(:source_root).and_return('/tmp/source')
   end
 
   it "should find a template by name" do

data/spec/spec_helper.rb

@@ -12,4 +12,27 @@ end
 require 'templater.rb'
 require 'rubygems'
 require 'spec'
-require 'fileutils'
+require 'fileutils'
+
+class MatchActionNames
+  def initialize(*names)
+    @names = names.map{|n| n.to_s}
+  end
+
+  def matches?(actual)
+    @actual = actual
+    @actual.map{|a| a.name.to_s}.sort == @names.sort
+  end
+
+  def failure_message
+    "expected #{@actual.inspect} to have action names #{@names.inspect}, but they didn't"
+  end
+
+  def negative_failure_message
+    "expected #{@actual.inspect} not to have action names #{@names.inspect}, but they did"
+  end
+end
+
+def have_names(*names)
+  MatchActionNames.new(*names)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: templater
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: "0.2"
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire: templater
 bindir: bin
 cert_chain: []
 
-date: 2008-08-18 00:00:00 +02:00
+date: 2008-09-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: extlib
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.5
+    version: 
 description: File generation system
 email: jonas.nicklas@gmail.com
 executables: []
@@ -49,6 +59,7 @@ files:
 - TODO
 - lib/templater
 - lib/templater/actions
+- lib/templater/actions/action.rb
 - lib/templater/actions/empty_directory.rb
 - lib/templater/actions/file.rb
 - lib/templater/actions/template.rb
@@ -60,17 +71,19 @@ files:
 - lib/templater/core_ext
 - lib/templater/core_ext/kernel.rb
 - lib/templater/core_ext/string.rb
+- lib/templater/description.rb
 - lib/templater/discovery.rb
 - lib/templater/generator.rb
 - lib/templater/manifold.rb
-- lib/templater/proxy.rb
 - lib/templater/spec
 - lib/templater/spec/helpers.rb
 - lib/templater.rb
+- spec/actions
+- spec/actions/empty_directory_spec.rb
+- spec/actions/file_spec.rb
+- spec/actions/template_spec.rb
 - spec/core_ext
 - spec/core_ext/string_spec.rb
-- spec/empty_directory_spec.rb
-- spec/file_spec.rb
 - spec/generator
 - spec/generator/actions_spec.rb
 - spec/generator/arguments_spec.rb
@@ -97,7 +110,6 @@ files:
 - spec/results/simple_erb.rbs
 - spec/spec_helper.rb
 - spec/spec_helpers_spec.rb
-- spec/template_spec.rb
 - spec/templater_spec.rb
 - spec/templates
 - spec/templates/erb.rbt

data/lib/templater/proxy.rb

@@ -1,62 +0,0 @@
-module Templater
-  
-  class Proxy #:nodoc:
-    
-    def initialize(generator, action={})
-      @generator = generator
-      @block = action[:block]
-      @source, @destination = action[:source], action[:destination]
-      @name = action[:name]
-    end
-    
-    def source(*source)
-      @source = ::File.join(*source)
-    end
-    
-    def destination(*dest)
-      @destination = ::File.join(*dest)
-    end
-    
-    def to_template
-      instance_eval(&@block) if @block
-      Templater::Actions::Template.new(@generator, @name, get_source, get_destination)
-    end
-    
-    def to_file
-      instance_eval(&@block) if @block
-      Templater::Actions::File.new(@name, get_source, get_destination)
-    end
-
-    def to_empty_directory
-      instance_eval(&@block) if @block
-      Templater::Actions::EmptyDirectory.new(@name, get_destination)
-    end
-    
-    def method_missing(method, *args, &block)
-      if @generator
-        @generator.send(method, *args, &block)
-      else
-        super
-      end
-    end
-    
-    protected
-    
-    def get_source
-      ::File.expand_path(@source.to_s, @generator.source_root)
-    end
-    
-    def get_destination
-      ::File.expand_path(convert_encoded_instructions(@destination.to_s), @generator.destination_root)
-    end
-    
-    def convert_encoded_instructions(filename)
-      filename.gsub(/%.*?%/) do |string|
-        instruction = string.match(/%(.*?)%/)[1]
-        @generator.respond_to?(instruction) ? @generator.send(instruction) : string
-      end
-    end
-    
-  end
-  
-end