kiss 0.9.4 → 1.0

data/lib/kiss/model.rb

@@ -4,33 +4,37 @@ class Kiss
   # to cache database model classes, unless no model_dir is specified.
   class Model < Sequel::Model
     class << self
+      def set_dataset(source)
+        super(source)
+      end
+      
       def name
         @table.to_s
       end
-  
-      # Name symbol for default foreign key
-      def default_remote_key
-        :"#{name.singularize.demodulize.underscore}_id"
+      
+      def controller
+        @controller
       end
       
-      def set_controller(controller)
-        @@controller = controller
+      def controller=(controller)
+        @controller = controller
       end
       
-      def set_dataset(source)
-        super(source)
+      def table
+        @table.to_sym
       end
       
       def table=(table)
         @table = table
       end
       
-      def controller
-        @@controller
+      # Name symbol for default foreign key
+      def default_foreign_key
+        :"#{name.singularize.demodulize.underscore}_id"
       end
       
-      def dbm
-        @@controller.dbm
+      def find_or_new(cond)
+        find(cond) || new(cond)
       end
       
       # TODO: Fix has_many and many_to_many associations
@@ -45,6 +49,8 @@ class Kiss
         
         association_reflections[name]
       end
+      
+      include Kiss::KissAccessors
     end
     
     def method_missing(meth)
@@ -52,38 +58,43 @@ class Kiss
     end
     
     def controller
-      @@controller
+      self.class.controller
     end
     
     include Kiss::ControllerAccessors
   end
 
   class ModelCache
-    def initialize(controller,model_dir = nil)
+    def self.model_dir=(model_dir = nil)
+      @@model_dir = model_dir && ::File.directory?(model_dir) ? model_dir : nil
+    end
+    
+    def initialize(controller = nil)
       @controller = controller
-      @model_dir = model_dir && File.directory?(model_dir) ? model_dir : nil
       @cache = {}
     end
   
     def [](source)
