darthapo-stratus 0.2 → 0.3

data/Changelog

@@ -1,3 +1,14 @@
+2008-12-18 21:40:18 -0600
+Updated manifest and gemspec
+ 
+2008-12-18 21:39:25 -0600
+Mostly functional now...
+* Added support for new:site
+* Added textile and markdown liquid tags
+
+2008-12-18 05:57:16 -0600
+First pass on builder
+ 
 2008-12-11 18:37:01 -0600
 Initial import of stratus
  

data/Manifest

@@ -3,6 +3,46 @@ Manifest
 Rakefile
 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/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
+examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/index.html
+examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/new_frame.rb
+examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/outlets.rb
+examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/view_for_tag.rb
+examples/dev-blog/content/articles/im-the-title/index.html
+examples/dev-blog/content/articles/liquid-js-a-non-evaling-template-engine-in-javascript/html_test.html
+examples/dev-blog/content/articles/liquid-js-a-non-evaling-template-engine-in-javascript/index.html
+examples/dev-blog/content/articles/liquid-js-a-non-evaling-template-engine-in-javascript/liquid_example.js
+examples/dev-blog/content/pages/about/index.html
+examples/dev-blog/content/pages/home/index.html
+examples/dev-blog/content/pages/projects/index.html
+examples/dev-blog/content/posts/001_new-blog/dom.js
+examples/dev-blog/content/posts/001_new-blog/index.html
+examples/dev-blog/content/posts/001_new-blog/old.html
+examples/dev-blog/content/posts/002_fun-for-the-whole-family/index.html
+examples/dev-blog/content/posts/002_fun-for-the-whole-family/snippet_one.rb
+examples/dev-blog/content/posts/003_life-is-quite-fun-really/index.html
+examples/dev-blog/themes/default/scripts/code_highlighter.js
+examples/dev-blog/themes/default/scripts/code_syntax.js
+examples/dev-blog/themes/default/styles/code_syntax.css
+examples/dev-blog/themes/default/styles/main.css
+examples/dev-blog/themes/default/templates/articles/content.html
+examples/dev-blog/themes/default/templates/articles/feed.xml
+examples/dev-blog/themes/default/templates/articles/list.html
+examples/dev-blog/themes/default/templates/layouts/main.html
+examples/dev-blog/themes/default/templates/pages/content.html
+examples/dev-blog/themes/default/templates/pages/feed.xml
+examples/dev-blog/themes/default/templates/pages/list.html
+examples/dev-blog/themes/default/templates/posts/content.html
+examples/dev-blog/themes/default/templates/posts/feed.xml
+examples/dev-blog/themes/default/templates/posts/list.html
 lib/stratus.rb
 lib/stratus/cli.rb
 lib/stratus/filters.rb
@@ -11,6 +51,7 @@ lib/stratus/generator/builder.rb
 lib/stratus/generator/context.rb
 lib/stratus/generator/renderer.rb
 lib/stratus/generator/scanner.rb
+lib/stratus/logging.rb
 lib/stratus/resources.rb
 lib/stratus/resources/attachment.rb
 lib/stratus/resources/base.rb
@@ -21,6 +62,7 @@ lib/stratus/resources/template.rb
 lib/stratus/settings.rb
 lib/stratus/tags.rb
 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/defaults/page.default.html
@@ -38,6 +80,7 @@ lib/stratus/tasks/shared/system.rake
 lib/stratus/tasks/site/new.rake
 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
@@ -67,21 +110,4 @@ 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/fixtures/site/www/index.html
-test/fixtures/site/www/pages/about/index.html
-test/fixtures/site/www/pages/home/index.html
-test/fixtures/site/www/pages/index.html
-test/fixtures/site/www/pages/projects/index.html
-test/fixtures/site/www/posts/fun-for-the-whole-family/index.html
-test/fixtures/site/www/posts/fun-for-the-whole-family/snippet_one.rb
-test/fixtures/site/www/posts/index.html
-test/fixtures/site/www/posts/life-is-quite-fun-really/index.html
-test/fixtures/site/www/posts/new-blog/dom.js
-test/fixtures/site/www/posts/new-blog/index.html
-test/fixtures/site/www/posts/new-blog/old.html
-test/fixtures/site/www/theme/scripts/code_highlighter.js
-test/fixtures/site/www/theme/scripts/code_syntax.js
-test/fixtures/site/www/theme/styles/code_syntax.css
-test/fixtures/site/www/theme/styles/main.css
-test/fixtures/site/www/themes/default/styles/main.css
 test/test_helper.rb

data/Rakefile

@@ -2,7 +2,7 @@ $: << 'lib'
 require 'rake'
 require 'rake/testtask'
 require 'rake/gempackagetask'
