radiant 0.7.0 → 0.7.1

data/CHANGELOG

@@ -1,5 +1,10 @@
 == Change Log
 
+=== 0.7.1 Engraving
+
+* Properly escape page part contents in the UI. [John Muhl, Sean Cribbs]
+* Fix tag reference popup and spec out helper better. [Sean Cribbs]
+
 === 0.7.0 Intaglio
 * Add Roasters template. [Paul du Coudray]
 * Make ResponseCache spec insensitive to key order. [Sean Cribbs]

data/CONTRIBUTORS

@@ -4,6 +4,11 @@
 The following people have submitted changes which have been applied to the
 core:
 
+=== 0.7.1 Engraving
+
+* John Muhl
+* Sean Cribbs
+
 === 0.7.0 Intaglio
 
 * Paul du Coudray

data/app/helpers/admin/references_helper.rb

@@ -37,6 +37,6 @@ module Admin::ReferencesHelper
   end
 
   def class_of_page
-    @page_class ||= (params[:class_name] || 'Page').constantize
+    @page_class ||= (params[:class_name].blank? ? 'Page' : params[:class_name]).constantize
   end
 end

data/app/views/admin/page_parts/_page_part.html.haml

@@ -12,4 +12,4 @@
           = link_to_function 'Available Tags', "load_tag_reference('#{page_part.name.to_slug}');"
       = render_region :part_controls, :locals => {:page_part => page_part}
     %div
-      ~ text_area_tag 'page[parts][][content]', page_part.content, :class => "textarea", :style => "width: 100%", :id => "part_#{page_part.name.to_slug}_content"
+      ~ text_area_tag 'page[parts][][content]', h(page_part.content), :class => "textarea", :style => "width: 100%", :id => "part_#{page_part.name.to_slug}_content"

data/lib/radiant.rb

@@ -5,7 +5,7 @@ unless defined? Radiant::Version
     module Version
       Major = '0'
       Minor = '7'
-      Tiny  = '0'
+      Tiny  = '1'
 
       class << self
         def to_s

data/lib/tasks/release.rake

@@ -91,13 +91,22 @@ namespace 'radiant' do
   desc "Publish the release files to RubyForge."
   task :release => [:gem, :package] do
     files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
