vanilla 1.0.2 → 1.2

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  hash: 11
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - James Adam
@@ -9,69 +14,149 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-06 00:00:00 -07:00
+date: 2011-05-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rack
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
-    version: 
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: soup
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: soup
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
-    version: 
+        hash: 27
+        segments: 
+        - 1
+        - 0
+        - 6
+        version: 1.0.6
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: ratom
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: ratom
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
-    version: 
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: RedCloth
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 4
+        - 1
+        - 1
         version: 4.1.1
-    version: 
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: BlueCloth
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: BlueCloth
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  prerelease: false
+  type: :runtime
+  name: haml
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: parslet
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: kintama
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 1
+        - 6
+        version: 0.1.6
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: mocha
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  requirement: *id009
 description: 
 email: james@lazyatom.com.com
 executables: 
@@ -81,71 +166,81 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- config.example.yml
-- config.ru
 - Rakefile
 - README
-- spec/dynasnip_spec.rb
-- spec/renderers
-- spec/renderers/base_renderer_spec.rb
-- spec/renderers/erb_renderer_spec.rb
-- spec/renderers/markdown_renderer_spec.rb
-- spec/renderers/raw_renderer_spec.rb
-- spec/renderers/ruby_renderer_spec.rb
-- spec/renderers/vanilla_app_detecting_renderer_spec.rb
-- spec/spec_helper.rb
-- spec/vanilla_app_spec.rb
-- spec/vanilla_presenting_spec.rb
-- spec/vanilla_request_spec.rb
-- spec/vanilla_snip_finding_spec.rb
-- lib/defensio.rb
-- lib/tasks
-- lib/tasks/vanilla.rake
-- lib/vanilla
+- test/dynasnip_test.rb
+- test/dynasnips/link_to_current_snip_test.rb
+- test/dynasnips/link_to_test.rb
+- test/dynasnips/page_title_test.rb
+- test/renderers/base_renderer_test.rb
+- test/renderers/erb_renderer_test.rb
+- test/renderers/haml_renderer_test.rb
+- test/renderers/markdown_renderer_test.rb
+- test/renderers/raw_renderer_test.rb
+- test/renderers/ruby_renderer_test.rb
+- test/snip_inclusion_test.rb
+- test/snip_reference_parser_test.rb
+- test/test_helper.rb
+- test/vanilla_app_test.rb
+- test/vanilla_presenting_test.rb
+- test/vanilla_request_test.rb
 - lib/vanilla/app.rb
 - lib/vanilla/console.rb
 - lib/vanilla/dynasnip.rb
-- lib/vanilla/dynasnips
-- lib/vanilla/dynasnips/comments.rb
-- lib/vanilla/dynasnips/current_snip.rb
-- lib/vanilla/dynasnips/debug.rb
-- lib/vanilla/dynasnips/edit.rb
-- lib/vanilla/dynasnips/edit_link.rb
-- lib/vanilla/dynasnips/index.rb
-- lib/vanilla/dynasnips/kind.rb
-- lib/vanilla/dynasnips/link_to.rb
-- lib/vanilla/dynasnips/link_to_current_snip.rb
-- lib/vanilla/dynasnips/login.rb
-- lib/vanilla/dynasnips/new.rb
-- lib/vanilla/dynasnips/notes.rb
-- lib/vanilla/dynasnips/pre.rb
-- lib/vanilla/dynasnips/rand.rb
-- lib/vanilla/dynasnips/raw.rb
-- lib/vanilla/dynasnips/url_to.rb
-- lib/vanilla/renderers
 - lib/vanilla/renderers/base.rb
 - lib/vanilla/renderers/bold.rb
 - lib/vanilla/renderers/erb.rb
+- lib/vanilla/renderers/haml.rb
 - lib/vanilla/renderers/markdown.rb
 - lib/vanilla/renderers/raw.rb
 - lib/vanilla/renderers/ruby.rb
 - lib/vanilla/renderers/textile.rb
+- lib/vanilla/renderers.rb
 - lib/vanilla/request.rb
 - lib/vanilla/routes.rb
-- lib/vanilla/snip_handling.rb
-- lib/vanilla/snips
-- lib/vanilla/snips/start.rb
-- lib/vanilla/snips/system.rb
-- lib/vanilla/snips/tutorial.rb
-- lib/vanilla/test_snips.rb
+- lib/vanilla/snip_reference_parser.rb
+- lib/vanilla/static.rb
 - lib/vanilla.rb
 - bin/vanilla
-- public/hatch.png
-- public/javascripts
-- public/javascripts/jquery.js
-- public/javascripts/vanilla.js
+- pristine_app/config.ru
+- pristine_app/Gemfile
+- pristine_app/Gemfile.lock
+- pristine_app/public/vanilla.css
+- pristine_app/README
+- pristine_app/soups/base/layout.snip
+- pristine_app/soups/base/start.snip
+- pristine_app/soups/dynasnips/current_snip.rb
+- pristine_app/soups/dynasnips/debug.rb
+- pristine_app/soups/dynasnips/index.rb
+- pristine_app/soups/dynasnips/link_to.rb
+- pristine_app/soups/dynasnips/link_to_current_snip.rb
+- pristine_app/soups/dynasnips/page_title.rb
+- pristine_app/soups/dynasnips/pre.rb
+- pristine_app/soups/dynasnips/raw.rb
+- pristine_app/soups/extras/comments.rb
+- pristine_app/soups/extras/kind.rb
+- pristine_app/soups/extras/rand.rb
+- pristine_app/soups/extras/url_to.rb
+- pristine_app/soups/tutorial/bad_dynasnip.snip
+- pristine_app/soups/tutorial/hello_world.snip
+- pristine_app/soups/tutorial/markdown_example.snip
+- pristine_app/soups/tutorial/snip.snip
+- pristine_app/soups/tutorial/soup.snip
+- pristine_app/soups/tutorial/test.snip
+- pristine_app/soups/tutorial/textile_example.snip
+- pristine_app/soups/tutorial/tutorial-another-snip.snip
+- pristine_app/soups/tutorial/tutorial-basic-snip-inclusion.snip
+- pristine_app/soups/tutorial/tutorial-dynasnips.snip.markdown
+- pristine_app/soups/tutorial/tutorial-layout.snip
+- pristine_app/soups/tutorial/tutorial-links.snip
+- pristine_app/soups/tutorial/tutorial-renderers.snip.markdown
+- 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: 
 - --main
@@ -153,23 +248,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: vanilla
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A bliki-type web content thing.
 test_files: []
 

data/config.example.yml

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

data/config.ru

@@ -1,9 +0,0 @@
-require 'vanilla'
-
-app = Vanilla::App.new(ENV['VANILLA_CONFIG'])
-use Rack::Session::Cookie, :key => 'vanilla.session',
-                           :path => '/',
-                           :expire_after => 2592000,
-                           :secret => app.config[:secret]
-use Rack::Static, :urls => ["/public"], :root => File.join(File.dirname(__FILE__))
-run app

data/lib/defensio.rb

@@ -1,59 +0,0 @@
-class Defensio
-  class << self
-    attr_accessor :format
-    attr_accessor :service_type
-    attr_accessor :api_version
-    attr_accessor :api_key
-    attr_accessor :owner_url
-  end
-  
-  self.format = :xml
-  self.service_type = :app # Can be :blog
-  self.api_version = '1.2'
-  
-  def self.configure(confhash)
-    if confhash['test']
-      @mock = true
-      self.owner_url = 'http://www.example.com'
-      return
-    else
-      confhash.each do |prop, val|
-        self.send("#{prop}=", val)
-      end
-    end
-  end
-  
-  def self.method_missing(name, *args)
-    self.post(name.to_s.dasherize, *args)
-  end
-  
-  private
-    def self.connection
-      uri = URI.parse('http://api.defensio.com/')
-      Net::HTTP.start(uri.host, uri.port)
-    end
-  
-    def self.post(action, params = {})
-      resp = connection.post(real_path(action), params_from_hash(params))
-      raise "Problem with request: #{action}" unless resp.code == '200'
-      parse_response(resp.body)
-    end
-  
-    def self.real_path(action)
-      "/#{service_type}/#{api_version}/#{action}/#{api_key}.#{format}"
-    end
-  
-    def self.params_from_hash(params = {})
-      # Thanks Net::HTTPHeader
-      params.stringify_keys.merge('owner-url' => owner_url).map {|k,v| "#{CGI.escape(k.dasherize.to_s)}=#{CGI.escape(v.to_s)}" }.join('&') 
-    end
-  
-    def self.parse_response(body)
-      case format
-      when :yaml
-        YAML.load(body)
-      when :xml
-        Hash.from_xml(body)
-      end
-    end
-end

data/lib/tasks/vanilla.rake