-      (@model_dir && source.is_a?(Symbol)) ? begin
-        # use controller's file_cache
-        model_path = "#{@model_dir}/#{source}.rb"
-        @controller.file_cache(model_path) do |src|
+      @cache[source] ||= begin
+        dataset = Model.db[source]
+        dataset.controller = @controller
+        (@@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(Model.db[source])
+          klass.set_dataset(dataset)
+          klass.controller = @controller
           klass.table = source
           klass.class_eval(src,model_path) if src
           klass
-        end
-      end : begin
-        # no model_dir, or source is not a symbol
-        # no mapping from source to filesystem path
-        # use ModelCache's own cache
-        @cache[source] ||= begin
+        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(Model.db[source])
+          klass.set_dataset(dataset)
           klass.table = source if source.is_a?(Symbol)
+          klass.controller = @controller
           klass
         end
       end
@@ -106,9 +117,30 @@ end
 
 Sequel::Model::Associations::AssociationReflection.class_eval do
   def associated_class
-    self[:class] ||= Kiss::Model.controller.dbm[self[:class_name].to_s.pluralize.to_sym]
+    self[:class] ||= self[:model].controller.dbm[self[:class_name].to_s.pluralize.to_sym]
   end
   def default_left_key
     :"#{self[:model].name.singularize.underscore}_id"
   end
+end
+
+class Sequel::Model
+  def inherited(subclass)
+    self.instance_variables.each do |var|
+      subclass.instance_variable_set(var, instance_variable_get(var))
+    end
+  end
+end
+
+class Sequel::Dataset
+  def controller=(controller)
+    @controller = controller
+  end
+  
+  def execute(sql, opts={}, &block)
+    if @controller
+      @controller.last_sql = sql
+    end
+    @db.execute(sql, {:server=>@opts[:server] || :read_only}.merge(opts), &block)
+  end
 end

data/lib/kiss/rack/bench.rb

@@ -1,58 +1,16 @@
-def bench(label = nil)
-  Rack::Bench.close_bench_item(Kernel.caller[0])
-  Rack::Bench.on
-  
-  if label
-    Rack::Bench.push_bench_item(
-      :label => label,
-      :start_time => Time.now,
-      :start_context => Kernel.caller[0]
-    )
-  end
-end
-
 module Rack
-  # Rack::Bench adds benchmarking capabilities to Kiss applications.
-  #
-  # bench(label) starts a new timer, which ends upon the next call to
-  # bench, or when execution returns to Rack::Bench.
-  #
-  # bench can be called without a label to end the previous timer 
-  # without starting a new one.
-  #
-  # Total request duration is also displayed for any request in which
-  # the bench function is called.
+  # Rack::Bench shows total request duration for any request.
   class Bench
-    def self.on
-      @@bench = true
-    end
-    
-    def self.close_bench_item(end_context = nil)
-      if @@bench_items[-1] && !@@bench_items[-1][:end_time]
-        @@bench_items[-1][:end_time] = Time.now
-        @@bench_items[-1][:end_context] = end_context
-      end
-    end
-    
-    def self.push_bench_item(item)
-      @@bench_items.push(item)
-    end
-    
     def initialize(app)
       @app = app
     end
 
     def call(env)
-      @@bench = false
-      @@bench_items = []
-      
       start_time = Time.now
       code, headers, body = @app.call(env)
       end_time = Time.now
       
-      if @@bench
-        Rack::Bench.close_bench_item
-        contents = <<-EOT
+      contents = <<-EOT
 <style>
 .kiss_bench {
   text-align: left;
@@ -73,59 +31,16 @@ module Rack
   text-decoration: underline;
 }
 </style>
-EOT
-        
-        contents += @@bench_items.map do |item|
-          start_link = context_link(item[:start_context])
-          end_link = context_link(item[:end_context])
-          
-          <<-EOT
-<div class="kiss_bench">
-<tt><b>#{item[:label].gsub(/\</,'&lt;')} duration: #{sprintf("%0.3f",item[:end_time].to_f - item[:start_time].to_f)} s</b></tt>
-<small style="line-height: 105%; display: block; padding-bottom: 3px">kiss bench<br/>started at #{start_link}<br/>ended at #{end_link || 'return to kiss bench'}</small>
-</div>
-EOT
-        end.join
-        
-        contents += <<-EOT
 <div class="kiss_bench">
 <tt><b>TOTAL request duration: #{sprintf("%0.3f",end_time.to_f - start_time.to_f)} s</b></tt>
 <br><small>kiss bench request total</small>
 </div>
 EOT
-      else
-        contents = ''
-      end
       
       body.each {|p| contents += p }
       headers['Content-Length'] = contents.length.to_s
     
       [ code, headers, contents ]
     end
-    
-    def absolute_path(filename)
-      filename = ( filename =~ /\A\// ? '' : (Dir.pwd + '/') ) + filename
-    end
-    
-    def context_link(context)
-      return nil unless context
-      
-      filename, line, method = context.split(/:/)
-      textmate_url = "txmt://open?url=file://" + h(absolute_path(filename)) + '&amp;line=' + line
-      %Q(<a href="#{textmate_url}">#{filename}:#{line}</a> #{method})
-    end
-    
-    def textmate_href(frame)
-      "txmt://open?url=file://" + h(absolute_path(context)).sub(/:/,'&amp;line=')
-    end
-
-    def h(obj)                  # :nodoc:
-      case obj
-      when String
-        Utils.escape_html(obj).gsub(/^(\s+)/) {'&nbsp;' * $1.length}
-      else
-        Utils.escape_html(obj.inspect)
-      end
-    end
   end
 end

data/lib/kiss/rack/log_exceptions.rb

@@ -1,23 +1,14 @@
 module Rack
-  # Rack::ShowExceptions catches exceptions raised from the app,
-  # showing a useful backtrace with clickable stack frames and 
-  # TextMate links to source files, as well as the last database
-  # query, GET/POST params, cookies, and Rack environment variables.
-  #
-  # Be careful using this on public-facing sites as it could reveal 
-  # potentially sensitive information to malicious users.
+  # Deprecated; now does nothing.
+  # Functionality moved to Kiss#initialize (lib/kiss.rb).
 
   class LogExceptions
     def initialize(app,path)
       @app = app
-      @@file = ::File.open(path,'w')
     end
     
     def call(env)
       @app.call(env)
-    rescue StandardError, LoadError, SyntaxError => e
-      @@file.print Kiss::ExceptionReport.generate(env, e) + "\n--- End of exception report --- \n\n"
-      raise
     end
   end
 end

data/lib/kiss/rack/show_debug.rb

@@ -1,14 +1,6 @@
-$debug_messages = []
-def debug(object)
-  $debug_messages.push( [object.inspect, Kernel.caller[0]] )
-  object
-end
-
 module Rack
-  # Rack::ShowDebug displays messages logged by the debug function.
-  #
-  # Be careful using this on public-facing sites as it could reveal 
-  # potentially sensitive information to malicious users.
+  # Deprecated; now does nothing.
+  # Functionality moved to Kiss#initialize (lib/kiss.rb).
   
   class ShowDebug
     def initialize(app)
@@ -16,67 +8,7 @@ module Rack
     end
 
     def call(env)
-      $debug_messages = []
-      code, headers, body = @app.call(env)
-      
-      if $debug_messages.size > 0
-        contents = <<-EOT
-<style>
-.kiss_debug {
-  text-align: left;
-  padding: 3px 7px;
-  border: 1px solid #ebe;
-  border-top: 1px solid #fdf;
-  border-bottom: 1px solid #d6d;
-  background-color: #fbf;
-  font-size: 12px;
-  color: #101;
-}
-.kiss_debug a {
-  color: #707;
-  text-decoration: none;
-}
-.kiss_debug a:hover {
-  color: #707;
-  text-decoration: underline;
-}
-</style>
-EOT
-        contents += $debug_messages.map do |object,context|
-          filename, line, method = context.split(/:/)
-          textmate_url = "txmt://open?url=file://" + h(absolute_path(filename)) + '&amp;line=' + line
-          <<-EOT
-<div class="kiss_debug">
-<tt><b>#{object.gsub(/\</,'&lt;')}</b></tt>
-<br><small>kiss debug output at <a href="#{textmate_url}">#{filename}:#{line}</a> #{method}</small>
-</div>
-EOT
-        end.join
-      else
-        contents = ''
-      end
-      
-      body.each {|p| contents += p }
-      headers['Content-Length'] = contents.length.to_s
-      
-      [ code, headers, contents ]
-    end
-    
-    def absolute_path(filename)
-      filename = ( filename =~ /\A\// ? '' : (Dir.pwd + '/') ) + filename
-    end
-    
-    def textmate_href(frame)
-      "txmt://open?url=file://" + h(absolute_path(context)).sub(/:/,'&amp;line=')
-    end
-
-    def h(obj)                  # :nodoc:
-      case obj
-      when String
-        Utils.escape_html(obj).gsub(/^(\s+)/) {'&nbsp;' * $1.length}
-      else
-        Utils.escape_html(obj.inspect)
-      end
+      @app.call(env)
     end
   end
 end

data/lib/kiss/rack/show_exceptions.rb

@@ -1,11 +1,6 @@
 module Rack
-  # Rack::ShowExceptions catches exceptions raised from the app,
-  # showing a useful backtrace with clickable stack frames and 
-  # TextMate links to source files, as well as the last database
-  # query, GET/POST params, cookies, and Rack environment variables.
-  #
-  # Be careful using this on public-facing sites as it could reveal 
-  # potentially sensitive information to malicious users.
+  # Deprecated; now does nothing.
+  # Functionality moved to Kiss#initialize (lib/kiss.rb).
 
   class ShowExceptions
     def initialize(app)
@@ -14,14 +9,6 @@ module Rack
     
     def call(env)
       @app.call(env)
-    rescue StandardError, LoadError, SyntaxError => e
-      body = Kiss::ExceptionReport.generate(env, e)
-      [500, {
-        "Content-Type" => "text/html",
-        "Content-Length" => body.length.to_s,
-        "X-Kiss-Error-Type" => e.class.name,
-        "X-Kiss-Error-Message" => e.message.sub(/\n.*/m,'')
-      }, body]
     end
   end
 end

data/lib/kiss/sequel_mysql.rb

@@ -13,8 +13,10 @@ module Sequel
       # Fixes bug in Sequel 1.5; shouldn't be needed for Sequel 2.x
       # (need to double-check, however).
       def fetch_arrays(sql)
-        @db.execute_select(sql) do |r|
-          r.each_array {|row| yield row}
+        execute(sql) do |r|
+          while row = r.fetch_row
+            yield row
+          end
         end
         self
       end

data/lib/kiss/static_file.rb

@@ -0,0 +1,31 @@
+class Kiss
+  class StaticFile
+    def initialize(path,mime_type = nil)
+      @path = path
+      @mime_type = mime_type
+    end
+    
+    def finish
+      ext = File.extname(@path)[1..-1]
+      
+      if File.file?(@path) && File.readable?(@path)
+        [200, {
+           "Last-Modified"  => File.mtime(@path).rfc822,
+           "Content-Type"   => @mime_type || Kiss.mime_type(ext) || "text/plain",
+           "Content-Length" => File.size(@path).to_s
+         }, self]
+      else
+        return [404, {"Content-Type" => "text/plain"},
+                ["File not found: #{@path}\n"]]
+      end
+    end
+
+    def each
+      File.open(@path, "rb") { |file|
+        while part = file.read(8192)
+          yield part
+        end
+      }
+    end
+  end
+end