vanilla 1.11.3 → 1.11.4

data/Rakefile

@@ -24,7 +24,7 @@ if Object.const_defined?(:Gem)
 
     # Change these as appropriate
     s.name              = "vanilla"
-    s.version           = "1.11.3"
+    s.version           = "1.11.4"
     s.summary           = "A bliki-type web content thing."
     s.author            = "James Adam"
     s.email             = "james@lazyatom.com.com"
@@ -41,7 +41,7 @@ if Object.const_defined?(:Gem)
 
     # All the other gems we need.
     s.add_dependency("rack", ">= 0.9.1")
-    s.add_dependency("soup", ">= 0.9.13")
+    s.add_dependency("soup", ">= 1.0.0")
     s.add_dependency("ratom", ">= 0.3.5")
     s.add_dependency("RedCloth", ">= 4.1.1")
     s.add_dependency("BlueCloth", ">= 1.0.0")

data/lib/tasks/vanilla.rake

@@ -99,9 +99,9 @@ EOF
 
     task :load_snips do
       print "Preparing soup... "
-      system_soup = ::Soup.new(::Soup::Backends::YAMLBackend.new("soup/system"))
+      system_soup = ::Soup.new(::Soup::Backends::FileBackend.new("soup/system"))
       system_soup << eval(File.read(File.join(File.dirname(__FILE__), '..', 'vanilla', 'snips', 'system.rb')))
-      dynasnip_soup = ::Soup.new(::Soup::Backends::YAMLBackend.new("soup/system/dynasnips"))
+      dynasnip_soup = ::Soup.new(::Soup::Backends::FileBackend.new("soup/system/dynasnips"))
       Dynasnip.all.each { |ds| dynasnip_soup << ds.snip_attributes }
       Dir[File.join(File.dirname(__FILE__), '..', 'vanilla', 'snips', '{start,tutorial}.rb')].each do |f|
         load f

data/lib/vanilla/app.rb

@@ -102,10 +102,10 @@ module Vanilla
 
     def prepare_soup(config)
       if config[:soups]
-        backends = [config[:soups]].flatten.map { |path| Vanilla::Soup::TimestampBackend.new(::Soup::Backends::YAMLBackend.new(path)) }
+        backends = [config[:soups]].flatten.map { |path| ::Soup::Backends::FileBackend.new(path) }
         ::Soup.new(::Soup::Backends::MultiSoup.new(*backends))
       else
-        ::Soup.new(Vanilla::Soup::TimestampBackend.new(::Soup::Backends::YAMLBackend.new(config[:soup])))
+        ::Soup.new(::Soup::Backends::FileBackend.new(config[:soup]))
       end
     end
   end

data/lib/vanilla/dynasnips/comments.rb

@@ -15,7 +15,7 @@ class Comments < Dynasnip
 
   def get(disable_new_comments=false)
     return usage if self.class.snip_name == app.request.snip_name
-    comments = app.soup.sieve(:commenting_on => enclosing_snip.name)
+    comments = app.soup.with(:commenting_on => enclosing_snip.name)
     comments_html = if app.request.snip_name == enclosing_snip.name
       rendered_comments = render_comments(comments)
       rendered_comments += comment_form.gsub('SNIP_NAME', enclosing_snip.name) unless disable_new_comments
@@ -28,7 +28,7 @@ class Comments < Dynasnip
   
   def post(*args)
     snip_name = app.request.params[:snip]
-    existing_comments = app.soup.sieve(:commenting_on => snip_name)
+    existing_comments = app.soup.with(:commenting_on => snip_name)
     comment = app.request.params.reject { |k,v| ![:author, :email, :website, :content].include?(k) }
     
     return "You need to add some details!" if comment.empty?

data/lib/vanilla/dynasnips/kind.rb

@@ -5,7 +5,7 @@ require 'date'
 class Kind < Dynasnip
   def handle(kind, limit=10, as=:html)
     as = as.to_sym
-    snips = app.soup.sieve(:kind => kind)
+    snips = app.soup.with(:kind => kind)
     entries = snips.sort_by { |s| s.created_at || Time.at(0) }.reverse[0...limit.to_i].map do |snip|
       render_entry_in_template(snip, as, kind)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 11
-  - 3
-  version: 1.11.3
+  - 4
+  version: 1.11.4
 platform: ruby
 authors: 
 - James Adam
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 +01:00
+date: 2010-08-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,10 +39,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 9
-        - 13
-        version: 0.9.13
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency