kiss 0.9.4 → 1.0

data/lib/kiss/template_methods.rb

@@ -53,7 +53,7 @@ class Kiss
     # processing).
     def insert(options = {})
       path = get_template_path(options)
-      content = File.read(path)
+      content = ::File.read(path)
     end
     
     # Processes template specified by options and return results.
@@ -64,12 +64,10 @@ class Kiss
     
     # Gets path to insert/template file from specified options.
     def get_template_path(options)
-      @current_template_dir ||= @template_dir
+      @current_template_dir ||= @template_dir + action_subdir
       
       path = options.is_a?(String) ? options : "#{options[:template]}.#{options[:extension] || 'rhtml'}"
-      path = path =~ /\A\// ? "#{@template_dir}#{path}" : "#{@current_template_dir}/#{path}"
-    
-      path
+      (path =~ /\A\//) ? "#{@template_dir}#{path}" : "#{@current_template_dir}/#{path}"
     end
     
     # Processes specified template file using specified binding.
@@ -98,7 +96,7 @@ class Kiss
       result = eval eruby_src, template_binding, path
       
       # restore previous template dir
-      @template_dir = old_template_dir
+      @current_template_dir = old_template_dir
       
       result
     end
@@ -116,10 +114,5 @@ class Kiss
     def escape_html(str)
       Rack::Utils.escape_html(str)
     end
-    
-    # Formats number to two decimal places.
-    def currency(num)
-      sprintf("%0.2f",num.to_f)
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kiss
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: "1.0"
 platform: ruby
 authors: 
 - Shawn Van Ittersum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 -07:00
+date: 2008-09-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,9 @@ files:
 - LICENSE
 - lib/kiss
 - lib/kiss/action.rb
+- lib/kiss/bench.rb
 - lib/kiss/controller_accessors.rb
+- lib/kiss/debug.rb
 - lib/kiss/exception_report.rb
 - lib/kiss/form
 - lib/kiss/form/field.rb
@@ -67,13 +69,13 @@ files:
 - lib/kiss/rack/bench.rb
 - lib/kiss/rack/email_errors.rb
 - lib/kiss/rack/facebook.rb
-- lib/kiss/rack/file.rb
 - lib/kiss/rack/file_not_found.rb
 - lib/kiss/rack/log_exceptions.rb
 - lib/kiss/rack/show_debug.rb
 - lib/kiss/rack/show_exceptions.rb
 - lib/kiss/sequel_mysql.rb
 - lib/kiss/sequel_session.rb
+- lib/kiss/static_file.rb
 - lib/kiss/template_methods.rb
 - lib/kiss.rb
 has_rdoc: true