kiss 1.0.1 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.3

data/lib/kiss.rb

@@ -10,7 +10,6 @@ require 'rubygems'
 require 'yaml'
 require 'rack'
 require 'rack/request'
-require 'sequel'
 require 'erubis'
 
 require 'kiss/hacks'
@@ -19,7 +18,7 @@ require 'kiss/controller_accessors'
 require 'kiss/template_methods'
 require 'kiss/action'
 
-require 'kiss/model'
+autoload :Sequel, 'sequel'
 
 module Rack
   autoload :Bench, 'kiss/rack/bench'
@@ -86,11 +85,11 @@ class Kiss
   
   # attributes below are application-wide
   cattr_reader :action_dir, :template_dir, :email_template_dir, :model_dir, :upload_dir,
-    :evolution_dir, :asset_dir, :public_dir, :db, :environment, :options, :layout, :rack_file
+    :evolution_dir, :asset_dir, :public_dir, :environment, :options, :layout, :rack_file
   
   # attributes below are request-specific
   attr_reader :params, :args, :action, :action_subdir, :action_path, :extension, :host, :request,
-    :session, :login
+    :exception_cache
   
   attr_accessor :last_sql
   
@@ -119,9 +118,6 @@ class Kiss
         else
           load(options)
         end
-    
-        # TODO: rewrite evolution file exists check for speed
-        check_evolution_number if @@db
       
         app = self
         builder_options = @@options[:rack_builder] || []
@@ -199,6 +195,7 @@ class Kiss
       @@lib_dirs = ['lib']
       @@gem_dirs = ['gems']
       @@require = []
+      @@authenticate_exclude = ['/logout']
     
       # common (shared) config
       if (File.file?(config_file = @@config_dir+'/common.yml'))
@@ -218,7 +215,6 @@ class Kiss
       @@asset_dir = @@public_dir = @@options[:asset_dir] || @@options[:public_dir] || 'public_html'
     
       @@model_dir = @@options[:model_dir] || 'models'
-      Kiss::ModelCache.model_dir = @@model_dir
       
       @@evolution_dir = @@options[:evolution_dir] || 'evolutions'
     
@@ -266,32 +262,8 @@ class Kiss
       end
     
       # database
-      if sequel = @@options[:database]
-        # open database connection (if not already open)
-        @@db = sequel.is_a?(String) ? (Sequel.open sequel) : sequel.is_a?(Hash) ? (Sequel.open sequel) : sequel
-      
-        if @@db.class.name == 'Sequel::MySQL::Database'
-          # add fetch_arrays, all_arrays methods
-          require 'kiss/sequel_mysql'
-          # turn off convert_tinyint_to_bool, unless options say otherwise
-          Sequel.convert_tinyint_to_bool = false unless @@options[:convert_tinyint_to_bool]
-        end
-      end
-    
-      # setup session storage, if session class specified in config
-      @@session_class.setup_storage(self) if @@session_class
-    
-      # prepare authenticate_exclude
-      if @@options[:authenticate_all]
-        if @@options[:authenticate_exclude].is_a?(Array)
-          @@options[:authenticate_exclude] = @@options[:authenticate_exclude].map do |action|
-            action = '/'+action unless action =~ /\A\//
-            action
-          end
-        else
-          @@options[:authenticate_exclude] = []
-        end
-      end
+      @@database_config = @@options[:database]
+      @@database_pool = []
     
       self
     end
@@ -328,6 +300,9 @@ class Kiss
         if require_libs = config_options.delete(:require)
           @@require.push( require_libs )
         end
