radiant 0.6.7 → 0.6.8

data/vendor/plugins/haml/test/haml/templates/helpers.haml

@@ -43,7 +43,7 @@ click
 - form_tag '' do
   %div= submit_tag 'save'
   - @foo = 'value one'
-  = render :partial => './partial'
+  = test_partial 'partial'
 - form_for :article, @article, :url => '' do |f|
   Title:
   = f.text_field :title

data/vendor/plugins/haml/test/haml/templates/just_stuff.haml

@@ -19,7 +19,6 @@
 %p== Embedded? #{embedded}!
 %p== Embedded? #{"twice! #{true}"}!
 %p== Embedded? #{"one"} af"t"er #{"another"}!
-.render= render :inline => "%em= 'wow!'", :type => :haml
 = "stuff followed by whitespace"
   
 - if true

data/vendor/plugins/haml/test/haml/templates/nuke_inner_whitespace.haml

@@ -0,0 +1,32 @@
+%p
+  %q< Foo
+%p
+  %q{:a => 1 + 1}< Foo
+%p
+  %q<= "Foo\nBar"
+%p
+  %q{:a => 1 + 1}<= "Foo\nBar"
+%p
+  %q<
+    Foo
+    Bar
+%p
+  %q{:a => 1 + 1}<
+    Foo
+    Bar
+%p
+  %q<
+    %div
+      Foo
+      Bar
+%p
+  %q{:a => 1 + 1}<
+    %div
+      Foo
+      Bar
+
+-# Regression test
+%p
+  %q<= "foo"
+  %q{:a => 1 + 1}
+    bar

data/vendor/plugins/haml/test/haml/templates/nuke_outer_whitespace.haml

@@ -0,0 +1,144 @@
+%p
+  %p
+    %q>
+      Foo
+%p
+  %p
+    %q{:a => 1 + 1}>
+      Foo
+%p
+  %p
+    %q> Foo
+%p
+  %p
+    %q{:a => 1 + 1}> Foo
+%p
+  %p
+    %q>
+      = "Foo"
+%p
+  %p
+    %q{:a => 1 + 1}>
+      = "Foo"
+%p
+  %p
+    %q>= "Foo"
+%p
+  %p
+    %q{:a => 1 + 1}>= "Foo"
+%p
+  %p
+    %q>
+      = "Foo\nBar"
+%p
+  %p
+    %q{:a => 1 + 1}>
+      = "Foo\nBar"
+%p
+  %p
+    %q>= "Foo\nBar"
+%p
+  %p
+    %q{:a => 1 + 1}>= "Foo\nBar"
+%p
+  %p
+    - tab_up
+    foo
+    %q>
+      Foo
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}>
+      Foo
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q> Foo
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}> Foo
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q>
+      = "Foo"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}>
+      = "Foo"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q>= "Foo"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}>= "Foo"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q>
+      = "Foo\nBar"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}>
+      = "Foo\nBar"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q>= "Foo\nBar"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}>= "Foo\nBar"
+    bar
+    - tab_down
+%p
+  %p
+    %q>
+%p
+  %p
+    %q>/
+%p
+  %p
+    %q{:a => 1 + 1}>
+%p
+  %p
+    %q{:a => 1 + 1}>/

data/vendor/plugins/haml/test/haml/templates/partials.haml

@@ -6,7 +6,7 @@
 %p
   @foo = 
   = @foo
-= render :file => "_partial.haml"
+= test_partial "partial"
 %p
   @foo = 
   = @foo

data/vendor/plugins/haml/test/haml/templates/tag_parsing.haml

@@ -19,6 +19,3 @@
   .foo16 e
   .123 f
   .foo2u g
-%div.broken
-  %foo<{ :a => :b }
-  .foo>{ :c => :d }

data/vendor/plugins/haml/test/haml/templates/whitespace_handling.haml

@@ -1,9 +1,9 @@
 #whitespace_test
-  = render :file => "_text_area.haml", :locals => { :value => "Oneline" }
-  = render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
-  ~ render :file => "_text_area.haml", :locals => { :value => "Oneline" }
-  ~ render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
-  #flattened~ render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
+  = test_partial "text_area", :value => "Oneline"
+  = test_partial "text_area", :value => "Two\nlines"
+  ~ test_partial "text_area", :value => "Oneline"
+  ~ test_partial "text_area", :value => "Two\nlines"
+  #flattened~ test_partial "text_area", :value => "Two\nlines"
 .hithere
   ~ "Foo bar"
   ~ "<pre>foo bar</pre>"
@@ -15,11 +15,11 @@
   ~ ['a', 'b', 'c'].map do |a|
     - "<textarea>\n#{a}\n</textarea>"
 #whitespace_test
-  = render :file => "_text_area.haml", :locals => { :value => "Oneline" }
-  = render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
-  = find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Oneline" })
-  = find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Two\nlines" })
-  #flattened= find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Two\nlines" })
+  = test_partial "text_area", :value => "Oneline"
+  = test_partial "text_area", :value => "Two\nlines"
+  = find_and_preserve test_partial("text_area", :value => "Oneline")
+  = find_and_preserve test_partial("text_area", :value => "Two\nlines")
+  #flattened= find_and_preserve test_partial("text_area", :value => "Two\nlines")
 .hithere
   = find_and_preserve("Foo bar")
   = find_and_preserve("<pre>foo bar</pre>")

