kiss 1.0.4 → 1.1

data/lib/kiss/hacks.rb

@@ -7,14 +7,18 @@
 
 # This gets called outside of controller contexts; used mainly for debugging
 # during Kiss framework development.
-def debug(object)
+def force_debug(object)
   print "Content-type: text/html\n\n" unless $debug
   $debug = true
   
-  puts object.inspect + '<br/>'
-  puts '<small>at ' + Kernel.caller[0] + '</small><br/>'
+  puts object.inspect + '<br/>' + '<small>at ' + Kernel.caller[0] + '</small><br/>'
   object
 end
+alias :debug :force_debug
+
+def trace(object)
+  debug(object)
+end
 
 class Kiss
   # Used when Kiss#file_cache called from Kiss::Action#file_cache.

data/lib/kiss/iterator.rb

@@ -10,12 +10,6 @@ class Kiss
       @index = -1
     end
     
-    # Used by template erubis pre-processing voodoo to advance
-    # the iterator index.  Not intended for any other use.
-    def increment
-      @index = @index + 1
-    end
-    
     # Return current iteration number, indexed from one instead of zero.
     def count
       @index + 1
@@ -52,5 +46,11 @@ class Kiss
     def size
       @collection ? @collection.size : nil
     end
+    
+    # Used by template erubis pre-processing voodoo to advance
+    # the iterator index.  Not intended for any other use.
+    def increment
+      @index = @index + 1
+    end
   end
 end

data/lib/kiss/login.rb

@@ -0,0 +1,45 @@
+class Kiss
+  class Login < Hash
+    def initialize(session)
+      @session = session
+      @session['login'] ||= {}
+      
+      # check if login expired
+      if expired?
+        # login expired
+        @session['login'] = {}
+      end
+      
+      @persist_data = @session['login']
+      self.merge!(@persist_data)
+    end
+    
+    def expired?
+      @session['login']['expires_at'] && session['login']['expires_at'] < Time.now
+    end
+    
+    def persist(data = {})
+      @persist_data.merge!(data)
+      self.merge!(data)
+    end
+    
+    def expires_at(time)
+      persist(:expires_at => time)
+    end
+    def expires_at=(seconds)
+      expires_at(seconds)
+    end
+    
+    def expires_in(seconds)
+      persist(:expires_at => Time.now + seconds)
+    end
+    def expires_in=(seconds)
+      expires_in(seconds)
+    end
+    
+    def clear
+      @session['login'] = {}
+      super()
+    end
+  end
+end

data/lib/kiss/mailer.rb

@@ -1,5 +1,14 @@
 class Kiss
   # This class creates, renders, and sends email messages.
+  
+  # @options
+  # :server, :port, :domain, :account, :password, :auth - for SMTP login
+  # :from/to - used by SMTP to send message (ignored by sendmail)
+  # :message - message headers/body text
+  # :template - name of email template to use to create message
+  # :data/vars - values to inject into email template
+  # :sendmail_path - filesystem path to sendmail executable
+  
   class Mailer
     include Kiss::TemplateMethods
     
@@ -54,6 +63,8 @@ class Kiss
     end
     
     # Attempts to send message using /usr/sbin/sendmail.
+    # NOTE: sendmail ignores :from and :to options, using
+    # From and To headers from the message
     def sendmail(options = nil)
       merge_options(options) if options
       
@@ -72,8 +83,15 @@ class Kiss
     
       require 'net/smtp' unless defined?(Net::SMTP)
       # begin
-        Net::SMTP.start('localhost') do |smtp|
-      		smtp.sendmail(@options[:message], options[:from], options[:to])
+        Net::SMTP.start(
+          @options[:server] || 'localhost',
+          @options[:port] || 25,
+          @options[:domain] || nil,
+          @options[:account] || @options[:username] || nil,
+          @options[:password] || nil,
+          @options[:auth] || :plain
+        ) do |smtp|
+      		smtp.sendmail(@options[:message], @options[:from], @options[:to])
       	end
       # rescue
       # end

data/lib/kiss/model.rb

@@ -8,16 +8,14 @@ class Kiss
         super(source)
       end
       
+      # This method is called by Sequel::Model's association def methods.
+      # Must return singularized table name for correct association key names.
       def name
-        @table.to_s
+        @table.to_s.singularize
       end
       
       def controller
-        @controller
-      end
-      
-      def controller=(controller)
-        @controller = controller
+        db.kiss_controller
       end
       
       def table
@@ -40,9 +38,9 @@ class Kiss
       # TODO: Fix has_many and many_to_many associations
       def associate(type, name, opts = {}, &block)
         opts = opts.clone