+        if auth_exclude = config_options.delete(:authenticate_exclude)
+          @@authenticate_exclude.push( *(auth_exclude.map { |action| action =~ /\A\// ? action : '/'+action }) )
+        end
     
         @@options.merge!( config_options )
       end
@@ -413,11 +388,6 @@ class Kiss
     
       text
     end
-  
-    # Returns exception cache, for use in Kiss::ExceptionReport.
-    def exception_cache
-      @@exception_cache
-    end
     
     # Given a file path, caches or returns the file's contents or the return value of
     # the passed block applied to the file's contents.
@@ -449,39 +419,6 @@ class Kiss
         (block_given?) ? yield(contents) : contents
       end
     end
-    
-    # Returns Sequel dataset to evolution_number table, which specifies app's current evolution number.
-    # Creates evolution_number table if it does not exist.
-    def evolution_number_table
-      unless db.table_exists?(:evolution_number)
-        db.create_table :evolution_number do
-          column :version, :integer, :null=> false
-        end
-        db[:evolution_number].insert(:version => 0)
-      end
-      db[:evolution_number]
-    end
-  
-    # Returns app's current evolution number.
-    def evolution_number
-      evolution_number_table.first.version
-    end
-  
-    # Sets app's current evolution number.
-    def evolution_number=(version)
-      load unless @@options
-      evolution_number_table.update(:version => version)
-    end
-  
-    # Check whether there exists a file in evolution_dir whose number is greater than app's
-    # current evolution number. If so, raise an error to indicate need to apply new evolutions.
-    def check_evolution_number
-      version = evolution_number
-      if Kiss.directory_exists?(@@evolution_dir) &&
-          Dir.entries(@@evolution_dir).select { |f| f =~ /\A0*#{version+1}_/ }.size > 0
-        raise "current evolution #{version} is outdated; apply evolutions or update evolution number"
-      end
-    end
   end # end class methods
   
   ### Instance Methods
@@ -531,16 +468,17 @@ class Kiss
         env['kiss.parsed_action'] = @action
         env['kiss.parsed_args'] = @args.inspect
         
-        setup_session
+        redirect_url(app_url + '/') if @action == '/login'
+        
         if login_session_valid?
           load_from_login_session
         elsif @@options[:authenticate_all]
-          if (!@@options[:authenticate_exclude].is_a?(Array) ||
-              @@options[:authenticate_exclude].select {|action| action == @action}.size == 0)
+          if (!@@authenticate_exclude.is_a?(Array) ||
+              @@authenticate_exclude.select {|action| action == @action}.size == 0)
             authenticate
           end
         end
-      
+        
         env['kiss.processed_action'] = @action
         process.render
       end
@@ -548,7 +486,7 @@ class Kiss
       
       @response.finish
     rescue StandardError, LoadError, SyntaxError => e
-      body = Kiss::ExceptionReport.generate(e, env, @exception_cache, @last_sql)
+      body = Kiss::ExceptionReport.generate(e, env, @exception_cache, @db ? @db.last_query : nil)
       if @@exception_log_file
         @@exception_log_file.print(body + "\n--- End of exception report --- \n\n")
       end
@@ -573,6 +511,8 @@ class Kiss
       headers['Content-Length'] = body.length.to_s
     end
     
+    @@database_pool.push(@db) if @db
+    
     [code,headers,body]
   end
   
@@ -622,27 +562,37 @@ class Kiss
     suffix ? @app_url + suffix : @app_url
   end
   
-  # Loads session from session store (specified by session_class).
-  def setup_session
-    @login = {}
-    @session = @@session_class ? begin
-      session = @@session_class.persist(@request.cookies[@@cookie_name])
-      @session_fingerprint = Marshal.dump(session.data).hash
-    
-      cookie_vars = {
-        :value => session.values[:session_id],
-        :path => @@options[:cookie_path] || @app_uri,
-        :domain => @@options[:cookie_domain] || @request.host
-      }
-      cookie_vars[:expires] = Time.now + @@options[:cookie_lifespan] if @@options[:cookie_lifespan]
-    
-      # set_cookie here or at render time
-      @response.set_cookie @@cookie_name, cookie_vars
-      @login.merge!(session[:login]) if session[:login] && session[:login][:expires_at] &&
-        session[:login][:expires_at] > Time.now
-      
-      session
-    end : {}
+  # Returns Sequel dataset to evolution_number table, which specifies app's current evolution number.
+  # Creates evolution_number table if it does not exist.
+  def evolution_number_table
+    unless db.table_exists?(:evolution_number)
+      db.create_table :evolution_number do
+        column :version, :integer, :null=> false
+      end
+      db[:evolution_number].insert(:version => 0)
+    end
+    db[:evolution_number]
+  end
+
+  # Returns app's current evolution number.
+  def evolution_number
+    evolution_number_table.first.version
+  end
+
+  # Sets app's current evolution number.
+  def evolution_number=(version)
+    load unless @@options
+    evolution_number_table.update(:version => version)
+  end
+
+  # Check whether there exists a file in evolution_dir whose number is greater than app's
+  # current evolution number. If so, raise an error to indicate need to apply new evolutions.
+  def check_evolution_number
+    version = evolution_number
+    if Kiss.directory_exists?(@@evolution_dir) &&
+        Dir.entries(@@evolution_dir).select { |f| f =~ /\A0*#{version+1}_/ }.size > 0
+      raise "current evolution #{version} is outdated; apply evolutions or update evolution number"
+    end
   end
   
   # Saves session to session store, if session data has changed since load.
@@ -652,21 +602,62 @@ class Kiss
   
   ##### LOGIN SESSION #####
   
-  # Empties request and session login hashes.
-  def reset_login_session
-    @session[:login] = @login = {}
+  def session
+    @session ||= begin
+      @@session_class ? begin
+        @@session_setup ||= begin
+          # setup session storage
+          @@session_class.setup_storage(self)
+          true
+        end
+        
+        session = @@session_class.persist(self,@request.cookies[@@cookie_name])
+        @session_fingerprint = Marshal.dump(session.data).hash
+    
+        cookie_vars = {
+          :value => session.values[:session_id],
+          :path => @@options[:cookie_path] || @app_uri,
+          :domain => @@options[:cookie_domain] || @request.host
+        }
+        cookie_vars[:expires] = Time.now + @@options[:cookie_lifespan] if @@options[:cookie_lifespan]
+    
+        # set_cookie here or at render time
+        @response.set_cookie @@cookie_name, cookie_vars
+      
+        session
+      end : {}
+    end
   end
-  alias_method :reset_login_data, :reset_login_session
+  
+  def login
+    @login ||= begin
+      login = {}
+      
+      login.merge!(session[:login]) if (session[:login] && session[:login][:expires_at] && 
+        session[:login][:expires_at] > Time.now)
+      
+      login
+    end
+  end
+  
+  # Deletes login data from session.
+  def logout
+    session.delete(:login)
+    @login = nil
+  end
+  alias_method :reset_login_session, :logout
+  alias_method :reset_login_data, :logout
   
   # Merges data hash (key-value pairs) into request login hash.
   def set_login_data(data)
-    @login = @login.merge(data)
+    login.merge!(data)
+    login
   end
   
   # Merges data hash (key-value pairs) into session login hash.
   def set_login_session(data)
     set_login_data(data)
-    @session[:login] = (@session[:login] || {}).merge(data)
+    session[:login] = (session[:login] || {}).merge(data)
   end
   
   # Sets expire time of session login hash, after which time it will be reset (emptied).
@@ -678,12 +669,12 @@ class Kiss
   
   # Returns true if login hash is defined and not expired.
   def login_session_valid?
-    @login && !login_session_expired?
+    login && !login_session_expired?
   end
   
   # Returns true if login hash is expired.
   def login_session_expired?
-    @login && (!@login[:expires_at] || @login[:expires_at] < Time.now)
+    login && (!login[:expires_at] || login[:expires_at] < Time.now)
   end
   
   # Calls login action's load_from_session method to populate request login hash.
@@ -708,10 +699,13 @@ class Kiss
     else
       klass = action_class('/login')
       raise 'authenticate called, but no login action found' unless klass
-      old_extension = @extension
-      @extension = 'rhtml'
+      
+      old_template = @template
+      @template = '/login.rhtml'
+      
       process(klass,login_path)
-      @extension = old_extension
+      
+      @template = old_template
       
       unless login_session_valid?
         #raise 'login action completed without setting valid login session'
@@ -825,19 +819,69 @@ class Kiss
     mailer
   end
   
+  def db
+    @db ||= @@database_pool.shift || begin
+      raise 'database config missing' unless @@database_config
+      
+      # open database connection (if not already open)
+      @db = @@database_config.is_a?(String) ? (Sequel.open @@database_config) :
+        @@database_config.is_a?(Hash) ? (Sequel.open @@database_config) : @@database_config
+      
+      @@db_extras_loaded ||= begin
+        @db.class.class_eval do
+          @last_query = nil
+          def last_query
+            @last_query
+          end
+  
+          alias_method :execute_old, :execute
+          def execute(sql, *args, &block)
+            @last_query = sql
+            execute_old(sql, *args, &block)
+          end
+        end
+        
+        require 'kiss/model'
+        Kiss::ModelCache.model_dir = @@model_dir
+        
+        if @db.class.name == 'Sequel::MySQL::Database'
+          # add fetch_arrays, all_arrays methods
+          require 'kiss/sequel_mysql'
+          # turn off convert_tinyint_to_bool, unless options say otherwise
+          Sequel.convert_tinyint_to_bool = false unless @@options[:convert_tinyint_to_bool]
+        end
+        true
+      end
+      
+      # TODO: rewrite evolution file exists check for speed
+      check_evolution_number
+      
+      @db
+    end
+  end
+  
   # Kiss Model cache, used to invoke and store Kiss database models.
   #
   # Example:
   # models[:users] : database model for `users' table
   def dbm
+    db unless @db
     @dbm ||= Kiss::ModelCache.new(self)
   end
   alias_method :models, :dbm
   
+  def random_text(*args)
+    self.class.random_text(*args)
+  end
+  
   def h(*args)
     self.class.h(*args)
   end
   
+  def template
+    @template || @action
+  end
+  
   # Adds data to be displayed in "Cache" section of Kiss exception reports.
   def set_exception_cache(data)
     @exception_cache.merge!(data)

data/lib/kiss/action.rb

@@ -114,9 +114,9 @@ class Kiss
       @base_url ||= app(action_subdir + '/')
       @layout = options.is_a?(Hash) && options.has_key?(:layout) ? options[:layout] : 
         (extension == 'rhtml' ? Kiss.layout : nil)
-    
+      
       content = options[:content].is_a?(String) ? options[:content] : process({
-        :template => action,
+        :template => template,
         :extension => extension
       }.merge(options))
     

data/lib/kiss/controller_accessors.rb

@@ -3,11 +3,6 @@ class Kiss
     def environment
       Kiss.environment
     end
-    
-    def db
-      Kiss.db
-    end
-    alias_method :database, :db
   
     def upload_dir
       Kiss.upload_dir
@@ -27,6 +22,11 @@ class Kiss
       controller.bench(label, Kernel.caller[0])
     end
     
+    def db
+      controller.db
+    end
+    alias_method :database, :db
+    
     def dbm
       controller.dbm
     end
@@ -67,6 +67,10 @@ class Kiss
     def set_login_session(*args)
       controller.set_login_session(*args)
     end
+    
+    def logout
+      controller.logout
+    end
   
     def reset_login_data
       controller.reset_login_data
@@ -92,6 +96,10 @@ class Kiss
       controller.action
     end
   
+    def template
+      controller.template
+    end
+  
     def action_subdir
       controller.action_subdir
     end

data/lib/kiss/exception_report.rb

@@ -90,6 +90,7 @@ class Kiss
     h2 span { font-size:80%; color:#000; font-weight:normal; }
     h3 { margin:1em 0 .5em 0; }
     h4 { margin:0 0 .5em 0; font-weight: normal; }
+    small { color #444; }
     table {
         border:1px solid #ccc; border-collapse: collapse; background:white; }
     tbody td, tbody th { vertical-align:top; padding:2px 3px; }

data/lib/kiss/hacks.rb

@@ -3,7 +3,7 @@
 
 # Placeholder; to be overloaded by Kiss Rack builder option MultiBench
 # (not yet implemented).
-def multibench(*args); end
+# def multibench(*args); end
 
 # This gets called outside of controller contexts; used mainly for debugging
 # during Kiss framework development.
@@ -72,19 +72,6 @@ class Fixnum
   end
 end
 
-class BigDecimal
-  # Formats number with comma-separated thousands.
-  def format_thousands(value = to_f.to_s)
-    integer, decimal = value.split(/\./,2)
-    integer.reverse.gsub(/(\d{3})/,'\1,').sub(/\,(-?)$/,'\1').reverse + '.' + decimal
-  end
-  
-  # Formats number to two decimal places.
-  def format_currency
-    format_thousands(sprintf("%0.2f",to_f))
-  end
-end
-
 class Date
   # Returns string representing date in m/d/yyyy format
   def mdy
@@ -110,6 +97,44 @@ class NilClass
   end
 end
 
+class String
+  def to_const
+    begin
+      parts = self.split(/::/)
+      klass = Kernel
+      while (next_part = parts.shift)
+        klass = klass.const_get(next_part)
+      end
+      
+      klass
+    rescue
+      raise "Constant '#{self}' not defined"
+    end
+  end
+end
+
+class Symbol
+  def to_const
+    self.to_s.to_const
+  end
+end
+
+module Rack
+  class Request
+    def server
+      url = scheme + "://"
+      url << host
+
+      if scheme == "https" && port != 443 ||
+          scheme == "http" && port != 80
+        url << ":#{port}"
+      end
+      
+      url
+    end
+  end
+end
+
 class SequelZeroTime < String
   def initialize(value = '0000-00-00 00:00',*args,&block)
     super(value,*args,&block)
@@ -157,95 +182,3 @@ class SequelZeroTime < String
     ''
   end
 end
-
-class Date
-  class << self
-    alias_method :old_parse, :parse
-    def parse(*args, &block)
-      return SequelZeroTime.new(args[0]) if args[0] =~ /0000/
-      old_parse(*args, &block)
-    end
-  end
-  
-  # comparision operators
-  def ==(value)
-    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
-  end
-  def >(value)
-    (value == 0 || value.is_a?(SequelZeroTime)) ? true : super(value)
-  end
-  def >=(value)
-    (value == 0 || value.is_a?(SequelZeroTime)) ? true : super(value)
-  end
-  def <(value)
-    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
-  end
-  def <=(value)
-    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
-  end
-end
-
-class Time
-  class << self
-    alias_method :old_parse, :parse
-    def parse(*args, &block)
-      return SequelZeroTime.new(args[0]) if args[0] =~ /0000/
-      old_parse(*args, &block)
-    end
-  end
-  
-  # comparision operators
-  def ==(value)
-    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
-  end
-  def >(value)
-    (value == 0 || value.is_a?(SequelZeroTime)) ? true : super(value)
-  end
-  def >=(value)
-    (value == 0 || value.is_a?(SequelZeroTime)) ? true : super(value)
-  end
-  def <(value)
-    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
-  end
-  def <=(value)
-    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
-  end
-end
-
-class String
-  def to_const
-    begin
-      parts = self.split(/::/)
-      klass = Kernel
-      while (next_part = parts.shift)
-        klass = klass.const_get(next_part)
-      end
-      
-      klass
-    rescue
-      raise "Constant '#{self}' not defined"
-    end
-  end
-end
-
-class Symbol
-  def to_const
-    self.to_s.to_const
-  end
-end
-
-module Rack
-  class Request
-    def server
-      url = scheme + "://"
-      url << host
-
-      if scheme == "https" && port != 443 ||
-          scheme == "http" && port != 80
-        url << ":#{port}"
-      end
-      
-      url
-    end
-  end
-end

data/lib/kiss/model.rb

@@ -76,8 +76,7 @@ class Kiss
   
     def [](source)
       @cache[source] ||= begin
-        dataset = Model.db[source]
-        dataset.controller = @controller
+        dataset = @controller.db[source]
         (@@model_dir && source.is_a?(Symbol)) ? begin
           # use file_cache
           model_path = "#{@@model_dir}/#{source}.rb"
@@ -101,7 +100,7 @@ class Kiss
     end
   
     def db
-      Sequel::Model.db
+      @controller.db
     end
   
     def literal(*args)
@@ -132,15 +131,69 @@ class Sequel::Model
   end
 end
 
-class Sequel::Dataset
-  def controller=(controller)
-    @controller = controller
+class Date
+  class << self
+    alias_method :old_parse, :parse
+    def parse(*args, &block)
+      return SequelZeroTime.new(args[0]) if args[0] =~ /0000/
+      old_parse(*args, &block)
+    end
   end
   
-  def execute(sql, opts={}, &block)
-    if @controller
-      @controller.last_sql = sql
+  # comparision operators
+  def ==(value)
+    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
+  end
+  def >(value)
+    (value == 0 || value.is_a?(SequelZeroTime)) ? true : super(value)
+  end
+  def >=(value)
+    (value == 0 || value.is_a?(SequelZeroTime)) ? true : super(value)
+  end
+  def <(value)
+    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
+  end
+  def <=(value)
+    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
+  end
+end
+
+class Time
+  class << self
+    alias_method :old_parse, :parse
+    def parse(*args, &block)
+      return SequelZeroTime.new(args[0]) if args[0] =~ /0000/
+      old_parse(*args, &block)
     end
-    @db.execute(sql, {:server=>@opts[:server] || :read_only}.merge(opts), &block)
+  end
+  
+  # comparision operators
+  def ==(value)
+    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
+  end
+  def >(value)
+    (value == 0 || value.is_a?(SequelZeroTime)) ? true : super(value)
+  end
+  def >=(value)
+    (value == 0 || value.is_a?(SequelZeroTime)) ? true : super(value)
+  end
+  def <(value)
+    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
+  end
+  def <=(value)
+    (value == 0 || value.is_a?(SequelZeroTime)) ? false : super(value)
+  end
+end
+
+class BigDecimal
+  # Formats number with comma-separated thousands.
+  def format_thousands(value = to_f.to_s)
+    integer, decimal = value.split(/\./,2)
+    integer.reverse.gsub(/(\d{3})/,'\1,').sub(/\,(-?)$/,'\1').reverse + '.' + decimal
+  end
+  
+  # Formats number to two decimal places.
+  def format_currency
+    format_thousands(sprintf("%0.2f",to_f))
   end
 end

data/lib/kiss/sequel_session.rb

@@ -53,8 +53,8 @@ class Kiss
       end
       
       # Generates a new session ID and creates a row for the new session in the database.
-      def generate
-        new(Sequel::Model(:sessions).create(
+      def generate(controller)
+        new(Sequel::Model(controller.db[:sessions]).create(
           :session_id => rand_uuid,
           :data => marshal({}),
           :created_at => Time.now,
@@ -64,14 +64,14 @@ class Kiss
 
       # Gets the existing session based on the <tt>session_id</tt> available in cookies.
       # If none is found, generates a new session.
-      def persist(session_id)
+      def persist(controller, session_id)
         if session_id
-          if object = Sequel::Model(:sessions).where(:session_id => session_id).first
+          if object = Sequel::Model(controller.db[:sessions]).where(:session_id => session_id).first
             session = new( object )
           end
         end
         unless session
-          session = generate
+          session = generate( controller.db )
         end
         session
       end

data/lib/kiss/template_methods.rb

@@ -66,7 +66,15 @@ class Kiss
     def get_template_path(options)
       @current_template_dir ||= @template_dir + action_subdir
       
-      path = options.is_a?(String) ? options : "#{options[:template]}.#{options[:extension] || 'rhtml'}"
+      if options.is_a?(String)
+        path = options
+        extension = nil
+      else
+        path = options[:template]
+        extension = options[:extension]
+      end
+      
+      path += ".#{extension || 'rhtml'}" unless path =~ /\./
       (path =~ /\A\//) ? "#{@template_dir}#{path}" : "#{@current_template_dir}/#{path}"
     end
     
@@ -85,12 +93,12 @@ class Kiss
         # macros
         template.gsub!(/\<\%\s*macro\s+(\w+.*?)\s*\%\>/,'<% def \1; _buf = \'\' %>')
         template.gsub!(/\<\%\s*end\s+macro\s*\%\>/,'<% _buf; end %>')
-    
+        
+        # generic loop iterator, using 'iterate'
+        template.gsub!(/\<\%\s*iterate\s+(\w+)\s+(.*?)\s*\%\>/,"<% \\1 = Kiss::Iterator.new; \\2; \\1.increment %>")
         # for loop iterator
-        template.gsub!(/\<\%\s*for\s+(\w+)\s+in\s+(.*?)\s*\%\>/,'<% loop = Kiss::Iterator.new(\2); for \1 in loop.collection; loop.increment %>')
-        # while loop iterator
-        template.gsub!(/\<\%\s*while\s+(.*?)\s*\%\>/,'<% loop = Kiss::Iterator.new; while \1; loop.increment %>')
-      
+        template.gsub!(/\<\%\s*for\s+(\w+)\s+in\s+(.*?)\s*\%\>/,"<% \\1_loop = Kiss::Iterator.new(\\2); for \\1 in \\1_loop.collection; \\1_loop.increment %>")
+        
         Erubis::Eruby.new(template).src
       end
       result = eval eruby_src, template_binding, path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kiss
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors: 
 - Shawn Van Ittersum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-29 00:00:00 -07:00
+date: 2008-10-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency