vanilla 1.9.10 → 1.9.11.1

data/README_FOR_APP

@@ -0,0 +1,47 @@
+                      WELCOME IN VANILLA
+                                 VANILLA
+                                 VANILLA
+                                 VANILLA
+What you've got:
+
+  config.ru  - this is the rack configuration, which is used to start
+               the application by your webserver
+  config.yml - the configuration; by default it specifies the directory
+               which contains the soup, and a cookie secret
+  soup/      - the default soup directory, where your snips are stored
+  
+
+For an overview of vanilla, start your site and look at the tutorial:
+
+  $ rackup   # then open http://localhost:9292/vanilla-rb-tutorial
+
+
+By default, you won't be able to edit anything on the site, because
+you can't log in. If you want to edit snips on the site, you'll need
+to create a user.
+
+  $ rake vanilla:add_user
+
+Your other option is to edit the soup directly; you can edit any file
+in the soup directory using your favourite editor, and the changes
+will be reflected automatically. The snip files are slightly modified
+YAML files. Here's one describing Soup itself, in soup/soup.yml:
+
+  Soup is a data store supporting the {link_to snip}-space that {link_to vanilla-rb} expects.
+
+  It's hosted on github [here][github].
+  
+  [github]: http://github.com/lazyatom/soup
+  --- # Soup attributes
+  :name: soup
+  :created_at: 2009-09-27 14:14:16.096231 +01:00
+  :updated_at: 2009-09-27 14:14:16.096232 +01:00
+  :render_as: Markdown
+
+The 'content' of the snip is at the top of the file, followed by
+
+  --- # Soup attributes
+  
+which starts the rest of the snip attributes. Again, see the online
+tutorial for information about what each attribute signifies.
+  

data/Rakefile

@@ -25,7 +25,7 @@ if Object.const_defined?(:Gem)
 
     # Change these as appropriate
     s.name              = "vanilla"
-    s.version           = "1.9.10"
+    s.version           = "1.9.11.1"
     s.summary           = "A bliki-type web content thing."
     s.author            = "James Adam"
     s.email             = "james@lazyatom.com.com"
@@ -36,7 +36,7 @@ if Object.const_defined?(:Gem)
     s.rdoc_options      = %w(--main README)
 
     # Add any extra files to include in the gem
-    s.files             = %w(config.example.yml config.ru Rakefile README) + Dir.glob("{spec,lib,bin,public}/**/*")
+    s.files             = %w(config.example.yml config.ru Rakefile README README_FOR_APP) + Dir.glob("{spec,lib,bin,public}/**/*")
     s.executables       = ['vanilla']
     s.require_paths     = ["lib"]
 

data/config.example.yml

@@ -1,6 +1,3 @@
 --- 
-:filename: config.example.yml
 :soup: soup
 :secret: a6bc097eff86cabd92ee72ba4687c3f057b7556deaa3e4a6b284460871056b87ba3e91548c37dcc44fbc10241cee5b386556e6bcc2946fd9b609dc3bc1b24488
-:credentials: 
-  admin: 5f4dcc3b5aa765d61d8327deb882cf99

data/lib/tasks/vanilla.rake

@@ -14,13 +14,12 @@ namespace :vanilla do
 
   task :load_snips do
     app = Vanilla::App.new(ENV['VANILLA_CONFIG'])
+    print "Preparing soup... "
     Dynasnip.all.each { |ds| app.soup << ds.snip_attributes }
-  
     Dir[File.join(File.dirname(__FILE__), '..', 'vanilla', 'snips', '*.rb')].each do |f|
       load f
-    end  
-  
-    puts "The soup is simmering."
+    end
+    puts "the soup is simmering."
   end
 
   desc 'Resets the soup to contain the base snips only. Dangerous!'
@@ -88,6 +87,7 @@ namespace :vanilla do
 
   desc 'Generate file containing secret for cookie-based session storage'
   task :generate_secret do
+    print "Generating cookie secret... "
     # Adapted from old rails secret generator.
     require 'openssl'
     if !File.exist?("/dev/urandom")
