broadway 0.0.3.2 → 0.0.3.3

data/Rakefile

@@ -14,7 +14,7 @@ RAILS_ROOT = File.dirname(__FILE__)
 spec = Gem::Specification.new do |s|
   s.name              = "broadway"
   s.author            = "Lance Pollard"
-  s.version           = "0.0.3.2"
+  s.version           = "0.0.3.3"
   s.date              = "Mon Mar 22 20:12:47 -0700 2010"
   s.summary           = "Write Posts in Textile and Markdown, built it into a Rails or Sinatra Blog"
   s.homepage          = "http://github.com/viatropos/broadway"

data/lib/broadway/page.rb

@@ -22,7 +22,7 @@ module Broadway
       self.basename = File.basename(path).split('.')[0..-2].first
 
       self.categories ||= []
-      self.categories.concat self.slug.split('/').reject { |x| x.empty? }
+      self.categories.concat self.dir.split('/').reject { |x| x.empty? }
       self.children ||= []
       process(options) unless options.has_key?(:process) and options[:process] == false
     end

data/lib/broadway/post.rb

@@ -34,7 +34,7 @@ module Broadway
       self.slug = slug
       self.ext = ext
       self.dir = options.has_key?(:dir) ? options[:dir] : File.dirname(path.gsub(/#{site.config[:source]}\/?/, ""))
-      base = self.dir == "." ? "" : File.basename(self.dir)
+      base = self.dir == "." ? "" : self.dir
       self.categories = base.split('/').reject { |x| x.empty? }
 
       process(options)

data/lib/broadway/resource.rb

@@ -43,9 +43,17 @@ module Broadway::Resource
       self.tags ||= []
     end
     
+    # definitely needs refactoring
     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}
+      key = self.categories.last
+      length = self.url.split("/").length
+      @children = site.find_pages_by_category(key) + site.find_posts_by_category(key)
+      @children.delete_if do |child|
+        (child.url == self.url) ||
+        (child.url.split("/").length <= length) ||
+        (child.is_a?(Broadway::Post) && child.categories != self.categories) ||
+        (child.is_a?(Broadway::Page) && child.categories[0..-2] != self.categories)
+      end
     end
     
     # The UID for this post (useful in feeds)

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: broadway
 version: !ruby/object:Gem::Version 
+  hash: 69
   prerelease: false
   segments: 
   - 0
   - 0
   - 3
-  - 2
-  version: 0.0.3.2
+  - 3
+  version: 0.0.3.3
 platform: ruby
 authors: 
 - Lance Pollard
@@ -22,9 +23,11 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -34,9 +37,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -48,9 +53,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -98,23 +105,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: broadway
-rubygems_version: 1.3.6
+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