-
-    system %{rubyforge login --username #{RUBY_FORGE_USER}}
+    release_id = nil
+    system %{rubyforge login}
     files.each_with_index do |file, idx|
       if idx == 0
-        system %Q[rubyforge -f#{RELEASE_NOTES}#{RELEASE_CHANGES} add_release #{RUBY_FORGE_GROUPID} #{RUBY_FORGE_PACKAGEID} "#{RELEASE_NAME}" #{file}]
+        cmd = %Q[rubyforge add_release #{RELEASE_NOTES}#{RELEASE_CHANGES} --preformatted #{RUBY_FORGE_GROUPID} #{RUBY_FORGE_PACKAGEID} "#{RELEASE_NAME}" #{file}]
+        puts cmd
+        system cmd
       else
-        system %Q[rubyforge add_file #{RUBY_FORGE_GROUPID} #{RUBY_FORGE_PACKAGEID} "#{RELEASE_NAME}" #{file}]
+        release_id ||= begin
+          puts "rubyforge config #{RUBY_FORGE_PROJECT}"
+          system "rubyforge config #{RUBY_FORGE_PROJECT}"
+          `cat ~/.rubyforge/auto-config.yml | grep "#{RELEASE_NAME}"`.strip.split(/:/).last.strip
+        end
+        cmd = %Q[rubyforge add_file #{RUBY_FORGE_GROUPID} #{RUBY_FORGE_PACKAGEID} #{release_id} #{file}]
+        puts cmd
+        system cmd
       end
     end
   end

data/spec/helpers/admin/references_helper_spec.rb

@@ -0,0 +1,115 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Admin::ReferencesHelper do
+  describe "determining the page class" do
+    before :each do
+      helper.send(:instance_variable_set, :@page_class, nil)
+    end
+
+    it "should return Page when the class_name was not sent" do
+      helper.class_of_page.should == Page
+    end
+
+    it "should return the named class when sent class_name" do
+      params[:class_name] = "FileNotFoundPage"
+      helper.class_of_page.should == FileNotFoundPage
+    end
+
+    it "should return Page when the class_name is blank" do
+      params[:class_name] = ''
+      helper.class_of_page.should == Page
+    end
+  end
+
+  describe "determining the filter" do
+    before :each do
+      helper.send(:instance_variable_set, :@filter, nil)
+    end
+
+    it "should return nil when no filter is set" do
+      helper.filter.should be_nil
+    end
+
+    it "should return the filter object for the named filter" do
+      params[:filter_name] = "Textile"
+      helper.filter.should == TextileFilter
+    end
+
+    it "should return nil when the set filter is blank" do
+      params[:filter_name] = ' '
+      helper.filter.should be_nil
+    end
+  end
+
+  describe "determining the display name" do
+    describe "when getting a filter reference" do
+      before :each do
+        helper.send(:instance_variable_set, :@filter, nil)
+        params[:id] = 'filters'
+      end
+
+      it "should return the name of the set filter" do
+        params[:filter_name] = "Textile"
+        helper._display_name.should == "Textile"
+      end
+
+      it "should return <none> when no filter is set" do
+        params[:filter_name] = nil
+        helper._display_name.should == "<none>"
+      end
+    end
+
+    describe "when getting a tag reference" do
+      before :each do
+        helper.send(:instance_variable_set, :@page_class, nil)
+        params[:id] = 'tags'
+      end
+
+      it "should return the display name of the page class" do
+        params[:class_name] = "FileNotFoundPage"
+        helper._display_name.should == "File Not Found"
+      end
+
+      it "should return Page when <normal> is chosen" do
+        params[:class_name] = nil
+        helper._display_name.should == "Page"
+      end
+    end
+  end
+
+  describe "rendering the filter reference" do
+    before :each do
+      helper.send(:instance_variable_set, :@filter, nil)
+      params[:id] = 'filters'
+      params[:filter_name] = 'Textile'
+    end
+
+    it "should render a helpful message when the description is blank" do
+      TextileFilter.should_receive(:description).and_return('')
+      helper.filter_reference.should == "There is no documentation on this filter."
+    end
+
+    it "should render the filter's description when available" do
+      helper.filter_reference.should == TextileFilter.description
+    end
+
+    it "should render a helpful message when no filter is selected" do
+      params[:filter_name] = nil
+      helper.filter_reference.should == "There is no filter on the current page part."
+    end
+  end
+
+  describe "rendering the tag reference" do
+    before :each do
+      helper.send(:instance_variable_set, :@page_class, nil)
+      params[:id] = 'tags'
+      params[:class_name] = ''
+    end
+
+    it "should render the tag reference partial for each tag description" do
+      count = Page.tag_descriptions.size
+      helper.should_receive(:render).exactly(count).times.and_return("desc")
+      helper.tag_reference.should == "desc" * count
+    end
+  end
+end

data/spec/integration/admin/pages_integration_spec.rb

@@ -34,6 +34,12 @@ describe 'Page management' do
     response.should have_text(/Under Construction/)
   end
   
+  it "should properly escape part contents" do
+    navigate_to '/admin/pages/new'
+    submit_form 'new_page', :continue => 'Save and Continue', :page => {:title => 'My Site', :slug => '/', :breadcrumb => 'My Site', :parts => [{:name => 'body', :content => '<r:url />'}], :status_id => Status[:published].id}
+    response.should have_tag('textarea', :text => "<r:url />")
+  end
+  
   describe 'with homepage' do
     dataset :home_page
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: radiant
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Radiant CMS dev team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-07 00:00:00 -05:00
+date: 2009-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -447,6 +447,7 @@ files:
 - spec/helpers/admin/node_helper_spec.rb
 - spec/helpers/admin/pages_helper_spec.rb
 - spec/helpers/admin/preferences_helper_spec.rb
+- spec/helpers/admin/references_helper_spec.rb
 - spec/helpers/admin/regions_helper_spec.rb
 - spec/helpers/admin/snippets_helper_spec.rb
 - spec/helpers/admin/users_helper_spec.rb
@@ -2596,6 +2597,8 @@ rdoc_options:
 - --exclude
 - log
 - --exclude
+- pkg
+- --exclude
 - public
 - --exclude
 - script