data/vendor/plugins/haml/test/sass/engine_test.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/sass'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
 class SassEngineTest < Test::Unit::TestCase
@@ -58,6 +56,8 @@ END
     "=foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'.",
     ".bar\n  =foo\n    :color red\n" => "Mixins may only be defined at the root of a document.",
     "=foo\n  :color red\n.bar\n  +foo\n    :color red" => "Illegal nesting: Nothing may be nested beneath mixin directives.",
+    "    a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 1],
+    " \n   \n\t\n  a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 4],
 
     # Regression tests
     "a\n  b:\n    c\n    d" => ["Illegal nesting: Only attributes may be nested beneath attributes.", 3]
@@ -130,8 +130,8 @@ END
   end
 
   def test_default_function
-    assert_equal("foo {\n  bar: url(foo.png); }\n",
-                 render("foo\n  bar = url(foo.png)\n"));
+    assert_equal("foo {\n  bar: url(foo.png); }\n", render("foo\n  bar = url(foo.png)\n"));
+    assert_equal("foo {\n  bar: url(); }\n", render("foo\n  bar = url()\n"));
   end
 
   def test_basic_multiline_selector
@@ -255,6 +255,12 @@ END
     renders_correctly "mixins", { :style => :expanded }
   end
 
+  def test_mixins_dont_interfere_with_sibling_combinator
+    assert_equal("foo + bar {\n  a: b; }\n", render("foo\n  + bar\n    a: b"))
+    assert_equal("foo + bar {\n  a: b; }\nfoo + baz {\n  c: d; }\n",
+                 render("foo\n  +\n    bar\n      a: b\n    baz\n      c: d"))
+  end
+
   private
 
   def render(sass, options = {})

data/vendor/plugins/haml/test/sass/plugin_test.rb

@@ -3,13 +3,9 @@
 MERB_ENV = RAILS_ENV  = 'testing'
 RAILS_ROOT = '.'
 
