broadway 0.0.3.5 → 0.1.0

data/lib/broadway/sinatra/helpers/collection_helper.rb

@@ -1,5 +1,5 @@
 module Broadway
-  module Helpers
+  module Sinatra
     module CollectionHelper
       
       # comment from http://openmonkey.com/articles/2009/02/a-cycle-helper-for-sinatra
@@ -68,6 +68,7 @@ module Broadway
             elsif i == array.length - 1 and options.has_key?(:last)
               attributes[:class] << " #{options[:last]}"
             end
+            attributes.delete(:class) if attributes[:class].blank?
             haml_tag :li, attributes do
               if block_given?
                 yield node

data/lib/broadway/sinatra/helpers/partial_helper.rb

@@ -1,5 +1,5 @@
 module Broadway
-  module Helpers
+  module Sinatra
     module PartialHelper
       
       def partial(template, options = {})
@@ -8,8 +8,8 @@ module Broadway
         options.merge!(:layout => false)
         template_array = template.to_s.split('/')
         template = "_#{template_array[-1]}"
-        local_template = File.join(request.env["PATH_INFO"][1..-1], template)
-        template = local_template if File.exists?(File.join("public", local_template) + ".haml")
+        local_template = ::File.join(request.env["PATH_INFO"][1..-1], template)
+        template = local_template if ::File.exists?(::File.join("public", local_template) + ".haml")
         template = template_array[0..-2].join('/') + "/#{template}"
         if collection = options.delete(:collection) then
           collection.inject([]) do |buffer, member|
@@ -22,14 +22,14 @@ module Broadway
       end
       
       def theme_partial(template, options = {})
-        theme = File.join(c(:theme_path), c(:theme))
+        theme = ::File.join(c(:theme_path), c(:theme))
         version = nil
         if options.has_key?(:locals) and options[:locals].has_key?(:theme_version)
           version = options[:locals][:theme_version]
         else
           version = "main"
         end
-        partial(File.join(theme, version, template.to_s), options)
+        partial(::File.join(theme, version, template.to_s), options)
       end
       
     end

data/lib/broadway/sinatra/helpers/text_helper.rb

@@ -1,12 +1,10 @@
 module Broadway
-  module Helpers
+  module Sinatra
     module TextHelper
       
       # config helper method
       def c(path)
-        result = site.config
-        path.to_s.split(".").each { |node| result = result[node.to_sym] if result }
-        result.nil? ? [] : result
+        site.configuration.get(path)
       end
       
       # read the post and parse it with Liquid
@@ -14,15 +12,11 @@ module Broadway
         post.read(attribute)
       end
       
-      def read_excerpt(post, max_length = nil)
-        result = read(post, "excerpt")
-        result = read(post) if result.nil? || result.empty?
-        max_length ||= result.length
-        result[0..max_length] + "..."
-        result
+      def read_excerpt(post, max_length = nil, format = nil, strip = true)
+        post.read_excerpt(max_length, format, strip)
       end
       
-      def code(code, options={})
+      def code(code, options = {})
         options[:lang] = extension_to_lang(options[:extension]) if options.has_key?(:extension)
         puts options.inspect
         options[:lang] ||= "plain_text" unless Uv.syntaxes.include?(options[:lang])

data/lib/broadway/sinatra/processor.rb

