static 0.0.1 → 0.1.0

data/Manifest.txt

@@ -20,7 +20,8 @@ templates/site.info
 templates/submenu.copy
 templates/disco/attributes
 templates/disco/display
-templates/disco/publish
+templates/disco/paginate
+templates/disco/feed
 templates/disco/link_list
 templates/layouts/default/contents.erbml
 templates/layouts/default/main_navigation.erbml
@@ -29,4 +30,5 @@ templates/layouts/default/submenu.erbml
 templates/layouts/default/structure/default.rbml
 templates/layouts/default/structure/footer.rbml
 templates/layouts/default/stylesheets/default.css
+templates/layouts/default/copy/page.copy
 

data/README.txt

@@ -1,4 +1,4 @@
-static
+=== static
     by evan short
 
 == DESCRIPTION:
@@ -11,6 +11,7 @@ paginated over a page. this allows such features as news, faqs,
 blogs and other galleries.
 
 == FEATURES:
+
 - command line interface
 - multiple site management
 - yaml site map
@@ -28,19 +29,38 @@ blogs and other galleries.
   - prompt context
   - tab completion
   - termios integration (or otherwise implemented command history)
-  - error messaging
+  - better error messaging
 - documentation
   - how layouts work
   - how blueprints work
-- word is out on how well it takes to switching the site map. my
-own guess is not well.
 - there are no specs
 - ready for a re-factor
 
-== SYNOPSIS:
+if i had to guess i would say that this will not work on windows. it
+is organized for a mac, but works fine, im sure, under unix in general
+i don't know that much about cygwin.  i don't anticipate fixing this myself
+(or even look into it) without some incentive. i will happily take patches.
+
+== TODO:
+
+- deal with resources (e.g. images, movies, etc)
+- allow +display+ to take a block describing the layout
+- command to preview in browser 
+- give better program hooks in the static home
+- allow pages to override the default layout
+- allow collections to override the default layout
+- give a method to display the site map
+- rename partials with underscores
+- option to turn links off if current
+- stop css from being overwritten when re-generating the blueprint
+- simple site versioning
+- css versioning
+- page splitting in copy
+
+== USAGE NOTES:
 
 so, first thing's first open up a terminal and run static. the first
-time it is run a folder called +static+ will be created in your ~/.
+time it is run a folder called +static+ will be created in your <tt>~/</tt>.
 in this folder your layouts and projects will be kept, along with a
 few template files in <tt>.templates</tt> that will be used when
 creating a site.
@@ -80,7 +100,19 @@ page in your site map. you may then run
 to edit the contents of those pages. more desireably, perhaps, you may
 zip this folder up and send it off to someone more suited to edit copy.
 
-next you must choose a layout. 
+some things to note when editing copy:
+
+- this must be a properly formatted yaml file
+  - use <tt>: |</tt> followed by an indented block of text to use multiline text in yaml
+  - use *s instead of -s to indicate list elements underneath <tt>: |</tt>s
+
+if it is not a properly formatted yaml file, generate will simply fail. you will hardly
+be given an error message, and certainly nothing helpful. it is for this reason i 
+suggest you check your contents files twice before sending them through the grinder.
+definitely some robustness or something needed here.
+given no me you will simp
+
+anyway, next you must choose a layout. 
 
   -> layout
 
@@ -112,11 +144,18 @@ once the layout is satisfactory, running
 
 will put the blueprint folder in place.
 
-  -> edit blueprints
+  -> edit blueprint
 
 will take you there to edit. 
 
-at this point you may generate your site by running
+to build the copy, choose a layout, and build the blueprint in one go:
+
+  -> build all
+
+it is worth noting that the edit commands may be used at any time, not only 
+directly after building that particular section.
+
+either way you get here, at this point you may generate your site by running
 
   -> generate
 
@@ -215,18 +254,32 @@ as a lower-case symbol) as such:
 
   get :page_name, :collection_name => :links
 
-there is much more to say, but a lot of it can be gleaned by looking at the
-stuff that is generated by default. any questions may be directed to
+== A Note from the Author
+
+there is much more to say, and there is no doubt that this is a first release,
+but a lot of what is going on can be gleaned by looking at the stuff that is
+generated by default. any questions may be directed to
 
   evan.short @ pleasedontspam. gmail.please
 
+suggestions and criticisms are welcome. i am aware that when things go sour
+there is often no word as to what actually went wrong. you can tell me 
+about them if you feel so inclined, but i am of the opinion that some more
+reasonable error messaging needs to happen in rbml rather than too much 
+more effort going into my dilligence at writing horribly nested if statements
+in the cli script.
+
 == REQUIREMENTS:
 
 rbml v. 0.0.5.9.4.1
 
 == INSTALL:
 
-sudo gem install static
+i looked into it briefly but found nothing about actually making a dependency
+in a gem. if anyone knows how to do this, please let me know. 
+
+  sudo gem install rbml
+  sudo gem install static
 
 == LICENSE:
 

data/bin/cli.rbml

@@ -7,6 +7,24 @@ cli :name=>"static", :prompt=>"-> " do
     puts "command not found: #{method} \nwith args: #{args.join(' ')}"
   end
   
