tributary 0.0.3 → 0.0.4

data/.rspec

@@ -1,6 +1,5 @@
 --colour
 --require rack/test
 --require ./lib/tributary
---require ./lib/tributary/plugins/dummy
 --require ./lib/tributary/plugins/mnml
 --require ./lib/tributary/plugins/unbreak_my_art

data/README.md

@@ -90,7 +90,7 @@ The settings altered by the user are kept in the given user’s session and so p
 Plugins
 -------
 
-Plugins (put in the `App.plugins` `Array`) are objects which can be sent a `handle` method with an `Item` as a parameter and are expected to return the `Item` (so the calls to subsequent plugins are chainable). See the `Mnml` plugin for an example implementation utilising a `SimpleDelegator` to filter the given `Item`’s `body` and `title` methods.
+Plugins (put in the `App.plugins` `Array`) are modules which get to extend `Item`s. See the `Mnml` plugin for an example implementation filtering the output of the `body` and `title` methods.
 
 
 

data/lib/tributary/plugins/mnml.rb

@@ -1,14 +1,11 @@
-module Tributary module Plugins class Mnml
+module Tributary module Plugins module Mnml
 
-  def handle item
-    mnml = SimpleDelegator.new item
-    def mnml.body
-      super.tr 'aeiouy', ''
-    end
-    def mnml.title
-      super.tr 'aeiouy', ''
-    end
-    mnml
+  def body
+    super.tr 'aeiouy', ''
+  end
+
+  def title
+    super.tr 'aeiouy', ''
   end
 
 end end end

data/lib/tributary/plugins/unbreak_my_art.rb

@@ -1,21 +1,18 @@
 # encoding: UTF-8
 
-module Tributary module Plugins class UnbreakMyArt
+module Tributary module Plugins module UnbreakMyArt
 
-  def handle item
-    unbroken = SimpleDelegator.new item
-    def unbroken.body
-      Plugins::UnbreakMyArt.unbreak super
-    end
-    def unbroken.title
-      Plugins::UnbreakMyArt.unbreak super
-    end
-    unbroken
+  def body
+    unbreak super
+  end
+
+  def title
+    unbreak super
   end
 
   private
 
-  def self.unbreak string
+  def unbreak string
     string.gsub /((^|[^\p{L}<])\p{L}\p{P}?) /, '\1 '
   end
 

data/lib/tributary/stream.rb

@@ -3,7 +3,7 @@ module Tributary class Stream
   def initialize root = App.root, plugins = App.plugins
     @items = Dir["#{root}/*/*.md"].map { |file| Item.new file }
     plugins.each do |plugin|
-      @items.map! { |item| plugin.handle item }
+      @items.each { |item| item.extend plugin }
     end
   end
 

data/spec/tributary/plugins/mnml_spec.rb

@@ -2,13 +2,13 @@
 
 module Tributary describe Plugins::Mnml do
 
-  describe '#handle' do
+  describe '#body, #title' do
 
-    it 'minimalises the given Item’s title and body' do
-      item = mock Item, body: 'a wonderful body', title: 'an interesting title'
-      mnml = Plugins::Mnml.new.handle item
-      mnml.body.should  == ' wndrfl bd'
-      mnml.title.should == 'n ntrstng ttl'
+    it 'returns the relevant minimalised part' do
+      file = Tempfile.open('Plugins::Mnml') { |f| f << "title: an interesting title\n\na wonderful body" }
+      item = Item.new(file.path).extend Plugins::Mnml
+      item.title.should == 'n ntrstng ttl'
+      item.body.should  == "<p> wndrfl bd</p>\n"
     end
 
   end

data/spec/tributary/plugins/unbreak_my_art_spec.rb

@@ -3,10 +3,22 @@
 module Tributary describe Plugins::UnbreakMyArt do
 
   def unbreak string
-    Plugins::UnbreakMyArt.new.handle(mock Item, body: string).body
+    file = Tempfile.open('Plugins::UnbreakMyArt') { |f| f << "\n\n#{string}" }
+    Item.new(file.path).extend(Plugins::UnbreakMyArt).body[3..-6]
   end
 
-  describe '#handle' do
+  describe '#body, #title' do
+
+    it 'returns the relevant unbroken part' do
+      file = Tempfile.open('Plugins::UnbreakMyArt') { |f| f << "title: about a ninja\n\nand a pirate" }
+      item = Item.new(file.path).extend Plugins::UnbreakMyArt
+      item.title.should == 'about a ninja'
+      item.body.should  == "<p>and a pirate</p>\n"
+    end
+
+  end
+
+  describe '#unbreak' do
 
     it 'prevents line wrapping after single-letter words' do
       unbreak('give me a break').should == 'give me a break'
@@ -18,19 +30,13 @@ module Tributary describe Plugins::UnbreakMyArt do
     end
 
     it 'does not alter one-letter HTML tags' do
-      unbreak("<a href='http://en.wikipedia.org/wiki/Invisible_Pink_Unicorn'>I want to believe</a>").should == "<a href='http://en.wikipedia.org/wiki/Invisible_Pink_Unicorn'>I want to believe</a>"
+      unbreak("<a href='http://en.wikipedia.org/wiki/Invisible_Pink_Unicorn'>I want to believe</a>").should == '<a href="http://en.wikipedia.org/wiki/Invisible_Pink_Unicorn">I want to believe</a>'
     end
 
     it 'allows for optional trailing punctuation' do
       unbreak('I, Clau-Clau-Claudius').should == 'I, Clau-Clau-Claudius'
     end
 
-    it 'unbreaks bodies and titles' do
-      unbroken = Plugins::UnbreakMyArt.new.handle mock Item, title: 'about a ninja', body: 'and a pirate'
-      unbroken.title.should == 'about a ninja'
-      unbroken.body.should  == 'and a pirate'
-    end
-
   end
 
 end end

data/spec/tributary/stream_spec.rb

@@ -23,7 +23,7 @@ module Tributary describe Stream do
   describe '#initialize' do
 
     it 'filters the Items through the provided Plugins' do
-      App.plugins = [Plugins::Mnml.new]
+      App.plugins = [Plugins::Mnml]
       plugged = Stream.new
       @stream.recent.map(&:title).should == ['ten…', 'this…', '600th anniversary (intl.)', 'bilinguality', 'a…', 'welcome to tributary']
       plugged.recent.map(&:title).should == ['tn…',  'ths…',  '600th nnvrsr (ntl.)',       'blnglt',       '…',  'wlcm t trbtr']

data/tributary.gemspec

@@ -4,7 +4,7 @@ YAML::ENGINE.yamler = 'syck'
 
 Gem::Specification.new do |gem|
   gem.name     = 'tributary'
-  gem.version  = '0.0.3'
+  gem.version  = '0.0.4'
   gem.summary  = 'tributary: a tiny, toto-inspired blogging engine'
   gem.homepage = 'http://github.com/chastell/tributary'
   gem.author   = 'Piotr Szotkowski'

metadata

@@ -2,7 +2,7 @@
 name: tributary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Piotr Szotkowski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +01:00
+date: 2011-03-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,6 @@ files:
 - lib/tributary.rb
 - lib/tributary/app.rb
 - lib/tributary/item.rb
-- lib/tributary/plugins/dummy.rb
 - lib/tributary/plugins/mnml.rb
 - lib/tributary/plugins/unbreak_my_art.rb
 - lib/tributary/stream.rb
@@ -141,7 +140,6 @@ files:
 - spec/site/views/pages.sass
 - spec/tributary/app_spec.rb
 - spec/tributary/item_spec.rb
-- spec/tributary/plugins/dummy_spec.rb
 - spec/tributary/plugins/mnml_spec.rb
 - spec/tributary/plugins/unbreak_my_art_spec.rb
 - spec/tributary/stream_spec.rb
@@ -178,6 +176,5 @@ test_files:
 - spec/tributary/app_spec.rb
 - spec/tributary/stream_spec.rb
 - spec/tributary/item_spec.rb
-- spec/tributary/plugins/dummy_spec.rb
 - spec/tributary/plugins/unbreak_my_art_spec.rb
 - spec/tributary/plugins/mnml_spec.rb

data/lib/tributary/plugins/dummy.rb

@@ -1,7 +0,0 @@
-module Tributary module Plugins class Dummy
-
-  def handle item
-    item
-  end
-
-end end end

data/spec/tributary/plugins/dummy_spec.rb

@@ -1,12 +0,0 @@
-module Tributary describe Plugins::Dummy do
-
-  describe '#handle' do
-
-    it 'returns an unmodified Item' do
-      item = mock Item
-      Plugins::Dummy.new.handle(item).should equal item
-    end
-
-  end
-
-end end