@@ -0,0 +1,84 @@
+require 'fileutils'
+require 'net/http'
+
+module Broadway
+  module Sinatra
+    class Processor
+      attr_accessor :site, :url, :paths
+    
+      def initialize(site, url = nil)
+        self.site = site
+        self.url  = URI.parse(url || site.url)
+      end
+      
+      def setting(name)
+        Sinatra::Application.send(name).to_s
+      end
+      
+      def error?(response, path, whiny = true)
+        if !response.is_a?(Net::HTTPSuccess)
+          raise message if whiny
+          puts "Error at '#{path}': #{response.to_s}"
+          return true
+        end
+        false
+      end
+      
+      def path(path)
+        self.paths << path
+      end
+      
+      def run(&block)
+        self.paths = [] if block_given?
+        self.instance_eval(&block)
+        self.paths.reverse!
+        requests
+      end
+      
+      def requests
+        begin
+          request
+        rescue Exception => e
+          requests # in case connection breaks
+          #raise "Make sure you've started the server, run: 'ruby app.rb'"
+        end
+      end
+      
+      def request
+        Net::HTTP.start(url.host, url.port) do |http|
+          trap("SIGINT") { http.finish; return }
+          while path = self.paths.pop
+            process(path, http.get(path))
+          end
+        end
+      end
+      
+      def process(path, response)
+        root = ::File.expand_path(Broadway.index)
+        date = "2010-01-01"
+        if path == "/"
+          write_to = ::File.expand_path(root).squeeze("/")
+        else
+          write_to = ::File.expand_path(::File.join(site.setting(:destination), path).squeeze("/"))
+        end
+        # if the file doesn't exist or is not rendered correctly
+        return if error?(response, path, false)
+        #return if sitemap?(response.body, post)
+        body = response.body
+        content = ""
+        if path == "/"
+          name = "index.html"
+        else
+          FileUtils.mkdir_p(write_to)
+          name = ::File.join(write_to, "#{date}-index.html")
+          content << "---\n"
+          content << "categories: [#{path.split("/").delete_if {|node| node.blank?}.join(", ")}]\n"
+          content << "---\n"
+        end
+        content << body
+        puts "done... #{path}"
+        ::File.open(name, "w") { |f| f.write(content) }
+      end
+    end
+  end
+end

data/lib/broadway/tasks.rb

@@ -0,0 +1 @@
+Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].each { |ext| load ext }

data/lib/broadway/tasks/default.rake

@@ -0,0 +1,85 @@
+namespace :broadway do
+  desc "Create a new Post"
+  task :post do
+    title = ENV["title"]
+    to    = ENV["to"]
+    
+    raise "What's the title?" if title.blank?
+    raise "Where should the post go? (`rake post to='./here'`)" if to.blank?
+    
+    slug = title.downcase.gsub(/[\s_-]+/, "-").gsub(/[^a-z0-9-]/, "")
+    date = Time.now.strftime("%Y-%m-%d")
+    full_date = Time.now.strftime("%Y-%m-%d @ %I:%M%p").downcase
+    name = "#{date}-#{slug}.markdown"
+    path = File.join(to, name)
+    
+    raise "#{name} already exists!" if File.exists?(path)
+    
+    content = ""
+    content << "---\n"
+    content << "title: #{title}\n"
+    content << "date: #{full_date}\n"
+    content << "---\n\n"
+    File.open(path, "w+") { |f| f.puts content } 
+    
+    puts "Created Post '#{title}' at #{path}"
+  end
+  
+  desc "Generate static files"
+  task :generate do
+    Broadway.generate
+  end
+  
+  desc "Run Broadway build"
+  task :build do
+    site = Broadway.build
+    if ENV['inspect']
+      site.pages.each do |page|
+        puts page.inspect
+      end
+      site.posts.each do |post|
+        puts post.inspect
+      end
+    end
+  end
+=begin  
+  desc "download large arrays of files"
+  task :theme do
+    downloads = {}
+    downloads[:domain] = "domain.com"
+    downloads[:urls]   = %w()
+    downloads[:folder] = "themes/my-theme"
+    Net::HTTP.start(downloads[:domain]) do |http|
+      puts downloads.inspect
+      downloads[:urls].each do |url|
+        puts url
+        url.gsub!("http://#{downloads[:domain]}", "") # get rid of base
+        response = http.get(url)
+        dir = File.join(downloads[:folder], File.dirname(url))
+        name = File.join(dir, File.basename(url)).split(/\&\?/).first
+        FileUtils.mkdir_p(dir) unless File.exists?(dir)
+        puts name
+        begin
+          open(name, "wb") do |file|
+            file.write(response.body)
+          end
+        rescue Exception => e
+          puts e.inspect
+        end
+
+      end
+    end
+  end
+  desc "Remove static file history from the tree because we don't need it and it takes up space"
+  task :remove_history do
+    # remove all paths passed as arguments from the history of the repo
+    files = "_posts/*"
+    `git filter-branch --index-filter "git rm -rf --cached --ignore-unmatch #{files}" HEAD`
+
+    # remove the temporary history git-filter-branch otherwise leaves behind for a long time
+    `rm -rf .git/refs/original/ && git reflog expire --all && git gc --aggressive --prune`
+    # don't know how to prevent it from removing everything except the current commit yet
+    FileUtils.mkdir_p("_posts")
+  end
+=end  
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: broadway
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  - 5
-  version: 0.0.3.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 20:12:47 -07:00
+date: 2010-08-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,52 +48,58 @@ dependencies:
         version: 2.3.5
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  type: :runtime
-  version_requirements: *id003
-description: "Broadway: Static and Dynamic Site Generator"
+description: "Broadway: Pluggable, portable, framework-friendly static site generator. Setting the Stage for the Ruby CMS."
 email: lancejpollard@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
