broadway 0.0.2 → 0.0.3

data/Rakefile

@@ -14,12 +14,12 @@ RAILS_ROOT = File.dirname(__FILE__)
 spec = Gem::Specification.new do |s|
   s.name              = "broadway"
   s.author            = "Lance Pollard"
-  s.version           = Broadway::VERSION
+  s.version           = "0.0.3"
   s.date              = "Mon Mar 22 20:12:47 -0700 2010"
-  s.summary           = "More than Syncing Rails Apps with the Google Data API"
+  s.summary           = "Write Posts in Textile and Markdown, built it into a Rails or Sinatra Blog"
   s.homepage          = "http://github.com/viatropos/broadway"
   s.email             = "lancejpollard@gmail.com"
-  s.description       = "Broadway: A New Way of Googling"
+  s.description       = "Broadway: Static and Dynamic Site Generator"
   s.has_rdoc          = true
   s.rubyforge_project = "broadway"
   s.platform          = Gem::Platform::RUBY
@@ -54,13 +54,18 @@ task :manifest => :clean do
   end
 end
 
+desc "Publish gem to rubygems"
+task :publish => [:package] do
+  %x[gem push pkg/#{spec.name}-#{spec.version}.gem]
+end
+
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
 desc "Install the gem locally"
 task :install => [:package] do
-  sh %{sudo gem install pkg/broadway-#{Broadway::VERSION} --no-ri --no-rdoc}
+  sh %{sudo gem install pkg/#{spec.name}-#{spec.version} --no-ri --no-rdoc}
 end
 
 desc "Generate the rdoc"

data/lib/broadway.rb

@@ -2,6 +2,5 @@ libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'broadway/base'
-require 'broadway/main'
 
 # http://en.wikipedia.org/wiki/Lists_of_musicals

data/lib/broadway/base.rb

@@ -20,10 +20,6 @@ require "time"
 require "yaml"
 require "nokogiri"
 require "cgi"
-require "sinatra"
-require "sinatra/base"
-require "sinatra_more"
-require "haml"
 
 # stdlib
 
@@ -33,17 +29,15 @@ 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 "helpers"
 
 module Broadway
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
   # Default options. Overriden by values in _config.yml or command-line opts.
   # (Strings rather symbols used for compatability with YAML)
   DEFAULTS = {
@@ -90,7 +84,7 @@ module Broadway
     # Get configuration from <source>/_config.yml
     config_file = File.join(source, "_config.yml")
     begin
-      config = YAML.load_file(config_file)
+      config = YAML.load_file(config_file).recursive_symbolize_keys!
       raise "Invalid configuration - #{config_file}" if !config.is_a?(Hash)
       $stdout.puts "Configuration from #{config_file}"
     rescue => err
@@ -100,7 +94,9 @@ module Broadway
     end
     
     # Merge DEFAULTS < _config.yml < override
-    Broadway::DEFAULTS.deep_merge(config).deep_merge(override)
+    config = Broadway::DEFAULTS.deep_merge(config).merge(override)
+
+    config
   end
   
   def self.build(options = {})

data/lib/broadway/convertible.rb

@@ -14,7 +14,22 @@ module Broadway
     def to_s
       self.content || ''
     end
-
+    
+    def read(attribute = nil)
+      self.content = IO.read(self.path)
+      if self.content =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
+        if attribute
+          output = YAML.load($1)[attribute] || ""
+          return output
+        end
+        self.content = self.content[($1.size + $2.size)..-1]
+      end
+      self.render(site.layouts, site.site_payload)
+      output = self.output
+      self.content = self.output = nil
+      output
+    end
+    
     # Read the YAML frontmatter
     #   +base+ is the String path to the dir containing the file
     #   +name+ is the String filename of the file
@@ -71,19 +86,12 @@ module Broadway
       # render and transform content (this becomes the final content of the object)
       payload["content_type"] = self.content_type
       self.content = Liquid::Template.parse(self.content).render(payload, info)
-      self.transform
+      
+      # TODO FIX
+#      self.transform
 
       # output keeps track of what will finally be written
       self.output = self.content
-
-      # recursively render layouts
-      layout = layouts[self.data["layout"]]
-      while layout
-        payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
-        self.output = Liquid::Template.parse(layout.content).render(payload, info)
-
-        layout = layouts[layout.data["layout"]]
-      end
     end
   end
 end

data/lib/broadway/page.rb

@@ -19,16 +19,22 @@ module Broadway
       self.path = options[:path] if options.has_key?(:path)
       self.data = {}
       self.dir = path =~ /\// ? File.dirname(path.gsub(/#{site.config[:source]}\/?/, "")).gsub(/^\//, "") : path
-      self.name = File.basename(self.dir)
+      base = self.dir == "." ? "" : File.basename(self.dir)
+      self.name = base
       self.ext = File.extname(path)
       self.basename = File.basename(path).split('.')[0..-2].first
 
       self.categories ||= []
-      self.categories.concat self.dir.split('/').reject { |x| x.empty? }
+      self.categories.concat base.split('/').reject { |x| x.empty? }
       self.children ||= []
       process(options) unless options.has_key?(:process) and options[:process] == false
     end
     
+    def children
+      @children = site.find_pages_by_category(self.categories.last) + site.find_posts_by_category(self.categories.last)
+      @children.delete_if {|i| i.url == self.url}
+    end
+    
     # The UID for this post (useful in feeds)
     # e.g. /2008/11/05/my-awesome-post
     #

data/lib/broadway/post.rb

@@ -3,7 +3,6 @@ module Broadway
   class Post
     include Comparable
     include Convertible
-    include Resource
     
     SRC_MATCHER = /^(.+\/)*(?:(\d+-\d+-\d+)-)?(.*)(\.[^.]+)$/
     URL_MATCHER = /^(.+\/)*(.*)$/
@@ -40,8 +39,9 @@ module Broadway
       self.slug = slug
       self.ext = ext
       self.dir = options.has_key?(:dir) ? options[:dir] : File.dirname(path.gsub(/#{site.config[:source]}\/?/, ""))
-
-      self.categories = dir.split('/').reject { |x| x.empty? }
+      base = self.dir == "." ? "" : File.basename(self.dir)
+      self.name = base
+      self.categories = base.split('/').reject { |x| x.empty? }
 
       process(options) unless options.has_key?(:process) and options[:process] == false
     end

data/lib/broadway/rails.rb

@@ -0,0 +1,3 @@
+module Broadway::Rails
+  
+end

data/lib/broadway/runner.rb

@@ -36,9 +36,6 @@ module Broadway
               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) }

data/lib/broadway/sinatra.rb

@@ -0,0 +1,5 @@
+module Broadway::Sinatra
+  
+end
+
+require_local "sinatra/*"

data/lib/broadway/{main.rb → sinatra/base.rb}

@@ -1,7 +1,9 @@
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-require 'base'
+require "sinatra"
+require "sinatra/base"
+require "sinatra_more"
 
 @site = site = Broadway.build
 

data/lib/broadway/{helpers.rb → sinatra/helpers.rb}

@@ -1,7 +1,7 @@
-require_local "helpers/*"
+require_local "sinatra/helpers/*"
 
 helpers do
-  files("helpers/*") do |file|
+  files("sinatra/helpers/*") do |file|
     include "Broadway::Helpers::#{File.basename(file).split(".").first.camelize}".constantize
   end
 end

data/lib/broadway/{helpers → sinatra/helpers}/text_helper.rb

@@ -11,18 +11,7 @@ module Broadway
       
       # read the post and parse it with Liquid
       def read(post, attribute = nil)
-        post.content = IO.read(post.path)
-        if post.content =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
-          if attribute
-            output = YAML.load($1)[attribute] || ""
-            return output
-          end
-          post.content = post.content[($1.size + $2.size)..-1]
-        end
-        post.render(site.layouts, site.site_payload)
-        output = post.output
-        post.content = post.output = nil
-        output
+        post.read(attribute)
       end
       
       def read_excerpt(post, max_length = nil)

data/lib/broadway/site.rb

@@ -16,7 +16,7 @@ module Broadway
       merge_extra_config!(config)
       
       config.recursive_symbolize_keys!
-      
+
       self.config          = config.clone
       
       self.source          = config[:source]
@@ -33,10 +33,11 @@ module Broadway
     
     def merge_extra_config!(config)
       locale = File.join(config[:locales], "#{config[:language]}.yml")
-      
+
       config.merge!(YAML.load_file(locale)) if File.exists?(locale)
 
-      config_dir = "config"
+
+      config_dir = File.join(config[:source], "config")
       return unless File.exists?(config_dir)
       Dir.glob("#{config_dir}/**/*").each do |file|
         next if File.directory?(file)
@@ -189,6 +190,7 @@ module Broadway
     def read_directories(dir = '')
       base = File.join(self.source, dir).gsub(/\/$/, "")
       lists = []
+
       # RULES:
       # Pages are only index.textile files, or static .html files (TODO)
       # Posts are leaf nodes (name.textile files)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Lance Pollard
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-03-22 20:12:47 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
         version: 2.3.5
   type: :runtime
   version_requirements: *id003
-description: "Broadway: A New Way of Googling"
+description: "Broadway: Static and Dynamic Site Generator"
 email: lancejpollard@gmail.com
 executables: []
 
@@ -73,15 +73,16 @@ files:
 - lib/broadway/base.rb
 - lib/broadway/convertible.rb
 - lib/broadway/core_ext.rb
-- lib/broadway/helpers/collection_helper.rb
-- lib/broadway/helpers/partial_helper.rb
-- lib/broadway/helpers/text_helper.rb
-- lib/broadway/helpers.rb
-- lib/broadway/main.rb
 - lib/broadway/page.rb
 - lib/broadway/post.rb
-- lib/broadway/resource.rb
+- lib/broadway/rails.rb
 - lib/broadway/runner.rb
+- lib/broadway/sinatra/base.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.rb
@@ -114,6 +115,6 @@ rubyforge_project: broadway
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: More than Syncing Rails Apps with the Google Data API
+summary: Write Posts in Textile and Markdown, built it into a Rails or Sinatra Blog
 test_files: []
 

data/lib/broadway/resource.rb

@@ -1,5 +0,0 @@
-module Broadway
-  module Resource
-    
-  end
-end