+  set :feed do |args|
+    flag(:new => 'n'){@new = true}
+    process(args)
+    feeds = []
+    name = (remaining_argument == '' ? '.' : remaining_argument)
+    feeds << unless @new
+      name = choice('please choose a collection:', items_under($active_site.home+'collections')[:folders], name) 
+      name
+    else
+      name
+    end
+    $active_site.info['feeds'] ||= []
+    $active_site.info['feeds'] << feeds
+    $active_site.info['feeds'].flatten!.uniq!
+    $active_site.save_info 'site.info'
+    puts "add this to base/default.rbml to host:\n\t`feed :#{name}`"
+  end
+
   set :start do |args|
     key(:site){ @active = :site }
     key(:collection){ @active = :collection }
@@ -14,7 +32,7 @@ cli :name=>"static", :prompt=>"-> " do
     flag(:help => 'h'){ puts "helpdocs for 'start' go here" }
 
     process(args)
-    name = (remaining_argument == '' ? '.' : remaining_argument)
+    name = (remaining_argument == '' ? request_value('please enter a name: ') : remaining_argument)
     @active = ($active_site ? :collection : :site) unless @active
 
     case @active
@@ -75,7 +93,11 @@ cli :name=>"static", :prompt=>"-> " do
       if @page
         paginate @page 
       else
-        $active_site.info['paginate'].each { |page, collection| paginate page }
+        if $active_site.info['paginate']
+          $active_site.info['paginate'].each { |page, collection| paginate page } 
+        else
+          puts 'please use `assign` to assign a collection to a page before paginating'
+        end
       end
     else
       puts 'please generate your blueprint before paginating'
@@ -115,8 +137,12 @@ cli :name=>"static", :prompt=>"-> " do
       @collection = $active_collection.name unless @collection
       @edit = [:attributes, :display]
     }
+    flag(:entry){
+      @edit = :entry
+    }
     flag(:collection => 'c'){ |name| @collection = name }
     
+    
     @edit = []
     process args
     file = remaining_argument
@@ -124,6 +150,10 @@ cli :name=>"static", :prompt=>"-> " do
 
     if $active_site
       case