+- README.markdown
 files: 
-- README.textile
-- Rakefile
-- lib/broadway/api.rb
-- lib/broadway/asset.rb
-- lib/broadway/base.rb
-- lib/broadway/convertible.rb
-- lib/broadway/core_ext.rb
-- lib/broadway/page.rb
-- lib/broadway/post.rb
-- lib/broadway/rails.rb
-- lib/broadway/resource.rb
-- lib/broadway/runner.rb
-- lib/broadway/sinatra/base.rb
+- lib/broadway/ext.rb
+- lib/broadway/filters/erb.rb
+- lib/broadway/filters/haml.rb
+- lib/broadway/filters/liquid.rb
+- lib/broadway/filters/markdown.rb
+- lib/broadway/filters/textile.rb
+- lib/broadway/migrators/blogger.rb
+- lib/broadway/migrators/wordpress.rb
+- lib/broadway/mixins/assetable.rb
+- lib/broadway/mixins/configurable.rb
+- lib/broadway/mixins/convertible.rb
+- lib/broadway/mixins/hierarchical.rb
+- lib/broadway/mixins/layoutable.rb
+- lib/broadway/mixins/pageable.rb
+- lib/broadway/mixins/processable.rb
+- lib/broadway/mixins/publishable.rb
+- lib/broadway/mixins/readable.rb
+- lib/broadway/mixins/resourceful.rb
+- lib/broadway/mixins/sluggable.rb
+- lib/broadway/mixins/sortable.rb
+- lib/broadway/mixins/taggable.rb
+- lib/broadway/mixins/themeable.rb
+- lib/broadway/processors/link.rb
+- lib/broadway/processors/post.rb
+- lib/broadway/processors/site.rb
+- lib/broadway/processors/tree.rb
+- lib/broadway/resources/asset.rb
+- lib/broadway/resources/configuration.rb
+- lib/broadway/resources/file.rb
+- lib/broadway/resources/layout.rb
+- lib/broadway/resources/link.rb
+- lib/broadway/resources/post.rb
+- lib/broadway/resources/site.rb
+- lib/broadway/resources/slug.rb
+- lib/broadway/sinatra/app.rb
 - lib/broadway/sinatra/helpers/collection_helper.rb
 - lib/broadway/sinatra/helpers/partial_helper.rb
 - lib/broadway/sinatra/helpers/text_helper.rb
-- lib/broadway/sinatra/helpers.rb
-- lib/broadway/sinatra.rb
-- lib/broadway/site.rb
-- lib/broadway/static_file.rb
+- lib/broadway/sinatra/processor.rb
+- lib/broadway/tasks/default.rake
+- lib/broadway/tasks.rb
 - lib/broadway.rb