-require 'stratus'
+require 'stratus/version'
 
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
@@ -43,7 +43,7 @@ end
 
 desc 'Clean up'
 task :clean => :clobber_package do
-  %w(diff diff email ri *.gem **/*~).each do |pattern|
+  %w(diff diff email ri *.gem **/*~ .DS_Store).each do |pattern|
     files = Dir[pattern]
     rm_rf files unless files.empty?
   end

data/Readme.markdown

@@ -6,10 +6,9 @@ And yes, I know, I'm on a weird cloud kick.
 
 # Todo
 
-
+* Add setting for including index or date (YYYY-MM-DD) in output slug
 * Read default content templates from config/defaults/
-* RSS/Atom feed generation
 * Incremental rendering
 * Publishing (S/FTP)
 * Tagging support (limited)
-* Category support (limited)
+* Category support (limited)

data/examples/dev-blog/StratusSite

@@ -0,0 +1,26 @@
+# I'm a rake file, so you can put Rake tasks in here, if you like...
+
+
+namespace :new do
+
+  desc "Creates a new page"
+  task :page=>'system:setup' do
+    if Stratus.args.length == 0
+      puts "  You must specify a page title" 
+      exit(1)
+    end
+    Stratus.args = ['page', Stratus.args[0]]
+    Rake::Task['new:content'].execute 
+  end
+
+  desc "Creates a new blog post"
+  task :post=>'system:setup' do
+    if Stratus.args.length == 0
+      puts "  You must specify a post title" 
+      exit(1)
+    end
+    Stratus.args = ['post', Stratus.args[0]]
+    Rake::Task['new:content'].execute 
+  end
+  
+end

data/examples/dev-blog/config/content.yaml

@@ -0,0 +1,23 @@
+default:
+  local_slug: 'index' # index | date | none
+  slug_format: '###'
+  sort: 'index'
+  reverse: false
+  feed: true
+
+# Override per content type
+
+articles:
+  sort: 'title'
+  local_slug: 'none'
+
+pages:
+  sort: 'title'
+  local_slug: 'none'
+
+posts:
+  local_slug: 'index'
+  remote_slug: 'date'
+  slug_format: '%Y-%m-%d'
+  sort: 'publish_date'
+  reverse: true

data/examples/dev-blog/config/defaults/article.html

@@ -0,0 +1,10 @@
+<head>
+  <title>{{ title }}</title>
+  <meta name="publish-date" content="{{ date | date:'%Y-%m-%d %H:%M' }}"/>
+</head>
+<summary>
+  <p>SUMMARY</p>
+</summary>
+<body>
+  <p>BODY</p>
+</body>

data/examples/dev-blog/config/defaults/content.html

@@ -0,0 +1,7 @@
+<head>
+  <title>{{ title }}</title>
+  <meta name="publish-date" content="{{ date | date:'%Y-%m-%d %H:%M' }}"/>
+</head>
+<body>
+  <p>BODY</p>
+</body>

data/examples/dev-blog/config/defaults/page.html

@@ -0,0 +1,10 @@
+<head>
+  <title>{{ title }}</title>
+  <meta name="publish-date" content="{{ date | date:'%Y-%m-%d %H:%M' }}"/>
+</head>
+<summary>
+  <p>SUMMARY</p>
+</summary>
+<body>
+  <p>BODY.</p>
+</body>

data/examples/dev-blog/config/defaults/post.html

@@ -0,0 +1,10 @@
+<head>
+  <title>{{ title }}</title>
+  <meta name="publish-date" content="{{ date | date:'%Y-%m-%d %H:%M' }}"/>
+</head>
+<summary>
+  <p>SUMMARY</p>
+</summary>
+<body>
+  <p>BODY.</p>
+</body>

data/examples/dev-blog/config/site.yaml

@@ -0,0 +1,21 @@
+site:
+  title: "My Site"
+  subtitle: "... is a testacular site. Ew, that doesn't sound right at all."
+  copyright: "© 2008 Me. All rights reserved."
+  homepage: "pages/home"
+  base_url: "http://my.site"
+  theme: "default"
+  author:
+    name: "Me"
+    email: "my@email.com"
+
+generator:
+  output: 'www'
+  relative_links: true
+  cleanup_xhtml: true
+  force_xhtml: false
+  tagging: true
+
+
+stratus: # Don't touch this section!
+  version: 0.3

data/examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/awake_from_nib.rb

@@ -0,0 +1,8 @@
+def awakeFromNib
+  window.setContentSize @generalPrefsView.frame.size 
+  window.contentView.addSubview @generalPrefsView
+  window.title = "General Preferences"
+  @currentViewTag = 0
+  # Will use CoreAnimation for the panel changes:
+  window.contentView.wantsLayer = true
+end