-require 'test/unit'
-require 'fileutils'
-require File.dirname(__FILE__) + '/../../lib/sass'
-require 'rubygems'
-
-require 'action_controller'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/plugin'
+require 'fileutils'
 
 class SassPluginTest < Test::Unit::TestCase
   @@templates = %w{

data/vendor/plugins/haml/test/sass/results/constants.css

@@ -12,3 +12,5 @@
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 
 #const { escaped-quote: !foo; escaped-slash: !foo; default: Hello! !important; }
+
+#regression { a: 4; }

data/vendor/plugins/haml/test/sass/templates/constants.sass

@@ -95,3 +95,6 @@
     :quote = "!foo"
     :slash = \!foo
   :default = !str !important
+
+#regression
+  :a= (3 + 2) - 1

data/vendor/plugins/haml/test/{haml/test_helper.rb → test_helper.rb}

@@ -1,7 +1,7 @@
 # allows testing with edge Rails by creating a test/rails symlink
-linked_rails = File.dirname(__FILE__) + '/../rails'
+linked_rails = File.dirname(__FILE__) + '/rails'
 
-if File.exists? linked_rails
+if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
   puts "[ using linked Rails ]"
   $:.unshift linked_rails + '/activesupport/lib'
   $:.unshift linked_rails + '/actionpack/lib'
@@ -12,4 +12,5 @@ require 'action_controller'
 require 'action_view'
 
 require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/haml'
+require File.dirname(__FILE__) + '/../lib/haml'
+require File.dirname(__FILE__) + '/../lib/sass'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: radiant
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors: []
 
@@ -9,11 +9,12 @@ autorequire: radiant
 bindir: bin
 cert_chain: []
 
-date: 2008-05-17 00:00:00 -05:00
+date: 2008-07-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -61,6 +62,8 @@ files:
 - app/helpers/admin/welcome_helper.rb
 - app/helpers/application_helper.rb
 - app/helpers/site_helper.rb
+- app/migrate
+- app/migrate/020_add_session_info_to_users.rb
 - app/models
 - app/models/env_dump_page.rb
 - app/models/file_not_found_page.rb
@@ -151,6 +154,8 @@ files:
 - db/migrate/017_rename_created_by_updated_by_columns.rb
 - db/migrate/018_add_description_and_keywords_to_pages.rb
 - db/migrate/019_add_salt_to_users.rb
+- db/migrate/020_add_session_info_to_users.rb
+- db/migrate/021_remove_session_expire_from_users.rb
 - db/schema.rb
 - db/templates
 - db/templates/empty.yml
@@ -249,6 +254,8 @@ files:
 - lib/radiant/admin_ui/region_partials.rb
 - lib/radiant/admin_ui/region_set.rb
 - lib/radiant/admin_ui.rb
+- lib/radiant/extension
+- lib/radiant/extension/script.rb
 - lib/radiant/extension.rb
 - lib/radiant/extension_loader.rb
 - lib/radiant/extension_migrator.rb
@@ -319,6 +326,7 @@ files:
 - script/breakpointer
 - script/console
 - script/destroy
+- script/extension
 - script/generate
 - script/performance
 - script/performance/benchmarker
@@ -375,6 +383,8 @@ files:
 - spec/lib/radiant/admin_ui/region_partials_spec.rb
 - spec/lib/radiant/admin_ui/region_set_spec.rb
 - spec/lib/radiant/admin_ui_spec.rb
+- spec/lib/radiant/extension
+- spec/lib/radiant/extension/script_spec.rb
 - spec/lib/radiant/extension_loader_spec.rb
 - spec/lib/radiant/extension_migrator_spec.rb
 - spec/lib/radiant/extension_spec.rb
@@ -667,9 +677,7 @@ files:
 - vendor/plugins/haml/bin/haml
 - vendor/plugins/haml/bin/html2haml
 - vendor/plugins/haml/bin/sass
-- vendor/plugins/haml/extra
-- vendor/plugins/haml/extra/haml-mode.el
-- vendor/plugins/haml/extra/sass-mode.el
+- vendor/plugins/haml/FAQ
 - vendor/plugins/haml/init.rb
 - vendor/plugins/haml/lib
 - vendor/plugins/haml/lib/haml
@@ -693,6 +701,7 @@ files:
 - vendor/plugins/haml/lib/sass/constant
 - vendor/plugins/haml/lib/sass/constant/color.rb
 - vendor/plugins/haml/lib/sass/constant/literal.rb
+- vendor/plugins/haml/lib/sass/constant/nil.rb
 - vendor/plugins/haml/lib/sass/constant/number.rb
 - vendor/plugins/haml/lib/sass/constant/operation.rb
 - vendor/plugins/haml/lib/sass/constant/string.rb
@@ -715,6 +724,7 @@ files:
 - vendor/plugins/haml/MIT-LICENSE
 - vendor/plugins/haml/Rakefile
 - vendor/plugins/haml/README.rdoc
+- vendor/plugins/haml/REVISION
 - vendor/plugins/haml/test
 - vendor/plugins/haml/test/benchmark.rb
 - vendor/plugins/haml/test/haml
@@ -733,6 +743,8 @@ files:
 - vendor/plugins/haml/test/haml/results/helpful.xhtml
 - vendor/plugins/haml/test/haml/results/just_stuff.xhtml
 - vendor/plugins/haml/test/haml/results/list.xhtml
+- vendor/plugins/haml/test/haml/results/nuke_inner_whitespace.xhtml
+- vendor/plugins/haml/test/haml/results/nuke_outer_whitespace.xhtml
 - vendor/plugins/haml/test/haml/results/original_engine.xhtml
 - vendor/plugins/haml/test/haml/results/partials.xhtml
 - vendor/plugins/haml/test/haml/results/silent_script.xhtml
@@ -760,6 +772,8 @@ files:
 - vendor/plugins/haml/test/haml/templates/helpful.haml
 - vendor/plugins/haml/test/haml/templates/just_stuff.haml
 - vendor/plugins/haml/test/haml/templates/list.haml
+- vendor/plugins/haml/test/haml/templates/nuke_inner_whitespace.haml
+- vendor/plugins/haml/test/haml/templates/nuke_outer_whitespace.haml
 - vendor/plugins/haml/test/haml/templates/original_engine.haml
 - vendor/plugins/haml/test/haml/templates/partialize.haml
 - vendor/plugins/haml/test/haml/templates/partials.haml
@@ -768,8 +782,6 @@ files:
 - vendor/plugins/haml/test/haml/templates/tag_parsing.haml
 - vendor/plugins/haml/test/haml/templates/very_basic.haml
 - vendor/plugins/haml/test/haml/templates/whitespace_handling.haml
-- vendor/plugins/haml/test/haml/test_helper.rb
-- vendor/plugins/haml/test/profile.rb
 - vendor/plugins/haml/test/sass
 - vendor/plugins/haml/test/sass/engine_test.rb
 - vendor/plugins/haml/test/sass/plugin_test.rb
@@ -811,7 +823,7 @@ files:
 - vendor/plugins/haml/test/sass/templates/subdir/nested_subdir
 - vendor/plugins/haml/test/sass/templates/subdir/nested_subdir/nested_subdir.sass
 - vendor/plugins/haml/test/sass/templates/subdir/subdir.sass
-- vendor/plugins/haml/TODO
+- vendor/plugins/haml/test/test_helper.rb
 - vendor/plugins/haml/VERSION
 - vendor/plugins/rspec
 - vendor/plugins/rspec/bin
@@ -3000,8 +3012,6 @@ rdoc_options:
 - --exclude
 - log
 - --exclude
-- pkg
-- --exclude
 - public
 - --exclude
 - script
@@ -3032,7 +3042,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: radiant
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A no-fluff content management system designed for small teams.