vanilla 1.17.2 → 1.17.3

data/Rakefile

@@ -1,6 +1,6 @@
 require "rubygems"
-require "rake/gempackagetask"
-require "rake/rdoctask"
+require "rubygems/package_task"
+require "rdoc/task"
 
 require "bundler/setup"
 require "vanilla"
@@ -75,6 +75,7 @@ if Object.const_defined?(:Gem)
     s.add_dependency("parslet", ">= 1.2.0")
     s.add_dependency("rack-test", ">=0.5.7")
 
+    s.add_development_dependency("rake", ">= 0.9.1")
     s.add_development_dependency("kintama", ">= 0.1.7") # add any other gems for testing/development
     s.add_development_dependency("mocha")
     s.add_development_dependency("capybara")
@@ -90,9 +91,9 @@ if Object.const_defined?(:Gem)
   # be automatically building a gem for this project. If you're not
   # using GitHub, edit as appropriate.
   #
-  # To publish your gem online, install the 'gemcutter' gem; Read more 
+  # To publish your gem online, install the 'gemcutter' gem; Read more
   # about that here: http://gemcutter.org/pages/gem_docs
-  Rake::GemPackageTask.new(spec) do |pkg|
+  Gem::PackageTask.new(spec) do |pkg|
     pkg.gem_spec = spec
   end
 
@@ -148,4 +149,4 @@ if Object.const_defined?(:Gem)
   end
 else
   puts "Gem management tasks unavailable, as rubygems was not fully loaded."
-end
+end

data/lib/vanilla/atom_feed.rb

@@ -17,6 +17,7 @@ module Vanilla
           @snips = app.soup[@criteria]
         end
       end
+      @count = params[:count] || @snips.length
     end
 
     def to_s
@@ -31,7 +32,7 @@ module Vanilla
     private
 
     def snips
-      @snips.sort_by { |s| atom_time(s.updated_at) }.reverse
+      @snips.sort_by { |s| atom_time(s.updated_at) }.reverse[0, @count]
     end
 
     def most_recent_updated_at
@@ -63,15 +64,21 @@ module Vanilla
     end
 
     def externalise_links(content)
-      content.gsub(/(href|src)=(["'])(\/?.*)\2/) do
-        type, quote, link = $1, $2, $3
-        if link =~ /^http/
-          "#{type}=#{quote}#{link}#{quote}"
-        else
-          absolute_link = "http://#{domain}" + (link =~ /^\// ? "" : "/") + link
-          "#{type}=#{quote}#{absolute_link}#{quote}"
-        end
+      # "([^"]*)"
+      content.gsub(/(href|src)="([^"]*)"/) do
+        externalised_link($1, '"', $2)
+      end.gsub(/(href|src)='([^']*)'/) do
+        externalised_link($1, "'", $2)
+      end
+    end
+
+    def externalised_link(type, quote, link)
+      if link =~ /^http/
+        "#{type}=#{quote}#{link}#{quote}"
+      else
+        absolute_link = "http://#{domain}" + (link =~ /^\// ? "" : "/") + link
+        "#{type}=#{quote}#{absolute_link}#{quote}"
       end
     end
   end
-end
+end

data/lib/vanilla/routing.rb

@@ -2,6 +2,7 @@ module Vanilla
   module Routing
 
     def url_to(snip_name, part=nil)
+      return "/" if snip_name == config.root_snip && part.nil?
       url = "/#{snip_name.gsub(" ", "+")}"
       url += "/#{part}" if part
       url

data/lib/vanilla/test_helper.rb

@@ -16,7 +16,7 @@ module Vanilla
           # to the application's soup without actually affecting the
           # app's content.
           config.soups ||= []
-          config.soups.unshift test_soup_path
+          config.soups.unshift temp_soup_path
         end
         @__app = klass.new
       end
@@ -24,7 +24,7 @@ module Vanilla
     end
 
     def vanilla_setup
-      FileUtils.mkdir_p(test_soup_path)
+      FileUtils.mkdir_p(temp_soup_path)
     end
 
     def vanilla_reset
@@ -49,12 +49,12 @@ module Vanilla
       app.soup << params
     end
 
-    def test_soup_path
+    def temp_soup_path
       File.expand_path(File.join(Dir.tmpdir, "soup"))
     end
 
     def vanilla_teardown
-      FileUtils.rm_rf(test_soup_path)
+      FileUtils.rm_rf(temp_soup_path)
     end
 
     def stub_app_soup(*snips)

data/lib/vanilla.rb

@@ -1,5 +1,5 @@
 module Vanilla
-  VERSION = "1.17.2"
+  VERSION = "1.17.3"
 
   autoload :Renderers, "vanilla/renderers"
   autoload :App, "vanilla/app"
@@ -20,4 +20,4 @@ module Vanilla
       @apps ||= []
     end
   end
-end
+end

data/pristine_app/soups/system/index.rb

@@ -4,9 +4,9 @@ class Index < Dynasnip
   def get(*args)
     list = app.soup.all_snips.sort_by { |a| a.updated_at || Time.at(0) }.reverse.map { |snip|
       %{<li>{link_to "#{snip.name}"}</li>}
-    }
+    }.join
     %{<ol id="index">#{list}</ol>}
   end
 
   self
-end
+end

data/test/core/atom_feed_test.rb

@@ -107,6 +107,16 @@ context "An atom feed" do
     assert_same_elements ["a", "c"], feed.entries.map { |e| e.title }
   end
 
+  should "allow limiting of the number of snips" do
+    stub_app_soup({:name => "a", :content => "x", :kind => "blog", :updated_at => (Time.now - 10)},
+                  {:name => "b", :content => "x", :kind => "blog", :updated_at => (Time.now - 20)})
+
+    feed_xml = app.atom_feed(:domain => "whatever", :matching => {:kind => "blog"}, :count => 1).to_s
+    feed = Atom::Feed.load_feed(feed_xml)
+    assert_equal 1, feed.entries.length
+    assert_equal "a", feed.entries.first.title
+  end
+
   should "set updated to be the latest updated_at of the included snips" do
     snip_a_data = {:name => "a", :content => "x", :updated_at => Time.parse("2011-05-22 12:00")}
     snip_b_data = {:name => "b", :content => "x", :updated_at => Time.parse("2011-05-23 12:34")}
@@ -211,4 +221,4 @@ context "An atom feed" do
     feed_xml = app.atom_feed(:domain => "yourdomain.example.com").to_s
     Atom::Feed.load_feed(feed_xml)
   end
-end
+end

data/test/core/routing_test.rb

@@ -27,4 +27,14 @@ context "Parsing routes" do
     end
   end
 
-end
+end
+
+context "Generating routes" do
+  should "generate root path for root snip" do
+    assert_equal "/", app.url_to(app.config.root_snip)
+  end
+
+  should "include the full snip and part if the root snip part was requested" do
+    assert_equal "/start/part", app.url_to(app.config.root_snip, "part")
+  end
+end

data/test/pristine_app/feed_test.rb

@@ -25,4 +25,15 @@ context "The feed dynasnip" do
     feed = Atom::Feed.load_feed(page.source)
     assert_equal "<p>This is <em>the</em> content</p>", feed.entries.first.content
   end
+
+  should "ensure relative links are made absolute" do
+     stub_app_soup({:name => "Hello", :content => "a [relative](/link)",
+                    :render_as => "markdown", :kind => "blog"},
+                    Feed.snip_attributes)
+
+    visit "/feed.xml"
+
+    feed = Atom::Feed.load_feed(page.source)
+    assert_equal %{<p>a <a href="http://yourdomain.example.com/link">relative</a></p>}, feed.entries.first.content
+  end
 end

data/test/pristine_app/index_test.rb

@@ -41,4 +41,4 @@ context "The index dynasnip" do
   def snip(attributes)
     Soup::Snip.new(attributes, nil)
   end
-end
+end

data/test/pristine_app/test_helper.rb

@@ -14,7 +14,7 @@ module TestHelper
 end
 
 Kintama.include TestHelper
-Kintama.include Capybara
+Kintama.include Capybara::DSL
 
 Kintama.setup do
   vanilla_setup
@@ -23,4 +23,4 @@ end
 
 Kintama.teardown do
   vanilla_teardown
-end
+end

metadata

@@ -1,217 +1,232 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vanilla
-version: !ruby/object:Gem::Version 
-  hash: 87
+version: !ruby/object:Gem::Version
+  version: 1.17.3
   prerelease: 
-  segments: 
-  - 1
-  - 17
-  - 2
-  version: 1.17.2
 platform: ruby
-authors: 
+authors:
 - James Adam
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-01 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 9
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: soup
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 0
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: soup
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.9
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: ratom
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 3
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.9
+- !ruby/object:Gem::Dependency
+  name: ratom
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.5
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 4
-        - 1
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 4.1.1
   type: :runtime
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: BlueCloth
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.1.1
+- !ruby/object:Gem::Dependency
+  name: BlueCloth
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  name: parslet
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: parslet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 5
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.7
   type: :runtime
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  name: kintama
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.7
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: kintama
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 1
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.7
   type: :development
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id012
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: james@lazyatom.com.com
-executables: 
+executables:
 - vanilla
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - Rakefile
 - README
 - .gemtest
@@ -298,40 +313,36 @@ files:
 - pristine_app/soups/tutorial/tutorial.snip.markdown
 - pristine_app/soups/tutorial/vanilla-rb.snip
 - pristine_app/soups/tutorial/vanilla.snip
-has_rdoc: true
 homepage: http://github.com/lazyatom/vanilla-rb
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
-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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 110256896921410377
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 110256896921410377
 requirements: []
-
 rubyforge_project: vanilla
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A bliki-type web content thing.
 test_files: []
-