strelka-cms 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 834b28f4d44362f61cd1feba36ebed0c8e487461
-  data.tar.gz: 6c1edc1d03d06df6935a620f3ba9b20fcf1bd04b
+  metadata.gz: 48864468ff1c947baea455bf5c0ed7c21aeb858e
+  data.tar.gz: 819f8b4ff6994d34a202beee4989f936ef444883
 SHA512:
-  metadata.gz: cca1fd8e406244b11be95499e0c8576bfdc9cfd5b45b6effa0ff0bef6ce03ed65e10c2d17ff1467d5b02a021bfff1fd56f364d37af4af94d6a233dac3c02848e
-  data.tar.gz: 7eca9faac12d1892696a72d99adb393ced77f8d6fd80817338b735b12fdfca812df8bb138b415480bc89dab65c3d79b62879d1654ede6feffd0460ec8242c2bd
+  metadata.gz: 14105cf4607b97da98b9519e642d0bf3b7bdd26c8ce084e0aca445fe03562f231fe08c9c03e82c4cf35369a7e0eb8bfcebfbefb8e37cbb1e922cb4033e6453c7
+  data.tar.gz: a925e1a36d975456d11d0d548324b9b4b270fd8073c222bb171fdce1ec2f21c12c674b6672f48479820ddd937815d39efc172ed52270fcf94c9a013e9fe7361a

data/ChangeLog

@@ -1,9 +1,103 @@
+2017-07-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* .gems, .pryrc, .ruby-gemset, .ruby-version, .rvm.gems, .rvmrc,
+	Rakefile, config.yml, data/strelka-cms/CMS_SCHEMA.sql, data/strelka-
+	cms/DEV_DB_SETUP.sql, lib/sequel/plugins/inline_migrations.rb,
+	lib/sequel/plugins/inline_schema.rb,
+	lib/sequel/plugins/soft_deletes.rb, lib/strelka/app/content-
+	feeds.rb, lib/strelka/app/content-manager.rb, lib/strelka/apps.rb,
+	lib/strelka/cms.rb, lib/strelka/cms/author.rb,
+	lib/strelka/cms/author_session.rb, lib/strelka/cms/feeds.rb,
+	lib/strelka/cms/model.rb, lib/strelka/cms/page.rb,
+	lib/strelka/cms/publisher.rb:
+	Import sequel workarounds, start work on models
+	[4caedd2c788a] [tip]
+
+2017-06-14  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, .rvmrc, Gemfile, Gemfile.lock, Rakefile, cert/ged.pem,
+	data/strelka-cms/apps/content-feeds, data/strelka-cms/apps/content-
+	manager, lib/strelka/app/content-feeds.rb, lib/strelka/app/content-
+	manager.rb, lib/strelka/cms/page.rb, lib/strelka/cms/pagecatalog.rb,
+	lib/strelka/cms/pagefilter.rb,
+	lib/strelka/cms/pagefilter/autoindex.rb, spec/helpers.rb,
+	spec/lib/helpers.rb, spec/strelka/cms/page_spec.rb,
+	spec/strelka/cms/pagecatalog_spec.rb,
+	spec/strelka/cms/pagefilter/autoindex_spec.rb,
+	spec/strelka/cms_spec.rb, strelka.gemspec:
+	Checkpoint before rewrite
+	[69ae95545cdc]
+
+2013-03-20  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.2.0 for changeset 76070ab08bdd
+	[968469d5f06c]
+
+	* .hgsigs:
+	Added signature for changeset 7e6d67090ff3
+	[76070ab08bdd] [v0.2.0]
+
+	* History.rdoc, lib/strelka/cms.rb:
+	Bump the minor version, update history.
+	[7e6d67090ff3]
+
+	* .rvm.gems, .tm_properties, Rakefile, lib/strelka/cms/page.rb,
+	lib/strelka/cms/pagefilter.rb,
+	lib/strelka/cms/pagefilter/example.rb,
+	spec/strelka/cms/page_spec.rb:
+	Update for newer versions of Strelka/convert to Pluggability.
+	[4baf070eb372]
+
+2013-02-28  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.1.0 for changeset d9a60c86dfa9
+	[c0c3226c7b49]
+
+	* .hgsigs:
+	Added signature for changeset 34ca70dbf0f8
+	[d9a60c86dfa9] [v0.1.0]
+
+	* History.rdoc, lib/strelka/cms.rb:
+	Bump minor version, update history.
+	[34ca70dbf0f8]
+
+	* .rvm.gems, Rakefile, lib/strelka/cms/page.rb,
+	spec/strelka/cms/page_spec.rb:
+	Update gems, convert from summarize to ots.
+	[aa0f957b7aa8]
+
+	* .rvmrc:
+	Test under Ruby 2 by default
+	[6152c3c159b6]
+
+2012-10-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.0.1 for changeset a2b1b1cf2f73
+	[412de32e62d7]
+
+	* .hgsigs:
+	Added signature for changeset 82c00e592623
+	[a2b1b1cf2f73] [v0.0.1]
+
+	* .rvm.gems, History.rdoc, Manifest.txt, README.rdoc, Rakefile, data
+	/strelka-cms/apps/content-manager, data/strelka-
+	cms/templates/layout.tmpl, etc/config.yml, public/news/v0.0.1.page:
+	Prep for release.
+
+	- Update dependencies
+	- Add a page for testing the RSSS feeds app.
+	- Allow pages with single dots in the filename.
+	[82c00e592623]
+
 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]
+	[8d4142b7bd18]
 
 2012-08-01  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,8 @@
+==  v0.3.0 [2017-07-05] Michael Granger <ged@FaerieMUD.org>
+
+Convert to use the newer Strelka discovery conventions.
+
+
 == v0.2.0 [2013-03-20] Michael Granger <ged@FaerieMUD.org>
 
 Update for newer versions of Strelka/convert to Pluggability.

data/Manifest.txt

@@ -4,13 +4,13 @@ Manifest.txt
 Procfile
 README.rdoc
 Rakefile
-data/strelka-cms/apps/content-feeds
-data/strelka-cms/apps/content-manager
 data/strelka-cms/templates/autoindex/default.tmpl
 data/strelka-cms/templates/layout.tmpl
 data/strelka-cms/templates/page.tmpl
 etc/mongrel.rb
+lib/strelka/apps.rb
 lib/strelka/cms.rb
+lib/strelka/cms/feeds.rb
 lib/strelka/cms/page.rb
 lib/strelka/cms/pagecatalog.rb
 lib/strelka/cms/pagefilter.rb
@@ -20,6 +20,7 @@ lib/strelka/cms/pagefilter/editorial.rb
 lib/strelka/cms/pagefilter/example.rb
 lib/strelka/cms/pagefilter/strip.rb
 lib/strelka/cms/pagefilter/textile.rb
+lib/strelka/cms/publisher.rb
 public/humans.txt
 public/images/misc/button-gloss.png
 public/images/misc/button-overlay.png
@@ -47,7 +48,8 @@ public/stylesheets/app.css
 public/stylesheets/foundation.css
 public/stylesheets/ie.css
 spec/data/test.page
-spec/lib/helpers.rb
+spec/helpers.rb
 spec/strelka/cms/page_spec.rb
 spec/strelka/cms/pagecatalog_spec.rb
+spec/strelka/cms/pagefilter/autoindex_spec.rb
 spec/strelka/cms_spec.rb

data/Rakefile

@@ -8,9 +8,10 @@ rescue LoadError
 	abort "This Rakefile requires 'hoe' (gem install hoe)"
 end
 
+GEMSPEC = 'strelka-cms.gemspec'
+
 Hoe.plugin :mercurial
 Hoe.plugin :signing
-Hoe.plugin :manualgen
 Hoe.plugin :deveiate
 
 Hoe.plugins.delete :rubyforge
@@ -19,24 +20,25 @@ hoespec = Hoe.spec 'strelka-cms' do
 	self.readme_file = 'README.rdoc'
 	self.history_file = 'History.rdoc'
 	self.extra_rdoc_files = FileList[ '*.rdoc' ]