+      when @edit == :entry
+        @collection ||= $active_collection
+        file ||= :last
+        puts 'getting ready to edit an entry'
       when @collection
         @edit.each { |item|
           puts "opening #{@collection}'s attributes"
@@ -219,19 +249,19 @@ cli :name=>"static", :prompt=>"-> " do
     flag(:force => 'f'){ @force = true }
     process args
     @active = :contents unless @active
+    set_layout(choice('please choose a layout:', items_under($ENV['LAYOUT_HOME'])[:folders]), false) unless $active_site.info['layout'] 
     case @active
     when :contents then
       destroy $active_site.home+'contents' if @force
-      $active_site.build(:contents)
+      $active_site.build(:contents) 
     when :blueprint then
       destroy $active_site.home+'blueprint' if @force
-      $active_site.info['layout'] ? $active_site.build(:blueprint) : puts('need to choosee a layout')
+      $active_site.build(:blueprint) 
     when :all then
-      destroy $active_site.home+'blueprint' if @force
+      destroy $active_site.home+'blueprint' if @force and not make_sure('do you want to destroy the blueprints?', 'N', 'y')
       destroy $active_site.home+'contents' if @force and not make_sure('do you want to destroy the contents?', 'N', 'y')
       $active_site.build(:contents)
-      $active_site.info['layout'] ? $active_site.build(:blueprint) : set_layout(choice('please choose a layout:', items_under($ENV['LAYOUT_HOME'])[:folders]), false)
-      $active_site.build(:blueprint) unless exists? :folder, $active_site.home+'blueprint'
+      $active_site.build(:blueprint) 
     end
   end
   
@@ -239,7 +269,39 @@ cli :name=>"static", :prompt=>"-> " do
     system 'clear'
   end
 
+  set :publish do |args|
+    flag(:user => 'u'){ |value|
+      $active_site.info['user_name'] = value || request_value( 'username: ' )
+    }
+    flag(:address => 'a'){ |value|
+      $active_site.info['server'] ||=  {}
+      $active_site.info['server']['address']  =  value || request_value('server address: ' )
+    }
+    flag(:dir => 'd'){ |value|
+      $active_site.info['server'] ||=  {}
+      $active_site.info['server']['location'] =  value || request_value( 'site location on server: ' )
+    }
+    flag(:link => 'l'){ |value|
+      $active_site.info['server'] ||=  {}
+      $active_site.info['server']['link'] =  value || request_value( 'web address of site home: ' )
+    }
+    flag(:blank => 'b'){ @blank =  true }
+    process args
+    $active_site.info['user_name']           ||=  request_value 'username: ' 
+    $active_site.info['server']              ||=  {}
+    $active_site.info['server']['address']   ||=  request_value 'server address: ' 
+    $active_site.info['server']['directory'] ||=  request_value 'directory on server: ' 
+    $active_site.info['server']['link']      ||=  request_value('web address of site home: ' ).as_http
+    $active_site.info['server']['link'] = $active_site.info['server']['link'].as_http
+
+    $active_site.save_info 'site.info'
+    publish_feeds @blank
+   end
+
   set :quit do
     exit
   end
+  set :exit do
+    exit
+  end
 end

data/bin/static

@@ -49,10 +49,33 @@ include Static
 ::Rbml::Processor.run(File.dirname(__FILE__)+'/cli.rbml')
 
 __END__
-$active_site = load_site('please')
-paginate :static
+$active_site = load_site('static')
+destroy $active_site.site_loc
+$active_site.generate
+set_layout($active_site.info['layout'], false)
+$active_site.build :contents
+$active_site.build :blueprint
+$active_site.info['layout']='default'
+$active_site.info['username'] = 'e'
+$active_site.info['server'] = {}
+$active_site.info['server']['link'] = 'http://newqdev.com'
+$active_site.info['server']['address'] = 'newqdev.com'
+$active_site.info['server']['directory'] = '~/newqdev.com'
+$active_collection = $active_site.start_collection 'news', ['date', 'headline', 'entry']
+$active_site.generate
+destroy $active_site.site_loc
+$active_site.generate
+#system "vi #{$active_collection.home}attributes"
+5.times do
+  puts $active_collection.add_entry
+  $active_collection.save_listing
+  gets
+end
+$active_site.info['feeds'] = ['news']
+$active_site.save_info 'site.info'
+publish_feeds true
 
-$active_site.build :all
+__END__
 #system "#{$ENV['EDITOR']} #{$active_site.home}"
 paginate :the_copy
 destroy $active_site.site_loc
@@ -61,7 +84,6 @@ $active_site.generate
 $active_site = start_site('static')
 $active_site.load_info
 $active_site.load_pages
-$active_site.start_collection 'news', ['date', 'headline', 'entry']
 $active_site.start_collection 'blog', ['date', 'title', 'entry']
 
 $active_site.build(:contents)

data/lib/collection.rb

@@ -21,16 +21,20 @@ class Collection
     c = self.new base, where, name
     c.attrs << attrs
     c.attrs.flatten!
-    c.write_attribute_file
+    c.write_attribute_file 
     c.load_attributes
-    c.write_display_file
+    c.write_display_file rescue puts $!
+    c.write_feed_file
     copy base+'.templates/disco/link_list', c.home
-    c.write_publish_file
+    c.write_paginate_file
     c.write '', c.home+'listing'
     c.mkdir c.home+'entries'
     c
   end
 
+  def display_file
+    home+'display'
+  end
   def self.collection_exists?(base, where, name)
     exists?(:folder, base) && exists?(:folder, where+'collections/'+name) && exists?(:file, where+"collections/#{name}/attributes")
   end
@@ -45,7 +49,8 @@ class Collection
   end
 
   def save_listing
-   File.open(home+'listing',  'w') { |yf| YAML.dump(@listing,  yf) }
+    File.open(home+'listing',  'w') { |yf| YAML.dump(@listing,  yf) }
+    @listing
   end
 
   def sanitize_listing
@@ -53,34 +58,32 @@ class Collection
     @listing.each { |item|
       entry = load_entry(item)
       add = false
+      attrs = File.open( home+'attributes' ) { |yf| @attrs = YAML::load( yf )[name] }
       entry.each { |key, value|
-        add = true if value and key != 'date' and key != :id
+        if attrs.include? key
+          add = true if value and not attrs[key]
+        end
       }
       tmp << item if add
     }
     @listing = tmp
+    save_listing
   end
 
   def write_attribute_file
-    write_template base+'.templates/disco/attributes', attributes
+    write_template base+'.templates/disco/attributes', home+'attributes'
   end
   def write_display_file
-    write_template base+'.templates/disco/display', blueprint
-  end
-  def write_publish_file
-    write_template base+'.templates/disco/publish', publish
+    write_template base+'.templates/disco/display', home+'display'
   end
-  def write_link_list_file
-    write_template base+'.templates/disco/link_list', publish
-  end
-  def publish
-    home+'publish'
+  def write_feed_file
+    write_template base+'.templates/disco/feed', home+'feed'
   end
-  def blueprint
-    home+'display'
+  def write_paginate_file
+    write_template base+'.templates/disco/paginate', home+'paginate'
   end
-  def attributes
-    home+'attributes'
+  def write_link_list_file
+    write_template base+'.templates/disco/link_list', home+'link_list'
   end
   def load_attributes
     File.open( home+'attributes' ) { |yf| @attrs = YAML::load( yf )[name] }
@@ -88,7 +91,7 @@ class Collection
   def load_listing
     File.open( home+'listing' ) { |yf| @listing = YAML::load( yf ) }
     @listing ||= []
-    @listing = @listing.sort.reverse
+    @listing = @listing.sort{|x, y| x[:id] <=> y[:id]}.reverse
   end
   def load_entries
     listing.each {|entry| entries <<  load_entry(entry) }
@@ -96,17 +99,28 @@ class Collection
   end
   def load_entry(file)
     tmp = nil
-    File.open( home+'entries/'+file ) {|yf| tmp = YAML::load( yf )[name].merge({:id => file})}
+    File.open( home+'entries/'+file[:id].to_s ) {|yf| tmp = YAML::load( yf )[name].merge(file)} rescue puts "loading entry -- #{$!}"
     tmp
   end
   def add_entry title=nil
     timestamp = Time.now.to_i.to_s 
     title ||=  timestamp
     load_listing
-    listing.unshift timestamp
+    listing.unshift({:id => timestamp, :publish => true})
     write_template home+'attributes', home+'entries/'+timestamp
     return home+'entries/'+timestamp
   end
+  def publish
+    tmp = {}
+    listing.each {|e|
+      if e[:publish] and not e[:publish].kind_of? String
+        e[:publish] = Time.now.to_s
+      end
+    }
+    save_listing
+  end
+
+  
 end
 
 

data/lib/extentions/string.rb

@@ -6,5 +6,6 @@ class String
   def as_ext; self[0,0]='.' unless self[0,1]=='.'|| self==''; self end
   def as_file_title; self.as_file.gsub /_/, ' ' end
   def filename_as_symbol; self.as_file.to_sym end
+  def as_http; self =~ /^http\:\/\// ? "http://#{self.gsub(/^http\:\/\//, '').as_folder}" : "http://#{self.as_folder}" end
 end
 

data/lib/page.rb

@@ -18,6 +18,12 @@
       pages << self
     end
 
+    def included_in? page_name, all_levels=false
+      ans = (file_name == page_name.to_s or Page.find(page_name).subs.include? name)
+      subs.each { |sub| ans = Page.find(sub.as_file).included_in?(page_name, all_levels) } if all_levels and !ans
+      ans
+    end
+
     def file_name
       name.as_file
     end
@@ -40,16 +46,16 @@
       if collection
         Generator.class_eval { cattr_accessor :include_text } 
         Generator.include_text = File.read home+"blueprint/#{page_location}_#{collection_name}_for_#{file_name}/#{collection.first}"
-        write ::Rbml::Processor.new.instance_eval(File.read(home+'layout/structure/default.rbml')), in_site_location+'index.html'
+        write ::Rbml::Processor.new.instance_eval(File.read(home+'base/default.rbml')), in_site_location+'index.html' 
   puts 'writing the index'
         collection.each { |col|
         Generator.include_text = File.read home+"blueprint/#{page_location}_#{collection_name}_for_#{file_name}/#{col}"
-        write ::Rbml::Processor.new.instance_eval(File.read(home+'layout/structure/default.rbml')), in_site_location+col+'.html'
+        write ::Rbml::Processor.new.instance_eval(File.read(home+'base/default.rbml')), in_site_location+col+'.html'
   puts "writing the entry for #{col}"
         } 
         Generator.class_eval { @include_text = nil } 
       else
-        write ::Rbml::Processor.new.instance_eval(File.read(home+'layout/structure/default.rbml')), in_site_location+'index.html'
+        write ::Rbml::Processor.new.instance_eval(File.read(home+'base/default.rbml')), in_site_location+'index.html'
       end
       puts "writing #{in_site_location}index.html"
     end
@@ -81,7 +87,7 @@
     end
     
     def load_contents
-      File.open(home+ 'contents/'+page_location+name.as_file+'.copy') { |yf| @contents  = YAML::load( yf ) }
+      File.open(home+ 'contents/'+page_location+name.as_file+'.copy') { |yf| @contents  = YAML::load( yf ) } rescue puts $!
     end
 
     def extentions
@@ -96,14 +102,16 @@
       page_path =  home+type.to_s+'/'+page_location
       mkdir page_path unless exists? :folder, page_path
       template_file = case type
-      when :contents : {:main => home+'.templates/page.copy', :sub => home+'.templates/submenu.copy'}
+      when :contents : {:main => home+'layout/copy/page.copy', :sub => home+'layout/copy/submenu.copy'}
       when :blueprint : {:main => home+'layout/contents.erbml', :sub => home+'layout/submenu.erbml'}
       end
 
       if subs && subs.kind_of?(Array) 
         unless exists?(:file, page_path+'submenu'+extentions[type])
-          write_template template_file[:sub], page_path+'submenu'+extentions[type] 
-          puts "writing #{page_path}submenu#{extentions[type]}"
+          unless type == :contents
+            write_template template_file[:sub], page_path+'_submenu'+extentions[type] 
+            puts "writing #{page_path}submenu#{extentions[type]}"
+          end
         else
           puts "#{page_path}submenu#{extentions[type]} already exists"
         end

data/lib/site.rb

@@ -30,9 +30,6 @@ class Site
     site.setup_location 'project_info'
     site.write_template templates+'site.map', site.path+'site.map'
     site.write_template templates+'site.info', site.path+'site.info'
-    site.setup_location '.templates'
-    site.copy templates+'page.copy', site.path+'page.copy'
-    site.copy templates+'submenu.copy', site.path+'submenu.copy'
     site.load_info
     site
   end
@@ -114,15 +111,23 @@ class Site
   end
 
   def build_header
-puts info.inspect
-    write_template home+"layout/page_head.erbml", home+'layout/structure/page_head.rbml'
-    write_template home+"layout/main_navigation.erbml", home+'layout/structure/main_navigation.rbml'
+    write_template home+"layout/page_head.erbml", home+'base/page_head.rbml'
+    write_template home+"layout/main_navigation.erbml", home+'base/main_navigation.rbml'
   end
 
   def build(type)
     setup_location(type.to_s)
     if type == :blueprint
       @main_links = []
+      copy home+'layout/structure', home+'base'
+      begin
+        copy home+'layout/stylesheets', home+'base/stylesheets'
+        puts 'copied stylesheets'
+      rescue
+        puts "There are no stylesheets associated with this layout"
+      end
+      copy home+'layout/resources', home+'base/resources' rescue puts "There are no resources associated with this layout"
+      copy home+'layout/scripts', home+'base/scripts' rescue puts "There are no scripts associated with this layout"
       load_main_links 
       build_header 
     end
@@ -131,13 +136,16 @@ puts info.inspect
 
   def generate
     mkdir site_loc unless exists? :folder, site_loc
-    copy home+'layout/stylesheets', site_loc rescue puts $!
+    copy home+'base/stylesheets', site_loc rescue puts $!
+    copy home+'base/resources', site_loc rescue puts $!
+    copy home+'base/scripts', site_loc rescue puts $!
     pages.each do |page|
       page.stylesheets = []
       Generator.load(page)
       page.load_contents
-      page.stylesheets << info['stylesheets'] 
-      page.generate info['paginate'] ? info['paginate'][page.file_name] : nil
+      page.stylesheets << info['stylesheets'] if info['stylesheets']
+      page.generate info['paginate'] ? info['paginate'][page.file_name] : nil rescue puts "site generator -- #{$!}"
+      Generator.unload
     end
   end
 end

data/lib/static.rb

@@ -27,7 +27,7 @@ $ENV = {}
 $ENV['EDITOR'] = 'vi'
 
 module Static
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
   include FileBase
 
   def start_site name
@@ -62,6 +62,7 @@ module Static
   end
 
   def paginate page, publishing_to=nil
+    return nil unless page
     @page = Page.find(page)
     Generator.load(load_collection($active_site.info['paginate'][@page.file_name]))
     Generator.class_eval {
@@ -73,24 +74,60 @@ module Static
         @tmp_entries ||= self.act_on.entries.dup
         @tmp_entries
       end
+      def self.entry_bank= what
+        @tmp_entries = what
+      end
     }
     publishing_to ||= "#{@page.home}blueprint/#{@page.page_location}_#{Generator.act_on.name}_for_#{@page.file_name}/"
     mkdir publishing_to, :force 
     @page_list = []
-    while(Generator.entry_bank and Generator.entry_bank)
+    Generator.act_on.instance_eval { def level; @level end; def level=(what); @level=what end }
+    Generator.entry_bank 
+    while(Generator.entry_bank)
       rbml = ::Rbml::Processor.new
       #Generator.contents = {:id => entry_bank.first[:id]}
-      publish_file = File.read(Generator.act_on.home+'publish')
+      publish_file = File.read(Generator.act_on.home+'paginate')
       id = Generator.entry_bank.first[:id]
       puts "writing partial for #{id}"
-      write rbml.render('xhtml', rbml.load_language('xhtml'), :partial => true) { eval(publish_file) }, publishing_to+id
+      hold = Generator.entry_bank.dup
+      begin
+        write rbml.render('xhtml', rbml.load_language('xhtml'), :partial => true) { eval(publish_file) }, publishing_to+id
+      rescue
+        Generator.entry_bank = hold
+        write rbml.render('xhtml', rbml.load_language('xhtml'), :format => false, :partial => true) { eval(publish_file) }, publishing_to+id rescue puts $!
+      end
       @page_list << id
+      File.open(publishing_to+'page.list',  'w') { |yf|  YAML.dump(@page_list,  yf) }
+      write_template Generator.act_on.home+'link_list', "#{@page.home}blueprint/#{@page.page_location}/_#{@page.file_name}_#{Generator.act_on.name}_links.rbml" rescue puts "writing template -- #{$!}"
+      puts "writing link list _#{@page.file_name}_#{Generator.act_on.name}_links"
     end
-    File.open(publishing_to+'page.list',  'w') { |yf|  YAML.dump(@page_list,  yf) }
-    write_template Generator.act_on.home+'link_list', "#{@page.home}blueprint/#{@page.page_location}/#{@page.file_name}_#{Generator.act_on.name}_links.rbml"
-puts "writing link list #{@page.file_name}_#{Generator.act_on.name}_links"
     @page_list = nil
+    Generator.act_on.instance_eval { @level = nil; undef :level; undef :level=}
     Generator.unload
   end
+  
+  def publish_feeds blank = nil
+    $active_site.info['feeds'].each do |name|
+      col = load_collection(name) #Generator.load(name).inspect
+      col.publish
+      Generator.load col
+      Generator.act_on.instance_eval {
+        def level; @level end; def level=(what); @level=what end
+        def last_built
+          date = ''
+          listing.each {|item| date = item[:publish] if item[:publish] and not date}
+          date
+        end
+      }
+      write ::Rbml::Processor.run(col.home+'feed'), $active_site.site_loc.as_folder+name+'.rss'  rescue puts $!
+      puts $active_site.site_loc.as_folder+name+'.rss' 
+      Generator.act_on.instance_eval { @level = nil; undef :level; undef :level=}
+      Generator.unload
+    end if $active_site.info['feeds']
+    unless blank
+      puts "rsync -avz #{$active_site.site_loc}/* #{$active_site.info['user_name']}@#{$active_site.info['server']['address']}:#{$active_site.info['server']['directory']}"
+      system "rsync -avz #{$active_site.site_loc}/* #{$active_site.info['user_name']}@#{$active_site.info['server']['address']}:#{$active_site.info['server']['directory']}"
+    end
+  end
 end
 

data/lib/xhtml.rb

@@ -10,10 +10,13 @@ module Inclusion
     end
     tmp+'.rbml'
   end
+  def partial from, what
+    get from, "_#{what}"
+  end
   def get from, what
     case from
     when :base
-      run_file  Generator.act_on.home+"layout/structure/#{what}.rbml"
+      run_file  Generator.act_on.home+"base/#{what}.rbml"
     when :page
       run_file Generator.act_on.home+"blueprint/#{Generator.page_location}#{find_file_name(Generator.act_on, what)}"
     else
@@ -21,21 +24,67 @@ module Inclusion
     end
   end
 
-  def display how_many, collection, entry_bank=nil
+  def display how_many, collection, entry_bank=nil, &blk
     col = load_collection(collection.to_s)
+    level = Generator.level
     how_many = col.entries.size if how_many == :all
     entry_bank ||= col.entries.dup
     Generator.load col
+    Generator.act_on.instance_eval { def level; @level end; def level=(what); @level=what end }
+    Generator.act_on.level = level
     how_many.times { 
       break if entry_bank.empty?
-      Generator.contents = entry_bank.shift
-      run_file Generator.act_on.blueprint
+      Generator.act_on.contents = entry_bank.shift
+      block_given? ? run_block(&blk) : run_file(Generator.act_on.display_file) rescue puts $!
     }
+    Generator.act_on.instance_eval { @level = nil; undef :level; undef :level=}
     Generator.unload
   end
 
   def include_partial
     i Generator.include_text 
+    Generator.include_text 
+  end
+end
+
+module Rbml
+  module Language
+    module Doc
+      module Rss
+        def address_for what, options={}
+          where = options[:page] ? options[:page]+'.html' : ''
+          say = $active_site.info['server']['link']
+          $active_site.pages.each { |page|
+            if page.name.as_file == what.to_s 
+              text ||= page.name
+              say += "#{page.in_site_link}#{where}"
+            end
+          }
+          say
+        end
+
+        def process_cdata what
+          what = what.to_s
+          exp = /\<\[.+?\]\>/
+          while(what =~ exp) do
+            what.sub!(exp) { |match|
+               eval(match.sub(/^\<\[/,'').sub(/\]\>$/, ''))
+            }
+          end
+          "<![CDATA[#{what}]]>"
+        end
+        def link_to where, text='', options={}
+          say=''
+          $active_site.pages.each { |page|
+            if page.name.as_file == where.to_s 
+              text ||= page.name
+              say = "\"#{text}\":#{$active_site.info['server']['link']}#{page.in_site_link}"
+            end
+          }
+          say
+        end
+      end
+    end
   end
 end
 
@@ -46,20 +95,43 @@ module Rbml
         def put_title
           title(Generator.contents['title'])
         end
+        def use_stylesheets *sheets
+          tmp = []
+          sheets.each { |s| tmp << s.to_s }
+          stylesheets Generator.level+'stylesheets/', tmp
+        end
+        alias :use_stylesheet :use_stylesheets
+
+        def image which, alt=nil
+          i "< image src='#{place}/#{which.to_s}' alt='#{alt||which.to_s}' />"
+          "<image src='#{Generator.level}resources/#{which.to_s}' alt='#{alt||which.to_s}' />"
+        end
+        def resource_address which
+          i "#{Generator.level}resources/#{which.to_s}"
+          "#{Generator.level}resources/#{which.to_s}"
+        end
+        def script_address which
+          i "#{Generator.level}scripts/#{which.to_s}"
+          "#{Generator.level}scripts/#{which.to_s}"
+        end
+
         def put_stylesheets
           styles = []
-          Generator.stylesheets.each{|style| styles << style}
-          stylesheets Generator.level+'stylesheets/', styles
+          Generator.stylesheets.each{|style| styles << style if style}
+         styles.empty? ? '' : stylesheets(Generator.level+'stylesheets/', styles)
         end
-        def breadcrumbs
+        def breadcrumbs(join_by=nil)
+          join_by ||= " >> "
           links = []
           Generator.breadcrumbs.each {|b| links << (Generator.act_on.name.as_file==b.to_s ? Generator.act_on.name : link_to(b)) }
-          i links.join(" >> ")
-          links.join(" >> ")
+          links.join(join_by)
         end
         def main_link_for what
           link_to what
         end
+        def feed name, title=nil
+          "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"#{title||name.to_s}\" href=\"#{Generator.act_on.level}#{name.to_s}.rss\" />"
+        end
         def link_to what, text=nil, options={}
           where = options[:page] ? options[:page]+'.html' : ''
           say=''
@@ -69,16 +141,22 @@ module Rbml
               say << "<a href='#{Generator.level}#{page.in_site_link}#{where}'>#{text}</a>"
             end
           }