-    
+        
         unless opts[:class] || opts[:class_name]
-          opts[:class_name] = name.to_s.pluralize
+          opts[:class_name] = name.to_s.singularize
         end
         
         super(type, name, opts, &block)
@@ -69,39 +67,37 @@ class Kiss
       @@model_dir = model_dir && ::File.directory?(model_dir) ? model_dir : nil
     end
     
-    def initialize(controller = nil)
-      @controller = controller
+    def initialize(database = nil)
+      @db = database
       @cache = {}
     end
+    
+    def new_model_class(database,source)
+      klass = Class.new(Kiss::Model)
+      klass.set_dataset(database[source])
+      klass.table = source
+      klass
+    end
   
     def [](source)
-      @cache[source] ||= begin
-        dataset = @controller.db[source]
-        (@@model_dir && source.is_a?(Symbol)) ? begin
-          # use file_cache
-          model_path = "#{@@model_dir}/#{source}.rb"
-          src = Kiss.file_cache(model_path)
-          klass = Class.new(Kiss::Model)
-          klass.set_dataset(dataset)
-          klass.controller = @controller
-          klass.table = source
+      raise 'argument to model cache must be symbol of database table name' unless source.is_a?(Symbol)
+      
+      database = @db
+      @@model_dir ? begin
+        # use file_cache
+        model_path = "#{@@model_dir}/#{source}.rb"
+        Kiss.file_cache(model_path) do |src|
+          klass = new_model_class(database,source)
           klass.class_eval(src,model_path) if src
           klass
-        end : begin
-          # no model_dir, or source is not a symbol
-          # no mapping from source to filesystem path
-          klass = Class.new(Kiss::Model)
-          klass.set_dataset(dataset)
-          klass.table = source if source.is_a?(Symbol)
-          klass.controller = @controller
-          klass
         end
-      end
+      end : @cache[source] ||= new_model_class(database,source)
     end
   
-    def db
-      @controller.db
+    def database
+      @db
     end
+    alias_method :db, :database
   
     def literal(*args)
       Sequel::Model.dataset.literal(*args)

data/lib/kiss/rack/bench.rb

@@ -1,4 +1,9 @@
 module Rack
+  # Deprecated.  Benchmarks output now prepended at end of Kiss#call.
+  # This module is kept for benchmarking full request operation time;
+  # this should be moved to Kiss#call as well. Then remove this module
+  # for Kiss 1.1.
+  
   # Rack::Bench shows total request duration for any request.
   class Bench
     def initialize(app)

data/lib/kiss/rack/errors_ok.rb

@@ -0,0 +1,19 @@
+module Rack
+  # Rack::Facebook formats HTTP responses to remove certain status codes
+  # and HTML entities that are invalid as FBML responses.
+  class ErrorsOK
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      code, headers, body = @app.call(env)
+      
+      if code >= 500 && code < 600
+        code = 200
+      end
+      
+      [ code, headers, body ]
+    end
+  end
+end

data/lib/kiss/rack/facebook.rb

