radiantcms-couchrest_model 0.1.3 → 0.1.4

data/vendor/extensions/textile_filter/textile_filter_extension.rb

@@ -0,0 +1,10 @@
+class TextileFilterExtension < Radiant::Extension
+  version "1.0"
+  description "Allows you to compose page parts or snippets using the Textile text filter."
+  url "http://textism.com/tools/textile/"
+
+  def activate
+    TextileFilter
+    Page.send :include, TextileTags
+  end
+end

data/vendor/plugins/haml/README.md

@@ -21,7 +21,7 @@ After you convert some HTML to Haml or some CSS to Sass,
 you can run
 
     haml document.haml
-    sass style.scss
+    sass style.sass
 
 to compile them.
 For more information on these commands, check out
@@ -29,9 +29,8 @@ For more information on these commands, check out
     haml --help
     sass --help
 
-To install Haml and Sass in Rails 2,
-just add `config.gem "haml"` to `config/environment.rb`.
-In Rails 3, add `gem "haml"` to your Gemfile instead.
+To install Haml and Sass as a Rails plugin,
+just run `haml --rails path/to/rails/app`
 and both Haml and Sass will be installed.
 Views with the `.html.haml` extension will automatically use Haml.
 Sass is a little more complicated;
@@ -39,7 +38,7 @@ Sass is a little more complicated;
 where they'll be automatically compiled
 to corresponding CSS files in `public/stylesheets` when needed
 (the Sass template directory is customizable...
-see [the Sass reference](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#template_location-option) for details).
+see [the Sass reference](http://sass-lang.com/docs/yardoc/SASS_REFERENCE.md.html#template_location-option) for details).
 
 For Merb, `.html.haml` views will work without any further modification.
 To enable Sass, you also need to add a dependency.
@@ -130,110 +129,171 @@ like `if` and `while`:
         = "Happy new " + "year!"
 
 Haml provides far more tools than those presented here.
-Check out the [reference documentation](http://beta.haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html)
-for full details.
+Check out the reference documentation in the Haml module.
 
-#### Indentation
+### Sass
 
-Haml's indentation can be made up of one or more tabs or spaces.
-However, indentation must be consistent within a given document.
-Hard tabs and spaces can't be mixed,
-and the same number of tabs or spaces must be used throughout.
+At its most basic,
+Sass is just another way of writing CSS.
+Although it's very much like normal CSS,
+the basic syntax offers a few helpful features:
+indentation indicates the properties in a rule,
+rather than non-DRY brackets;
+and newlines indicate the end of a properties,
+rather than a semicolon.
+For example:
 
-### Sass
+    #main
+      background-color: #f00
+      width: 98%
 
-Sass is an extension of CSS
-that adds power and elegance to the basic language.
-It allows you to use [variables][vars], [nested rules][nested],
-[mixins][mixins], [inline imports][imports],
-and more, all with a fully CSS-compatible syntax.
-Sass helps keep large stylesheets well-organized,
-and get small stylesheets up and running quickly,
-particularly with the help of
-[the Compass style library](http://compass-style.org).
-
-[vars]:    http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#variables_
-[nested]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#nested_rules_
-[mixins]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#mixins
-[imports]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import
-
-Sass has two syntaxes.
-The one presented here, known as "SCSS" (for "Sassy CSS"),
-is fully CSS-compatible.
-The other (older) syntax, known as the indented syntax or just "Sass",
-is whitespace-sensitive and indentation-based.
-For more information, see the [reference documentation][syntax].
-
-[syntax]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#syntax
-
-To run the following examples and see the CSS they produce,
-put them in a file called `test.scss` and run `sass test.scss`.
-
-#### Nesting
-
-Sass avoids repetition by nesting selectors within one another.
-The same thing works for properties.
-
-    table.hl {
-      margin: 2em 0;
-      td.ln { text-align: right; }
-    }
+becomes:
 
-    li {
-      font: {
-        family: serif;
-        weight: bold;
-        size: 1.2em;
-      }
+    #main {
+      background-color: #f00;
+      width: 98% }
+
+However, Sass provides much more than a way to make CSS look nice.
+In CSS, it's important to have accurate selectors,
+so your styles don't just apply to everything.
+However, in order to do this,
+you need to use nested element selectors.
+These get very ugly very quickly.
+I'm sure everyone's had to write something like
+"#main .sidebar .top p h1 a",
+followed by
+"#main .sidebar .top p h1 a:visited" and
+"#main .sidebar .top p h1 a:hover".
+Well, Sass gets rid of that.
+Like Haml, it uses indentation to indicate the structure of the document.
+So, what was:
+
+    #main {
+      width: 90%;
+    }
+    #main p {
+      border-style: solid;
+      border-width: 1px;
+      border-color: #00f;
+    }
+    #main p a {
+      text-decoration: none;
+      font-weight: bold;
+    }
+    #main p a:hover {
+      text-decoration: underline;
     }
 
-#### Variables
+becomes:
 
-Use the same color all over the place?
-Need to do some math with height and width and text size?
-Sass supports variables, math operations, and many useful functions.
+    #main
+      width: 90%
+      p
+        border-style: solid
+        border-width: 1px
+        border-color: #00f
+        a
+          text-decoration: none
+          font-weight: bold
+        a:hover
+          text-decoration: underline
+
+Pretty nice, no? Well, it gets better.
+One of the main complaints against CSS is that it doesn't allow variables.
+What if have a color or a width you re-use all the time?
+In CSS, you just have to re-type it each time,
+which is a nightmare when you decide to change it later.
+Not so for Sass!
+You can use the `!` character to set variables.
+Then, if you put `=` after your property name,
+you can set it to a variable.
+For example:
 
-    $blue: #3bbfce;
-    $margin: 16px;
+    !note_bg= #55aaff
 
-    .content_navigation {
-      border-color: $blue;
-      color: darken($blue, 10%);
-    }
+    #main
+      width: 70%
+      .note
+        background-color = !note_bg
+      p
+        width: 5em
+        background-color = !note_bg
 
-    .border {
-      padding: $margin / 2;
-      margin: $margin / 2;
-      border-color: $blue;
-    }
+becomes:
 
-#### Mixins
+    #main {
+      width: 70%; }
+      #main .note {
+        background-color: #55aaff; }
+      #main p {
+        width: 5em;
+        background-color: #55aaff; }
 
-Even more powerful than variables,
-mixins allow you to re-use whole chunks of CSS,
-properties or selectors.
-You can even give them arguments. 
+You can even do simple arithmetic operations with variables,
+adding numbers and even colors together:
 
-    @mixin table-scaffolding {
-      th {
-        text-align: center;
-        font-weight: bold;
-      }
-      td, th { padding: 2px; }
-    }
+    !main_bg= #46ar12
+    !main_width= 40em
+
+    #main
+      background-color = !main_bg
+      width = !main_width
+      .sidebar
+        background-color = !main_bg + #333333
+        width = !main_width - 25em
+
+becomes:
+
+    #main {
+      background-color: #46a312;
+      width: 40em; }
+      #main .sidebar {
+        background-color: #79d645;
+        width: 15em; }
+
+Taking the idea of variables a bit further are mixins.
+These let you group whole bunches of CSS properties into a single
+directive and then include those anywhere you want:
+
+    =blue-border
+      border:
+        color: blue
+        width: 2px
+        style: dotted
+
+    .comment
+      +blue-border
+      padding: 2px
+      margin: 10px 0
 
-    @mixin left($dist) {
-      float: left;
-      margin-left: $dist;
+    .reply
+      +blue-border
+
+becomes:
+
+    .comment {
+      border-color: blue;
+      border-width: 2px;
+      border-style: dotted;
+      padding: 2px;
+      margin: 10px 0;
     }
 
-    #data {
-      @include left(10px);
-      @include table-scaffolding;
+    .reply {
+      border-color: blue;
+      border-width: 2px;
+      border-style: dotted;
     }
 
-A comprehensive list of features is available
-in the [Sass reference](http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html).
+A comprehensive list of features is in
+the documentation for the Sass module.
+
+## Indentation
+
+Indentation can be made up of one or more tabs or spaces.
+However, indentation must be consistent within a given document.
+Hard tabs and spaces can't be mixed,
+and the same number of tabs or spaces must be used throughout.
 
 ## Executables
 
@@ -258,12 +318,11 @@ Since HTML is so variable, this transformation is not always perfect;
 it's a good idea to have a human check the output of this tool.
 See `html2haml --help` for further information and options.
 
-### `sass-convert`
+### `css2sass`
 
-The `sass-convert` executable converts between CSS, Sass, and SCSS.
-When converting from CSS to Sass or SCSS,
-nesting is applied where appropriate.
-See `sass-convert --help` for further information and options.
+The `css2sass` executable attempts to transform CSS into Sass code.
+This transformation attempts to use Sass nesting where possible.
+See `css2sass --help` for further information and options.
 
 ## Authors
 

data/vendor/plugins/haml/Rakefile

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'rake'
+
 # ----- Utility Functions -----
 
 def scope(path)
@@ -39,28 +42,14 @@ END
 
 # ----- Packaging -----
 
-# Don't use Rake::GemPackageTast because we want prerequisites to run
-# before we load the gemspec.
-desc "Build all the packages."
-task :package => [:revision_file, :submodules, :permissions] do
-  load scope('haml.gemspec')
-  Gem::Builder.new(HAML_GEMSPEC).build
-  pkg = "#{HAML_GEMSPEC.name}-#{HAML_GEMSPEC.version}"
-  mkdir_p "pkg"
-  verbose(true) {mv "#{pkg}.gem", "pkg/#{pkg}.gem"}
-
-  sh %{rm -f pkg/#{pkg}.tar.gz}
-  verbose(false) {HAML_GEMSPEC.files.each {|f| sh %{tar rf pkg/#{pkg}.tar #{f}}}}
-  sh %{gzip pkg/#{pkg}.tar}
-end
+require 'rake/gempackagetask'
+load scope('haml.gemspec')
 
-task :permissions do
-  sh %{chmod -R a+rx bin}
-  sh %{chmod -R a+r .}
-  require 'shellwords'
-  Dir.glob('test/**/*_test.rb') do |file|
-    next if file =~ %r{^test/haml/spec/}
-    sh %{chmod a+rx #{file}}
+Rake::GemPackageTask.new(HAML_GEMSPEC) do |pkg|
+  if Rake.application.top_level_tasks.include?('release')
+    pkg.need_tar_gz  = true
+    pkg.need_tar_bz2 = true
+    pkg.need_zip     = true
   end
 end
 
@@ -76,25 +65,68 @@ task :revision_file do
     File.open(scope('REVISION'), 'w') { |f| f.puts "(unknown)" }
   end
 end
+Rake::Task[:package].prerequisites.insert(0, :revision_file)
 
 # We also need to get rid of this file after packaging.
 at_exit { File.delete(scope('REVISION')) rescue nil }
 
-desc "Install Haml as a gem. Use SUDO=1 to install with sudo."
+desc "Install Haml as a gem."
 task :install => [:package] do
+  sudo = RUBY_PLATFORM =~ /win32|mingw/ ? '' : 'sudo'
   gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
-  sh %{#{'sudo ' if ENV["SUDO"]}#{gem} install --no-ri pkg/haml-#{File.read(scope('VERSION')).strip}}
+  sh %{#{sudo} #{gem} install --no-ri pkg/haml-#{File.read(scope('VERSION')).strip}}
 end
 
 desc "Release a new Haml package to Rubyforge."
-task :release => [:check_release, :package] do
+task :release => [:check_release, :release_elpa, :package] do
   name = File.read(scope("VERSION_NAME")).strip
   version = File.read(scope("VERSION")).strip
   sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem}
   sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz}
+  sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.bz2}
+  sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.zip}
   sh %{gem push pkg/haml-#{version}.gem}
 end
 
+# Releases haml-mode.el and sass-mode.el to ELPA.
+task :release_elpa do
+  require 'tlsmail'
+  require 'time'
+  require scope('lib/haml')
+
+  version = Haml.version[:number]
+
+  haml_unchanged = mode_unchanged?(:haml, version)
+  sass_unchanged = mode_unchanged?(:sass, version)
+  next if haml_unchanged && sass_unchanged
+  raise "haml-mode.el and sass-mode.el are out of sync." if haml_unchanged ^ sass_unchanged
+
+  if sass_unchanged && File.read(scope("extra/sass-mode.el")).
+      include?(";; Package-Requires: ((haml-mode #{sass_unchanged.inspect}))")
+    raise "sass-mode.el doesn't require the same version of haml-mode."
+  end
+
+  from = `git config user.email`.strip
+  raise "Don't know how to send emails except via Gmail" unless from =~ /@gmail.com$/
+
+  to = "elpa@tromey.com"
+  Net::SMTP.enable_tls(OpenSSL::SSL::VERIFY_NONE)
+  Net::SMTP.start('smtp.gmail.com', 587, 'gmail.com', from, read_password("GMail Password"), :login) do |smtp|
+    smtp.send_message(<<CONTENT, from, to)
+From: Nathan Weizenbaum <#{from}>
+To: #{to}
+Subject: Submitting haml-mode and sass-mode #{version}
+Date: #{Time.now.rfc2822}
+
+haml-mode and sass-mode #{version} are packaged and ready to be included in ELPA.
+They can be downloaded from:
+
+  http://github.com/nex3/haml/raw/#{Haml.version[:rev]}/extra/haml-mode.el
+  http://github.com/nex3/haml/raw/#{Haml.version[:rev]}/extra/sass-mode.el
+CONTENT
+  end
+end
+
 # Ensures that the version have been updated for a new release.
 task :check_release do
   version = File.read(scope("VERSION")).strip
@@ -139,18 +171,6 @@ def mode_unchanged?(mode, version)
   return false
 end
 
-task :submodules do
-  if File.exist?(File.dirname(__FILE__) + "/.git")
-    sh %{git submodule sync}
-    sh %{git submodule update --init}
-  elsif !File.exist?(File.dirname(__FILE__) + "/vendor/fssm/lib")
-    warn <<WARN
-WARNING: vendor/fssm doesn't exist, and this isn't a git repository so
-I can't get it automatically!
-WARN
-  end
-end
-
 task :release_edge do
   ensure_git_cleanup do
     puts "#{'=' * 50} Running rake release_edge"
@@ -160,16 +180,14 @@ task :release_edge do
     sh %{git merge origin/master}
 
     # Get the current master branch version
-    version = File.read(scope('VERSION')).strip.split('.')
-    pr = version[3]
-    version = version.map {|n| n.to_i}
-    unless pr || (version[1] % 2 == 1 && version[2] == 0)
+    version = File.read(scope('VERSION')).strip.split('.').map {|n| n.to_i}
+    unless version[1] % 2 == 1 && version[2] == 0
       raise "#{version.join('.')} is not a development version" 
     end
 
     # Bump the edge gem version
     edge_version = File.read(scope('EDGE_GEM_VERSION')).strip.split('.').map {|n| n.to_i}
-    if !pr && (edge_version[0..1] != version[0..1])
+    if edge_version[0..1] != version[0..1]
       # A new master branch version was released, reset the edge gem version
       edge_version[0..1] = version[0..1]
       edge_version[2] = 0
@@ -187,8 +205,8 @@ task :release_edge do
     sh %{rake package}
     sh %{git checkout VERSION}
 
+    sh %{rubyforge login}
     sh %{rubyforge add_release haml haml-edge "Bleeding Edge (v#{edge_version})" pkg/haml-edge-#{edge_version}.gem}
-    sh %{gem push pkg/haml-edge-#{edge_version}.gem}
   end
 end
 
@@ -232,14 +250,12 @@ OPTS
 
   YARD::Rake::YardocTask.new do |t|
     t.files = FileList.new(scope('lib/**/*.rb')) do |list|
-      list.exclude('lib/haml/template/patch.rb')
-      list.exclude('lib/haml/template/plugin.rb')
+      list.exclude('lib/haml/template/*.rb')
       list.exclude('lib/haml/railtie.rb')
       list.exclude('lib/haml/helpers/action_view_mods.rb')
       list.exclude('lib/haml/helpers/xss_mods.rb')
       list.exclude('lib/sass/plugin/merb.rb')
       list.exclude('lib/sass/plugin/rails.rb')
-      list.exclude('lib/sass/less.rb')
     end.to_a
     t.options << '--incremental' if Rake.application.top_level_tasks.include?('redoc')
     t.options += FileList.new(scope('yard/*.rb')).to_a.map {|f| ['-e', f]}.flatten
@@ -274,18 +290,8 @@ task :pages do
     sh %{git checkout #{proj}-pages}
     sh %{git reset --hard origin/#{proj}-pages}
 
-    Dir.chdir("/var/www/#{proj}-pages") do
-      sh %{git fetch origin}
-
-      sh %{git checkout stable}
-      sh %{git reset --hard origin/stable}
-
-      sh %{git checkout #{proj}-pages}
-      sh %{git reset --hard origin/#{proj}-pages}
-      sh %{rake build --trace}
-      sh %{mkdir -p tmp}
-      sh %{touch tmp/restart.txt}
-    end
+    sh %{rake build --trace}
+    sh %{rsync -av --delete site/ /var/www/#{proj}-pages}
   end
 end
 
@@ -352,7 +358,7 @@ rails_versions << "v2.0.5" if RUBY_VERSION =~ /^1\.8/
 
 def test_rails_version(version)
   Dir.chdir "test/rails" do
-    sh %{git checkout #{version}}
+    `git checkout #{version}`
   end
   puts "Testing Rails #{version}"
   Rake::Task['test'].reenable
@@ -362,14 +368,14 @@ end
 namespace :test do
   desc "Test all supported versions of rails. This takes a while."
   task :rails_compatibility do
-    sh %{rm -rf test/rails}
+    `rm -rf test/rails`
     puts "Checking out rails. Please wait."
-    sh %{git clone git://github.com/rails/rails.git test/rails}
+    system("git clone git://github.com/rails/rails.git test/rails") rescue nil
     begin
       rails_versions.each {|version| test_rails_version version}
 
       puts "Checking out rails_xss. Please wait."
-      sh %{git clone git://github.com/NZKoz/rails_xss.git test/plugins/rails_xss}
+      system("git clone git://github.com/NZKoz/rails_xss.git test/plugins/rails_xss")
       test_rails_version(rails_versions.find {|s| s =~ /^v2\.3/})
     ensure
       `rm -rf test/rails`
@@ -380,22 +386,8 @@ end
 
 # ----- Handling Updates -----
 
-def email_on_error
-  yield
-rescue Exception => e
-  IO.popen("sendmail nex342@gmail.com", "w") do |sm|
-    sm << "From: nex3@nex-3.com\n" <<
-      "To: nex342@gmail.com\n" <<
-      "Subject: Exception when running rake #{Rake.application.top_level_tasks.join(', ')}\n" <<
-      e.message << "\n\n" <<
-      e.backtrace.join("\n")
-  end
-ensure
-  raise e if e
-end
-
 def ensure_git_cleanup
-  email_on_error {yield}
+  yield
 ensure
   sh %{git reset --hard HEAD}
   sh %{git clean -xdf}
@@ -403,34 +395,29 @@ ensure
 end
 
 task :handle_update do
-  email_on_error do
-    unless ENV["REF"] =~ %r{^refs/heads/(master|stable|(?:haml|sass)-pages)$}
-      puts "#{'=' * 20} Ignoring rake handle_update REF=#{ENV["REF"].inspect}"
-      next
-    end
-    branch = $1
-
-    puts
-    puts
-    puts '=' * 150
-    puts "Running rake handle_update REF=#{ENV["REF"].inspect}"
-
-    sh %{git fetch origin}
-    sh %{git checkout stable}
-    sh %{git reset --hard origin/stable}
-    sh %{git checkout master}
-    sh %{git reset --hard origin/master}
-
-    if branch == "master"
-      sh %{rake release_edge --trace}
-    elsif branch == "stable"
-      sh %{rake pages --trace PROJ=haml}
-      sh %{rake pages --trace PROJ=sass}
-    elsif branch =~ /^(haml|sass)-pages$/
-      sh %{rake pages --trace PROJ=#{$1}}
-    end
+  unless ENV["REF"] =~ %r{^refs/heads/(master|(?:haml|sass)-pages)$}
+    puts "#{'=' * 20} Ignoring rake handle_update REF=#{ENV["REF"].inspect}"
+    next
+  end
+  branch = $1
+
+  puts
+  puts
+  puts '=' * 150
+  puts "Running rake handle_update REF=#{ENV["REF"].inspect}"
 
-    puts 'Done running handle_update'
-    puts '=' * 150
+  sh %{git checkout master}
+  sh %{git fetch origin}
+  sh %{git reset --hard origin/master}
+
+  if branch == "master"
+    sh %{rake release_edge --trace}
+    sh %{rake pages --trace PROJ=haml}
+    sh %{rake pages --trace PROJ=sass}
+  elsif branch =~ /^(haml|sass)-pages$/
+    sh %{rake pages --trace PROJ=#{$1}}
   end
+
+  puts 'Done running handle_update'
+  puts '=' * 150
 end