+	self.license "BSD-3-Clause"
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'strelka',             '~> 0.0'
-	self.dependency 'ratom',               '~> 0.6'
 	self.dependency 'RedCloth',            '~> 4.2'
+	self.dependency 'nokogiri',            '~> 1.6'
+	self.dependency 'strelka',             '~> 0.15'
+	self.dependency 'ratom',               '~> 0.8'
 	self.dependency 'ots',                 '~> 0.5'
-	self.dependency 'nokogiri',            '~> 1.4'
-	self.dependency 'pluggability',        '~> 0.0'
+	self.dependency 'pluggability',        '~> 0.2'
 	self.dependency 'tidy-ext',            '~> 0.1'
 	self.dependency 'rcodetools',          '~> 0.8'
 	self.dependency 'strelka-fancyerrors', '~> 0.0'
+	self.dependency 'mail',                '~> 2.6'
 
-	self.dependency 'hoe-deveiate',        '~> 0.1', :developer
+	self.dependency 'hoe-deveiate',        '~> 0.3', :developer
+	self.dependency 'fakefs',              '~> 0.4', :developer
 
-	self.spec_extras[:licenses] = ["BSD"]
-	self.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Strelka CMS']
-	self.require_ruby_version( '>=1.9.3' )
+	self.require_ruby_version( '>=2.3.4' )
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
 
@@ -62,6 +64,38 @@ if Rake::Task.task_defined?( '.gemtest' )
 	end
 end
 
+# Use the fivefish formatter for docs generated from development checkout
+if File.directory?( '.hg' )
+	require 'rdoc/task'
+
+	Rake::Task[ 'docs' ].clear
+	RDoc::Task.new( 'docs' ) do |rdoc|
+		rdoc.main = "README.rdoc"
+		rdoc.rdoc_files.include( "*.rdoc", "ChangeLog", "lib/**/*.rb" )
+		rdoc.generator = :fivefish
+		rdoc.title = "Strelka-CMS: A file-based content management system"
+		rdoc.rdoc_dir = 'doc'
+	end
+end
+
+
+task :gemspec => GEMSPEC
+file GEMSPEC => __FILE__
+task GEMSPEC do |task|
+	spec = $hoespec.spec
+	spec.files.delete( '.gemtest' )
+	spec.signing_key = nil
+	spec.cert_chain = Rake::FileList[ 'certs/*.pem' ].to_a
+	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	File.open( task.name, 'w' ) do |fh|
+		fh.write( spec.to_ruby )
+	end
+end
+
+CLOBBER.include( GEMSPEC.to_s )
+task :default => :gemspec
+
+
 
 # Add admin app testing directories to the clobber list
 CLOBBER.include( 'static', 'run', 'logs', 'strelka.sqlite' )

data/lib/strelka/apps.rb

@@ -0,0 +1,12 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+# Strelka App discovery file
+
+require 'strelka/discovery'
+
+Strelka::Discovery.register_apps(
+    'cms-publisher' => 'strelka/cms/publisher.rb',
+    'cms-feeds' => 'strelka/cms/feeds.rb'
+)
+

data/lib/strelka/cms.rb

@@ -19,10 +19,10 @@ module Strelka::CMS
 
 
 	# Version string
-	VERSION = '0.2.0'
+	VERSION = '0.3.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 7e6d67090ff3 $
+	REVISION = %q$Revision: e9f738cb50e0 $
 
 
 	require 'strelka/cms/page'

data/{data/strelka-cms/apps/content-feeds → lib/strelka/cms/feeds.rb}

@@ -17,7 +17,7 @@ require 'strelka/cms/page'
 
 
 # The Feed applet -- generate RSS and Atom feeds for various things.
-class Strelka::CMS::ContentFeeds < Strelka::App
+class Strelka::CMS::Feeds < Strelka::App
 	extend Loggability,
 	       Configurability,
 	       Strelka::MethodUtilities
@@ -194,6 +194,3 @@ class Strelka::CMS::ContentFeeds < Strelka::App
 
 
 end # class Strelka::CMS::Feeds
-
-Encoding.default_internal = Encoding::UTF_8
-Strelka::CMS::Feeds.run if __FILE__ == $0

