strelka-cms 0.0.1.pre.15 → 0.0.1.pre.19

data/ChangeLog

@@ -1,5 +1,107 @@
+2012-08-09  Michael Granger  <ged@FaerieMUD.org>
+
+	* data/strelka-cms/apps/content-feeds, lib/strelka/cms/page.rb,
+	lib/strelka/cms/pagefilter/autoindex.rb:
+	Merged with a31949150348
+	[8d4142b7bd18] [tip]
+
+2012-08-01  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/cms/page.rb:
+	Add a #date alias for #modified to Strelka::Page
+	[69163c473cea]
+
+	* data/strelka-cms/apps/content-feeds, etc/config.yml,
+	lib/strelka/cms/page.rb, lib/strelka/cms/pagefilter/autoindex.rb:
+	Various bugfixes
+	[fbc7cfa5e103]
+
+	* lib/strelka/cms/pagefilter/example.rb:
+	Make the output of example sections a bit more generically-classed
+	[d0cbf0a91c2d]
+
+2012-07-20  Michael Granger  <ged@FaerieMUD.org>
+
+	* data/strelka-cms/apps/content-manager, lib/strelka/cms/page.rb:
+	Fixes for path translation
+	[a31949150348]
+
+2012-07-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/cms/page.rb:
+	Open pages using UTF-8, too.
+	[45bf3dd4b7ba]
+
+	* data/strelka-cms/apps/content-manager:
+	Fix the matching pattern for content-manager non-index pages.
+	[cc72d806d27d]
+
+	* data/strelka-cms/apps/content-feeds, data/strelka-cms/apps/content-
+	manager:
+	Set the default internal encoding to UTF-8.
+	[1776e9b3cf55]
+
+2012-07-04  Michael Granger  <ged@FaerieMUD.org>
+
+	* data/strelka-cms/apps/content-feeds, lib/strelka/cms/page.rb:
+	Fix the feeds app.
+
+	- Update to reflect changes in the Page and PageCatalog classes.
+	[ea1d6e84ea16]
+
+	* data/strelka-cms/apps/content-manager, lib/strelka/cms/page.rb,
+	lib/strelka/cms/pagecatalog.rb:
+	Fix the toplevel index page in the content-manager.
+
+	- Special case the empty-path request
+	- Add Page#relative_html_path for cross-linking
+	- Strip off a leading '/' for PageCatalog patterns.
+	[066a60328688]
+
+	* Manifest.txt, data/strelka-cms/apps/content-feeds,
+	lib/strelka/cms/pagefilter/autoindex.rb,
+	spec/strelka/cms/pagecatalog_spec.rb:
+	Add specs for PageCatalog.
+	[0fcdc8fd6599]
+
+	* data/strelka-cms/apps/content-feeds:
+	Fix missing comma.
+	[f8e829fb333f]
+
+	* data/strelka-cms/apps/content-feeds:
+	Make the content-feeds default page root the same as the content-
+	manager.
+	[91e245357ae4]
+
+	* data/strelka-cms/apps/content-feeds, data/strelka-cms/apps/content-
+	manager:
+	Make the config keys match the appid.
+	[f1cd78c6b503]
+
+	* Rakefile:
+	Fix strelka dependency
+	[abaf9e7f8e21]
+
+	* .tm_properties:
+	Add a TextMate preferences file
+	[9d5017f235b9]
+
+2012-07-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc:
+	Adding some tentative instructions to the README
+	[906cd44818a7]
+
+	* .hgignore:
+	Adding .env to the ignorefile
+	[361ef117b1e3]
+
 2012-06-29  Michael Granger  <ged@FaerieMUD.org>
 
+	* Manifest.txt, lib/strelka/cms.rb:
+	Fix the specs, update the manifest.
+	[e90e841548bc]
+
 	* .hgignore, .pryrc, .rvm.gems, .rvmrc, History.rdoc, Manifest.txt,
 	Procfile, README.rdoc, Rakefile, data/strelka-cms/apps/content-
 	feeds, data/strelka-cms/apps/content-manager, data/strelka-
@@ -30,4 +132,4 @@
 	public/stylesheets/ie.css, spec/data/test.page, spec/lib/helpers.rb,
 	spec/strelka/cms/page_spec.rb, spec/strelka/cms_spec.rb:
 	Initial commit