data/examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/ib_action.rb

@@ -0,0 +1,14 @@
+ib_action :selectPrefPanel do |sender|
+  tag =  sender.tag
+  view, title = self.viewForTag(tag)
+  previousView, prevTitle = self.viewForTag(@currentViewTag)
+  @currentViewTag = tag
+  newFrame = self.newFrameForNewContentView(view)
+  window.title = "#{title} Preferences"
+  # Using an animation grouping because we may be changing the duration
+  NSAnimationContext.beginGrouping
+    # Call the animator instead of the view / window directly
+    window.contentView.animator.replaceSubview_with(previousView, view)
+    window.animator.setFrame_display newFrame, true
+  NSAnimationContext.endGrouping
+end

data/examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/index.html

@@ -0,0 +1,58 @@
+<head>
+  <title>Animating NSViews in RubyCocoa</title>
+  <meta name="publish-date" content="2008-12-20 00:34"/>
+</head>
+<summary>
+  <p>Yesterday we talked about how to make nifty <a href="http://mattmccray.com/archive/2008/01/16/Selectable_Toolbar_Icons_in_Ru">selectable toolbars</a> like this:</p>
+
+  <p style="text-align:center;"><img src="http://www.mattmccray.com/images/selectable-toolbar.png" alt="selectable-toolbar.png" border="0" width="366" height="80" /></p>
+
+  <p>Now let's look at the finishing touch for our Preferences window; Animating the panel changes. We'll be flying through this at a pretty good clip, but don't worry. I'll provide the full source for your inspection.</p>
+</summary>
+<body>
+  <p>Yesterday we talked about how to make nifty <a href="http://mattmccray.com/archive/2008/01/16/Selectable_Toolbar_Icons_in_Ru">selectable toolbars</a> like this:</p>
+
+  <p style="text-align:center;"><img src="http://www.mattmccray.com/images/selectable-toolbar.png" alt="selectable-toolbar.png" border="0" width="366" height="80" /></p>
+
+  <p>Now let's look at the finishing touch for our Preferences window; Animating the panel changes. We'll be flying through this at a pretty good clip, but don't worry. I'll provide the full source for your inspection.</p>
+
+  <p>First off, let's add some new outlets to our window controller:</p>
+
+  {{ this.attachment.outlets | sourcecode}}
+
+  <p><img src="http://www.mattmccray.com/images/CustomView.png" alt="CustomView.png" border="0" width="135" height="54" align="right" /> Now in Interface Builder, we'll create the views for each preference pane by dragging Custom Views from the Library onto our Preferences.nib.</p>
+
+  <p><em>Note</em>: Be sure to drop the Custom Views on the main nib window in IB, not on the Preferences <code>NSWindow</code>. Your project (in IB) should look something like this:</p>
+
+  <div style="text-align:center;"><img src="http://www.mattmccray.com/images/Prefs-IB.png" alt="Prefs-IB.png" border="0" width="385" height="337" /></div>
+
+  <p>Hook up the outlets to the new views, and edit your preference panels to your heart's desire. From here, we go back to the code.</p>
+
+  <p><em>Tip</em>: Be sure to set the auto-sizing on your preference panels (the <code>NSView</code>s) so that it matches the <code>NSWindow</code>'s <code>contentView</code>.</p>
+
+  <p style="text-align:center;"><img src="http://www.mattmccray.com/images/Picture 5.png" alt="Picture 5.png" border="0" width="232" height="120"/></p>
+
+  <p>Next up are some helper methods for our window controller. I won't spend too much time explaining these, but they're pretty straight forward.</p>
+
+  {{ this.attachment.view_for_tag | sourcecode }}
+
+  <p><code>#viewForTag</code> actually returns our <code>NSView</code> and a title string.</p>
+
+  {{ this.attachment.new_frame | sourcecode }}
+
+  <p><code>#newFrameForNewContentView</code> calculates the new frame rectangle for the window based on the new view (preference pane).</p>
+
+  <p>Now we're ready to fill out our <code>selectPrefPanel</code> action:</p>
+
+  {{ this.attachment.ib_action | sourcecode }}
+
+
+  <p>Right on! Now we setup the initial pane when the window loads:</p>
+
+  {{ this.attachment.awake_from_nib | sourcecode }}
+
+  <p>That pretty much does it. Now you have a professional looking preferences window. So enough of those dang blasted <code>NSTabView</code>s!</p>
+
+  <p>Here's the completed <a href="http://pastie.textmate.org/140681">PreferencesController.rb</a>. Or, you can download the <a href="http://www.mattmccray.com/downloads/PreferencesExample.zip">full Xcode project</a>. (Requires Leopard, Xcode 3, and Interface Builder 3)</p>
+
+  <p>Happy coding!</p></body>