@@ -104,12 +104,14 @@ namespace :vanilla do
     app = Vanilla::App.new(ENV['VANILLA_CONFIG'])
     app.config[:secret] = secret
     app.config.save!
-    puts "Secret generated."
+    puts "done; cookies are twice baked. BIS-CUIT!"
   end
 
   desc 'Prepare standard files to run Vanilla'
   task :prepare_files do
     cp File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. config.ru])), 'config.ru'
+    cp File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. config.example.yml])), 'config.yml'
+    cp File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. README_FOR_APP])), 'README'
     cp_r File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. public])), 'public'
     mkdir 'tmp'
     File.open("Rakefile", "w") do |f|
@@ -127,47 +129,21 @@ EOF
   desc 'Prepare a new vanilla.rb installation'
   task :setup do
     puts <<-EOM
+____________________.c( Vanilla.rb )o._____________________
 
-  ===================~ Vanilla.rb ~====================
-
-  Congratulations! You have elected to try out the weirdest web thing ever.
-  Lets get started. Firstly, I'm going to cook you some soup:
-
-
-  EOM
-    Rake::Task['vanilla:load_snips'].invoke
-  
-    puts <<-EOM
-  
-  Now I'm going to generate your configuration. This will be stored either in
-  'config.yml' in the current directory, or in the path you provide via the
-  environment variable VANILLA_CONFIG.  
-
-  Generating the secret for cookie-based session storage.
-  EOM
-    Rake::Task['vanilla:prepare_files'].invoke
-    Rake::Task['vanilla:generate_secret'].invoke
-  
-    puts <<-EOM
-
-
-  Now that we've got our broth, you'll want to add a user, so you can edit stuff.
-  Lets do that now:
+Congratulations! You have elected to try out the weirdest web 
+thing ever. Lets get started.
 
+EOM
+  Rake::Task['vanilla:prepare_files'].invoke
+  Rake::Task['vanilla:generate_secret'].invoke
+  Rake::Task['vanilla:load_snips'].invoke
 
-  EOM
-    Rake::Task['vanilla:add_user'].invoke
-    puts <<-EOM
-
+  puts <<-EOM
 
-  OK! You're ready to go. To start vanilla.rb, you'll want to get it running under
-  a webserver that supports Rack. The easiest way to do this locally is via 'rackup':
-  
-    $ rackup
-  
-  Then go to http://localhost:9292
+___________________.c( You Are Ready )o.___________________
 
-  I'm going now, Goodbye!
+#{File.readlines('README')[0,16].join}
   EOM
   end
-end
+end

data/lib/vanilla/dynasnips/kind.rb

@@ -29,7 +29,7 @@ class Kind < Dynasnip
         e.title = snip.name
         e.authors = [Atom::Person.new(:name => snip.author || domain)]
         e.links << Atom::Link.new(:href => "http://#{domain}#{url_to(snip.name)}")
-        e.id = "tag:#{domain},#{(snip.created_at || Date.today.to_s).split[0]}:/#{snip.name}"
+        e.id = "tag:#{domain},#{(snip.created_at.to_s || Date.today.to_s).split[0]}:/#{snip.name}"
       end
     end
   end
@@ -47,7 +47,7 @@ class Kind < Dynasnip
     when :xml
       Atom::Feed.new do |f|
         f.title = feed_title
-        f.updated = DateTime.parse(snips[0].updated_at)
+        f.updated = snips[0].updated_at
         f.id = "tag:#{domain},2008-06-01:kind/#{kind}"
         f.entries = entries
       end.to_xml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  version: 1.9.10
+  version: 1.9.11.1
 platform: ruby
 authors: 
 - James Adam
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-13 00:00:00 +01:00
+date: 2009-10-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - config.ru
 - Rakefile
 - README
+- README_FOR_APP
 - spec/dynasnip_spec.rb
 - spec/renderers/base_renderer_spec.rb
 - spec/renderers/erb_renderer_spec.rb
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vanilla
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A bliki-type web content thing.