tributary 0.0.1 → 0.0.2

data/README.md

@@ -87,13 +87,13 @@ The settings altered by the user are kept in the given user’s session and so p
 
 
 
-Plugins
--------
+Plug-ins
+--------
 
-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.
+Plug-ins (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 plug-ins are chainable). See the `Mnml` plug-in for an example implementation utilising a `SimpleDelegator` to filter the given `Item`’s `body` and `title` methods.
 
 
 
 ---
 
-© MMX Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL 3 (see LICENCE)
+© MMX-MMXI Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL 3 (see LICENCE)

data/Rakefile

@@ -1,5 +1,12 @@
 require 'rspec/core/rake_task'
-
 ENV['TZ'] = 'Europe/Warsaw'
-
 RSpec::Core::RakeTask.new :spec
+
+desc 'Run Tributary console'
+task :console do
+  require 'irb'
+  require_relative 'lib/tributary'
+  include Tributary
+  ARGV.clear
+  IRB.start
+end

data/lib/tributary.rb

@@ -3,6 +3,8 @@ require 'sinatra/base'
 require 'sinatra/r18n'
 require 'yaml'
 
-require_relative 'tributary/app'
-require_relative 'tributary/item'
-require_relative 'tributary/stream'
+module Tributary
+  autoload :App,    'tributary/app'
+  autoload :Item,   'tributary/item'
+  autoload :Stream, 'tributary/stream'
+end

data/lib/tributary/app.rb

@@ -27,7 +27,7 @@ module Tributary class App < Sinatra::Base
 
   get '/set' do
     params.each { |key, value| session[key.to_sym] = value if App.user_prefs.map(&:to_s).include? key }
-    redirect request.referer
+    URI.parse(request.referer).host == request.host ? redirect(request.referer) : redirect('/')
   end
 
   get '/:feed.xml' do |feed|

data/spec/tributary/app_spec.rb

@@ -105,36 +105,36 @@ module Tributary describe App do
     it 'renders the Atom feed' do
       get '/index.xml'
       last_response.should be_ok
-      last_response.headers['Content-Type'].should == 'application/atom+xml;charset=utf-8'
+      last_response.headers['Content-Type'].should == 'application/atom+xml'
       last_response.body.should == File.read('spec/fixtures/index.xml')
     end
 
     it 'renders per-locale Atom feeds' do
       get '/index.en.xml'
       last_response.should be_ok
-      last_response.headers['Content-Type'].should == 'application/atom+xml;charset=utf-8'
+      last_response.headers['Content-Type'].should == 'application/atom+xml'
       last_response.body.should == File.read('spec/fixtures/index.en.xml')
 
       get '/index.pl.xml'
       last_response.should be_ok
-      last_response.headers['Content-Type'].should == 'application/atom+xml;charset=utf-8'
+      last_response.headers['Content-Type'].should == 'application/atom+xml'
       last_response.body.should == File.read('spec/fixtures/index.pl.xml')
     end
 
     it 'renders lang_limit-ed Atom feeds' do
       get '/index.en.en.xml'
       last_response.should be_ok
-      last_response.headers['Content-Type'].should == 'application/atom+xml;charset=utf-8'
+      last_response.headers['Content-Type'].should == 'application/atom+xml'
       last_response.body.should == File.read('spec/fixtures/index.en.en.xml')
 
       get '/index.pl.pl.xml'
       last_response.should be_ok
-      last_response.headers['Content-Type'].should == 'application/atom+xml;charset=utf-8'
+      last_response.headers['Content-Type'].should == 'application/atom+xml'
       last_response.body.should == File.read('spec/fixtures/index.pl.pl.xml')
 
       get '/index.en.en+pl.xml'
       last_response.should be_ok
-      last_response.headers['Content-Type'].should == 'application/atom+xml;charset=utf-8'
+      last_response.headers['Content-Type'].should == 'application/atom+xml'
       last_response.body.should == File.read('spec/fixtures/index.en.en+pl.xml')
     end
 