data/lib/strelka/cms/page.rb

@@ -226,6 +226,7 @@ class Strelka::CMS::Page
 	### it in its configured template if it has one.
 	def render( * )
 		if path = self.template
+			self.log.debug "Wrapping %p in template at %p" % [ self, path ]
 			tmpl = Inversion::Template.load( path )
 			tmpl.page = self
 			return tmpl

data/lib/strelka/cms/pagecatalog.rb

@@ -28,7 +28,8 @@ class Strelka::CMS::PageCatalog
 
 	### Create a new PageCatalog that will find and read pages from the configured
 	### directory.
-	def initialize( basedir=Pathname.pwd, pattern=DEFAULT_GLOB_PATTERN )
+	def initialize( basedir=nil, pattern=DEFAULT_GLOB_PATTERN )
+		basedir ||= Pathname.pwd
 		pattern.slice!( 0, 1 ) if pattern.start_with?( '/' )
 		self.log.debug "New catalog for pages matching: %s in: %s" % [ pattern, basedir ]
 		@basedir  = Pathname( basedir )
@@ -94,14 +95,30 @@ class Strelka::CMS::PageCatalog
 	end
 
 
+	### Fetch a Strelka::CMS::Page from the catalog that matches +pagename+.
+	def []( pagename )
+		pagename = pagename + '.page' unless pagename.end_with?( '.page' )
+		paths = self.page_path_enumerator
+		pagepath = paths.find do |path|
+			self.log.debug "Testing path %s (relative to %s) for %s: %s" %
+				[ path, self.basedir, pagename, path.relative_path_from(self.basedir) ]
+			path.relative_path_from(self.basedir).to_s == pagename.to_s
+		end or return nil
+
+		return Strelka::CMS::Page.load( pagepath, self )
+	end
+
+
 	#########
 	protected
 	#########
 
 	### Return an Enumerator that will yield a Pathname for each page matching the #pageglob
 	def page_path_enumerator
-		self.log.debug "Fetching an enumerator for %s" % [ self.glob ]
-		Pathname.glob( self.glob ).each
+		self.log.debug "Fetching an enumerator for files matching: %s" % [ self.glob ]
+		paths = Pathname.glob( self.glob )
+		self.log.debug "  fully-qualifying %d paths: %p" % [ paths.length, paths ]
+		return paths.collect {|fn| self.basedir + fn }.each
 	end
 
 
@@ -110,7 +127,8 @@ class Strelka::CMS::PageCatalog
 	def page_enumerator
 		Enumerator.new do |yielder|
 			self.page_path_enumerator.each do |path|
-				page = Strelka::CMS::Page.load( path, self )
+				self.log.debug "Loading %s..." % [ path ]
+				page = Strelka::CMS::Page.load( path.to_s, self )
 				yielder.yield( page )
 			end
 		end

data/lib/strelka/cms/pagefilter.rb

@@ -25,34 +25,6 @@ class Strelka::CMS::PageFilter
 	plugin_prefixes 'strelka/cms/pagefilter'
 
 
-	### Search for plugins in the $LOAD_PATH and load each of them that's found.
-	def self::load_all
-		loaded = []
-		glob_pat = '{' + self.derivative_dirs.join(',') + '}/*.rb'
-		$LOAD_PATH.uniq.collect {|path| path.untaint; Pathname(path) }.each do |base|
-			self.log.debug "  searching for %s" % [ base + glob_pat ]
-			Pathname.glob( base + glob_pat ).each do |plugin|
-				# Don't load this file twice
-				next if Pathname(__FILE__).expand_path == plugin.expand_path
-
-				begin
-					path = plugin.to_s.untaint
-					require( path )
-					loaded << plugin
-				rescue LoadError, SecurityError => err
-					self.log.error "  %s while loading %s: %s" %
-						[ err.class.name, plugin.to_s, err.message ]
-					err.backtrace.each do |frame|
-						self.log.debug "  #{frame}"
-					end
-				end
-			end
-		end
-
-		return loaded
-	end
-
-
 	#################################################################
 	###	I N S T A N C E   M E T H O D S
 	#################################################################

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

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'ostruct'
+require 'English'
 
 require 'strelka/cms/pagecatalog'
 require 'strelka/cms/page'
@@ -33,8 +34,8 @@ class Strelka::CMS::PageFilter::AutoIndex < Strelka::CMS::PageFilter
 		<\?
 			autoindex           # Instruction Target
 			\s+
-			(\S+)              # glob for pages to link [$1]
-			(.*?)				# options [$2]
+			(?<pattern>\S+)     # glob for pages to link [$1]
+			(?<options>.*?)     # options [$2]
 			\s*
 		\?>
 	  }xm
@@ -59,42 +60,33 @@ class Strelka::CMS::PageFilter::AutoIndex < Strelka::CMS::PageFilter
 	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|
-				self.log.debug "  got: %p" % [ match ]
-				# Grab the tag values
-				pattern = $1
-				options = $2
-
-				self.log.debug "Generating an index for %p relative to %p." % [ pattern, page.path ]
-				self.generate_index( pattern, page, catalog, options )
-			end
-			return source
-		else
-			self.log.debug "Not generating autoindex sections: no catalog"
-			return source.gsub( PI, NO_CATALOG_COMMENT )
+		catalog = page.catalog or return self.strip_instructions( source )
+
+		self.log.debug "Processing autoindex directives."
+		return source.gsub( PI ) do |*|
+			pattern = $LAST_MATCH_INFO[:pattern]
+			options = $LAST_MATCH_INFO[:options]
+			self.generate_index( pattern, page, catalog, options )
 		end
 	end
 
 
+	### Strip autoindex PIs from +source+ and return it.
+	def strip_instructions( source )
+		self.log.debug "Not generating autoindex sections: no catalog"
+		return source.gsub( PI, NO_CATALOG_COMMENT )
+	end
+
+
 	### 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 ]
+		self.log.debug "Generating an index for %p relative to %p with options: %p." %
+			[ pattern, page.path, options ]
+
 		options = self.parse_options( options )
 		style   = options.style || DEFAULT_STYLE
 
-		pages = if pattern.start_with?( '/' )
-				self.log.debug "  absolute pattern; matching relative to catalog basedir %p" %
-					[ catalog.basedir.to_s ]
-				catalog.matching_pattern( pattern ).to_a
-			else
-				self.log.debug "  relative pattern; matching relative to page directory %p" %
-					[ page.path.dirname.to_s ]
-				catalog.relative_to( page.path.dirname ).matching_pattern( pattern ).to_a
-			end
-		pages = self.sort_pages( pages, options ) if options.sortkey
+		pages = self.find_matching_pages( catalog, page, pattern, options )
 
 		style = style + '.tmpl' unless style =~ /\.tmpl$/
 		style = DEFAULT_TEMPLATE_DIR + style
@@ -116,6 +108,20 @@ class Strelka::CMS::PageFilter::AutoIndex < Strelka::CMS::PageFilter
 	protected
 	#########
 
+	### Return the pages matching the specified +pattern+ in the +catalog+ relative
+	### to the given +page+.
+	def find_matching_pages( catalog, page, pattern, options )
+		self.log.debug "Find pages in catalog %p matching pattern %p relative to page %p.." %
+			[ catalog, pattern, page ]
+		pages = catalog.matching_pattern( pattern )
+		pages = pages.relative_to( page.path.dirname ) unless pattern.start_with?( '/' )
+		pages = self.sort_pages( pages.to_a, options )
+		pages = pages[ 0, options.limit ] if options.limit
+
+		return pages
+	end
+
+
 	### Parse the options to the PI, returning the results as an OpenStruct.
 	def parse_options( optstring )
 		opts = OpenStruct.new
@@ -135,6 +141,8 @@ class Strelka::CMS::PageFilter::AutoIndex < Strelka::CMS::PageFilter
 			return pages.sort_by {|page| page.path.mtime }.reverse
 		when 'title'
 			return pages.sort_by {|page| page.title }
+		when nil
+			return pages
 		else
 			self.log.error "Don't know how to sort the index by %p" % [ options.sortkey ]
 		end