@@ -19,6 +19,7 @@ module Rack
       contents.gsub!(/txmt:\/\//, 'http://textmate.local/')
       contents.gsub!('<body>','<div class="body">')
       contents.gsub!('</body>','</div>')
+      contents.gsub!('<wbr/>','')
       
       headers['Content-Length'] = contents.length.to_s
       

data/lib/kiss/rack/recorder.rb

@@ -0,0 +1,22 @@
+module Rack
+  class Recorder
+    def initialize(app)
+      @app = app
+      
+      @@filepath ||= begin
+        puts "Yo.  Starting app..."
+        puts "Would ask you for a test name or recording path here."
+        'something'
+      end
+    end
+    
+    def call(env)
+      code, headers, body = @app.call(env)
+      
+      puts "OK, that was fun."
+      puts "Would save some request and response data here."
+      
+      [ code, headers, body ]
+    end
+  end
+end

data/lib/kiss/rack/show_debug.rb

@@ -1,5 +1,5 @@
 module Rack
-  # Deprecated; now does nothing.
+  # Deprecated. To be removed in Kiss 1.1.
   # Functionality moved to Kiss#initialize (lib/kiss.rb).
   
   class ShowDebug

data/lib/kiss/rack/show_exceptions.rb

@@ -1,5 +1,5 @@
 module Rack
-  # Deprecated; now does nothing.
+  # Deprecated. To be removed in Kiss 1.1.
   # Functionality moved to Kiss#initialize (lib/kiss.rb).
 
   class ShowExceptions

data/lib/kiss/template_methods.rb

@@ -2,17 +2,27 @@ class Kiss
   module TemplateMethods
     include Kiss::ControllerAccessors
     
+    def db
+      controller.database
+    end
+    alias_method :database, :db
+    
     # Contains data set by action/mailer logic to be displayed in templates.
     def data
       @data
     end
     alias_method :vars, :data
     
+    def data=(hash)
+      @data = hash
+    end
+    alias_method :'vars=', :'data='
+    
     # Merges specified data (key-value pairs) into template data hash.
     def set(vars)
       vars.each_pair do |key,value|
         # convert symbols to strings
-        @data[key.to_s] = value
+        @data[key] = value
       end
     end
     
@@ -51,28 +61,51 @@ class Kiss
     
     # Reads file specified by options and return contents (without template
     # processing).
-    def insert(options = {})
-      path = get_template_path(options)
+    def insert(*args)
+      path = get_template_path(get_template_options(*args))
       content = ::File.read(path)
     end
     
     # Processes template specified by options and return results.
-    def process(options = {})
+    def process(*args)
+      options = get_template_options(*args)
       path = get_template_path(options)
-      content = erubis(path,binding)
+      
+      if (options[:data] || options[:vars])
+        new_data = (options[:data] || {}).merge(options[:vars] || {})
+        old_data = self.data
+        self.data = self.data.merge(new_data)
+      else
+        old_data = nil
+      end
+      
+      content = erubis(path)
+      self.data = old_data if old_data
+      
+      content
+    end
+    alias_method :process_template, :process
+    
+    # Convert arguments into options hash for use get_template_path.
+    def get_template_options(*args)
+      case args.length
+      when 0
+        {}
+      when 1
+        args[0].is_a?(Hash) ? args[0] : { :template => args[0] }
+      when 2
+        args[1].merge( :template => args[0] )
+      else
+        raise 'too many arguments'
+      end
     end
     
     # Gets path to insert/template file from specified options.
-    def get_template_path(options)
+    def get_template_path(options = {})
       @current_template_dir ||= @template_dir + action_subdir
       
-      if options.is_a?(String)
-        path = options
-        extension = nil
-      else
-        path = options[:template]
-        extension = options[:extension]
-      end
+      path = options[:template]
+      extension = options[:extension]
       
       path += ".#{extension || 'rhtml'}" unless path =~ /\./
       (path =~ /\A\//) ? "#{@template_dir}#{path}" : "#{@current_template_dir}/#{path}"
@@ -89,18 +122,25 @@ class Kiss
       old_template_dir = @current_template_dir
       @current_template_dir = path.sub(/\/?[^\/]*\Z/,'')
       
-      eruby_src = file_cache(path,'template') do |template|
-        # macros
-        template.gsub!(/\<\%\s*macro\s+(\w+.*?)\s*\%\>/,'<% def \1; _buf = \'\' %>')
-        template.gsub!(/\<\%\s*end\s+macro\s*\%\>/,'<% _buf; end %>')
+      # read the file, parse into eruby source,
+      # and pre-process source for Kiss additions
+      eruby_src = file_cache(path) do |template|
+        template ? begin
+          # 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*\%\>/,"<% \\1_loop = Kiss::Iterator.new(\\2); for \\1 in \\1_loop.collection; \\1_loop.increment %>")
+          # 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*\%\>/,"<% \\1_loop = Kiss::Iterator.new(\\2); for \\1 in \\1_loop.collection; \\1_loop.increment %>")
         
-        Erubis::Eruby.new(template).src
+          Erubis::Eruby.new(template).src
+        end : nil
       end
+      raise Kiss::FileNotFound, "template '#{path}' not found" unless eruby_src
+      
+      # evaluate source in context of template_binding
       result = eval eruby_src, template_binding, path
       
       # restore previous template dir
@@ -110,17 +150,18 @@ class Kiss
     end
     
     # Escapes string for use in URLs.
-    def url_encode(string)
-    	# don't encode to hex: letters, numbers, periods, spaces
-    	# encode space to +
-      string.gsub(/([^A-Za-z0-9\.])/) { sprintf("%%%02X", $&.unpack("C")[0]) }
+    def url_escape(string)
+      Kiss.url_escape(str)
     end
-    alias_method :escape, :url_encode
-    alias_method :h, :url_encode
+    alias_method :escape, :url_escape
+    alias_method :url_encode, :url_escape
+    alias_method :escape_url, :url_escape
     
     # Encodes string for output to HTML.
-    def escape_html(str)
-      Rack::Utils.escape_html(str)
+    def html_escape(str)
+      Kiss.html_escape(str)
     end
+    alias_method :h, :html_escape
+    alias_method :escape_html, :html_escape
   end
 end