darthapo-stratus 0.3 → 0.3.1

data/Changelog

@@ -1,3 +1,44 @@
+2008-12-23 15:43:50 -0600
+Added 'site:tree' task to print entire collection tree to console.
+ 
+2008-12-22 02:05:38 -0600
+Updated boilerplate site, updated number_of_words filter
+ 
+2008-12-21 02:30:26 -0600
+Udpated example dev-blog and added support Growl, if you have ruby-growl installed.
+ 
+2008-12-20 18:38:48 -0600
+Updated boilerplate, next/prev now honors your sorting settings, memoized LiquidContext's site_data.
+ 
+2008-12-20 16:29:37 -0600
+New: ignoring post dated content, validation failure messsages. Bugfixes: copy_file exceptions.
+* Copying a file that doesn't exist will no longer throw an exception.
+* Added support for validation failure messages
+* Added validation for Content resources to be skipped if they are post dated
+
+2008-12-20 05:31:31 -0600
+Nearing core feature completion...
+* All collection types are rendered now, not just pages and posts
+* Feed are generated for collection types
+* Moved content configuration into config/content.yaml
+* Added simple logging
+* Added configuration options for creating relative links, forcing XHTML support and more
+* Added sourcecode Liquid filter and tag.
+  - Tag: It will take all the contents within the tag and create pre/code wrapper around it.
+  - Filter: If an attachment is passed, it will load it and insert it's contents within a pre/code wrapper.
+
+2008-12-19 03:33:02 -0600
+Returned markdown support to Maruku
+ 
+2008-12-19 03:31:29 -0600
+Performance updates
+* All paths are absolute uris (no more path_to_root during Liquid rendering)
+* Relative paths are generated after the page generation using Hpricot
+* Memoized liquid hash generation
+
+2008-12-18 21:41:51 -0600
+Updated changelog
+ 
 2008-12-18 21:40:18 -0600
 Updated manifest and gemspec
  

data/Manifest

@@ -5,10 +5,9 @@ Readme.markdown
 bin/stratus
 examples/dev-blog/StratusSite
 examples/dev-blog/config/content.yaml
-examples/dev-blog/config/defaults/article.html
-examples/dev-blog/config/defaults/content.html
-examples/dev-blog/config/defaults/page.html
-examples/dev-blog/config/defaults/post.html
+examples/dev-blog/config/defaults/article.default.html
+examples/dev-blog/config/defaults/page.default.html
+examples/dev-blog/config/defaults/post.default.html
 examples/dev-blog/config/site.yaml
 examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/awake_from_nib.rb
 examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/ib_action.rb
@@ -65,16 +64,24 @@ lib/stratus/tags/markdown.rb
 lib/stratus/tags/sourcecode.rb
 lib/stratus/tags/textile.rb
 lib/stratus/tasks/app/boilerplate/StratusSite
+lib/stratus/tasks/app/boilerplate/config/content.yaml
 lib/stratus/tasks/app/boilerplate/config/defaults/page.default.html
 lib/stratus/tasks/app/boilerplate/config/defaults/post.default.html
 lib/stratus/tasks/app/boilerplate/config/site.yaml
 lib/stratus/tasks/app/boilerplate/content/pages/home/index.html
+lib/stratus/tasks/app/boilerplate/content/posts/001_welcome/index.html
+lib/stratus/tasks/app/boilerplate/content/posts/002_getting-started/index.html
+lib/stratus/tasks/app/boilerplate/themes/default/images/footer-bg.png
+lib/stratus/tasks/app/boilerplate/themes/default/images/page-bg.png
+lib/stratus/tasks/app/boilerplate/themes/default/scripts/site.js
 lib/stratus/tasks/app/boilerplate/themes/default/styles/main.css
 lib/stratus/tasks/app/boilerplate/themes/default/templates/layouts/main.html
-lib/stratus/tasks/app/boilerplate/themes/default/templates/objects/page.html
-lib/stratus/tasks/app/boilerplate/themes/default/templates/objects/page.index.html
-lib/stratus/tasks/app/boilerplate/themes/default/templates/objects/post.html
-lib/stratus/tasks/app/boilerplate/themes/default/templates/objects/post.index.html
+lib/stratus/tasks/app/boilerplate/themes/default/templates/pages/content.html
+lib/stratus/tasks/app/boilerplate/themes/default/templates/pages/feed.xml
+lib/stratus/tasks/app/boilerplate/themes/default/templates/pages/list.html
+lib/stratus/tasks/app/boilerplate/themes/default/templates/posts/content.html
+lib/stratus/tasks/app/boilerplate/themes/default/templates/posts/feed.xml
+lib/stratus/tasks/app/boilerplate/themes/default/templates/posts/list.html
 lib/stratus/tasks/app/site.rake
 lib/stratus/tasks/shared/system.rake
 lib/stratus/tasks/site/new.rake
