broadway 0.0.1 → 0.0.2

data/README.textile

@@ -297,4 +297,10 @@ 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.
+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

data/lib/broadway/base.rb

@@ -7,74 +7,76 @@ def require_local(path, from = __FILE__)
 end
 
 require "rubygems"
-require 'redcloth'
-require 'nokogiri'
-require 'active_support'
-require 'action_mailer'
-require 'action_view'
-require 'action_view/base'
+require "redcloth"
+require "nokogiri"
+require "active_support"
+require "action_mailer"
+require "action_view"
+require "action_view/base"
 
 # core
-require 'fileutils'
-require 'time'
-require 'yaml'
-require 'nokogiri'
-require 'cgi'
-require 'sinatra'
-require 'sinatra/base'
-require 'sinatra_more'
-require 'haml'
+require "fileutils"
+require "time"
+require "yaml"
+require "nokogiri"
+require "cgi"
+require "sinatra"
+require "sinatra/base"
+require "sinatra_more"
+require "haml"
 
 # stdlib
 
 # 3rd party
-require 'redcloth'
+require "redcloth"
 
 $:.push(File.dirname(__FILE__))
-require 'core_ext'
-require 'convertible'
-require 'resource'
-require 'site'
-require 'asset'
-require 'page'
-require 'post'
-require 'static_file'
-require 'runner'
+require "core_ext"
+require "convertible"
+require "resource"
+require "site"
+require "asset"
+require "page"
+require "post"
+require "static_file"
+require "runner"
 require "helpers"
 
 module Broadway
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
   # Default options. Overriden by values in _config.yml or command-line opts.
   # (Strings rather symbols used for compatability with YAML)
   DEFAULTS = {
-    :auto         => false,
-    :server       => false,
-    :server_port  => 4000,
-
-    :source       => '.',
-    :destination  => File.join('..', '_posts'),
-
-    :lsi          => false,
-    :pygments     => false,
-    :markdown     => 'maruku',
-    :permalink    => 'pretty',
-    :url_type     => 'relative',
-    :url          => 'http://localhost:4567',
-    :language     => 'en-US',
+    :auto           => false,
+    :server         => false,
+    :server_port    => 4000,
+                  
+    :source         => ".",
+    :destination    => "_site",
     
-    :maruku       => {
-      :use_tex    => false,
-      :use_divs   => false,
-      :png_engine => 'blahtex',
-      :png_dir    => 'images/latex',
-      :png_url    => '/images/latex'
+    :lsi            => false,
+    :pygments       => false,
+    :markdown       => "maruku",
+    :permalink      => "pretty",
+    :url_type       => "relative",
+    :url            => "http://localhost:4567",
+    :locales        => "locales",
+    :language       => "en-US",
+    
+    :maruku         => {
+      :use_tex      => false,
+      :use_divs     => false,
+      :png_engine   => "blahtex",
+      :png_dir      => "images/latex",
+      :png_url      => "/images/latex"
     },
     
-    :layouts     => "_layouts",
-    :posts       => "",#"_posts"
-    :posts_include => [".textile", ".markdown"]
+    :layouts        => "_layouts",
+    :posts_include  => [".textile", ".markdown"],
+    :theme_path     => "themes",
+    :theme_versions => ["main"]
   }
-
+  
   # Generate a Broadway configuration Hash by merging the default options
   # with anything in _config.yml, and adding the given options on top
   #   +override+ is a Hash of config directives
@@ -86,7 +88,7 @@ module Broadway
     source = override[:source] || Broadway::DEFAULTS[:source]
 
     # Get configuration from <source>/_config.yml
-    config_file = File.join(source, '_config.yml')
+    config_file = File.join(source, "_config.yml")
     begin
       config = YAML.load_file(config_file)
       raise "Invalid configuration - #{config_file}" if !config.is_a?(Hash)
@@ -100,7 +102,7 @@ module Broadway
     # Merge DEFAULTS < _config.yml < override
     Broadway::DEFAULTS.deep_merge(config).deep_merge(override)
   end
-    
+  
   def self.build(options = {})
     self.process(:build, options)
   end

data/lib/broadway/helpers/partial_helper.rb

@@ -22,10 +22,16 @@ module Broadway
       end
       
       def theme_partial(template, options = {})
-        partial(File.join(c(:theme_path), template.to_s), options)
+        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)
       end
       
     end
   end
 end
-

data/lib/broadway/main.rb

@@ -15,11 +15,28 @@ def site
 end
 
 def default_locals(locals = {})
-  locals#.merge(site.config.dup).merge({:menu => menu})
+  {
+    :environment    => Sinatra::Application.environment,
+    :theme_version  => "main"
+  }.merge(locals)
 end
 
-def theme_path
-  site.config[:theme_path]
+def default_options(options = {})
+  if params.has_key?("layout") and params["layout"] == false
+    options[:layout] = false
+  else
+    options[:layout] = !request.xhr?
+  end
+  options
+end
+
+def theme_path(version = "main")
+  File.join(site.config[:theme_path], site.config[:theme], version)
+end
+
+# "main" is the default, so remove it
+def theme_versions
+  site.config[:theme_versions]
 end
 
 def pages
