jenner 0.0.3 → 0.2.6

data/README.md

@@ -34,30 +34,58 @@ Your generated site will be in `./public`.
 
 ### Items
 
-Here's an example (example.html):
+Items can be created as HTML or [Haml](http://haml.info/) files.
+
+Here's an example HTML item:
 
     ---
     title:    'Example Page'
     date:     2014-01-23 17:02:00 -6
-    template: 'page'
+    template: 'page.html'
     ---
 
+    <h1>{{self.title}}</h1>
     <p>This is an example page.</p>
 
+Here's the same example using Haml + Liquid:
+
+    ---
+    title:    'Example Page'
+    date:     2014-01-23 17:02:00 -6
+    template: 'page.html'
+    ---
+
+    %h1 {{self.title}}
+    %p This is an example page.
+
+Here's the same example using Haml directly, not Liquid:
+
+    ---
+    title:    'Example Page'
+    date:     2014-01-23 17:02:00 -6
+    template: 'page.html'
+    ---
+
+    %h1= self.title
+    %p This is an example page.
+
+It's your choice: HTML, HTML + Liquid, Haml, Haml+ Liquid.
+
 This item will be rendered using the `page` template. The `page`
 template can use the following data:
 
     {{item.title}} => "Example Page"
     {{item.data}}  => 2014-01-23 17:02:00 -6
-    {{item.template_name}} => "page"
+    {{item.template_path}} => "page.html"
     {{item.body}}  => "<p>This is an example page.</p>
+    {{item.url}}   => "/example.html"
 
 You can define additional pieces of data in the item header like this:
 
     ---
     title:    'Example Page'
     date:     2014-01-23 17:02:00 -6
-    template: 'page'
+    template: 'page.html'
     foo:      'bar'
     answer:   42
     ---
@@ -74,31 +102,150 @@ they will be processed as Markdown.
     ---
     title:    'Example Markdown Page'
     date:     2014-01-23 17:02:00 -6
-    template: 'page'
+    template: 'page.html'
     ---
 
     # This is an example page
 
-
 ### Templates
 
-Templates are just HTML files that use Liquid markup. Every item you
-create is rendered with a template that you specify in the item's
-header.
+Templates are just HTML or [Haml](http://haml.info/) files that use
+Liquid markup. Every item you create is rendered with a template that
+you specify in the item's header via the `template` attribute.
+
+Haml templates can use Liquid, but they don't have to. You could simply
+use the template's context in Haml:
+
+    %h1= item.title
+    = item.body
+
+instead of:
+
+    %h1 {{item.title}}
+    {{item.body}}
 
 Every item provides the following data at minimum:
 
     {{item.title}}
     {{item.date}}
-    {{item.template_name}}
+    {{item.template_path}}
     {{item.body}}
+    {{item.url}}
+    {{site}}
 
 Additional pieces of data are available within `{{item.data}}` if they
 are defined in the item's YAML header.
 
 You can include other templates with the `{% include %}` tag.
 
-    {% include 'some_other_template' %}
+    {% include 'header.html' %}
+    {{item.body}}
+    {% include 'footer.html' %}
+
+### Assets
+
+All your other files/subdirectories will be copied over as-is with two
+exceptions:
+
+1. [Sass](http://sass-lang.com/) `.scss` files will be processed and copied over as `.css`
+2. Filenames starting with _ will be ignored (e.g. _hidden.html)
+
+### Tags
+
+Tags are a special addition to the YAML header. You can specify them as
+a YAML string array e.g.:
+
+    ---
+    title:    'Example Page'
+    date:     2014-01-23 17:02:00 -6
+    template: 'page.html'
+    tags:     [one, two, three]
+    ---
+
+You will have access to the tag names in {{item.tags}}. You can also get
+a tag by name with a Liquid filter.
+
+    {{ 'one' | tag | assign_to: my_tag }}
+
+    {% for item in my_tag.items %}
+      {{item.body}}
+    {% endfor %}
+
+
+### Other Liquid Filters
+
+I personally dislike having to write specialized plugins or generators
+to generate my site. By simply adding a couple of filters to Liquid, we
+can easily do just about anything on the item/page level without having
+to write anymore outside Ruby.
+
+    <h1>Page rendering two items</h1>
+    {{ 'item_one.html' | item_from_path | assign_to: item_one }}
+    {{ 'item_two.html' | item_from_path | assign_to: item_two }}
+
+    <table>
+      <tr>
+        <th>{{item_one.title}}</th>
+        <th>{{item_two.title}}</th>
+      </tr>
+      <tr>
+        <td>{{item_one.body}}</td>
+        <td>{{item_two.body}}</td>
+      </tr>
+    <table>
+
+    <h1>Bunch of items</h1>
+    {{ 'blog\/' | items_from_path | assign_to: blog_posts }}
+    {% for blog_post in blog_posts %}
+      do something with {{blog_post}} here
+    {% endfor %}
+
+Some other useful helpers:
+
+    {{ 'test.css' | stylesheet_tag }}
+    {{ 'test.js'  | javascript_tag }}
+    {{ 'page_one.html' | item_from_path | link_to }}
+    {{ 'test.gif' | asset_from_path | assign_to: my_image }}
+    <img src="{{my_image.url}}" />
+
+You can also use a couple of filters to grab items by custom data or
+custom data and value combination. For example, say you have a few items
+with an author attribute.
+
+    {{'author' | items_with_data | assign_to: items_with_author_defined}}
+
+Or maybe you just want a certain author:
+
+    {{'author' | items_with_data: 'Mark Twain' | assign_to: items_twain_wrote }}
+
+If the custom data you created can be an array, it works on that too:
+
+    {{'favorite_colors' | items_with_data: 'blue' | assign_to: items_who_like_blue_and_possibly_other_colors }}
+
+### Custom URL Formatting
+
+By default, all items will be copied over as-is e.g. if your item
+resides in /blog/2014/0128_test_post.html it will end up in
+/public/blog/2014/0128_test_post.html.
+
+You can specify a custom url_format parameter in your YAML item header.
+
+    ---
+    title:      'test post'
+    date:       2014-01-28 15:23:00 -6
+    template:   'post.html'
+    url_format: '%Y/%m/%d/:title'
+    ---
+
+The formatting will be relative to whatever directory the file resides
+in, and will be processed by using [Ruby's Time#strftime](http://www.ruby-doc.org/core-1.9.3/Time.html#method-i-strftime)
+method on the item's date, and `:title` will be replaced with an
+underscored version of your site's title.
+
+If the above example post resides in /blog, the output file will go to:
+/public/blog/2014/01/28/test-post/index.html. The `{{item.url}}`
+parameter will not include the index.html to keep things pretty. It will
+be: `/blog/2014/01/28/test-post`.
 
 
 ## Contributing

data/bin/jenner

@@ -17,4 +17,13 @@ Mercenary.program(:jenner) do |p|
       Jenner.build(args, options)
     end
   end
+
+  p.command(:serve) do |c|
+    c.syntax "jenner serve"
+    c.description "Serve your Jenner site"
+
+    c.action do |args, options|
+      Jenner.serve(args, options)
+    end
+  end
 end

data/jenner.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency "haml", "~> 4.0.5"
   gem.add_dependency "liquid", "~> 2.6.1"
   gem.add_dependency "maruku", "~> 0.7.1"
   gem.add_dependency "mercenary", "~> 0.2.1"

data/lib/jenner.rb

@@ -1,10 +1,16 @@
 require "bundler/setup"
+require "haml"
 require "liquid"
 require "maruku"
+require "ostruct"
 require "sass"
+require "webrick"
 
+require "jenner/asset"
 require "jenner/item"
+require "jenner/liquid_filters"
 require "jenner/site"
+require "jenner/tag"
 require "jenner/template"
 require "jenner/template_file_system"
 require "jenner/version"
@@ -15,4 +21,33 @@ module Jenner
     puts "Building a site at #{@site.root}"
     @site.generate!
   end
+
+  def self.serve(args, options={})
+    root = File.expand_path("./public")
+    if Dir.exists?(root)
+      puts "Starting server on port 9191"
+      server = WEBrick::HTTPServer.new :Port => 9191, :DocumentRoot => root
+      trap 'INT' do server.shutdown end
+
+      server.start
+    else
+      puts "Site does not appear to be built. Run 'jenner build' first"
+    end
+  end
+
+  def self.deep_struct(obj)
+    case obj
+    when Hash
+      obj = obj.clone
+      obj.each do |key,value|
+        obj[key] = Jenner.deep_struct(value)
+      end
+      OpenStruct.new(obj)
+    when Array
+      obj = obj.clone
+      obj.map! {|i| Jenner.deep_struct(i) }
+    else
+      obj
+    end
+  end
 end

data/lib/jenner/asset.rb

@@ -0,0 +1,52 @@
+module Jenner
+  class Asset
+    attr_reader :path
+    def initialize(path, site)
+      @path = path
+      @site = site
+    end
+
+    def filename
+      File.basename(@path)
+    end
+
+    def sass?
+      File.extname(filename) == ".scss"
+    end
+
+    def output_filename
+      sass? ? filename.sub(".scss",".css") : filename
+    end
+
+    def source_path
+      File.join(@site.root,"_site",@path)
+    end
+
+    def output_path
+      @path.sub(filename, output_filename)
+    end
+
+    def url
+      "/#{output_path}"
+    end
+
+    def public_path
+      File.join(@site.root,"public", output_path)
+    end
+
+    def to_liquid
+      {
+        'url' => url
+      }
+    end
+
+    def generate!
+      if sass?
+        engine = Sass::Engine.new(File.read(source_path), syntax: :scss)
+        File.write(public_path, engine.render)
+      else
+        FileUtils.cp source_path, public_path
+      end
+    end
+  end
+end

data/lib/jenner/item.rb

@@ -1,64 +1,131 @@
+# encoding: utf-8
 module Jenner
   class Item
-    attr_reader :body, :title, :date, :template_name, :data
-    def initialize(filename, site)
-      @filename = filename
+    attr_reader :title, :date, :template_path, :data, :tags
+    def initialize(path, site)
+      @path     = path
       @site     = site
 
-      @body = File.read(File.join(@site.root,'_site',@filename), encoding: "US-ASCII")
+      @body = File.read(File.join(@site.root,'_site',@path))
 
       if @body =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
         @body   = $'
         @header = YAML.load($1)
       end
 
-      @title         = @header.delete("title")
-      @date          = @header.delete("date")
-      @template_name = @header.delete("template")
-      @tags          = @header.delete("tags")
-      @data          = @header
+      begin
+        @title         = @header.delete("title")
+        @date          = @header.delete("date")
+        @template_path = @header.delete("template")
+        @tags          = @header.delete("tags") || []
+        @url_format    = @header.delete("url_format")
+        @data          = @header
+      rescue Exception => e
+        raise "Invalid header data on item at path: #{@path}"
+      end
+    end
+
+    def relative_path
+      path = File.dirname(@path)
+      return "" if path == "."
+
+      "#{path}/"
+    end
+
+    def local_path
+      @path
+    end
+
+    def path
+      return @path if @url_format.nil?
+
+      if File.extname(url) == ""
+        "#{url}/index.html"
+      else
+        url
+      end
+    end
+
+    def output_filename
+      return "index.html" if File.extname(url) == ""
+
+      File.basename(@path).sub(".markdown",".html")
+    end
+
+    def input_filename
+      File.extname(@path)
     end
 
     def url
-      "/#{@filename}"
+      @url_format.nil? ? "/#{@path.sub(".markdown",".html")}" : formatted_url
+    end
+
+    def underscored_title
+      @title.gsub(/[^\w]+/,"-").downcase
+    end
+
+    def formatted_url
+      "/#{relative_path}#{@date.strftime(@url_format).gsub(":title", underscored_title)}"
     end
 
     def template
-      Jenner::Template.from_file(File.join(@site.root,'_templates',"#{@template_name}.html"), @site)
+      Jenner::Template.from_file(File.join(@site.root,'_templates',"#{@template_path}"), @site)
     end
 
-    def to_liquid
+    def to_liquid_without_body
       {
         'title'         => @title,
         'date'          => @date,
-        'template_name' => @template_name,
+        'template_path' => @template_path,
         'tags'          => @tags,
         'data'          => @data,
-        'url'           => url
+        'url'           => url,
+        'site'          => @site
       }
     end
 
-    def markdown(s)
-      return s unless @filename.split('.').last == "markdown"
+    def to_liquid
+      to_liquid_without_body.merge(
+        'body' => body
+      )
+    end
+
+    def markdown?
+      File.extname(@path) == ".markdown"
+    end
 
-      Maruku.new(s).to_html
+    def haml?
+      File.extname(@path) == ".haml"
+    end
+
+    def liquid_body
+      Liquid::Template.parse(@body).render({'self' => self.to_liquid_without_body}, registers: { site: @site })
     end
 
     def body
-      markdown(Liquid::Template.parse(@body).render('self' => self))
+      if haml?
+        Haml::Engine.new(liquid_body).render(Jenner.deep_struct(self.to_liquid_without_body), :site => Jenner.deep_struct(@site.to_liquid))
+      elsif markdown?
+        Maruku.new(liquid_body).to_html
+      else
+        liquid_body
+      end
     end
 
     def render
       template.render(
-        'item' => self.to_liquid.merge('body' => body)
+        'item' => self.to_liquid
       )
     end
 
     def public_path
-      File.join(@site.root,'public',@filename)
+      File.join(@site.root,'public',path.sub('.markdown','.html').sub(".haml",".html"))
     end
 
     def generate!
+      return if File.basename(public_path)[0] == "_"
+
+      FileUtils.mkdir_p(File.dirname(public_path))
       File.write(public_path,render)
     end
   end

data/lib/jenner/liquid_filters.rb

@@ -0,0 +1,56 @@
+module Jenner
+  module LiquidFilters
+
+    def asset_from_path(path)
+      @context.registers[:site].assets.find { |asset| asset.path == path } || "Asset with path '#{path}' not found"
+    end
+
+    def item_from_path(path)
+      @context.registers[:site].items.find { |item| item.local_path == path } || "Item with path '#{path}' not found"
+    end
+
+    def items_from_path(path)
+      @context.registers[:site].items.select {|item| item.local_path =~ /^#{path}/ } || []
+    end
+
+    def tag(name)
+      @context.registers[:site].tags.find { |tag| tag.name == name } || "Tag with name '#{name}' not found"
+    end
+
+    def items_with_data(key, value=nil)
+      key_matches = @context.registers[:site].items.select { |item|
+        item.data.keys.include?(key)
+      }
+      return key_matches if value.nil?
+
+      # value was provided
+      key_matches.select do |item|
+        if item.data[key].is_a?(Array)
+          item.data[key].include?(value)
+        else
+          item.data[key] == value
+        end
+      end
+    end
+
+    def assign_to(value, name)
+      @context[name] = value
+      nil
+    end
+
+    def stylesheet_tag(path)
+      %(<link href="#{path}" media="all" rel="stylesheet" type="text/css" />)
+    end
+
+    def javascript_tag(path)
+      %(<script type="text/javascript" src="#{path}"></script>)
+    end
+
+    def link_to(item)
+      %(<a href="#{item.url}">#{item.title}</a>)
+    end
+
+  end
+end
+
+Liquid::Template.register_filter(Jenner::LiquidFilters)

data/lib/jenner/site.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Jenner
   class Site
     attr_reader :root
@@ -7,22 +8,45 @@ module Jenner
       Liquid::Template.file_system = Jenner::TemplateFileSystem.new(File.join(@root,'_templates'))
     end
 
+    def to_liquid
+      {
+        'root'      => @root,
+        'assets'    => assets,
+        'items'     => items,
+        'tag_names' => tag_names,
+        'tags'      => tags
+      }
+    end
+
     def site_path
       File.join(@root,"_site")
     end
 
-    def files
-      Dir.glob(File.join(site_path,"[^_]*.{html,markdown}")) +
-        Dir.glob(File.join(site_path,"**","[^_]*.{html,markdown}"))
+    def all_files
+      @all_files ||= Dir.glob(File.join(site_path,"**","*.*"))
+    end
+
+    def item_files
+      @item_files ||= all_files.select {|f| ['.html','.markdown'].include? File.extname(f) }
+    end
+
+    def asset_files
+      @asset_files ||= all_files - item_files
     end
 
     def relative_path(item)
       (item.split("/") - site_path.split("/")).join("/")
     end
 
+    def assets
+      @assets ||= asset_files.inject([]) { |a,asset|
+        a << Jenner::Asset.new(relative_path(asset), self)
+      }
+    end
+
     def items
-      files.inject([]) { |a,i|
-        a << Jenner::Item.new(relative_path(i), self)
+      @items ||= item_files.inject([]) { |a, item|
+        a << Jenner::Item.new(relative_path(item), self)
       }
     end
 
@@ -38,30 +62,37 @@ module Jenner
       site_dir.split("/")
     end
 
+    def tag_names
+      @tag_names ||= items.inject([]) {|a,i|
+        a << i.tags
+      }.flatten.uniq
+    end
+
+    def tags
+      @tags ||= tag_names.inject([]) { |a,tag|
+        a << Jenner::Tag.new(tag, self)
+      }
+    end
+
     def relative_path_to_public(item)
       (item.split("/") - site_dirs).join("/")
     end
 
+    def create_directories!
+      Dir.glob(File.join(@root,"_site","**")).each do |dir|
+        next unless File.directory?(dir)
+
+        FileUtils.mkdir_p(File.join(public_dir,relative_path_to_public(dir)))
+      end
+    end
+
     def generate!
       FileUtils.rm_rf(public_dir)
       FileUtils.mkdir(public_dir)
 
-      base_dirs = File.join(site_dir).split("/")
-      Dir.glob(File.join(@root,"_site","**","*")).each do |item|
-        if File.directory?(item)
-          FileUtils.mkdir_p(File.join(public_dir,relative_path_to_public(item)))
-        else
-          next if [".html",".markdown"].include? File.extname(item)
-          if File.extname(item) == ".scss"
-            engine = Sass::Engine.new(File.read(item), :syntax => :scss)
-            item = item.sub(".scss",".css")
-            File.write(File.join(public_dir,relative_path_to_public(item)),engine.render)
-          else
-            destination = File.join(public_dir,relative_path_to_public(item))
-            FileUtils.cp item, destination
-          end
-        end
-      end
+      create_directories!
+
+      assets.map(&:generate!)
       items.map(&:generate!)
     end
   end

data/lib/jenner/tag.rb

@@ -0,0 +1,24 @@
+module Jenner
+  class Tag
+    attr_reader :name
+    def initialize(name, site)
+      @name = name
+      @site = site
+    end
+
+    def items
+      @items ||= @site.items.select { |item|
+        item.tags.include?(@name)
+      }.inject([]) {|a, item|
+        a << item
+      }
+    end
+
+    def to_liquid
+      {
+        "name"  => @name,
+        "items" => items
+      }
+    end
+  end
+end

data/lib/jenner/template.rb

@@ -1,17 +1,34 @@
+# encoding: UTF-8
 module Jenner
   class Template
-    attr_reader :body
-    def initialize(body, site)
+    def initialize(body, site, options={})
       @body = body
       @site = site
+      @haml = options[:haml]
     end
 
-    def render(context)
-      Liquid::Template.parse(@body).render(context)
+    def haml?
+      @haml
+    end
+
+    def body(context={})
+      haml? ? Haml::Engine.new(@body).render(Jenner.deep_struct(context)) : @body
+    end
+
+    def render(context={})
+      Liquid::Template.parse(body(context.merge('site' => @site))).render(context.merge('site' => @site), registers: { site: @site }).to_s.encode("utf-8")
     end
 
     def self.from_file(file_path, site)
-      new(File.read(file_path, encoding: 'US-ASCII'), site)
+      if File.extname(file_path) != ".haml"
+        new(File.read(file_path), site)
+      else
+        from_haml(File.read(file_path), site)
+      end
+    end
+
+    def self.from_haml(haml_body, site)
+      new(haml_body, site, haml: true)
     end
   end
 end

data/lib/jenner/template_file_system.rb

@@ -1,20 +1,25 @@
+# encoding: utf-8
 module Jenner
   class TemplateFileSystem
     attr_reader :root
     def initialize(root)
       @root = root
-      @pattern =  "%s.html"
+      @pattern =  "%s"
     end
 
     def read_template_file(template_path, context)
       full_path = full_path(template_path)
       raise FileSystemError, "No such template '#{template_path}'" unless File.exists?(full_path)
 
-      File.read(full_path)
+      if File.extname(template_path) == ".haml"
+        Haml::Engine.new(File.read(full_path)).render(Jenner.deep_struct(context.environments.first))
+      else
+        File.read(full_path)
+      end
     end
 
     def full_path(template_path)
-      raise FileSystemError, "Illegal template name '#{template_path}'" unless template_path =~ /^[^.\/][a-zA-Z0-9_\/]+$/
+      #raise Liquid::FileSystemError, "Illegal template name '#{template_path}'" unless template_path =~ /^[^.\/][a-zA-Z0-9_\/]+$/
 
       full_path = if template_path.include?('/')
         File.join(root, File.dirname(template_path), @pattern % File.basename(template_path))
@@ -22,7 +27,7 @@ module Jenner
         File.join(root, @pattern % template_path)
       end
 
-      raise FileSystemError, "Illegal template path '#{File.expand_path(full_path)}'" unless File.expand_path(full_path) =~ /^#{File.expand_path(root)}/
+      raise Liquid::FileSystemError, "Illegal template path '#{File.expand_path(full_path)}'" unless File.expand_path(full_path) =~ /^#{File.expand_path(root)}/
 
       full_path
     end

data/lib/jenner/version.rb

@@ -1,3 +1,3 @@
 module Jenner
-  VERSION = "0.0.3"
+  VERSION = "0.2.6"
 end

data/test/fixtures/source/_site/_hidden.html

@@ -0,0 +1,8 @@
+---
+title:    'hidden'
+date:     2014-01-23 17:02:00 -6
+template: 'wrapper.html'
+foo:      'bar'
+bar:      [2]
+---
+42

data/test/fixtures/source/_site/blog/20140128_test_post.markdown

@@ -0,0 +1,8 @@
+---
+title:      'TEST post'
+date:       2014-01-28 15:23:00 -6
+template:   'post.html'
+url_format: '%Y/%m/%d/:title'
+---
+
+this is a test post.

data/test/fixtures/source/_site/embed_test.html

@@ -0,0 +1,7 @@
+---
+title:    'embed test'
+date:     2014-01-23 17:02:00 -6
+template: 'simple.html'
+---
+{{ '_hidden.html' | item_from_path | assign_to: 'foo' }}
+secret: {{foo.body}}

data/test/fixtures/source/_site/haml_test.haml

@@ -0,0 +1,9 @@
+---
+title:    'haml test'
+date:     2014-01-23 17:02:00 -6
+template: 'post.html'
+foo:      'bar'
+---
+
+%p liquid: {{self.title}} {{self.data.foo}}
+%p haml: #{self.title} #{self.data.foo}

data/test/fixtures/source/_site/markdown_test.markdown

@@ -1,7 +1,9 @@
 ---
 title:    'markdown test'
 date:     2014-01-23 17:02:00 -6
-template: 'wrapper'
+template: 'wrapper.html'
+foo:      'baz'
+bar:      [1,2]
 ---
 
 # {{self.title}}

data/test/fixtures/source/_site/subdirectory/subfile.html

@@ -1,7 +1,6 @@
 ---
 title:    'subfile'
 date:     2014-01-23 17:02:00 -6
-template: 'simple'
+template: 'simple.html'
 ---
-
 subfile

data/test/fixtures/source/_site/test.html

@@ -1,7 +1,7 @@
 ---
 title:    'test'
 date:     2014-01-23 17:02:00 -6
-template: 'wrapper'
+template: 'wrapper.html'
 tags:     [one, two, three]
 foo:      'bar'
 ---

data/test/fixtures/source/_templates/haml_template.haml

@@ -0,0 +1 @@
+%p #{item.body}

data/test/fixtures/source/_templates/post.html

@@ -0,0 +1 @@
+{{item.body}}

data/test/fixtures/source/_templates/simple.html

@@ -1 +1 @@
-item: {{item.title}}
+item: {{item.body}}

data/test/fixtures/source/_templates/wrapper.html

@@ -1,6 +1,6 @@
 top
 {{item.title}}
 {{item.date}}
-{{item.template_name}}
+{{item.template_path}}
 {{item.body}}
 bottom

data/test/jenner/test_asset.rb

@@ -0,0 +1,50 @@
+require 'helper'
+
+class TestAsset < Test::Unit::TestCase
+  def setup
+    super
+    @asset = Jenner::Asset.new('test.scss', @site)
+  end
+
+  def test_filename
+    assert_equal "test.scss", @asset.filename
+  end
+
+  def test_sass
+    assert @asset.sass?
+  end
+
+  def test_sass_on_an_image
+    @asset = Jenner::Asset.new("subdirectory/test.png", @site)
+    assert !@asset.sass?
+  end
+
+  def test_output_filename
+    assert_equal "test.css", @asset.output_filename
+  end
+
+  def test_url
+    assert_equal "/test.css", @asset.url
+  end
+
+  def test_public_path
+    assert_equal site_file("public/test.css"), @asset.public_path
+  end
+
+  def test_generate
+    FileUtils.mkdir(File.join(@site.root,"public"))
+    @asset.generate!
+    assert File.exists?(File.join(@site.root,"public","test.css"))
+  end
+
+  def test_generate_on_non_sass
+    FileUtils.mkdir(File.join(@site.root,"public"))
+    @asset = Jenner::Asset.new("foo.txt", @site)
+    @asset.generate!
+    assert File.exists?(File.join(@site.root,"public","foo.txt"))
+  end
+
+  def test_to_liquid
+    assert_equal({'url' => @asset.url}, @asset.to_liquid)
+  end
+end

data/test/jenner/test_item.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'helper'
 
 class TestItem < Test::Unit::TestCase
@@ -5,7 +6,7 @@ class TestItem < Test::Unit::TestCase
     item = Jenner::Item.new('test.html',@site)
     assert_equal "test", item.title
     assert_equal Time.new(2014,1,23,17,2,0,"-06:00"), item.date
-    assert_equal "wrapper", item.template_name
+    assert_equal "wrapper.html", item.template_path
     assert_equal({ "foo" => "bar" }, item.data)
   end
 
@@ -16,7 +17,7 @@ class TestItem < Test::Unit::TestCase
 
   def test_render
     item = Jenner::Item.new('test.html',@site)
-    assert_equal "top\ntest\n2014-01-23 17:02:00 -0600\nwrapper\ntest\nbar\nitem content\n\nbottom\n", item.render
+    assert_equal "top\ntest\n2014-01-23 17:02:00 -0600\nwrapper.html\ntest\nbar\nitem content\n\nbottom\n", item.render
   end
 
   def test_public_path
@@ -26,16 +27,19 @@ class TestItem < Test::Unit::TestCase
 
   def test_generate!
     item = Jenner::Item.new('test.html',@site)
-    # make the public dir for the item, since @site normally does it
-    FileUtils.mkdir(File.join(@site.root,'public'))
     item.generate!
     assert File.exists?(File.join(@site.root,'public','test.html'))
-    assert_equal item.render, File.read(File.join(@site.root,'public','test.html'), encoding: "US-ASCII")
+    assert_equal item.render, File.read(File.join(@site.root,'public','test.html'))
   end
 
   def test_markdown_template
     item = Jenner::Item.new('markdown_test.markdown', @site)
-    assert_equal "top\nmarkdown test\n2014-01-23 17:02:00 -0600\nwrapper\n\n<h1 id=\"markdown_test\">markdown test</h1>\n\n<p>item content</p>\n\nbottom\n", item.render
+    assert_equal "top\nmarkdown test\n2014-01-23 17:02:00 -0600\nwrapper.html\n\n<h1 id=\"markdown_test\">markdown test</h1>\n\n<p>item content</p>\n\nbottom\n", item.render
+  end
+
+  def test_markdown_template_public_path
+    item = Jenner::Item.new('markdown_test.markdown', @site)
+    assert_equal site_file('public/markdown_test.html'), item.public_path
   end
 
   def test_public_path_on_subdir_item
@@ -45,10 +49,9 @@ class TestItem < Test::Unit::TestCase
 
   def test_generate_on_subdir_item
     item = Jenner::Item.new("subdirectory/subfile.html",@site)
-    FileUtils.mkdir_p(File.join(@site.root,'public','subdirectory'))
     item.generate!
     assert File.exists?(File.join(@site.root,'public','subdirectory','subfile.html'))
-    assert_equal "item: subfile\n", File.read(File.join(@site.root,'public','subdirectory','subfile.html'))
+    assert_equal "item: subfile\n\n", File.read(File.join(@site.root,'public','subdirectory','subfile.html'))
   end
 
   def test_url
@@ -60,4 +63,56 @@ class TestItem < Test::Unit::TestCase
     item = Jenner::Item.new('subdirectory/subfile.html',@site)
     assert_equal "/subdirectory/subfile.html", item.url
   end
+
+  def test_underscored_title
+    item = Jenner::Item.new('blog/20140128_TEST_post.markdown', @site)
+    assert_equal "test-post", item.underscored_title
+  end
+
+  def test_relative_path
+    item = Jenner::Item.new('blog/20140128_TEST_post.markdown', @site)
+    assert_equal "blog/", item.relative_path
+  end
+
+  def test_output_filename_on_custom_url
+    item = Jenner::Item.new('blog/20140128_TEST_post.markdown', @site)
+    assert_equal "index.html", item.output_filename
+  end
+
+  def test_output_filename_on_regular_markdown_file
+    item = Jenner::Item.new('markdown_test.markdown', @site)
+    assert_equal "markdown_test.html", item.output_filename
+  end
+
+  def test_custom_url
+    item = Jenner::Item.new('blog/20140128_TEST_post.markdown', @site)
+    assert_equal "/blog/2014/01/28/test-post", item.url
+  end
+
+  def test_public_path_on_custom_url
+    item = Jenner::Item.new('blog/20140128_TEST_post.markdown', @site)
+    assert_equal site_file("public/blog/2014/01/28/test-post/index.html"), item.public_path
+  end
+
+  def test_generate_on_custom_url
+    item = Jenner::Item.new('blog/20140128_TEST_post.markdown', @site)
+    item.generate!
+    assert File.exists?(site_file("public/blog/2014/01/28/test-post/index.html"))
+  end
+
+  def test_item_from_path
+    item = Jenner::Item.new('embed_test.html', @site)
+    assert_equal "item: \nsecret: 42\n\n\n", item.render
+  end
+
+  def test_haml_item
+    item = Jenner::Item.new("haml_test.haml", @site)
+    assert_equal "<p>liquid: haml test bar</p>\n<p>haml: haml test bar</p>\n\n", item.render
+  end
+
+  def test_haml_generation
+    item = Jenner::Item.new("haml_test.haml", @site)
+    item.generate!
+    assert File.exists?(site_file("public/haml_test.html"))
+  end
 end

data/test/jenner/test_liquid_filters.rb

@@ -0,0 +1,76 @@
+require 'helper'
+
+class TestLiquidFilters < Test::Unit::TestCase
+  include Liquid
+
+  def setup
+    super
+
+    @context = Liquid::Context.new({},{},site: @site)
+    @context.add_filters(Jenner::LiquidFilters)
+  end
+
+  def test_item_from_path
+    assert Variable.new("'test.html' | item_from_path").render(@context).is_a?(Jenner::Item)
+  end
+
+  def test_items_from_path
+    a = Variable.new("'[^\/]+\.html' | items_from_path").render(@context)
+    assert a.is_a?(Array)
+    assert_equal 3, a.length
+  end
+
+  def test_asset_from_path
+    assert Variable.new("'foo.txt' | asset_from_path").render(@context).is_a?(Jenner::Asset)
+  end
+
+  def test_assign_to(value, name)
+    assert_nil Variable.new("'bar' | assign_to: 'foo'").render(@context)
+    assert_equal "bar", @context['foo']
+  end
+
+  def test_stylesheet_tag
+    assert_equal %(<link href="test.css" media="all" rel="stylesheet" type="text/css" />),
+      Variable.new("'test.css' | stylesheet_tag").render(@context)
+  end
+
+  def test_javascript_tag
+    assert_equal  %(<script type="text/javascript" src="test.js"></script>),
+      Variable.new("'test.js' | javascript_tag").render(@context)
+  end
+
+  def test_link_to
+    assert_equal %(<a href="/test.html">test</a>),
+      Variable.new("'test.html' | item_from_path | link_to").render(@context)
+  end
+
+  def test_tag
+    assert Variable.new("'one' | tag").render(@context).is_a?(Jenner::Tag)
+  end
+
+  def test_items_with_data
+    items = Variable.new("'foo' | items_with_data").render(@context)
+    paths = items.map(&:path)
+    assert paths.include?("test.html")
+    assert paths.include?("_hidden.html")
+    assert paths.include?("markdown_test.markdown")
+    assert !paths.include?("foo.txt")
+  end
+
+  def test_items_with_data_and_value
+    items = Variable.new(%('foo' | items_with_data: "bar")).render(@context)
+    paths = items.map(&:path)
+    assert paths.include?("test.html")
+    assert paths.include?("_hidden.html")
+    assert !paths.include?("markdown_test.markdown")
+  end
+
+  def test_items_with_data_and_value_on_array
+    items = Variable.new(%('bar' | items_with_data: 2)).render(@context)
+    paths = items.map(&:path)
+    assert !paths.include?("test.html")
+    assert paths.include?("_hidden.html")
+    assert paths.include?("markdown_test.markdown")
+  end
+
+end

data/test/jenner/test_site.rb

@@ -36,4 +36,16 @@ class TestSite < Test::Unit::TestCase
     assert File.exists?(site_file("public/test.css"))
     assert_equal "body {\n  background-color: blue; }\n", File.read(site_file("public/test.css"), encoding: "US-ASCII")
   end
+
+  def test_asset_files
+    assert @site.asset_files.include? site_file('_site/test.scss')
+  end
+
+  def test_tag_names
+    assert_equal ['one',"three","two"], @site.tag_names.sort
+  end
+
+  def test_tags
+    assert @site.tags.first.is_a? Jenner::Tag
+  end
 end

data/test/jenner/test_tag.rb

@@ -0,0 +1,22 @@
+require 'helper'
+
+class TestTag < Test::Unit::TestCase
+  def setup
+    super
+
+    @tag = Jenner::Tag.new('one', @site)
+  end
+
+  def test_name
+    assert_equal "one", @tag.name
+  end
+
+  def test_items
+    assert_equal "/test.html", @tag.items.first.url
+  end
+
+  def test_to_liquid
+    assert_equal "one", @tag.to_liquid["name"]
+    assert_equal "/test.html", @tag.to_liquid["items"].first.url
+  end
+end

data/test/jenner/test_template.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'helper'
 
 class TestTemplate < Test::Unit::TestCase
@@ -16,8 +17,44 @@ class TestTemplate < Test::Unit::TestCase
     assert_equal "hi, {{name}}\n", template.body
   end
 
+  def test_has_access_to_site_as_liquid
+    template = Jenner::Template.new("{{site.root}}", @site)
+    assert_equal @site.root, template.render
+  end
+
   def test_include
-    template = Jenner::Template.new("{% include 'test' %}", @site)
+    template = Jenner::Template.new("{% include 'test.html' %}", @site)
     assert_equal "hi, jay\n", template.render('name' => 'jay')
   end
+
+  def test_include_haml
+    template = Jenner::Template.new("{% include 'haml_template.haml' with item %}", @site)
+    assert_equal "<p>foo</p>\n", template.render('item' => {'body' => 'foo'})
+  end
+
+  def test_support_for_haml
+    template = Jenner::Template.from_haml("!!! 5", @site)
+    assert_equal "<!DOCTYPE html>\n", template.render
+  end
+
+  def test_haml_from_file
+    template = Jenner::Template.from_file(template_file('haml_template.haml'), @site)
+    assert_equal "<p>foo</p>\n", template.render('item' => { 'body' => 'foo' })
+  end
+
+  def test_haml_can_use_liquid
+    template = Jenner::Template.new("%p hi, {{name}}", @site, haml: true)
+    assert_equal "<p>hi, jay</p>\n", template.render('name' => 'jay')
+  end
+
+  def test_haml_has_access_to_liquid_context_in_body
+    template = Jenner::Template.new(%(%p hi, \#{name}), @site, haml: true)
+    assert_equal "<p>hi, jay</p>\n", template.body('name' => 'jay')
+  end
+
+  def test_haml_body_gets_passed_through_with_render
+    template = Jenner::Template.new(%(%p hi, \#{name}), @site, haml: true)
+    assert_equal "<p>hi, jay</p>\n", template.render('name' => 'jay')
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenner
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.5
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -107,23 +123,35 @@ files:
 - bin/jenner
 - jenner.gemspec
 - lib/jenner.rb
+- lib/jenner/asset.rb
 - lib/jenner/item.rb
+- lib/jenner/liquid_filters.rb
 - lib/jenner/site.rb
+- lib/jenner/tag.rb
 - lib/jenner/template.rb
 - lib/jenner/template_file_system.rb
 - lib/jenner/version.rb
 - test/fixtures/source/_site/_hidden.html
+- test/fixtures/source/_site/blog/20140128_test_post.markdown
+- test/fixtures/source/_site/embed_test.html
+- test/fixtures/source/_site/foo.txt
+- test/fixtures/source/_site/haml_test.haml
 - test/fixtures/source/_site/markdown_test.markdown
 - test/fixtures/source/_site/subdirectory/subfile.html
 - test/fixtures/source/_site/subdirectory/test.png
 - test/fixtures/source/_site/test.html
 - test/fixtures/source/_site/test.scss
+- test/fixtures/source/_templates/haml_template.haml
+- test/fixtures/source/_templates/post.html
 - test/fixtures/source/_templates/simple.html
 - test/fixtures/source/_templates/test.html
 - test/fixtures/source/_templates/wrapper.html
 - test/helper.rb
+- test/jenner/test_asset.rb
 - test/jenner/test_item.rb
+- test/jenner/test_liquid_filters.rb
 - test/jenner/test_site.rb
+- test/jenner/test_tag.rb
 - test/jenner/test_template.rb
 homepage: http://github.com/unreal/jenner
 licenses: []
@@ -151,16 +179,25 @@ specification_version: 3
 summary: Jenner is an opinionated static site generator
 test_files:
 - test/fixtures/source/_site/_hidden.html
+- test/fixtures/source/_site/blog/20140128_test_post.markdown
+- test/fixtures/source/_site/embed_test.html
+- test/fixtures/source/_site/foo.txt
+- test/fixtures/source/_site/haml_test.haml
 - test/fixtures/source/_site/markdown_test.markdown
 - test/fixtures/source/_site/subdirectory/subfile.html
 - test/fixtures/source/_site/subdirectory/test.png
 - test/fixtures/source/_site/test.html
 - test/fixtures/source/_site/test.scss
+- test/fixtures/source/_templates/haml_template.haml
+- test/fixtures/source/_templates/post.html
 - test/fixtures/source/_templates/simple.html
 - test/fixtures/source/_templates/test.html
 - test/fixtures/source/_templates/wrapper.html
 - test/helper.rb
+- test/jenner/test_asset.rb
 - test/jenner/test_item.rb
+- test/jenner/test_liquid_filters.rb
 - test/jenner/test_site.rb
+- test/jenner/test_tag.rb
 - test/jenner/test_template.rb
 has_rdoc: