nesta 0.9.9 → 0.9.10

data/spec/spec_helper.rb

@@ -7,10 +7,6 @@ require 'sinatra'
 
 Test::Unit::TestCase.send :include, Rack::Test::Methods
 
-Spec::Runner.configure do |config|
-  config.include(RspecHpricotMatchers)
-end
-
 module Nesta
   class App < Sinatra::Base
     set :environment, :test
@@ -21,31 +17,7 @@ end
 require File.expand_path('../lib/nesta/env', File.dirname(__FILE__))
 require File.expand_path('../lib/nesta/app', File.dirname(__FILE__))
 
-module FixtureHelper
-  FIXTURE_DIR = File.expand_path('fixtures', File.dirname(__FILE__))
-
-  def create_fixtures_directory
-    FileUtils.mkdir_p(FixtureHelper::FIXTURE_DIR)
-  end
-
-  def remove_fixtures
-    FileUtils.rm_r(FixtureHelper::FIXTURE_DIR, :force => true)
-  end
-end
-
-module RequestSpecHelper
-  def app
-    Nesta::App
-  end
-  
-  def body
-    last_response.body
-  end
-end
-
 module ConfigSpecHelper
-  include FixtureHelper
-
   def stub_yaml_config
     @config = {}
     Nesta::Config.stub!(:yaml_exists?).and_return(true)
@@ -65,7 +37,40 @@ module ConfigSpecHelper
   def stub_configuration(options = {})
     stub_config_key('title', 'My blog', options)
     stub_config_key('subtitle', 'about stuff', options)
-    content_path = File.join(FixtureHelper::FIXTURE_DIR, 'content')
-    stub_config_key('content', content_path, options.merge(:rack_env => true))
+    stub_config_key(
+        'content', temp_path('content'), options.merge(:rack_env => true))
+  end
+end
+
+module TempFileHelper
+  TEMP_DIR = File.expand_path('tmp', File.dirname(__FILE__))
+
+  def create_temp_directory
+    FileUtils.mkdir_p(TempFileHelper::TEMP_DIR)
+  end
+
+  def remove_temp_directory
+    FileUtils.rm_r(TempFileHelper::TEMP_DIR, :force => true)
+  end
+  
+  def temp_path(base)
+    File.join(TempFileHelper::TEMP_DIR, base)
+  end
+end
+
+Spec::Runner.configure do |config|
+  config.include(RspecHpricotMatchers)
+
+  config.include(ConfigSpecHelper)
+  config.include(TempFileHelper)
+end
+
+module RequestSpecHelper
+  def app
+    Nesta::App
+  end
+  
+  def body
+    last_response.body
   end
 end

data/views/atom.haml

@@ -21,7 +21,7 @@
       %title= article.heading
       %link{ :href => url_for(article), :type => 'text/html', :rel => 'alternate' }
       %id= atom_id(article)
-      %content(type='html')&= find_and_preserve(absolute_urls(article.body))
+      %content(type='html')&= find_and_preserve(absolute_urls(article.body(self)))
       %published= article.date(:xmlschema)
       %updated= article.date(:xmlschema)
       - article.categories.each do |category|

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: nesta
 version: !ruby/object:Gem::Version 
-  hash: 41
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 9
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Graham Ashton
@@ -15,180 +10,130 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 +01:00
+date: 2011-09-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
         version: "3.1"
   type: :runtime
   prerelease: false
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sass
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
         version: "3.1"
   type: :runtime
   prerelease: false
-  requirement: *id002
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: maruku
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
   type: :runtime
   prerelease: false
-  requirement: *id003
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 4
-        - 2
         version: "4.2"
   type: :runtime
   prerelease: false
-  requirement: *id004
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
+        version: 1.2.6
   type: :runtime
   prerelease: false
-  requirement: *id005
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: shotgun
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
         version: "0.8"
   type: :runtime
   prerelease: false
-  requirement: *id006
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
-        version: 0.8.3
+        version: 0.8.4
   type: :development
   prerelease: false
-  requirement: *id007
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 5
-        - 7
-        version: 0.5.7
+        version: 0.6.1
   type: :development
   prerelease: false
-  requirement: *id008
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :development
   prerelease: false
-  requirement: *id009
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec_hpricot_matchers
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :development
   prerelease: false
-  requirement: *id010
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
         version: 1.2.3
   type: :development
   prerelease: false
-  requirement: *id011
+  version_requirements: *id011
 description: |
   Nesta is a lightweight Content Management System, written in Ruby using
   the Sinatra web framework. Nesta has the simplicity of a static site
@@ -231,18 +176,25 @@ files:
 - lib/nesta/nesta.rb
 - lib/nesta/overrides.rb
 - lib/nesta/path.rb
-- lib/nesta/plugins.rb
+- lib/nesta/plugin.rb
 - lib/nesta/version.rb
 - nesta.gemspec
 - scripts/import-from-mephisto
 - spec/atom_spec.rb
 - spec/commands_spec.rb
 - spec/config_spec.rb
+- spec/fixtures/nesta-plugin-test/Gemfile
+- spec/fixtures/nesta-plugin-test/Rakefile
+- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test.rb
+- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test/init.rb
+- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test/version.rb
+- spec/fixtures/nesta-plugin-test/nesta-plugin-test.gemspec
 - spec/model_factory.rb
 - spec/models_spec.rb
 - spec/overrides_spec.rb
 - spec/page_spec.rb
 - spec/path_spec.rb
+- spec/plugin_spec.rb
 - spec/sitemap_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -286,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 279403347508023079
       segments: 
       - 0
       version: "0"
@@ -295,14 +247,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 279403347508023079
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nesta
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby CMS, written in Sinatra
@@ -310,11 +262,18 @@ test_files:
 - spec/atom_spec.rb
 - spec/commands_spec.rb
 - spec/config_spec.rb
+- spec/fixtures/nesta-plugin-test/Gemfile
+- spec/fixtures/nesta-plugin-test/Rakefile
+- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test.rb
+- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test/init.rb
+- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test/version.rb
+- spec/fixtures/nesta-plugin-test/nesta-plugin-test.gemspec
 - spec/model_factory.rb
 - spec/models_spec.rb
 - spec/overrides_spec.rb
 - spec/page_spec.rb
 - spec/path_spec.rb
+- spec/plugin_spec.rb
 - spec/sitemap_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/lib/nesta/plugins.rb

@@ -1,15 +0,0 @@
-module Nesta
-  module Plugins
-    def self.load_local_plugins
-      plugins = Dir.glob(File.expand_path('../plugins/*', File.dirname(__FILE__)))
-      plugins.each { |plugin| require_plugin(plugin) }
-    end
-
-    private
-      def self.require_plugin(plugin)
-        require File.join(plugin, 'lib', File.basename(plugin))
-      rescue LoadError => e
-        $stderr.write("Couldn't load plugins/#{File.basename(plugin)}: #{e}\n")
-      end
-  end
-end