@@ -1,177 +0,0 @@
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..')))
-require 'vanilla'
-
-namespace :vanilla do
-  desc "Open an irb session preloaded with this library"
-  task :console do
-    sh "irb -Ilib -rubygems -rvanilla -rvanilla/console"
-  end
-
-  task :clean do
-    # TODO: get the database name from Soup
-    FileUtils.rm "soup.db" if File.exist?("soup.db")
-  end
-
-  task :prepare do
-    Soup.prepare
-  end
-
-  task :load_snips => :prepare do  
-    Dynasnip.persist_all!(overwrite=true)
-  
-    Dir[File.join(File.dirname(__FILE__), '..', 'vanilla', 'snips', '*.rb')].each do |f|
-      load f
-    end  
-  
-    load File.join(File.dirname(__FILE__), *%w[.. vanilla test_snips.rb])
-  
-    puts "The soup is simmering. Loaded #{Soup.tuple_class.count} tuples"
-  end
-
-  desc 'Resets the soup to contain the base snips only. Dangerous!'
-  task :reset => [:clean, :load_snips]
-
-  namespace :upgrade do
-    desc 'Upgrade the dynasnips'
-    task :dynasnips => :prepare do
-      Dynasnip.all.each do |dynasnip|
-        print "Upgrading #{dynasnip.snip_name}... "
-        # TODO: our confused Soup interface might return an array.
-        snip = Soup[dynasnip.snip_name]
-        if snip.empty? || snip.nil?
-          # it's a new dyna
-          Soup << dynasnip.snip_attributes
-          puts "(new)"
-        elsif snip.created_at == snip.updated_at
-          # it's not been changed, let's upgrade
-          snip.destroy
-          Soup << dynasnip.snip_attributes
-          puts "(unedited)"
-        else
-          # the dyna exists and has been changed
-          dynasnip.snip_attributes.each do |name, value|
-            unless (existing_value = snip.get_value(name)) == value
-              puts "Conflict in attribute '#{name}':"
-              puts "> Your soup: '#{existing_value}'"
-              puts ">  New soup: '#{value}"
-              print "Upgrade? [Y/n]: "
-              upgrade_value = ["Y", "y", ""].include? STDIN.gets.chomp.strip
-              snip.set_value(name, value) if upgrade_value
-            end
-          end
-          snip.save
-        end
-      end
-    end
-  end
-
-  desc 'Upgrade dynasnips and system snips'
-  task :upgrade => ["upgrade:dynasnips"]
-
-  desc 'Add a user (or change an existing password)'
-  task :add_user => :prepare do
-    puts "Adding a new user"
-    # config_file = ENV['VANILLA_CONFIG'] || 'config.yml'
-    # config_file = YAML.load(File.open(config_file)) rescue {}
-    app = Vanilla::App.new(ENV['VANILLA_CONFIG'])
-    print "Username: "
-    username = STDIN.gets.chomp.strip
-    print "Password: "
-    password = STDIN.gets.chomp.strip
-    print "Confirm password: "
-    confirm_password = STDIN.gets.chomp.strip
-    if password != confirm_password
-      raise "Passwords don't match!"
-    else
-      app.config[:credentials] ||= {}
-      app.config[:credentials][username] = MD5.md5(password).to_s
-      app.config.save!
-      puts "User '#{username}' added."
-    end
-  end
-
-  desc 'Generate file containing secret for cookie-based session storage'
-  task :generate_secret do
-    # Adapted from old rails secret generator.
-    require 'openssl'
-    if !File.exist?("/dev/urandom")
-      # OpenSSL transparently seeds the random number generator with
-      # data from /dev/urandom. On platforms where that is not
-      # available, such as Windows, we have to provide OpenSSL with
-      # our own seed. Unfortunately there's no way to provide a
-      # secure seed without OS support, so we'll have to do with
-      # rand() and Time.now.usec().
-      OpenSSL::Random.seed(rand(0).to_s + Time.now.usec.to_s)
-    end
-    data = OpenSSL::BN.rand(2048, -1, false).to_s
-    secret = OpenSSL::Digest::SHA1.new(data).hexdigest
-    app = Vanilla::App.new(ENV['VANILLA_CONFIG'])
-    app.config[:secret] = secret
-    app.config.save!
-    puts "Secret generated."
-  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_r File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. public])), 'public'
-    mkdir 'tmp'
-    File.open("Rakefile", "w") do |f|
-      rakefile =<<-EOF
-require 'vanilla'
-load 'tasks/vanilla.rake'
-
-# Add any other tasks here.
-EOF
-      f.write rakefile.strip
-    end
-  end
-
-
-  desc 'Prepare a new vanilla.rb installation'
-  task :setup do
-    puts <<-EOM
-
-  ===================~ 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:
-
-
-  EOM
-    Rake::Task['vanilla:add_user'].invoke
-    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
-
-  I'm going now, Goodbye!
-  EOM
-  end
-end