strelka-cms 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d12e9b44f5cbfad5fd5e79874893bf78848f03e
-  data.tar.gz: 9feaecf28b686231d5b96e19cf7469a5a8377b23
+  metadata.gz: 834b28f4d44362f61cd1feba36ebed0c8e487461
+  data.tar.gz: 6c1edc1d03d06df6935a620f3ba9b20fcf1bd04b
 SHA512:
-  metadata.gz: 11debf7efa008c839020c4d0633ec232b89490bcf3722953f06d94cb16fe439e8cfe18e89d1e1b4af70c5a950c0fa3891473623f2de41878c13be3c29c3a12c4
-  data.tar.gz: f62579769263b488a71d4422700baf73ffee179b30c67e8d6e2b881b7af5a2d6e7f186972d523d396e5daa5c9c7e0c74bdd199ccaaa588fdd9d8bffcdc075215
+  metadata.gz: cca1fd8e406244b11be95499e0c8576bfdc9cfd5b45b6effa0ff0bef6ce03ed65e10c2d17ff1467d5b02a021bfff1fd56f364d37af4af94d6a233dac3c02848e
+  data.tar.gz: 7eca9faac12d1892696a72d99adb393ced77f8d6fd80817338b735b12fdfca812df8bb138b415480bc89dab65c3d79b62879d1654ede6feffd0460ec8242c2bd

data/History.rdoc

@@ -1,3 +1,8 @@
+== v0.2.0 [2013-03-20] Michael Granger <ged@FaerieMUD.org>
+
+Update for newer versions of Strelka/convert to Pluggability.
+
+
 == v0.1.0 [2013-02-28] Michael Granger <ged@FaerieMUD.org>
 
 Update dependencies, convert from summarize to ots.

data/Rakefile

@@ -22,16 +22,17 @@ hoespec = Hoe.spec 'strelka-cms' do
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'strelka',       '~> 0.0'
-	self.dependency 'ratom',         '~> 0.6'
-	self.dependency 'RedCloth',      '~> 4.2'
-	self.dependency 'ots',           '~> 0.5'
-	self.dependency 'nokogiri',      '~> 1.4'
-	self.dependency 'pluginfactory', '~> 1.0'
-	self.dependency 'tidy-ext',      '~> 0.1'
-	self.dependency 'rcodetools',    '~> 0.8'
-
-	self.dependency 'hoe-deveiate', '~> 0.1', :developer
+	self.dependency 'strelka',             '~> 0.0'
+	self.dependency 'ratom',               '~> 0.6'
+	self.dependency 'RedCloth',            '~> 4.2'
+	self.dependency 'ots',                 '~> 0.5'
+	self.dependency 'nokogiri',            '~> 1.4'
+	self.dependency 'pluggability',        '~> 0.0'
+	self.dependency 'tidy-ext',            '~> 0.1'
+	self.dependency 'rcodetools',          '~> 0.8'
+	self.dependency 'strelka-fancyerrors', '~> 0.0'
+
+	self.dependency 'hoe-deveiate',        '~> 0.1', :developer
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Strelka CMS']

data/lib/strelka/cms/page.rb

@@ -191,7 +191,7 @@ class Strelka::CMS::Page
 				filter.process( filtered_content, self )
 			rescue => err
 				self.log.error "%s while applying the %s filter: %s" %
-					[ err.class.name, filter.name, err.message ]
+					[ err.class.name, filter.class.factory_type, err.message ]
 				self.log.debug "  " + err.backtrace.join("\n  ")
 				filtered_content
 			end

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

@@ -89,7 +89,7 @@ class Strelka::CMS::PageFilter::Example < Strelka::CMS::PageFilter
 				# Now find the end of the example or complain
 				contentpos = scanner.pos
 				scanner.skip_until( END_PI ) or
-					raise "Unterminated example at line %d" % 
+					raise "Unterminated example at line %d" %
 						[ scanner.string[0..scanner.pos].count("\n") ]
 
 				# Now build the example and append to the buffer
@@ -129,7 +129,7 @@ class Strelka::CMS::PageFilter::Example < Strelka::CMS::PageFilter
 			content = body
 		end
 
