templater 0.2 → 0.2.1

data/Rakefile

@@ -14,6 +14,19 @@ HOMEPAGE = "http://templater.rubyforge.org/"
 SUMMARY = "File generation system"
 
 
+# Used by release task
+RUBY_FORGE_PROJECT  = "templater"
+GEM_NAME            = NAME
+PROJECT_URL         = HOMEPAGE
+PROJECT_SUMMARY     = SUMMARY
+PROJECT_DESCRIPTION = SUMMARY
+
+PKG_BUILD    = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+GEM_VERSION  = Templater::VERSION + PKG_BUILD
+RELEASE_NAME = "REL #{GEM_VERSION}"
+
+require "extlib/tasks/release"
+
 #
 # ==== Gemspec and installation
 #
@@ -124,7 +137,6 @@ namespace :spec do
     t.spec_opts = ["--format", "html:doc/reports/specs.html"]
     t.fail_on_error = false
   end
-
 end
 
 desc 'Default: run unit tests.'

data/lib/templater/actions/empty_directory.rb

@@ -16,12 +16,12 @@ module Templater
         self.options = options
       end
 
-      # Returns the contents of the source file as a String
+      # Returns an empty String: there's nothing to read from.
       #
       # === Returns
       # String:: The source file.
       def render
-        ::File.read(source)
+        ''
       end
 
       # Checks if the destination file already exists.
@@ -42,9 +42,9 @@ module Templater
   
       # Renders the template and copies it to the destination.
       def invoke!
-        @generator.send(@options[:before], self) if @options[:before]
+        callback(:before)
         ::FileUtils.mkdir_p(destination)
-        @generator.send(@options[:after], self) if @options[:after]
+        callback(:after)
       end
     
       # removes the destination file

data/lib/templater/actions/template.rb

@@ -44,10 +44,10 @@ module Templater
   
       # Renders the template and copies it to the destination.
       def invoke!
-        @generator.send(@options[:before], self) if @options[:before]
+        callback(:before)
         ::FileUtils.mkdir_p(::File.dirname(destination))
         ::File.open(destination, 'w') {|f| f.write render }
-        @generator.send(@options[:after], self) if @options[:after]
+        callback(:after)
       end
     
       # removes the destination file

data/lib/templater/description.rb

@@ -44,6 +44,23 @@ module Templater
       end
     end
     
+    def extract(argument)
+      case options[:as]
+      when :hash
+        if argument.is_a?(String)
+          return argument.split(',').inject({}) do |h, pair|
+            key, value = pair.split(':')
+            raise Templater::MalformattedArgumentError, "Expected '#{argument.inspect}' to be a key/value pair" unless key and value
+            h[key] = value
+            h
+          end
+        end
+      when :array
+        return argument.split(',') if argument.is_a?(String)
+      end
+      return argument
+    end
+    
   end
   
   class InvocationDescription < Description

data/lib/templater/generator.rb

@@ -401,14 +401,16 @@ module Templater
         @options[option.name] ||= option.options[:default]
       end
       
-      extract_arguments(*args)
+      args.each_with_index do |arg, n|
+        set_argument(n, arg)
+      end
 
-      # Initialize arguments to their default values.
       self.class.arguments.each_with_index do |argument, i|
+        # Initialize arguments to their default values.
         @arguments[i] ||= argument.options[:default]
+        # Check if all arguments are valid.
+        argument.valid?(@arguments[i])
       end
-      
-      valid_arguments?
     end
     
     # Finds and returns the template of the given name. If that template's options don't match the generator
@@ -538,7 +540,12 @@ module Templater
     protected
     
     def set_argument(n, value)
-      self.class.arguments[n].valid?(value)
+      expected = self.class.arguments[n]
+      raise Templater::TooManyArgumentsError, "This generator does not take this many Arguments" if expected.nil?
+
+      value = expected.extract(value)
+
+      expected.valid?(value)
       @arguments[n] = value
     end
     
@@ -559,45 +566,7 @@ module Templater
         key.to_sym.in?(Templater::ACTION_RESERVED_OPTIONS) or self.send(key) == value
       end
     end
-        
-    def valid_arguments?
-      self.class.arguments.each_with_index do |arg, i|
-        arg.valid?(@arguments[i])
-      end
-    end
 