data/examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/new_frame.rb

@@ -0,0 +1,10 @@
+def newFrameForNewContentView(view)
+  newFrameRect = window.frameRectForContentRect(view.frame)
+  oldFrameRect = window.frame
+  newSize = newFrameRect.size
+  oldSize = oldFrameRect.size
+  frame = window.frame
+  frame.size = newSize
+  frame.origin.y = frame.origin.y - (newSize.height - oldSize.height)
+  frame
+end

data/examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/outlets.rb

@@ -0,0 +1,2 @@
+ib_outlets :generalPrefsView,
+           :advancedPrefsView

data/examples/dev-blog/content/articles/animating-nsviews-in-rubycocoa/view_for_tag.rb

@@ -0,0 +1,6 @@
+def viewForTag(tag)
+  case tag
+    when 0: [@generalPrefsView,  "General"]
+    when 1: [@advancedPrefsView, "Advanced"]
+  end
+end

data/examples/dev-blog/content/articles/im-the-title/index.html

@@ -0,0 +1,10 @@
+<head>
+  <title>I'm the title</title>
+  <meta name="publish-date" content="2008-12-18 19:58"/>
+</head>
+<summary>
+  <p>SUMMARY</p>
+</summary>
+<body>
+  <p>I'm the main body.</p>
+</body>

data/examples/dev-blog/content/articles/liquid-js-a-non-evaling-template-engine-in-javascript/html_test.html

@@ -0,0 +1,5 @@
+<!-- Browsers ignore script blocks with an unrecognized type.  -->
+<!-- Makes for pretty good inline template storage.  -->
+<script type="text/liquid" id="myOtherTemplate">
+  Hello, {{ current_user }}!
+</script>

data/examples/dev-blog/content/articles/liquid-js-a-non-evaling-template-engine-in-javascript/index.html

@@ -0,0 +1,35 @@
+<head>
+  <title>Liquid.js, A Non-Evaling Template Engine in JavaScript</title>
+  <meta name="publish-date" content="2008-12-20 01:11"/>
+</head>
+<summary>
+  <p>SUMMARY</p>
+</summary>
+<body>
+{% markdown %}
+Of late, I’ve needed a robust JavaScript template engine that doesn’t use `eval` (and preferably not `with`). Also, I’ve always liked [Liquid][].
+
+So, two plus two equals... JavaScript! Hah, you thought it was four, didn’t you? Well, that’s what you get for thinking.
+
+Yeah, long story short, I ported Liquid to JavaScript. You can grab it from github (where else?) here: <http://github.com/darthapo/liquid.js>
+
+I’m calling this version 0.1. It’s not battle tested yet, but I know it’ll work using Firefox 3+, Safari 3+, and Adobe Air 1.1.
+
+So what are the differences between running the Ruby version and the JavaScript version? Well, as far as the templates themselves, nothing. It’s a full port, so all of Liquid’s default tags and filters are supported in Liquid.js. I even added a placeholder function that you can implement yourself (based on your own needs) to support the ‘include’ tag.
+
+{{ this.attachment.liquid_example | sourcecode }}
+
+An easy way to include template in a page is to use script elements, like this:
+
+{{ this.attachment.html_test | sourcecode }}
+
+Currently, Liquid.js requires [MooTools][]. Some of the things I’d like to polish up:
+
+* Remove MooTools requirement, run entirely independent of any other js library
+* Add Rhino for console-based testing
+* Test, test, test on Internet <strike>Exploder</strike> Explorer
+
+[Liquid]: http://liquidmarkup.org
+[MooTools]: http://mootools.net/
+{% endmarkdown %}
+</body>

data/examples/dev-blog/content/articles/liquid-js-a-non-evaling-template-engine-in-javascript/liquid_example.js

@@ -0,0 +1,14 @@
+Liquid.readTemplateFile = function(path) {
+  var elem = $(path);
+  if(elem) {
+    return elem.innerHTML;
+  } else {
+    return path +" can't be found."; 
+    // Or throw and error, or whatever you want...
+  }
+}
+var src = "{% include 'myOtherTemplate' with current_user %}";
+
+var tmpl = Liquid.parse( src );
+
+alert( tmpl.render({ current_user:'M@' }));

data/examples/dev-blog/content/pages/about/index.html

@@ -0,0 +1,7 @@
+<head>
+  <title>About</title>
+  <meta name="sort_order" content="10" type="int">
+</head>
+<body>
+  <p>About this site.</p>
+</body>