-          i say
           say
         end
-        def put what
-          stuff = Generator.contents[what.to_s] || ''
-          t parse_context(stuff)
+        def put what, options={}
+          t find_contents(what, options)
+        end
+        def plain_put what, options={}
+           find_contents(what, options)
         end
-        def plain_put what
-          stuff = Generator.contents[what.to_s] || ''
-          i parse_context(stuff)
+        def truncate what, how_many, options={}
+          options[:trail] ||= '...'
+          contents = find_contents(what)
+          contents = contents.size > how_many ? contents[0, how_many] + options[:trail] : contents
+          options[:textile] ? t(contents) : i(contents)
+        end
+        def find_contents what, options={}
+           parse_context(Generator.contents[what.to_s] || '')
         end
 
         def parse_context(what)
@@ -89,6 +167,12 @@ module Rbml
                eval(match.sub(/^\<\[/,'').sub(/\]\>$/, ''))
             }
           end
+          exp = /\<!\[.+?\]\>/
+          while(what =~ exp) do
+            what.sub!(exp) { |match|
+               match.sub!(/^\<!\[/,'<[')
+            }
+          end
           what
         end
 

data/templates/disco/display

@@ -1,4 +1,6 @@
+# describe the base display for <%=name%> here.
 div(:class => '<%=name%>'){
-<% attrs.each do |a, v| %>  put :<%= a %>
+<% if attrs %>
+<% attrs.each { |a, v| %>  put :<%= a %> <% } %>
 <%end%>
 }

data/templates/disco/feed

@@ -0,0 +1,21 @@
+rss{
+  title <%=name.inspect%>
+  link $active_site.info['server']['link']
+# description ''                                                                                             
+  language 'en-us'
+  pubDate Time.now.to_s
+  lastBuildDate Generator.last_built
+  docs 'http://blogs.law.harvard.edu/tech/rss'
+  generator 'static+rbml'
+#  managingEditor ''
+#  webMaster ''
+  display(5, :<%=name.as_file%>){
+    item {
+      title Generator.contents['title']
+      link Generator.contents['link'] if Generator.contents['link']
+      description { process_cdata(Generator.contents['entry']) }
+      pubDate Generator.contents[:publish]
+      guid { address_for(:<%=name.as_file%>, :page => Generator.contents[:id]) }
+    }
+  }
+}

data/templates/disco/link_list

@@ -1,5 +1,5 @@
 ul{
-<% @page_list.each { |entry| %>
+<% Generator.listing.each { |entry| %>
   <% contents = Generator.load_entry entry %>
   li { link_to :<%=@page.file_name%>, <%= contents['title'].inspect || entry.inspect %>, :page => <%= entry.inspect %> }
 <% } %>

data/templates/layouts/default/contents.erbml

@@ -1,8 +1,8 @@
 
+ h3{plain_put :content_head}
 
-h3 'Main Content for <%= name %>'
-<%= 'breadcrumbs' if breadcrumbs.size > 1 %>
 <% if has_subs? %>
-div(:id => 'submenu'){ get :<%=menu_title.as_file%>, :submenu }
+div(:id => 'submenu'){ partial :<%=menu_title.as_file%>, :submenu }
 <% end %>
+<%= 'breadcrumbs' if breadcrumbs.size > 1 %>
 put :contents

data/templates/layouts/default/copy/page.copy

@@ -0,0 +1,4 @@
+title: <%=name%>
+content_head: <%=name%>
+contents: |
+  here are some *contents* for the time being!  <[link_to :<%=name.as_file%>]>

data/templates/layouts/default/structure/default.rbml

@@ -1,6 +1,7 @@
 xhtml :doctype => {:type=>:xhtml, :version=>"1.0", :strict=>false} do
 	head do
     put_title
+    use_stylesheet :default
 	  put_stylesheets
 	  charset 'utf-8'
 	end

data/templates/layouts/default/stylesheets/default.css

@@ -1,18 +1,23 @@
-body {
-background-color: #000;
+body{
+	font-size: 62.5%;
+	font-family:"Lucida Grande", Arial, Verdana, sans-serif;
+	margin:0;
+	background:#f0ecd7 url(../resources/bg.jpg) top center repeat-y;
 }
 
 #container {
-width: 800px;
-margin-bottom: 10px;
-margin-left: auto;
-margin-right: auto;
-background-color: #fff;
+	font-size:1.1em;
+	width: 800px;
+	margin-bottom: 10px;
+	margin: auto;
+	background: #fff;
 }
 
 #header {
-  background-color:#333;
+	height:75px;
+  background:#456;
   color: #eee;
+border-bottom:1px solid #ccc;
 }
 #header h1 {
   font: 38px 'verdana', sans-serif;
@@ -20,57 +25,117 @@ background-color: #fff;
   margin-left:20px;
   padding:0px;
   padding-top:10px;
+
 }
 
-#header ul {
+#news_header {
+  font-size: 1.6em;
+  padding-right: 10px;
+	font-family:"Lucida Grande", Arial, Verdana, sans-serif;
+  text-align: right;
+  color: #eee;
+  background:#456;
+ }
+.news {
+  float: left;
+  padding-right: 10px;
+  padding-left: 10px;
+  width:350px;
+  border:1px solid #666;
+  margin-top:0px;
+}
+
+.clear { clear:both; }
+.right { float:right; }
+.left { float:left; }
+.install { 
+  width:80%;
   margin:auto;
-  margin:0px;
-  padding:0px;
+  background:#eee;
+  border-bottom:1px solid #333;
+  margin-bottom:10px;
+}
+.install p {
+  margin-left: 20px;
+  padding-right:20px;
+}
+.install pre {
+  margin-left: 20px;
+}
+.install h4 {
+	font-family:"Lucida Grande", Arial, Verdana, sans-serif;
+  margin-top: 5px;
+  padding-right: 20px;
+  background:#456;
+  color:#eee;
   text-align:right;
-  margin-right:20px;
 }
 
