mustache 0.2.0 → 0.2.1

data/HISTORY.md

@@ -0,0 +1,5 @@
+## 0.2.1 (2009-10-11)
+
+* Mustache.underscore can now be called without an argument
+* Settings now mostly live at the class level, excepting `template`
+* Any setting changes causes the template to be recompiled

data/benchmarks/speed.rb

@@ -43,9 +43,9 @@ content = File.read(ComplexView.template_file)
 
 unless ENV['CACHED']
   bench '{ w/o caching' do
-    tpl = ComplexView.new
-    tpl.template = content
-    tpl[:item] = items
-    tpl.to_html
+    ctpl = ComplexView.new
+    ctpl.template = content
+    ctpl[:item] = items
+    ctpl.to_html
   end
 end

data/lib/mustache.rb

@@ -16,10 +16,11 @@ require 'mustache/context'
 # While Mustache will do its best to load and render a template for
 # you, this process is completely customizable using a few options.
 #
-# All settings can be overriden at either the class or instance
-# level. For example, going with the above example, we can do either
-# `Stats.template_path = "/usr/local/templates"` or
-# `view.template_path = "/usr/local/templates"`
+# All settings can be overriden at the class level.
+#
+# For example, going with the above example, we can use
+# `Stats.template_path = "/usr/local/templates"` to specify the path
+# Mustache uses to find templates.
 #
 # Here are the available options:
 #
@@ -49,6 +50,12 @@ require 'mustache/context'
 #   >> Mustache.render("Hello {{planet}}", :planet => "World!")
 #   => "Hello World!"
 #
+# The `template` setting is also available on instances.
+#
+#   view = Mustache.new
+#   view.template = "Hi, {{person}}!"
+#   view[:person] = 'Mom'
+#   view.render # => Hi, mom!
 class Mustache
   # Helper method for quickly instantiating and rendering a view.
   def self.render(*args)
@@ -68,11 +75,12 @@ class Mustache
   # The template path informs your Mustache subclass where to look for its
   # corresponding template. By default it's the current directory (".")
   def self.template_path
-    @template_path || '.'
+    @template_path ||= '.'
   end
 
   def self.template_path=(path)
     @template_path = File.expand_path(path)
+    @template = nil
   end
 
   # Alias for `template_path`
@@ -87,21 +95,23 @@ class Mustache
 
   # A Mustache template's default extension is 'html'
   def self.template_extension
-    @template_extension || 'html'
+    @template_extension ||= 'html'
   end
 
   def self.template_extension=(template_extension)
     @template_extension = template_extension
+    @template = nil
   end
 
   # The template file is the absolute path of the file Mustache will
   # use as its template. By default it's ./class_name.html
   def self.template_file
-    @template_file || "#{template_path}/#{underscore(to_s)}.#{template_extension}"
+    @template_file || "#{path}/#{underscore}.#{template_extension}"
   end
 
   def self.template_file=(template_file)
     @template_file = template_file
+    @template = nil
   end
 
   # The template is the actual string Mustache uses as its template.
@@ -109,11 +119,11 @@ class Mustache
   # Mustache::Template object here, but you can still safely use
   # `template=` with a string.
   def self.template
-    @template || templateify(File.read(template_file))
+    @template ||= templateify(File.read(template_file))
   end
 
   def self.template=(template)
-    @template = templateify(template)
+    @template = template
   end
 
   # template_partial => TemplatePartial
@@ -124,7 +134,11 @@ class Mustache
   end
 
   # TemplatePartial => template_partial
-  def self.underscore(classified)
+  # Takes a string but defaults to using the current class' name.
+  def self.underscore(classified = name)
+    classified = name if classified.to_s.empty?
+    classified = superclass.name if classified.to_s.empty?
+
     string = classified.dup.split('::').last
     string[0] = string[0].chr.downcase
     string.gsub(/[A-Z]/) { |s| "_#{s.downcase}"}
@@ -140,46 +154,13 @@ class Mustache
     end
   end
 
-  # Instance version.Turns a string into a Mustache::Template. If passed a Template,
   def templateify(obj)
-    if obj.is_a?(Template)
-      obj
-    else
-      Template.new(obj.to_s, template_path, template_extension)
-    end
-  end
-
-  #
-  # Instance level settings
-  #
-
-  def template_path
-    @template_path || self.class.template_path
-  end
-
-  def template_path=(template_path)
-    @template_path = template_path
-  end
-
-  def template_extension
-    @template_extension || self.class.template_extension
-  end
-
-  def template_extension=(template_extension)
-    @template_extension = template_extension
-  end
-
-  def template_file
-    return @template_file if @template_file
-    "#{template_path}/#{Mustache.underscore(self.class.name)}.#{template_extension}"
-  end
-
-  def template_file=(template_file)
-    @template_file = template_file
+    self.class.templateify(obj)
   end
 
+  # The template can be set at the instance level.
   def template
-    @template || templateify(File.read(template_file))
+    @template ||= self.class.template
   end
 
   def template=(template)

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = '0.2.0'
+  Version = '0.2.1'
 end

data/test/mustache_test.rb

@@ -98,8 +98,9 @@ end_partial
   end
 
   def test_template_partial_with_custom_extension
-    partial = TemplatePartial.new
+    partial = Class.new(TemplatePartial)
     partial.template_extension = 'txt'
+    partial.template_path = File.dirname(__FILE__) + '/../examples'
 
     assert_equal <<-end_partial.strip, partial.render.strip
 Welcome
@@ -129,6 +130,11 @@ end_partial
     assert_equal 'template_partial', Mustache.underscore('TemplatePartial')
   end
 
+  def test_anon_subclass_underscore
+    klass = Class.new(TemplatePartial)
+    assert_equal 'template_partial', klass.underscore
+  end
+
   def test_namespaced_underscore
     assert_equal 'stat_stuff', Mustache.underscore('Views::StatStuff')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 -07:00
+date: 2009-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -26,6 +26,7 @@ files:
 - .gitignore
 - .kick
 - CONTRIBUTORS
+- HISTORY.md
 - LICENSE
 - README.md
 - Rakefile