@@ -31,15 +48,22 @@ Sinatra::Application.class_eval do
   register SinatraMore::RoutingPlugin
 end
 
-def page_path(page)
-  content_path(page, "index")
+def page_path(page, version)
+  content_path(page, version, "index")
+end
+
+def post_path(post, version)
+  content_path(post, version, "show")
 end
 
-def post_path(post)
-  content_path(post, "show")
+def c(path)
+  result = site.config
+  path.to_s.split(".").each { |node| result = result[node.to_sym] if result }
+  result.nil? ? [] : result
 end
 
-def content_path(content, action)
+def content_path(content, version, action)
+  # first check if it's in the posts directory (where textile files are)
   path = File.join(content.dir, action).squeeze("/")
   exists = false
   extensions = %w(html haml erb html.haml html.erb)
@@ -48,17 +72,17 @@ def content_path(content, action)
     exists = true if File.exists?("#{target_path}.#{ext}")
   end
   return path if exists
+  # then check if it's in the theme directory
   checked = [target_path]
-  path = target_path = File.join(site.config[:theme_path], path).squeeze("/")
+  path = target_path = File.join(theme_path(version), content.layout, action).squeeze("/")
   exists = false
   extensions.each do |ext|
     exists = true if File.exists?(File.join(site.config[:source], "#{target_path}.#{ext}"))
   end
   return path if exists
-  if content.url == "/"
-    return File.join(site.config[:theme_path], "index")
-  end
+  return File.join(theme_path(version), "index") if content.url == "/"
   checked << target_path
-  puts "Couldn't find paths for #{content.class.to_s.downcase.split(":").last} ('#{content.url}'): #{checked.inspect}"
+  
+  puts "Couldn't find any paths for #{content.class.to_s.downcase.split(":").last} '#{content.url}': #{checked.inspect}"
   return nil
 end

data/lib/broadway/page.rb

@@ -3,7 +3,7 @@ module Broadway
   class Page
     include Convertible
 
-    attr_accessor :site
+    attr_accessor :site, :position # order
     attr_accessor :name, :ext, :basename, :dir, :path, :slug
     attr_accessor :data, :content, :output, :categories, :tags, :children
     
@@ -50,17 +50,29 @@ module Broadway
     end
     
     def show_children?
-      self.data && (!self.data.has_key?("show_children") || self.data["show_children"] == true)
+      return true if self.data.nil?
+      if self.data.has_key?("show_children")
+        return self.data["show_children"] == "true" || self.data["show_children"] == true
+      end
+      return true
     end
     
     def title
       self.data && (self.data['title'] || self.name)
     end
     
+    def excerpt
+      self.data && self.data['excerpt']
+    end
+    
     def parent
       url ? site.find_page_by_url(url[1..-1].split("/").first) : nil
     end
     
+    def layout
+      self.data and self.data.has_key?("layout") ? self.data["layout"] : self.categories.first
+    end
+    
     # The generated relative url of this page
     # e.g. /about
     #
@@ -83,6 +95,10 @@ module Broadway
       end
     end
     
+    def <=>(other)
+      return self.position <=> other.position
+    end
+    
     # Extract information from the page filename
     #   +name+ is the String filename of the page file
     #

data/lib/broadway/post.rb

@@ -19,7 +19,7 @@ module Broadway
     attr_accessor :site
     # where the file is
     attr_accessor :path, :dir, :name, :basename, :ext
-    attr_accessor :data, :content, :output
+    attr_accessor :data, :content, :output, :position # order
     attr_accessor :date, :slug, :published, :tags, :categories, :asset
     
     # Initialize this Post instance.
@@ -76,7 +76,11 @@ module Broadway
     #
     # Returns -1, 0, 1
     def <=>(other)
-      return self.url <=> other.url
+      if self.date and other.date
+        self.date <=> other.date
+      else
+        self.position <=> other.position
+      end
     end
     
     # The UID for this post (useful in feeds)
@@ -91,6 +95,10 @@ module Broadway
       url ? site.find_page_by_url(url[1..-1].split("/").first) : nil
     end
     
+    def layout
+      self.data and self.data.has_key?("layout") ? self.data["layout"] : self.categories.first
+    end
+    
     # The full path and filename of the post.
     # Defined in the YAML of the post body
     # (Optional)

data/lib/broadway/runner.rb

@@ -11,27 +11,43 @@ module Broadway
     end
     
     def run(&block)