@@ -166,7 +166,7 @@ module Tributary describe App do
     end
 
     it 'sets the right App settings and redirects properly' do
-      get '/set?locale=pl', {}, 'HTTP_REFERER' => '/bilingual'
+      get '/set?locale=pl', {}, 'HTTP_REFERER' => 'http://example.org/bilingual'
       last_response.location.should == 'http://example.org/bilingual'
       follow_redirect!
       App.locale.should == 'pl'
@@ -188,6 +188,11 @@ module Tributary describe App do
       App.lang_limit.should == nil
     end
 
+    it 'doesn’t redirect outside of the current domain' do
+      get '/set', {}, 'HTTP_REFERER' => 'http://foo.bar/baz'
+      last_response.location.should == 'http://example.org/'
+    end
+
     it 'localises the output based on locale (defaulting to English)' do
       get '/set?locale=pl'
       get '/bilingual'

data/spec/tributary/item_spec.rb

@@ -14,7 +14,7 @@ module Tributary describe Item do
     @welcome   = Item.new 'spec/site/articles/welcome.md'
   end
 
-  context '#<=>' do
+  describe '#<=>' do
 
     it 'sorts Items by date, date-less last' do
       [@bi_en, @beep, @welcome, @about, @battle].sort.should == [@battle, @bi_en, @welcome, @beep, @about]
@@ -34,7 +34,7 @@ module Tributary describe Item do
 
   end
 
-  context '#body' do
+  describe '#body' do
 
     it 'returns the given Item’s markdown-processed body' do
       @about.body.should   == "<p>tributary <em>about</em> page</p>\n\n<p>about this tributary install</p>\n"
@@ -43,7 +43,7 @@ module Tributary describe Item do
 
   end
 
-  context '#date' do
+  describe '#date' do
 
     it 'returns the given Item’s parsed Time' do
       @about.date.should   == nil
@@ -54,7 +54,7 @@ module Tributary describe Item do
 
   end
 
-  context '#eql?' do
+  describe '#eql?' do
 
     it 'returns predicate for sane use of Items as Hash keys' do
       @about.should be_eql Item.new('spec/site/pages/about.md')
@@ -62,7 +62,7 @@ module Tributary describe Item do
 
   end
 
-  context '#hash' do
+  describe '#hash' do
 
     it 'returns static value for sane use of Items as Hash keys' do
       @about.hash.should == Item.new('spec/site/pages/about.md').hash
@@ -70,7 +70,7 @@ module Tributary describe Item do
 
   end
 
-  context '#lang' do
+  describe '#lang' do
 
     it 'returns the Item’s language (if defined)' do
       @about.lang.should == nil
@@ -80,7 +80,7 @@ module Tributary describe Item do
 
   end
 
-  context '#path' do
+  describe '#path' do
 
     it 'returns the given Item’s path' do
       @about.path.should  == 'about'
@@ -91,7 +91,7 @@ module Tributary describe Item do
 
   end
 
-  context '#published?' do
+  describe '#published?' do
 
     it 'returns whether the given Item has a date in the past' do
       @about.should_not be_published
@@ -102,7 +102,7 @@ module Tributary describe Item do
 
   end
 
-  context '#title' do
+  describe '#title' do
 
     it 'returns the given Item’s YAML-specified title' do
       @about.title.should   == 'about tributary'
@@ -117,7 +117,7 @@ module Tributary describe Item do
 
   end
 
-  context '#type' do
+  describe '#type' do
 
     it 'returns the given Item’s type' do
       @about.type.should   == :pages

data/spec/tributary/plugins/dummy_spec.rb

@@ -1,6 +1,6 @@
 module Tributary describe Plugins::Dummy do
 
-  context '#handle' do
+  describe '#handle' do
 
     it 'returns an unmodified Item' do
       item = mock Item

data/spec/tributary/plugins/mnml_spec.rb

@@ -2,7 +2,7 @@
 
 module Tributary describe Plugins::Mnml do
 