-    # from a list of arguments, walk through that list and assign it to this generator, taking into account
-    # that an argument could be a hash or array that consumes the remaining arguments.
-    def extract_arguments(*args)
-      args.each_with_index do |arg, i|
-        expected = self.class.arguments[i]
-        raise Templater::TooManyArgumentsError, "This generator does not take this many Arguments" if expected.nil?
-      
-        # When one of the arguments has :as set to :hash or :list, the remaining arguments should be consumed
-        # and converted to a Hash or an Array respectively
-        case expected.options[:as]
-        when :hash
-          if arg.is_a?(String)
-            pairs = args[i..-1]
-            
-            hash = pairs.inject({}) do |h, pair|
-              key, value = pair.split(':')
-              raise Templater::MalformattedArgumentError, "Expected '#{arg.inspect}' to be a key/value pair" unless key and value
-              h[key] = value
-              h
-            end
-            
-            set_argument(i, hash) and return
-          else
-            set_argument(i, arg)
-          end
-        when :array
-          set_argument(i, args[i..-1].flatten) and return
-        else
-          set_argument(i, arg)
-        end
-      end
-    end
   end
   
 end

data/lib/templater.rb

@@ -42,6 +42,6 @@ module Templater
   class MalformattedArgumentError < ArgumentError #:nodoc:
   end
   
-  VERSION = '0.2'
+  VERSION = '0.2.1'
   
 end

data/spec/actions/empty_directory_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) / '..' / 'spec_helper'
-
+require File.dirname(__FILE__) + '/../spec_helper'
+ 
 describe Templater::Actions::EmptyDirectory do
 
   before do
@@ -29,7 +29,10 @@ describe Templater::Actions::EmptyDirectory do
   end
 
   describe '#render' do
-    it 'does nothing for empty directories?'
+    it 'should return an empty string' do
+      file = Templater::Actions::EmptyDirectory.new(@generator, :monkey, '/path/to/destination')
+      file.render.should == ''
+    end 
   end
 
   describe '#exists?' do
@@ -102,4 +105,4 @@ describe Templater::Actions::EmptyDirectory do
     end
   end
 
-end
+end

data/spec/actions/file_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) / '..' / 'spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Templater::Actions::File do
 
@@ -109,4 +109,4 @@ describe Templater::Actions::File do
     end
   end
 
-end
+end

data/spec/actions/template_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) / '..' / 'spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Templater::Actions::Template do
 
@@ -138,4 +138,4 @@ describe Templater::Actions::Template do
     end
   end
 
-end
+end

data/spec/generator/arguments_spec.rb

@@ -160,8 +160,8 @@ describe Templater::Generator, '.argument as array' do
     instance.llama[0].should == 'test'
   end
   
-  it "should consume the remaining arguments and convert them to an array" do
-    instance = @generator_class.new('/tmp', {}, 'a monkey', 'test', 'silver', 'river')
+  it "should split the remaining arguments by comma and convert them to an array" do
+    instance = @generator_class.new('/tmp', {}, 'a monkey', 'test,silver,river')
     instance.llama[0].should == 'test'
     instance.llama[1].should == 'silver'
     instance.llama[2].should == 'river'
@@ -197,15 +197,15 @@ describe Templater::Generator, '.argument as hash' do
     instance.llama['test'].should == 'unit'
   end
   
-  it "should consume the remaining arguments and convert them to a hash if they are key/value pairs" do
-    instance = @generator_class.new('/tmp', {}, 'a monkey', 'test:unit', 'john:silver', 'river:road')
+  it "should split by comma and convert them to a hash if they are key/value pairs" do
+    instance = @generator_class.new('/tmp', {}, 'a monkey', 'test:unit,john:silver,river:road')
     instance.llama['test'].should == 'unit'
     instance.llama['john'].should == 'silver'
     instance.llama['river'].should == 'road'
   end
   
   it "should raise an error if one of the remaining arguments is not a key/value pair" do
-    lambda { @generator_class.new('/tmp', {}, 'a monkey', 'a:llama', 'duck:llama', 'not_a_pair', 'pair:blah') }.should raise_error(Templater::MalformattedArgumentError)
+    lambda { @generator_class.new('/tmp', {}, 'a monkey', 'a:llama,duck:llama,not_a_pair,pair:blah') }.should raise_error(Templater::MalformattedArgumentError)
   end
   
   it "should raise error if the argument is neither a hash nor a key/value pair" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: templater
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire: templater
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 +03:00
+date: 2008-09-28 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,9 +103,6 @@ files:
 - spec/results
 - spec/results/erb.rbs
 - spec/results/file.rbs
-- spec/results/path
-- spec/results/path/to
-- spec/results/path/to/subdir
 - spec/results/random.rbs
 - spec/results/simple_erb.rbs
 - spec/spec_helper.rb