-      begin
-        Net::HTTP.start(url.host, url.port) do |http|
-          self.content.each do |item|
-            response = http.get(item.url)
-            # if the file doesn't exist or is not rendered correctly
-            next if error?(response, item.url, false)
-            write_dir = File.expand_path(File.join(site.config[:destination], item.dir))
-            name = File.join(write_dir, "index.html")
-            FileUtils.mkdir_p(write_dir)
-            text = ""
-            text << "---\n"
-            text << "categories: #{item.categories.sort.join(" ")}\n"
-            text << "---\n"
-            text << response.body
-            yield text if block_given?
-            File.write(name, text)
+      versions = site.config[:theme_versions]
+      puts "Connecting to... #{url.scheme}://#{url.host}:#{url.port}"
+      item_url = nil
+      versions.each do |version|
+        prefix = version == "main" ? "" : version
+        begin
+          Net::HTTP.start(url.host, url.port) do |http|
+            self.content.each do |item|
+              if block_given?
+                item_url = yield(item)
+              else
+                if prefix == "touch"
+                  item_url = "/touch#{item.url.gsub(".", "")}?layout=false"
+                else
+                  item_url = ("/" + File.join(prefix, item.url.gsub(".", ""))).squeeze("/")
+                end
+              end
+              puts "Connecting to... #{url.scheme}://#{url.host}:#{url.port}#{item_url}"
+              item_dir = File.expand_path(File.join(site.config[:destination], prefix, item.url).squeeze("/"))
+              response = http.get(item_url)
+              # if the file doesn't exist or is not rendered correctly
+              next if error?(response, item_url, false)
+              FileUtils.mkdir_p(item_dir)
+              name = File.join(item_dir, "index.html").squeeze("/")
+              text = ""
+#              text << "---\n"
+#              text << "categories: #{item.categories.sort.join(" ")}\n"
+#              text << "---\n"
+              text << response.body
+              puts "Writing... #{name}"
+              File.open(name, "w") {|f| f.write(text) }
+            end
           end
+        rescue Exception => e
+          puts e.inspect
+          raise "Make sure you've started the server, run: 'ruby app.rb'"
         end
-      rescue Exception => e
-        puts e.inspect
-        raise "Make sure you've started the server, run: 'ruby app.rb'"
       end
     end
     

data/lib/broadway/site.rb

@@ -32,10 +32,10 @@ module Broadway
     end
     
     def merge_extra_config!(config)
-      locale = File.join("locales", "#{config[:language]}.yml")
-      if File.exists?(locale)
-        config.merge!(YAML.load_file(locale))
-      end
+      locale = File.join(config[:locales], "#{config[:language]}.yml")
+      
+      config.merge!(YAML.load_file(locale)) if File.exists?(locale)
+
       config_dir = "config"
       return unless File.exists?(config_dir)
       Dir.glob("#{config_dir}/**/*").each do |file|
@@ -212,12 +212,15 @@ module Broadway
       
       # lists are xml files we've collect, but we want to make sure we've
       # created all the posts we need to beforehand
+      # this also sorts everything
       list = File.join(config[:source], "index.xml")
       lists << list if File.exists?(list)
       lists.each do |path|
         new_tree(path)
       end
       
+      sort!
+            
       # finally, we have set all the initial variables on the
       # pages and posts we need, now we can process them to find
       # the content and generate the urls
@@ -254,13 +257,14 @@ module Broadway
     def parse_tree(parent)
       result = []
       return result if parent.nil? || parent.children.nil? || parent.children.empty?
-      parent.children.each do |child|
+      parent.children.each_with_index do |child, index|
         next unless child.elem?
         content = child.children.empty? ? post_from_xml(child) : page_from_xml(child)
         next unless content
         if content.respond_to?(:children)
           content.children.concat parse_tree(child)
         end
+        content.position = index
         result << content
       end
       result
@@ -281,7 +285,7 @@ module Broadway
       path = (content["src"] || content["url"] || "").gsub(/^\//, "")
       post ||= new_post(path)
       return unless post
-      %w(title image excerpt menu_title tooltip show_children content).each do |key|
+      %w(title image excerpt menu_title tooltip show_children content layout).each do |key|
         post.data[key] = content[key] if content.has_attribute?(key)
       end
       post
@@ -295,12 +299,29 @@ module Broadway
       path = (content["src"] || content["url"] || "").gsub(/^\//, "")
       page ||= new_page(path)
       return unless page
-      %w(title image excerpt menu_title tooltip show_children content).each do |key|
+      %w(title image excerpt menu_title tooltip show_children content layout).each do |key|
         page.data[key] = content[key] if content.has_attribute?(key)
       end
       page
     end
     
+    # sort all pages and posts
+    # determined by index.xml file (and later, for dates)
+    def sort!
+      sort_content(:page, self.pages)
+      sort_content(:post, self.posts)
+    end
+    
+    def sort_content(type, contents)
+      
+      method = type.to_s.pluralize
+      unnumbered = self.send(method).select { |content| content.position.nil? }
+      start_index = self.send(method).length - unnumbered.length
+      unnumbered.each_with_index { |content, index| content.position = start_index + index }
+      self.send(method).sort!
+      self.send(method)
+    end
+    
     # While in Jekyll this method renders the content explicitly,
     # I'm using Sinatra, partly because I like having the flexibility
     # of using their get/post methods, and partly because I don't have

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Lance Pollard