+- README.markdown
 has_rdoc: true
 homepage: http://github.com/viatropos/broadway
 licenses: []
@@ -128,6 +133,6 @@ rubyforge_project: broadway
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Write Posts in Textile and Markdown, built it into a Rails or Sinatra Blog
+summary: Pluggable, portable, framework-friendly Ruby Static Site Generator. Setting the Stage for the Ruby CMS.
 test_files: []
 

data/README.textile

@@ -1,306 +0,0 @@
-h1. Broadway
-
-TODO: Tests.  I've just extracted this out of a project and now I'll write tests.
-
-"html2haml":http://html2haml.heroku.com/
-
-"JAVASCRIPT <script src=":http://github.com/HenrikJoreteg/jquery-magic-labels/raw/master/jquery.magiclabels.min.js
-
-This is the source for my blog.  I develop the themes in Sinatra, and convert them into Jekyll for posts.  I'm only doing this until _someone_ gives Jekyll some HAML support so I can use it with Github...  Or I find that it's really not that good of an investment to use Github Pages.
-
-h2. The Goal
-
-The goal of this project is to make it easy to manage 20 public software projects at once.  This way, anyone developing their thing on github can easily post new examples and documentation as they develop their project, without anything out of their ordinary workflow.
-
-h2. Sinatra, HAML, JQuery, Textile
-
-"About this Blog":http://blog.peepcode.com/tutorials/2010/about-this-blog
-
-h2. Jekyll and Sinatra
-
-I use Jekyll for the static page generation (spits out all the pages, essentially pre-compiling everything into raw HTML).  I don't use Jekyll because it uses Liquid.  Liquid might be nice for someone who doesn't want to learn programming but would like to have fun with a few variables, and reuse some code.  But for a programmer who takes pride in efficiency, clean code, and being DRY, HAML and full Ruby access is much better; it gives me freedom to _do_.  I can:
-
-# Format the HTML perfectly (using HAML with Textmate)
-# Have Ruby hooks to conditionally link in elements throughout (getting rid of YAML headers)
-# Use Ruby to dynamically process other URLs
-# Extend the application to do other things like file uploading, all the while
-# Keeping everything DRY and clean.
-
-You can use @_posts@ without any layout!  And they can be raw HTML files!
-
-h3. Notes
-
-* Any folder starting with an underscore is private in terms of browser access
-
-h2. Directory Structure
-
-<pre>
-.
-|-- _config.yml
-|-- _layouts
-|-- _posts (generated output)
-|-- _site (github's place)
-|-- _source (sinatra application for development)
-|   |-- files (blog files to-be published)
-|   |-- posts (blog files)
-|   |-- lib (sinatra helpers)
-|   `-- public (sinatra public directory)
-|-- shared (javascripts, css, media, etc.)
-|-- index.html
-|-- robots.txt (what google should ignore)
-`-- sitemap.xml (google's sitemap from jekyll)
-</pre>
-
-h2. Configuration
-
-h3. Default Configuration
-
-<pre>
-permalink: 
-	if post's name is "entry": /path/to (index.haml)
-	if post's name is "something-else": /path/to/something-else
-	those are "directory" styled permalinks
-title: Path - To - Index
-keywords: nil
-description: nil
-</pre>
-
-h4. Permalink Styles
-
-directory: /path/to/index or /path/to/title
-date: /year/month/day/title
-category: /root/child/childer/title
-
-If directories have underscores, they are subtracted from the path:
-
-/path/to/_some_way_of_organizing_my_posts/my-post.textile
-	=> /path/to/my-post
-	
-Preference:
-
-# If directory contains all of [index.haml, entry.textile], it will render index.haml
-# If directory contains all of [entry.textile], it will render entry.textile
-
-h2. The Rendering Process
-
-# Startup Sinatra
-# Generate URLs from Post metadata, or, by default, directory to index.html or index.haml.  Also collect all tags and categories in the application
-# Now we have all: urls, tags, categories.  But we haven't read all of the files into memory which can be a problem
-# Go to a URL via Sinatra, render HAML
-# Read post for that URL into memory
-# Save HAML to HTML file
-
-h2. Themes
-
-When you make a request to a url, it renders out the template from the public/themes directory, but your content goes in public/posts.  In public/posts, you can add HAML/HTML files to customize the base of the them (via 'yield'), but you don't need to.  Instead, you just create your posts and they will be given a url.  The default layout for anything in your public/posts directory is the root directory it's in.  That's because you're likely to initially structure your posts according to the theme's RESTful page structure.  But if you specify a <code>layout</code> in the header of your file, it will use that from the theme.
-
-ln -s ~/viatropos/shared/themes ~/viatropos/_source/public/shared
-
-h2. Posts
-
-There are 3 types of posts:
-
-# Blog Posts
-# Index Posts
-# Regular Posts
-
-Blog posts are dated, so they must be prefixed with a date (2010-03-11-my-blog-post.textile).  Index posts describe the default page and metadata, and they must be named "index" (index.textile).  Regular posts are posts that don't care about date (such as wiki posts or just simple pages for a portfolio site), and they are named however (my-service-page.textile).  Each post has metadata defined in a YAML header.  The metadata can be wired explicitly to a themes implementation because, eventually, we'll all come to some sort of consensus on what should and shouldn't be included in the page metadata definition.
-
-h2. View Variables
-
-Inside your view you have access to quite a lot of variables:
-
-# @metadata@: Hash of all the config variables defined for your header metadata.
-# @config@: Hash of global config values
-# @params@: Hash of values passed in through the URL
-# @site@: site object, which has these properties
-## @posts@: array of posts
-## @categories@: array of categories @{:name => post}@
-## @pages@: array of pages (TBD)
-# @post@: Post object, if applicable
-## @data@: Hash of metadata specific to this post (symbolized keys)
-## @title@: Post title
-## @url@: Relative URL to Post
-## @date@: Date post was created
-## @published@: Whether or not it's been officially published
-## @tags@
-## @categories@
-
-ALL HASH KEYS ARE SYMBOLS, NOT STRINGS!
-
-h2. Layouts
-
-There are quite a few layouts available in each project:
-
-# Overview
-# Blog
-# Post w/ column
-# Post w/o column
-# Portfolio: two column grid
-# Portfolio: three column grid
-# Testimonials
-# two column list
-# Contact
-
-h2. TODO
-
-# CycleHelper for easier haml repeaters
-
-h2. Theme Development
-
-"html2haml":http://html2haml.heroku.com/
-
-Create a folder called shared/themes/my-theme-name.  In there, create folders for html, touch, and flash.  In the html folder, you need the following
-
-<pre>
-.
-|-- index.haml # home page (layout.haml is somewhere else entirely)
-|-- about
-|-- blog
-|-- features
-|-- demos
-|-- download
-|-- support
-|-- community
-|-- shared
-|   |-- stylesheets
-|   |-- javascripts
-|   |-- images
-|   `-- partials
-|   	|-- _head.haml
-|   	`-- _header.haml
-</pre>
-
-There are two ways the posts/pages can be constructed:
-
-# They have a date prefixing their name
-# They are in an XML file
-
-Dates specify an order, so do XML files.  In the end, we have an xml file for each root directory that lists all of the posts in a tree.  Whether they were from being in the "_posts" directory or because they were in an XML file, it doesn't matter.
-
-If the content of the post doesn't need more than a few lines, you can specify it in XML (each item in XML is converted to a Post).  Saves on space.
-
-The end result is that we have 1 xml file for each category of posts, which can be imported into Flex.
-
-h2. Posts vs. Pages
-
-Posts are pages that can be mass produced, such as wiki pages, blog entries, and forum posts.  They may have these extra defined properties:
-
-# date
-# categories
-# tags
-
-However, Pages can also have categories and tags and dates, but they are not used the same way as posts.
-
-A major difference between pages and posts however is that Posts cannot be nested; Pages can be nested.
-
-h3. So how do we define the difference between Pages and Posts in Broadway?
-
-# Posts and Pages can be written with a date in their name: 2010-03-30-my-post.textile.
-# Directories determine _some_ of the categories of Posts and Pages (you can define additional ones)
-# Posts are basically subclasses of Page, which we can define in two ways:
-## Placing Posts into the __posts_ directory
-## Adding a @category@ to a Page called "post"
-# Related Posts have the same layout, while related pages may have completely different layouts
-
-So what we do is say, _all Posts are leaf items_.  If a file is called @index.textile@, however, it is considered a Page for the corresponding directory.  Thus, the following directory structure:
-
-|-- overview
-|	|-- index.textile
-|	|-- screenshots.textile
-|	|-- performance.textile
-
-...corresponds to this XML structure:
-
-<pre><code>
-<page url="/overview">
-	<post url="/overview/screenshots"/>
-	<post url="/overview/performance"/>
-</page>
-</code></pre>
-
-...which corresponds to these ruby objects
-
-<pre><code>
-page = Page.new(:url => "/overview")
-page.posts << Post.new(:url => "/overview/screenshots")
-page.posts << Post.new(:url => "/overview/performance")
-</pre></code>
-
-Posts can have dates, categories, and tags, while pages can only have categories and tags.
-
-h2. Post Properties
-
-# title
-# url
-# has_one: image
-# tooltip
-# content
-# description
-# categories (directory)
-# tags
-# slug (identifier)
-# published
-# author
-# comments
-# attachments
-
-h2. Attachment Properties
-
-id - Integer
-url - String
-slug - String
-title - String
-description - String
-caption - String
-parent - Integer
-mime_type - String
-images - Object
-
-- Go through public directory
-- look for .xml and .textile/.markdown/.html
-- Can go arbitrary levels deep
-- Pages are for each directory
-	- if no page, then it will render an error page
-	- if index.haml, it will render that
-- Posts are organized by category, which map directly to their directory
-- Posts also have tags
-- Themes can sort posts based on categories
-- There is a global list of tags and categories
-- Posts unique id is the slug
-- posts can't be nested
-- pages can't be nested, but the urls can be
-- there are config files for random variables
-- posts are stored into xml files by page (root level)
-- posts can have 1 image, plus any random content in the post
-- snippets are config items, which can be textile/markdown/html
-
-If there is an index.xml in a folder, it is appended to the child matching that url node in the root index.xml file
-- Content is either in XML, or in the index.textile file of a folder, or the name of the url dot textile.
-	- overview/index.textile
-	- overview.textile
-- The Post (textile file) or XML node can specify the layout:
-	- <item layout="guides".../>
-	- layout: guides
-	If no layout is specified, it will check for these files:
-		- path/to/post/index.haml
-		- theme/path/index.haml
-		- error
-
-h2. Defining Posts and Pages
-
-Posts can be created in two ways: XML or text
-
-h3. Posts from Text (HTML, Textile, Markdown)
-
-Post objects are built out of the path to the file
-
-h3. Posts from XML
-
-Post objects are built out of everything in the XML.  If the XML node is referencing a file outside of itself, then it falls into the first category.
-
-h3. Graphics
-
-http://www.iconarchive.com/show/mac-icons-by-artua/Microphone-icon.html
-http://www.iconarchive.com/show/vista-multimedia-icons-by-icons-land/Microphone-Disabled-icon.html
-http://www.iconarchive.com/show/play-stop-pause-icons-by-icons-land/Microphone-Disabled-icon.html