-#header ul li {
-  margin-top:35px;
-  margin-right:20px;
+.news .title {
+  font-size: 1.5em;
+	font-family:"Lucida Grande", Arial, Verdana, sans-serif;
+  border-bottom:1px solid #333;
+  margin-top:5px;
+  background-color: #eee;
+}
+
+.news .date {
+  font-size: .6em;
+	font-family:"Lucida Grande", Arial, Verdana, sans-serif;
+  margin-top: 0px;
+  text-align: right;
+}
+
+dt {
+  font-family: monospace;
 }
 
+dl {
+  margin-left: 50px;
+}
+dd {
+  margin-bottom: 10px;
+}
+
+
+#main_navigation{float:right; margin:1px 0px 0px 0px;}
+
 #main_navigation li{
-  display:inline;
+	float:left;
 }
 
 a {
-  color:#e60066;
+  color:#456;
 }
 
 a:hover {
-  background-color:#333;
-  color:#fff;
+  color:#686;
 }
 .main_link a {
-  color:#333;
-  background-color:#fff;
-  padding:5px;
-  margin-bottom:5px;
+  	color:#333;
+  	background:#fff;
+  	padding:5px;
+  	border: solid 1px #ccc;
+	border-bottom:none;
+	text-decoration:none;
 }
 
 .main_link a:hover {
-  color:#e60066;
-  background-color:#333;
-  border: solid 1px #fff;
+	padding:7px 7px 5px 7px;
+	font-size:1.15em;
 }
 
 #content {
 padding:10px;
