radiant 1.0.0.rc1 → 1.0.0.rc2

data/vendor/extensions/{assets → clipped}/spec/models/asset_spec.rb

@@ -63,8 +63,9 @@ describe Asset do
     end
     
     it 'should return icon for non-image with a given size' do
-      image = new_asset :asset_content_type => 'application/msword'
-      image.thumbnail('thumbnail').should == "/images/admin/assets/document_thumbnail.png"
+      document = new_asset :asset_content_type => 'application/msword'
+      document.thumbnail('icon').should == "/images/admin/assets/document_icon.png"
+      document.thumbnail('anything_but_icon').should == "/images/admin/assets/document_icon.png"
     end
   end
 

data/vendor/extensions/sheets/Rakefile

@@ -21,12 +21,15 @@ require 'spec/rake/spectask'
 require 'cucumber'
 require 'cucumber/rake/task'
 
+vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
+
 # Cleanup the RADIANT_ROOT constant so specs will load the environment
 Object.send(:remove_const, :RADIANT_ROOT)
 
 extension_root = File.expand_path(File.dirname(__FILE__))
 
-task :default => :spec
+task :default => [:spec, :cucumber]
 task :stats => "spec:statsetup"
 
 desc "Run all specs in spec directory"
@@ -35,8 +38,6 @@ Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-task :features => 'spec:integration'
-
 namespace :spec do
   desc "Run all specs in spec directory with RCov"
   Spec::Rake::SpecTask.new(:rcov) do |t|
@@ -61,13 +62,8 @@ namespace :spec do
   end
   
   desc "Run the Cucumber features"
-  Cucumber::Rake::Task.new(:integration) do |t|
-    t.fork = true
-    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
-    # t.feature_pattern = "#{extension_root}/features/**/*.feature"
-    t.profile = "default"
-  end
-
+  task :integration => 'cucumber:ok'
+  
   # Setup specs for stats
   task :statsetup do
     require 'code_statistics'
@@ -96,6 +92,30 @@ namespace :spec do
   end
 end
 
+namespace :cucumber do
+  Cucumber::Rake::Task.new(:ok, 'Run features that should pass') do |t|
+    t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+    t.fork = true # You may get faster startup if you set this to false
+    t.profile = 'default'
+  end
+
+  Cucumber::Rake::Task.new(:wip, 'Run features that are being worked on') do |t|
+    t.binary = vendored_cucumber_bin
+    t.fork = true # You may get faster startup if you set this to false
+    t.profile = 'wip'
+  end
+
+  desc 'Run all features'
+  task :all => [:ok, :wip]
+end
+
+desc 'Alias for cucumber:ok'
+task :cucumber => 'cucumber:ok'
+
+task :features => :cucumber do
+  STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
+end
+
 desc 'Generate documentation for the sheets extension.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -105,13 +125,5 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-# For extensions that are in transition
-desc 'Test the sheets extension.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
 # Load any custom rakefiles for extension
 Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }

data/vendor/extensions/sheets/app/controllers/admin/sheet_resource_controller.rb

@@ -33,7 +33,7 @@ class Admin::SheetResourceController < Admin::ResourceController
   
   def find_root
     @root = model_class.root
-  rescue Page::MissingRootPageError => e
+  rescue Page::MissingRootPageError, Sheet::InvalidHomePage => e
     flash[:error] = t('sheets.root_required', :model => humanized_model_name)
     redirect_to welcome_path and return false
   end

data/vendor/extensions/sheets/app/models/sheet.rb

@@ -1,4 +1,5 @@
 module Sheet
+  module InvalidHomePage; end
   module Instance
     def self.included(base)
       base.class_eval {
@@ -9,6 +10,9 @@ module Sheet
         
         def self.root
           sheet_root ||= Page.find_by_path('/').children.first(:conditions => {:class_name => self.to_s})
+        rescue NoMethodError => e
+          e.extend Sheet::InvalidHomePage
+          raise e
         end
 
         def self.default_page_parts

data/vendor/extensions/sheets/app/views/admin/scripts/index.html.haml

@@ -6,12 +6,16 @@
         %th Javascript
         %th Modify
     %tbody
-      - models.each do |javascript|
+      - unless models.blank?
+        - models.each do |javascript|
+          %tr
+            %td.name
+              = image('javascript') 
+              = link_to javascript.title, edit_admin_script_path(javascript)
+            %td.actions= link_to(image('minus') + ' ' + t('remove'), admin_script_url(javascript), :class => "action", :method => :delete, :confirm => "Is it OK to delete #{javascript.slug}?")
+      - else
         %tr
-          %td.name
-            = image('javascript') 
-            = link_to javascript.title, edit_admin_script_path(javascript)
-          %td.actions= link_to(image('minus') + ' ' + t('remove'), admin_script_url(javascript), :class => "action", :method => :delete, :confirm => "Is it OK to delete #{javascript.slug}?")
+          %td.empty{:colspan => 2}= t('no_scripts')
 
 #actions
   = pagination_for(models)

data/vendor/extensions/sheets/app/views/admin/styles/index.html.haml

@@ -15,7 +15,7 @@
             %td.actions= link_to(image('minus') + ' ' + t('remove'), admin_style_url(stylesheet), :class => "action", :method => :delete, :confirm => "Is it OK to delete #{stylesheet.slug}?")
       - else
         %tr
-          %td.empty{:colspan => 2} There are no stylesheets
+          %td.empty{:colspan => 2}= t('no_styles')
 
 #actions
   = pagination_for(models)

data/vendor/extensions/sheets/config/locales/en.yml

@@ -12,4 +12,6 @@ en:
   stylesheet_page: Stylesheet
   javascript_page: Javascript
   sheets:
-    root_required: "You must first create a homepage before you may create a %{model}."
+    root_required: "You must first publish a homepage before you may create a %{model}."
+  no_styles: 'No Stylesheets'
+  no_scripts: 'No Javascripts'

data/vendor/extensions/sheets/features/admin/managing_javascripts.feature

@@ -0,0 +1,65 @@
+Feature: Managing javascripts
+  In order to create, modify, and delete content from the website
+  a content editor
+  wants to manipulate javascripts in the admin interface
+  
+  Scenario: Limiting access
+    Given I am logged in as "existing"
+    When I go to the "scripts" admin page
+    Then I should see "You must have developer or administrator privileges to edit javascripts."
+  
+  Scenario: Listing javascripts
+    Given I am logged in as "designer"
+    When I go to the "scripts" admin page
+    Then I should see "Javascripts"
+    Then I should see "site.js"
+    And I should see "New Javascript"
+    
+  Scenario: Creating javascripts
+    Given I am logged in as "designer"
+    When I go to the "scripts" admin page
+    And I follow "New Javascript"
+    And I fill in "Slug" with "cuke.js"
+    And I press "Create Javascript"
+    Then I should see "Javascripts"
+    And I should see "cuke.js"
+    And I should see "New Javascript"
+    
+  Scenario: Editing javascripts
+    When I go to "/js/site.js"
+    Then the page should render
+      """
+      alert("site!");
+      """
+    When I am logged in as "designer"
+    When I go to the "scripts" admin page
+    And I follow "site.js"
+    And I fill in "Slug" with "changed.js"
+    And I fill in "Body" with "alert('site changed!');"
+    And I press "Save Changes"
+    Then I should see "changed.js"
+    And I follow "Logout"
+    And I go to "/js/changed.js"
+    And the page should render
+      """
+      alert('site changed!');
+      """
+    
+  Scenario: Rendering Javascripts
+    Given I am logged in as "designer"
+    When I go to the "scripts" admin page
+    And I follow "New Javascript"
+    And I fill in "Slug" with "styled.js"
+    And I fill in the "Body" content with the text
+      """
+      var s = {};
+      <r:javascript slug="site.js" />
+      """
+    And I press "Create Javascript"
+    And I go to "/js/styled.js"
+    Then the page should render
+      """
+      var s = {};
+      alert("site!");
+      """
+    

data/vendor/extensions/sheets/features/admin/managing_stylesheets.feature

@@ -0,0 +1,65 @@
+Feature: Managing stylesheets
+  In order to create, modify, and delete content from the website
+  a content editor
+  wants to manipulate stylesheets in the admin interface
+  
+  Scenario: Limiting access
+    Given I am logged in as "existing"
+    When I go to the "styles" admin page
+    Then I should see "You must have developer or administrator privileges to edit stylesheets."
+  
+  Scenario: Listing stylesheets
+    Given I am logged in as "designer"
+    When I go to the "styles" admin page
+    Then I should see "Stylesheets"
+    Then I should see "site.css"
+    And I should see "New Stylesheet"
+  
+  Scenario: Creating stylesheets
+    Given I am logged in as "designer"
+    When I go to the "styles" admin page
+    And I follow "New Stylesheet"
+    And I fill in "Slug" with "cuke.css"
+    And I press "Create Stylesheet"
+    Then I should see "Stylesheets"
+    And I should see "cuke.css"
+    And I should see "New Stylesheet"
+    
+  Scenario: Editing stylesheets
+    When I go to "/css/site.css"
+    Then the page should render
+      """
+      p { color: blue; }
+      """
+    When I am logged in as "designer"
+    When I go to the "styles" admin page
+    And I follow "site.css"
+    And I fill in "Slug" with "changed.css"
+    And I fill in "Body" with "p { color: red; } /* I added this comment */"
+    And I press "Save Changes"
+    Then I should see "changed.css"
+    And I follow "Logout"
+    And I go to "/css/changed.css"
+    And the page should render
+      """
+      p { color: red; } /* I added this comment */
+      """
+    
+  Scenario: Rendering CSS
+    Given I am logged in as "designer"
+    When I go to the "styles" admin page
+    And I follow "New Stylesheet"
+    And I fill in "Slug" with "styled.css"
+    And I fill in the "Body" content with the text
+      """
+      body { color: red; }
+      <r:stylesheet slug="site.css" />
+      """
+    And I press "Create Stylesheet"
+    And I go to "/css/styled.css"
+    Then the page should render
+      """
+      body { color: red; }
+      p { color: blue; }
+      """
+    

data/vendor/extensions/sheets/features/support/env.rb

@@ -4,13 +4,8 @@ ENV["RAILS_ENV"] = "test"
 extension_env = File.expand_path(File.dirname(__FILE__) + '/../../../../../config/environment')
 require extension_env+'.rb'
 
-Dir.glob(File.join(RADIANT_ROOT, "features", "**", "*.rb")).each {|step| require step}
+Dir.glob(File.join(RADIANT_ROOT, "features", "**", "*.rb")).each {|step| require step unless step =~ /datasets_loader\.rb$/}
  
 Cucumber::Rails::World.class_eval do
-  include Dataset
-  datasets_directory "#{RADIANT_ROOT}/spec/datasets"
-  Dataset::Resolver.default = Dataset::DirectoryResolver.new("#{RADIANT_ROOT}/spec/datasets", File.dirname(__FILE__) + '/../../spec/datasets', File.dirname(__FILE__) + '/../datasets')
-  self.datasets_database_dump_path = "#{Rails.root}/tmp/dataset"
-  
-  dataset :pages, :stylesheets, :javascripts
+  dataset :users_and_pages, :stylesheets, :javascripts
 end

data/vendor/extensions/sheets/features/support/paths.rb

@@ -1,14 +1,11 @@
-def path_to(page_name)
-  case page_name
+module NavigationHelpers
   
-  when /the homepage/i
-    root_path
+  PathMatchers = {} unless defined?(PathMatchers)
+  PathMatchers.merge!({
+    /styles/i => 'admin_styles_path',
+    /scripts/i => 'admin_scripts_path'
+  })
   
-  when /login/i
-    login_path
-  # Add more page name => path mappings here
-  
-  else
-    raise "Can't find mapping from \"#{page_name}\" to a path."
-  end
-end
+end
+
+World(NavigationHelpers)

data/vendor/extensions/sheets/lib/radiant-sheets-extension/version.rb

@@ -1,3 +1,3 @@
 module RadiantSheetsExtension
-  VERSION = '1.0.0'
+  VERSION = '1.0.0.pre'
 end

data/vendor/extensions/sheets/radiant-sheets-extension.gemspec

@@ -12,13 +12,18 @@ Gem::Specification.new do |s|
   s.summary     = %q{Sheets for Radiant CMS}
   s.description = %q{Manage CSS and Javascript content in Radiant CMS as Sheets, a subset of Pages.}
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  ignores = if File.exist?('.gitignore')
+    File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
+  else
+    []
+  end
+  s.files         = Dir['**/*'] - ignores
+  s.test_files    = Dir['test/**/*','spec/**/*','features/**/*'] - ignores
+  # s.executables   = Dir['bin/*'] - ignores
   s.require_paths = ["lib"]
   
   s.post_install_message = %{
   Add this to your radiant project with:
-    config.gem 'radiant-sheets-extension', :version => '#{RadiantSheetsExtension::VERSION}'
+    config.gem 'radiant-sheets-extension', :version => '~>#{RadiantSheetsExtension::VERSION}'
   }
 end

data/vendor/extensions/sheets/spec/datasets/javascripts_dataset.rb

@@ -3,7 +3,9 @@ class JavascriptsDataset < Dataset::Base
   
   def load
     create_page 'js', :slug => 'js', :class_name => 'JavascriptPage', :parent_id => pages(:home).id do
-      create_page 'site.js', :slug => 'site.js', :class_name => 'JavascriptPage'
+      create_page 'site.js', :slug => 'site.js', :class_name => 'JavascriptPage' do
+        create_page_part 'site_js_body', :name => 'body', :content => 'alert("site!");'
+      end
     end
   end
   

data/vendor/extensions/sheets/spec/datasets/stylesheets_dataset.rb

@@ -3,7 +3,9 @@ class StylesheetsDataset < Dataset::Base
   
   def load
     create_page "css", :slug => 'css', :class_name => 'StylesheetPage' do
-      create_page "site.css", :slug => 'site.css', :class_name => 'StylesheetPage'
+      create_page "site.css", :slug => 'site.css', :class_name => 'StylesheetPage' do
+        create_page_part 'site_css_body', :name => 'body', :content => 'p { color: blue; }'
+      end
       create_page "sassy.sass", :slug => 'sassy.sass', :class_name => 'StylesheetPage' do
         create_page_part 'sass_body', :name => 'body', :content => 'header
   background: red', :filter_id => 'Sass'

data/vendor/extensions/sheets/spec/lib/javascript_tags_spec.rb

@@ -11,24 +11,24 @@ describe "Javascript Tags" do
     subject { page }
     it { should render(%{<r:javascript />}).with_error("`javascript' tag must contain a `slug' attribute.") }
     it { should render(%{<r:javascript slug="bogus" />}).with_error("javascript bogus not found") }
-    it { should render(%{<r:javascript slug="site.js" />}).as("site.js body.") }
+    it { should render(%{<r:javascript slug="site.js" />}).as('alert("site!");') }
     it { should render(%{<r:javascript slug="site.js" as="url" />}).as("/js/site.js?#{javascript_page.updated_at.to_i}") }
     it { should render(%{<r:javascript slug="site.js" as="link" />}).as(%{<script type="#{javascript_page.headers['Content-Type']}" src="#{javascript_page.url.gsub(/\/$/,'')}?#{javascript_page.updated_at.to_i.to_s}"></script>}) }
     it { should render(%{<r:javascript slug="site.js" as="link" type="special/type" />}).as(%{<script type="special/type" src="#{javascript_page.url.gsub(/\/$/,'')}?#{javascript_page.updated_at.to_i.to_s}"></script>}) }
     it { should render(%{<r:javascript slug="site.js" as="link" something="custom" />}).as(%{<script type="#{javascript_page.headers['Content-Type']}" src="#{javascript_page.url.gsub(/\/$/,'')}?#{javascript_page.updated_at.to_i.to_s}" something="custom"></script>}) }
     it { should render(%{<r:javascript slug="site.js" as="inline" />}).as(%{<script type="#{javascript_page.headers['Content-Type']}">
 //<![CDATA[
-site.js body.
+alert("site!");
 //]]>
 </script>}) }
     it { should render(%{<r:javascript slug="site.js" as="inline" type="special/type" />}).as(%{<script type="special/type">
 //<![CDATA[
-site.js body.
+alert("site!");
 //]]>
 </script>}) }
     it { should render(%{<r:javascript slug="site.js" as="inline" something="custom" />}).as(%{<script type="#{javascript_page.headers['Content-Type']}" something="custom">
 //<![CDATA[
-site.js body.
+alert("site!");
 //]]>
 </script>}) }
   end

data/vendor/extensions/sheets/spec/lib/stylesheet_tags_spec.rb

@@ -11,7 +11,7 @@ describe "Stylesheet Tags" do
     subject { page }
     it { should render(%{<r:stylesheet />}).with_error("`stylesheet' tag must contain a `slug' attribute.") }
     it { should render(%{<r:stylesheet slug="bogus" />}).with_error("stylesheet bogus not found") }
-    it { should render(%{<r:stylesheet slug="site.css" />}).as("site.css body.") }
+    it { should render(%{<r:stylesheet slug="site.css" />}).as("p { color: blue; }") }
     it { should render(%{<r:stylesheet slug="site.css" as="url" />}).as("/css/site.css?#{site_css.updated_at.to_i}") }
     it { should render(%{<r:stylesheet slug="site.css" as="link" />}).as(%{<link rel="stylesheet" type="text/css" href="/css/site.css?#{site_css.updated_at.to_i.to_s}" />}) }
     it { should render(%{<r:stylesheet slug="site.css" as="link" type="special/type" />}).as(%{<link rel="stylesheet" type="special/type" href="/css/site.css?#{site_css.updated_at.to_i.to_s}" />}) }
@@ -19,17 +19,17 @@ describe "Stylesheet Tags" do
     it { should render(%{<r:stylesheet slug="site.css" as="link" rel="alternate" />}).as(%{<link rel="alternate" type="text/css" href="/css/site.css?#{site_css.updated_at.to_i.to_s}" />}) }
     it { should render(%{<r:stylesheet slug="site.css" as="inline" />}).as(%{<style type="text/css">
 /*<![CDATA[*/
-site.css body.
+p { color: blue; }
 /*]]>*/
 </style>}) }
     it { should render(%{<r:stylesheet slug="site.css" as="inline" type="special/type" />}).as(%{<style type="special/type">
 /*<![CDATA[*/
-site.css body.
+p { color: blue; }
 /*]]>*/
 </style>}) }
     it { should render(%{<r:stylesheet slug="site.css" as="inline" something="custom" />}).as(%{<style type="text/css" something="custom">
 /*<![CDATA[*/
-site.css body.
+p { color: blue; }
 /*]]>*/
 </style>}) }
     it "should apply text filters when outputing content" do