-  context '#handle' do
+  describe '#handle' do
 
     it 'minimalises the given Item’s title and body' do
       item = mock Item, body: 'a wonderful body', title: 'an interesting title'

data/spec/tributary/stream_spec.rb

@@ -20,7 +20,7 @@ module Tributary describe Stream do
     @stream = Stream.new
   end
 
-  context '#initialize' do
+  describe '#initialize' do
 
     it 'filters the Items through the provided Plugins' do
       App.plugins = [Plugins::Mnml.new]
@@ -31,7 +31,7 @@ module Tributary describe Stream do
 
   end
 
-  context '#langs' do
+  describe '#langs' do
 
     it 'returns an Array of langs used in the Items' do
       @stream.langs.should == ['en', 'pl']
@@ -39,7 +39,7 @@ module Tributary describe Stream do
 
   end
 
-  context '#pick_item' do
+  describe '#pick_item' do
 
     it 'returns the relevant Item based on the provided path' do
       @stream.pick_item('about').should        == @about
@@ -69,7 +69,7 @@ module Tributary describe Stream do
 
   end
 
-  context '#previous' do
+  describe '#previous' do
 
     it 'returns an Item previous to the given Item' do
       @stream.previous(@battle).should  == @bi_en
@@ -89,7 +89,7 @@ module Tributary describe Stream do
 
   end
 
-  context '#recent' do
+  describe '#recent' do
 
     it 'returns published Items, newest-first' do
       @stream.recent.should == [@polish, @english, @battle, @bi_en, @dated, @welcome]
@@ -124,7 +124,7 @@ module Tributary describe Stream do
 
   end
 
-  context '#subsequent' do
+  describe '#subsequent' do
 
     it 'returns an Item subsequent to the given Item' do
       @stream.subsequent(@welcome).should == @dated
@@ -144,7 +144,7 @@ module Tributary describe Stream do
 
   end
 
-  context '#types' do
+  describe '#types' do
 
     it 'returns an Array of the Items’ types' do
       @stream.types.should == [:articles, :beeps, :pages]

data/tributary.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = 'tributary'
-  gem.version  = '0.0.1'
+  gem.version  = '0.0.2'
   gem.summary  = 'tributary: a tiny, toto-inspired blogging engine'
   gem.homepage = 'http://github.com/chastell/tributary'
   gem.author   = 'Piotr Szotkowski'
@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'haml'
   gem.add_dependency 'kramdown'
-  gem.add_dependency 'sinatra', '>= 1.1'
+  gem.add_dependency 'sinatra', '>= 1.1.2'
   gem.add_dependency 'sinatra-r18n'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'rspec', '>= 2'

metadata

@@ -1,110 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tributary
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+  prerelease: !!null 
 platform: ruby
-authors: 
+authors:
 - Piotr Szotkowski
-autorequire: 
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-31 01:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-03-04 00:00:00.000000000 +01:00
+default_executable: !!null 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: haml
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &22181920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: kramdown
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *22181920
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: &22181480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *22181480
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &22180980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra-r18n
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *22180980
+- !ruby/object:Gem::Dependency
+  name: sinatra-r18n
+  requirement: &22180560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *22180560
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &22180100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *22180100
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &22179600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id006
-description: 
+  prerelease: false
+  version_requirements: *22179600
+description: !!null 
 email: chastell@chastell.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - LICENCE
@@ -166,36 +145,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/chastell/tributary
 licenses: []
-
-post_install_message: 
+post_install_message: !!null 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
-signing_key: 
+rubyforge_project: !!null 
+rubygems_version: 1.5.0
+signing_key: !!null 
 specification_version: 3
-summary: "tributary: a tiny, toto-inspired blogging engine"
-test_files: 
+summary: ! 'tributary: a tiny, toto-inspired blogging engine'
+test_files:
 - spec/tributary/app_spec.rb
 - spec/tributary/stream_spec.rb
 - spec/tributary/item_spec.rb