-border-top: solid 3px #000;
-border-bottom: solid 3px #000;
-background-color: #ffffff;}
+font-family:Baskerville, Times, Times New Roman, serif ;
+	font-size:1.5em;
+background: #fff;}
 
 #content h3 {
 font: 22px 'verdana', sans-serif;
 margin: 0px;
 padding: 0px;
-border-bottom: solid 1px #333;
+border-bottom: solid 2px #456;
 width:570px;
 }
 
@@ -79,28 +144,37 @@ text-align:justify;
 }
 
 #submenu {
-float: right;
-width: 200px;
-margin: 0px;
-padding: 0px;
-border: solid 1px #333;
-margin-left:10px;
+	float: right;
+	width: 200px;
+	margin: -3px 0px 0px 10px;
+	padding: 0;
+	border: solid 2px #456;
+	font-family:"Lucida Grande", Arial, Verdana, sans-serif; 
 }
 
-li {
- list-style:none
+#submenu a{
+  margin-left: 20px;
 }
+#submenu ul{
+margin-left: 10px;
+padding:0px 7px 0px 7px;}
 
-#footer ul{
-  text-align:center;
+ul li {
+ list-style:none;
 }
 
+
 #footer {
 margin:auto;
-color:#fff;
+color:#000;
+background-color:#999;
 font: 10px 'verdana', sans-serif;
 padding-bottom:5px;
-background-color: #333;
 margin-top:0px;
+border-top:1px solid #666;
+border-bottom:1px solid #333;
 padding-top:5px;
 }
+
+#footer .copyright{
+text-align:center;}

data/templates/site.info

@@ -1,5 +1,3 @@
 started_on: <%= Date.today %>
 title: "<%=name%> - [[current_page]]"
 working_name: "<%=name%>"
-stylesheets:
-  - default

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: static
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-06-15 00:00:00 -04:00
+  version: 0.1.0
+date: 2007-07-20 00:00:00 -04:00
 summary: The author was too lazy to write a summary
 require_paths: 
 - lib
@@ -50,7 +50,8 @@ files:
 - templates/submenu.copy
 - templates/disco/attributes
 - templates/disco/display
-- templates/disco/publish
+- templates/disco/paginate
+- templates/disco/feed
 - templates/disco/link_list
 - templates/layouts/default/contents.erbml
 - templates/layouts/default/main_navigation.erbml
@@ -59,6 +60,7 @@ files:
 - templates/layouts/default/structure/default.rbml
 - templates/layouts/default/structure/footer.rbml
 - templates/layouts/default/stylesheets/default.css
+- templates/layouts/default/copy/page.copy
 test_files: []
 
 rdoc_options: