broadway 0.1.0 → 0.1.1

data/README.markdown

@@ -1,6 +1,8 @@
 <h1>
   <span>Broadway</span>
+  <!-- 
   <span><img src="http://viatropos.github.com/broadway/favicon.png"/></span>
+  -->
 </h1>
 
 Pluggable, portable, framework-friendly static site generator.  Setting the Stage for the Ruby CMS.
@@ -108,7 +110,7 @@ The `Configuration` object is defined from `_config.yml` in the Broadway Site ro
 
 ## Context
 
-There are plenty of static site generators out there: [Jekyll](http://github.com/mojombo/jekyll), [Webby](http://github.com/TwP/webby), [Nanoc](http://github.com/ddfreyne/nanoc), [StaticMatic](http://github.com/staticmatic/staticmatic), [Middleman](http://github.com/tdreyno/middleman), [Mercury](http://github.com/jackhq/mercury), [Frank](http://github.com/blahed/frank), [DynamicMatic](http://github.com/nex3/dynamicmatic), [WebGen](http://github.com/gettalong/webgen), [Pekky](http://github.com/lukesutton/pekky), [Awestruct](http://github.com/bobmcwhirter/awestruct), [Massimo](http://github.com/petebrowne/massimo)...  The problem with them is that they are completely separate frameworks from Sinatra and Rails.  They're not meant to be used with either of those.  It's a lot of work to integrate them.
+There are plenty of static site generators out there: [Jekyll](http://github.com/mojombo/jekyll), [Webby](http://github.com/TwP/webby), [Nanoc](http://github.com/ddfreyne/nanoc), [StaticMatic](http://github.com/staticmatic/staticmatic), [Middleman](http://github.com/tdreyno/middleman), [Mercury](http://github.com/jackhq/mercury), [Frank](http://github.com/blahed/frank), [DynamicMatic](http://github.com/nex3/dynamicmatic), [WebGen](http://github.com/gettalong/webgen), [Pekky](http://github.com/lukesutton/pekky), [Awestruct](http://github.com/bobmcwhirter/awestruct), [Massimo](http://github.com/petebrowne/massimo), [Toto](http://cloudhead.io/toto)...  The problem with them is that they are completely separate frameworks from Sinatra and Rails.  They're not meant to be used with either of those.  It's a lot of work to integrate them.
 
 Broadway makes Rails and Sinatra static-compatible.
 

data/lib/broadway/mixins/taggable.rb

@@ -10,11 +10,11 @@ module Broadway
       # tags can be stored under multiple contexts
       # default is "tags" (use "categories" or whatever else you want)
       def tags(context = "tags")
-        unless @tags
+        if @tags.blank?
           @tags = tag_hash(self.data["tags"] || [])
         end
-        
-        @tags[context.to_s] if @tags
+        @tags["tags"] ||= []
+        @tags[context.to_s]
       end
       
       def tags=(value)

data/lib/broadway/resources/asset.rb

@@ -13,7 +13,7 @@ module Broadway
       self.resource = resource
       self.name     = name
       self.data     = options.recursively_symbolize_keys!
-      self.path     = options.delete(:path)
+      self.path     = options.delete(:path) || options.delete(:src) || options.delete(:url) || options.delete(:href)
       options.each do |k,v|
         self.send("#{k}=", v) if self.respond_to?(k)
       end
@@ -21,6 +21,10 @@ module Broadway
       self.title ||= Broadway::File.file_name(self.path).titleize
     end
     
+    alias url path
+    alias href path
+    alias src path
+    
     def site
       resource.site
     end

data/lib/broadway/resources/configuration.rb

@@ -57,7 +57,6 @@ module Broadway
       # then, we need to know where to look for _settings.yml
       source        = overrides[:source] || DEFAULTS[:source]
       settings_file = overrides[:settings] || DEFAULTS[:settings]
-      settings_file = ::File.join(source, settings_file) unless ::File.exists?(settings_file)
       # Get configuration from <source>/_config.yml
       begin
         settings    = YAML.load_file(settings_file).recursively_symbolize_keys!

data/lib/broadway/resources/file.rb

@@ -54,7 +54,7 @@ module Broadway
       content = read(attribute)
       case extension.to_s
       when "markdown", "md"
-        content = RDiscount.new(content).to_html
+        content = RDiscount.new(content, :filter_html, :smart).to_html
       when "textile"
         content = RedCloth.new(content).to_html
       end

data/lib/broadway/resources/post.rb

@@ -59,5 +59,46 @@ module Broadway
       @description
     end
     
+    def self_and_siblings
+      if parent
+        parent.children.blank? ? nil : parent.children
+      else
+        nil
+      end
+    end
+
+    def submenu
+      return nil if data["submenu"].blank?
+      data["submenu"].map do |path|
+        site.find_post_by_path(path)
+      end.compact
+    end
+
+    def subpages
+      (self_and_siblings || submenu || children).sort do |a, b|
+        if a.data["position"] && b.data["position"]
+          a.data["position"].to_i <=> b.data["position"]
+        else
+          a <=> b
+        end
+      end
+    end
+
+    def gallery
+      data["gallery"] || nil
+    end
+
+    def menu_title
+      data["menu_title"] || title
+    end
+
+    def subtitle
+      data["subtitle"] || nil
+    end
+
+    def parent_path
+      ("/" + categories.join("/")).squeeze("/")
+    end
+    
   end
 end

data/lib/broadway/resources/site.rb

@@ -15,6 +15,10 @@ module Broadway
       processor.build
     end
     
+    def assets
+      posts.map(&:assets).flatten.uniq
+    end
+    
     def generate!
       processor.generate
     end
@@ -27,6 +31,10 @@ module Broadway
       settings[:url] || "http://localhost"
     end
     
+    def production_url
+      settings[:production_url]
+    end
+    
     def index_path
       settings[:index_path]
     end

data/lib/broadway/run.rb

@@ -0,0 +1,85 @@
+require 'rubygems'
+require 'open-uri'
+require 'broadway'
+require 'nokogiri'
+
+this = File.expand_path(File.dirname(__FILE__))
+site = Broadway.build(:source => "#{this}/../_content", :settings => "#{this}/_config.yml")
+
+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 sitemap?(body, post)
+  return false if post.path !~ /^\/sitemap/
+  attributes = {
+    :version => "2.0",
+    "xmlns:html" => "http://www.w3.org/TR/REC-html40",
+    "xmlns:sitemap" => "http://www.sitemaps.org/schemas/sitemap/0.9",
+    "xmlns:xsl" => "http://www.w3.org/1999/XSL/Transform"
+  }
+  builder = Nokogiri::XML::Builder.new(:encoding => "UTF-8") do |xml|
+    xml.stylesheet(attributes) do
+      xml.parent.namespace = xml.parent.namespace_definitions.last
+      xml["xsl"].output(:method => "html", :version => "1.0", :encoding => "UTF-8", :indent => "yes")
+      xml["xsl"].template(:match => "/") do
+        xml << body.gsub(/\<\!doctype[^>]+\>/i, "").gsub(/^/, "    ")
+      end
+    end
+  end
+  content = builder.to_xml
+  
+  name = File.join("stylesheets/sitemap.xsl")
+  File.open(name, "w") { |f| f.write(content) }
+  return true
+end
+
+def render_path(site, http, path, post = nil)
+  date = "2010-01-01"
+  response = http.get(path)
+  write_to = File.expand_path(File.join(site.setting(:destination), path).squeeze("/"))
+  # if the file doesn't exist or is not rendered correctly
+  puts "get #{path}"
+  return if error?(response, path, false)
+  return if post && 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
+  File.open(name, "w") { |f| f.write(content) }
+end
+
+url = URI.parse("http://localhost:4567")
+#Time.now.strftime("%Y-%m-%d")
+begin
+  Net::HTTP.start(url.host, url.port) do |http|
+    site.posts.reverse.each do |post|
+      render_path(site, http, post.path, post)
+    end
+    render_path(site, http, "/about")
+    render_path(site, http, "/tags")
+    site.tags.each do |tag, posts|
+      begin
+        render_path(site, http, "/tags/#{tag}")
+      rescue Exception => e
+        puts "#{tag}: #{e.inspect}"
+      end
+    end
+  end
+rescue Exception => e
+  puts e.inspect
+  raise "Make sure you've started the server, run: 'ruby app.rb'"
+end

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

@@ -20,12 +20,17 @@ module Broadway
       def row_for(array, options = {}, &block)
         return "" if array.empty?
         array.each_with_index do |node, i|
-          attributes = options.has_key?(:li_attributes) ? options[:li_attributes] : {}
+          attributes = (options.has_key?(:li_attributes) ? options[:li_attributes] : {}).dup
           attributes[:class] ||= ""
           if i == 0 and options.has_key?(:first)
-            attributes[:class] << "#{options[:first]}"
+            attributes[:class] << " #{options[:first]}"
           elsif i == array.length - 1 and options.has_key?(:last)
-            attributes[:class] << "#{options[:last]}"
+            attributes[:class] << " #{options[:last]}"
+          end
+          if attributes[:class].blank?
+            attributes.delete(:class)
+          else
+            attributes[:class].squeeze!(" ")
           end
           haml_tag :li, attributes do
             if block_given?

data/lib/broadway/sinatra/processor.rb

@@ -35,10 +35,13 @@ module Broadway
         requests
       end
       
+      protected
+      
       def requests
         begin
           request
         rescue Exception => e
+          puts e.inspect
           requests # in case connection breaks
           #raise "Make sure you've started the server, run: 'ruby app.rb'"
         end
@@ -64,7 +67,9 @@ module Broadway
         # 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
+        
+        body = absolute!(response.body)
+        
         content = ""
         if path == "/"
           name = "index.html"
@@ -79,6 +84,30 @@ module Broadway
         puts "done... #{path}"
         ::File.open(name, "w") { |f| f.write(content) }
       end
+      
+      def absolute!(body)
+        raise "set :production_url in _config.yml" if site.production_url.blank?
+        base  = site.production_url.gsub(/\/$/, "") # no trailing slash
+        body.gsub!(/(src|href)=([\'\"])\//) do |match|
+          "#{$1}=#{$2}#{base}/"
+        end
+        body
+=begin        
+        html = Nokogiri::HTML(body)
+        html.css("a, link").each do |link|
+          if link["href"] =~ /^\//
+            link["href"] = base + link["href"]
+          end
+        end
+        html.css("script, img, video").each do |src|
+          if src["src"] =~ /^\//
+            src["src"] = base + src["src"]
+          end
+        end
+        
+        html.to_html
+=end        
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: broadway
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 -05:00
+date: 2010-08-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,7 @@ dependencies:
         version: 2.3.5
   type: :runtime
   version_requirements: *id002
-description: "Broadway: Pluggable, portable, framework-friendly static site generator. Setting the Stage for the Ruby CMS."
+description: Pluggable, portable, framework-friendly static site generator. Setting the Stage for the Ruby CMS.
 email: lancejpollard@gmail.com
 executables: []
 
@@ -91,6 +91,7 @@ files:
 - lib/broadway/resources/post.rb
 - lib/broadway/resources/site.rb
 - lib/broadway/resources/slug.rb
+- lib/broadway/run.rb
 - lib/broadway/sinatra/app.rb
 - lib/broadway/sinatra/helpers/collection_helper.rb
 - lib/broadway/sinatra/helpers/partial_helper.rb
@@ -133,6 +134,6 @@ rubyforge_project: broadway
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Pluggable, portable, framework-friendly Ruby Static Site Generator. Setting the Stage for the Ruby CMS.
+summary: Pluggable, portable, framework-friendly Ruby Static Site Generator.
 test_files: []