-		# If the language is something that can itself include PIs, look for the 
+		# If the language is something that can itself include PIs, look for the
 		# special '<??end ?>' token and strip the extra '?'
 		if %w[xml html textile xhtml].include?( lang )
 			content.gsub!( /<\?\?(.*?)\?>/ ) do
@@ -146,12 +146,12 @@ class Strelka::CMS::PageFilter::Example < Strelka::CMS::PageFilter
 		caption = %{<div class="caption">} + caption.to_s + %{</div>} if caption
 
 		return %{<notextile><div class="example %s-example">%s%s</div></notextile>} %
-		 	[lang, content, caption || '']
+			[lang, content, caption || '']
 	end
 
 
-	### Parse an options hash for filtering from the given +args+, which can either 
-	### be a plain String, in which case it is assumed to be the name of the language the example 
+	### Parse an options hash for filtering from the given +args+, which can either
+	### be a plain String, in which case it is assumed to be the name of the language the example
 	### is in, or a Hash of configuration options.
 	def parse_options( args )
 		args = "{ #{args} }" unless args && args.strip[0] == ?{

data/lib/strelka/cms/pagefilter.rb

@@ -1,6 +1,7 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+#encoding: utf-8
 
-require 'pluginfactory'
+require 'pluggability'
 require 'strelka/mixins'
 
 require 'strelka/cms' unless defined?( Strelka::CMS )
@@ -14,17 +15,14 @@ require 'strelka/cms/page' unless defined?( Strelka::CMS::Page )
 #
 class Strelka::CMS::PageFilter
 	extend Loggability,
-	       PluginFactory
+	       Pluggability
 
 
 	# Loggability API -- log to the deveiate logger
 	log_to :strelka_cms
 
-
-	### PluginFactory API -- list the directories to search for derivatives.
-	def self::derivative_dirs
-		[ 'strelka/cms/pagefilter' ]
-	end
+	# Pluggability API -- list the directories to search for plugins
+	plugin_prefixes 'strelka/cms/pagefilter'
 
 
 	### Search for plugins in the $LOAD_PATH and load each of them that's found.
@@ -59,6 +57,12 @@ class Strelka::CMS::PageFilter
 	###	I N S T A N C E   M E T H O D S
 	#################################################################
 
+	def name
+		self.log.warn "#name called from: \n%s" % [ caller(1).join("\n") ]
+		"pagefilter"
+	end
+
+
 	### Export any static resources required by this filter to the given +output_dir+.
 	def export_resources( output_dir )
 		# No-op by default

data/lib/strelka/cms.rb

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

data/spec/strelka/cms/page_spec.rb

@@ -169,7 +169,7 @@ describe Strelka::CMS::Page do
 			file
 		end
 
-		let( :catalog ) { Strelka::CMS::PageCatalog.new(basedir) } 
+		let( :catalog ) { Strelka::CMS::PageCatalog.new(basedir) }
 		let( :page ) { described_class.load(pagefile.path, catalog) }
 		let( :relative_pagefile_pathname ) do
 			Pathname( pagefile.path ).relative_path_from( catalog.basedir )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka-cms
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strelka
@@ -103,19 +103,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: pluginfactory
+  name: pluggability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: tidy-ext
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: strelka-fancyerrors
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: strelka-cms
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: This is a web content-management application written for the Strelka web

metadata.gz.sig

@@ -1,2 +1,3 @@
-������$.6KY���,y�#ю�l�XJϔ(2���c䂄���N!-+���3"6H���t>\�d"�B��O�P��a$Aː�������ǩ�hQd�v����@F[Q(����Q��G\N�
-�CImU�Z�zX�Ns�����i	LS�b��Oǧ= ~F���F��\/����HY��=W����]6�����Ԋl4�A
+���Fvj(PS!��.��c�8��h%��1�oNJ>P��=��a���?X�ƨ�!v�#�?�l�\�N �7�8���Ҵݒ<?k6'G�q皯A|�
+g���[ݙ��גt��(8�Ljڊ�P��'���K������C|#�Z�2:d��k�ɃSQ��6��"F�q}L��Y����ذ)����31v
��lQ�
+#���Gi�;�k&_�߽z{6��e{�B���PM|�� y�~����Bغ�wU�b���4Z@