@@ -82,32 +89,4 @@ lib/stratus/tasks/site/site.rake
 lib/stratus/tasks/site/theme.rake
 lib/stratus/version.rb
 stratus.gemspec
-test/fixtures/site/StratusSite
-test/fixtures/site/config/defaults/article.default.html
-test/fixtures/site/config/defaults/content.default.html
-test/fixtures/site/config/defaults/page.default.html
-test/fixtures/site/config/defaults/post.default.html
-test/fixtures/site/config/site.yaml
-test/fixtures/site/content/articles/001_im-the-title/index.html
-test/fixtures/site/content/pages/about/index.html
-test/fixtures/site/content/pages/home/index.html
-test/fixtures/site/content/pages/projects/index.html
-test/fixtures/site/content/posts/001_new-blog/dom.js
-test/fixtures/site/content/posts/001_new-blog/index.html
-test/fixtures/site/content/posts/001_new-blog/old.html
-test/fixtures/site/content/posts/002_fun-for-the-whole-family/index.html
-test/fixtures/site/content/posts/002_fun-for-the-whole-family/snippet_one.rb
-test/fixtures/site/content/posts/003_life-is-quite-fun-really/index.html
-test/fixtures/site/themes/default/scripts/code_highlighter.js
-test/fixtures/site/themes/default/scripts/code_syntax.js
-test/fixtures/site/themes/default/styles/code_syntax.css
-test/fixtures/site/themes/default/styles/main.css
-test/fixtures/site/themes/default/templates/layouts/main.html
-test/fixtures/site/themes/default/templates/objects/article.html
-test/fixtures/site/themes/default/templates/objects/article.index.html
-test/fixtures/site/themes/default/templates/objects/feed.xml
-test/fixtures/site/themes/default/templates/objects/page.html
-test/fixtures/site/themes/default/templates/objects/page.index.html
-test/fixtures/site/themes/default/templates/objects/post.html
-test/fixtures/site/themes/default/templates/objects/post.index.html
 test/test_helper.rb

data/Readme.markdown

@@ -12,3 +12,7 @@ And yes, I know, I'm on a weird cloud kick.
 * Publishing (S/FTP)
 * Tagging support (limited)
 * Category support (limited)
+
+# Ideas
+
+* `vimeo` tag that embeds a thumbnail image with a link to the vimeo page (metadata: http://vimeo.com/api/clip/963462.xml)

data/examples/dev-blog/themes/default/styles/main.css

@@ -4,7 +4,7 @@
 }
 
 BODY {
-  font-family: "tahoma";
+  font-family: "lucida grande", "tahoma", sans-serif;
   background: #555;
 }
 

data/examples/dev-blog/themes/default/templates/posts/content.html

@@ -8,12 +8,11 @@
     Published on {{ this.publish_date | short_date }}. {{ this.body | number_of_words }} words.
   </p>
   <p class="pager">
-{% if this.prev %}
-      <a href="{{ this.prev | uri_rel }}">&laquo; {{ this.prev.title }}</a>
-{% endif %}
-      <a href="{{ page.home | uri_rel }}">Home</a>
 {% if this.next %}
-      <a href="{{ this.next | uri_rel }}">{{ this.next.title }} &raquo;</a>
+      <a class="older" href="{{ this.next | uri_rel }}">&laquo; {{ this.next.title }}</a>
+{% endif %}
+{% if this.prev %}
+      <a class="newer" href="{{ this.prev | uri_rel }}">{{ this.prev.title }} &raquo;</a>
 {% endif %}
   </p>
 </div>

data/lib/stratus.rb

@@ -42,6 +42,7 @@ require 'maruku'
 #require 'cgi' # for HTML Escaping...
 #require 'bluecloth' rescue LoadError
 
+require 'stratus/version'
 require 'stratus/logging'
 require 'stratus/generator'
 require 'stratus/resources'

data/lib/stratus/filters.rb

@@ -19,9 +19,43 @@ module Stratus
     end
     
     def number_of_words(input)
-      input.split.length
+      s = strip_html(CGI::unescapeHTML(input))
+      s.gsub!(/[\w|\']+/, 'X')
+      s.gsub!(/\W+/, '')
+      s.length
     end
     
+    # Moved to base resource...
+    # def last(content)
+    #   return nil unless content.is_a? Hash and content.has_key?('collection_type')
+    #   collection = Stratus::Generator::LiquidContext.site_data[content['collection_type']]
+    #   collection.last
+    # end
+    # 
+    # def prev(content)
+    #   return nil unless content.is_a? Hash and content.has_key?('collection_type')
+    #   collection = Stratus::Generator::LiquidContext.site_data[content['collection_type']]
+    #   collection.each_with_index do |c,i|
+    #       return collection[(i - 1)] if c.slug == content['slug']
+    #   end
+    #   nil
+    # end
+    # 
+    # def next(content)
+    #   return nil unless content.is_a? Hash and content.has_key?('collection_type')
+    #   collection = Stratus::Generator::LiquidContext.site_data[content['collection_type']]
+    #   collection.each_with_index do |c,i|
+    #       return collection[(i + 1)] if c.slug == content['slug']
+    #   end
+    #   nil
+    # end
+    # 
+    # def first(content)
+    #   return nil unless content.is_a? Hash and content.has_key?('collection_type')
+    #   collection = Stratus::Generator::LiquidContext.site_data[content['collection_type']]
+    #   collection.first
+    # end
+    
     EXTS = {
       '.rb'   => 'ruby',
       '.css'  => 'css',

data/lib/stratus/generator/builder.rb

@@ -9,10 +9,21 @@ class Builder
   end
   
   def execute
+    sweep_content
+    render_content
+    copy_theme_files
+    
+    info "Done.", "\n"
+    growl "Build complete."
+  end
+
+  def sweep_content
     info "Scanning source structure..."
     scanner = Stratus::Generator::Scanner.new(@root_path)
     scanner.sweep
-    
+  end
+  
+  def render_content
     info "Rendering output..."
     make_dir Stratus.output_dir
     Stratus::Resources.collection_types.each do |col_type|
@@ -42,10 +53,6 @@ class Builder
     else
       error "NO HOME PAGE DEFINED! UPDATE YOUR CONFIG FILE!!!"
     end
-    
-    copy_theme_files
-    
-    info "Done.", "\n"
   end
 
   def copy_theme_files
@@ -80,12 +87,17 @@ protected
   end
   
   def copy_file(path, to)
-    make_dir( File.dirname( to ) )
-    FileUtils.cp_r path, to
-    info(" - #{ to }", '.')
+    unless File.exists?(path)
+      info(" ? #{ to }", '.')
+    else
+      make_dir( File.dirname( to ) )
+      FileUtils.cp_r path, to
+      info(" - #{ to }", '.')
+    end
   end
   
   def delete_file(path, force=false)
+    return unless File.exists?(path)
     if force
       FileUtils.rm_rf( path )
     else
@@ -102,6 +114,18 @@ class << self
     Builder.new(root_path).execute
   end
   
+  def page_tree(root_path)
+    builder = Builder.new(root_path)
+    builder.sweep_content
+    
+    Stratus::Resources.collection_types.sort.each do |col_type|
+      puts "#{ col_type }/"
+      Stratus::Resources.content(:collection_type=>col_type, :sort_by=>:slug).each do |r|
+        puts "   #{ r.slug }"
+      end
+    end
+  end
+  
 end
 
 end

data/lib/stratus/generator/context.rb

@@ -7,39 +7,42 @@ class LiquidContext < Hash
   
   def initialize
     super
-    site_data = {
-      'site'  => Stratus.settings['site'],
-      'vars'  => Stratus.settings.fetch('vars', {})
-    }
-    Stratus::Resources.collection_types.each do |col_type|
-      sort_col = Stratus.content_setting(col_type, 'sort', 'index').to_sym
-      reversed = Stratus.content_setting(col_type, 'reverse', false)
-      collection_data = Stratus::Resources.content(:collection_type=>col_type, :sort_by=>sort_col, :reverse=>reversed)
-#      puts "#{col_type}: #{collection_data.length} items... (sorted by #{sort_col}#{reversed ? ', reversed': ''})"
-      site_data[col_type] = collection_data
-      site_data[col_type.singularize] = hashify(collection_data)
-    end
-    self.merge!(site_data)
+    self.merge!(self.class.site_data)
     self
   end
   
-  def self.path_to_root
-    @@path_to_root ||= ''
-  end
-  def self.path_to_root=(path)
-    @@path_to_root = path
-  end
+  class << self
+    def path_to_root
+      @path_to_root ||= ''
+    end
+    def path_to_root=(path)
+      @path_to_root = path
+    end
+    
+    def site_data
+      @site_data ||= returning({}) do |data|
+        data['site'] = Stratus.settings['site']
+        data['vars'] =Stratus.settings.fetch('vars', {})
+        Stratus::Resources.collection_types.each do |col_type|
+          sort_col = Stratus.content_setting(col_type, 'sort', 'index').to_sym
+          reversed = Stratus.content_setting(col_type, 'reverse', false)
+          collection_data = Stratus::Resources.content(:collection_type=>col_type, :sort_by=>sort_col, :reverse=>reversed)
+          data[col_type] = collection_data
+          data[col_type.singularize] = hashify(collection_data)
+        end
+      end
+    end
   
-protected
+  protected
   
-  def hashify(list)
-    returning({}) do |h|
-      list.each do |item|
-        h[item.slug] = item
+    def hashify(list)
+      returning({}) do |h|
+        list.each do |item|
+          h[item.slug] = item
+        end
       end
     end
   end
-  
 end
 
 end

data/lib/stratus/generator/renderer.rb

@@ -54,9 +54,12 @@ protected
   
   # Allows all context changes to be scoped
   def in_context(&block)
-    old_context = @context.clone
+    #old_context = @context.clone
     results = yield
-    @context = old_context
+    # Make sure stuff doesn't bleed over...
+    @context['this'] = nil
+    @context['content'] = nil
+    #@context = old_context
     results
   end
   

data/lib/stratus/logging.rb

@@ -12,14 +12,40 @@ module Logging
     end
   end
   
-  def error
+  def error(msg)
+    puts msg
+  end
+
+  def notify(type='', title='', msg='')
     puts msg
   end
   
-  def fatal
+  def fatal(msg)
     puts msg
   end
   
+  def growl(message, title="Stratus Notification", type="stratus-notify")
+    growler.notify type, title, message
+    #notify(notify_type, title, message, priority = 0, sticky = false)
+  end
+  
+  def growler
+    @growler ||= begin
+      if defined?(Growl)
+        Growl.new( "localhost", "stratus", ["stratus-notify"])
+      else
+        self
+      end
+    end
+  end
+  
 end
 
+end
+
+
+begin
+  require 'ruby-growl'
+rescue LoadError
+  # If you had ruby-growl, stratus would use it.
 end

data/lib/stratus/resources.rb

@@ -8,11 +8,13 @@ module Stratus::Resources
     
     def register_content(content)
       content.fixup_meta
-      if content.validate! # Should allow returning false to exclude from DB
+      validates, msg = content.validate!
+      if validates
         collection_types << content.collection_type unless collection_types.include?( content.collection_type ) or content.content_type != :content
         all << content
       else
-        puts " - Skipping '#{content.content_path}': failed validation"
+        msg ||= "Failed validation..."
+        puts " * Skipping '#{content.content_path}': #{msg}"
       end
     end
     

data/lib/stratus/resources/base.rb

@@ -107,12 +107,18 @@ class Base
     Stratus.setting('homepage') == content_path
   end
   
-  def next_content
-    Stratus::Resources.content(:first, :collection_type=>@collection_type, :index=>(@index + 1)) unless index.nil?
-  end
-
   def prev_content
-    Stratus::Resources.content(:first, :collection_type=>@collection_type, :index=>(@index - 1)) unless index.nil?
+    collection = Stratus::Generator::LiquidContext.site_data[ collection_type ]
+    idx = collection.index(self)
+    return false if idx.nil? or idx <= 0
+    collection[(idx - 1)]
+  end
+  
+  def next_content
+    collection = Stratus::Generator::LiquidContext.site_data[ collection_type ]
+    idx = collection.index(self)
+    return false if idx.nil? or idx >= (collection.length - 1)
+    collection[(idx + 1)]
   end
   
   def to_liquid
@@ -190,6 +196,10 @@ protected
       # Coerce the meta data value if it's defined...
       content = if meta_tag[:type]
         case meta_tag[:type].downcase.to_sym
+        when :bool
+          (meta_tag[:content] == 'true')
+        when :boolean
+          (meta_tag[:content] == 'true')
         when :int
           meta_tag[:content].to_i
         when :integer