-	[5f4c4eb6ef5b] [tip]
+	[5f4c4eb6ef5b]

data/data/strelka-cms/apps/content-feeds

@@ -18,11 +18,15 @@ require 'strelka/cms/page'
 
 # The Feed applet -- generate RSS and Atom feeds for various things.
 class Strelka::CMS::ContentFeeds < Strelka::App
-	extend Configurability,
+	extend Loggability,
+	       Configurability,
 	       Strelka::MethodUtilities
 	include UUIDTools
 
 
+	# Loggability API -- log to Strelka::CMS's logger
+	log_to :strelka_cms
+
 	# Configurability API -- configure this app with the 'feeds' section of the
 	# config.
 	config_key :content_feeds
@@ -87,6 +91,7 @@ class Strelka::CMS::ContentFeeds < Strelka::App
     get 'rss' do |req|
 		feedpath = req.app_path[ %r{/rss/(.*)}, 1 ]
 		newest_pages = self.find_newest_pages( feedpath, req )
+		newest_page = newest_pages.first
 
 		baseuri = req.uri
 		baseuri.path = ''
@@ -112,7 +117,7 @@ class Strelka::CMS::ContentFeeds < Strelka::App
 		res = req.response
 
 		# Set the cache header and set the mimetype
-		res.headers.last_modified = newest_pages.first.date.httpdate
+		res.headers.last_modified = newest_page.date.httpdate
 		res.content_type = 'application/rss+xml'
 		res.body = feed.to_s
 
@@ -136,7 +141,7 @@ class Strelka::CMS::ContentFeeds < Strelka::App
 			feed.authors << Atom::Person.new( :name => 'Michael Granger' )
 			feed.id      = @site_uuid.to_uri
 
-			newest_pages.each do |page|
+			newest_pages.sort_by {|page| page.modified }.reverse.each do |page|
 				entry_url = baseuri.dup
 				entry_url.path = '/' + File.join( feedpath, page.relative_html_path )
 

data/lib/strelka/cms/page.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'time'
+require 'date'
 require 'nokogiri'
 require 'summarize'
 require 'loggability'
@@ -270,6 +271,7 @@ class Strelka::CMS::Page
 	### if neither of those are available.
 	def modified
 		if headerdate = self.options['date']
+			headerdate = headerdate.to_time if headerdate.respond_to?( :to_time )
 			headerdate = Time.parse( headerdate ) unless headerdate.is_a?( Time )
 			return headerdate
 		elsif self.path

data/lib/strelka/cms/pagefilter/autoindex.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'ostruct'
-require 'configurability'
 
 require 'strelka/cms/pagecatalog'
 require 'strelka/cms/page'
@@ -58,6 +57,8 @@ class Strelka::CMS::PageFilter::AutoIndex < Strelka::CMS::PageFilter
 
 	### Process the given +source+ for <?autoindex ... ?> processing-instructions
 	def process( source, page )
+		self.log.info "Looking for autoindex directives..."
+
 		if catalog = page.catalog
 			self.log.debug "Processing autoindex directives."
 			source.gsub!( PI ) do |match|
@@ -79,6 +80,8 @@ class Strelka::CMS::PageFilter::AutoIndex < Strelka::CMS::PageFilter
 
 	### Create an HTML fragment.
 	def generate_index( pattern, page, catalog, options )
+		self.log.debug "Generating (%p) autoindex for page = %p in catalog: %p. Options = %p" %
+			[ pattern, page, catalog, options ]
 		options = self.parse_options( options )
 		style   = options.style || DEFAULT_STYLE
 

data/lib/strelka/cms/pagefilter/example.rb

@@ -225,7 +225,7 @@ class Strelka::CMS::PageFilter::Example < Strelka::CMS::PageFilter
 	### Highlights the given +content+ in language +lang+.
 	def highlight( content, lang )
 		source = ERB::Util.html_escape( content )
-		return %Q{\n\n<pre class="brush: #{lang}">#{source}</pre>\n\n}
+		return %Q{\n\n<pre><code class="#{lang}">#{source}</code></pre>\n\n}
 	end
 
 end # class Strelka::CMS::PageFilter::Example

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.15
+  version: 0.0.1.pre.19
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strelka