radiant-sheets-extension 1.0.0.pre → 1.0.0

data/app/controllers/admin/sheet_resource_controller.rb

@@ -40,15 +40,12 @@ class Admin::SheetResourceController < Admin::ResourceController
   
   def create_root
     unless @root
-      s = model_class.new_with_defaults
       begin
-        s.parent_id = Page.find_by_slug('/').id
+        model_class.create_root
       rescue Page::MissingRootPageError
         flash[:error] = t('sheets.root_required', :model => humanized_model_name)
         redirect_to welcome_path and return false
       end
-      s.slug = model_class == StylesheetPage ? 'css' : 'js'
-      s.save
     end
   end
 end

data/app/models/sheet.rb

@@ -1,3 +1,4 @@
+require 'digest/md5'
 module Sheet
   module InvalidHomePage; end
   module Instance
@@ -9,12 +10,19 @@ module Sheet
         class_inheritable_accessor :sheet_root
         
         def self.root
-          sheet_root ||= Page.find_by_path('/').children.first(:conditions => {:class_name => self.to_s})
+          Page.find_by_path('/').children.first(:conditions => {:class_name => self.to_s})
         rescue NoMethodError => e
           e.extend Sheet::InvalidHomePage
           raise e
         end
 
+        def self.create_root
+          s = self.new_with_defaults
+          s.parent_id = Page.find_by_slug('/').id
+          s.slug = self.name == 'StylesheetPage' ? 'css' : 'js'
+          s.save
+        end
+
         def self.default_page_parts
           PagePart.new(:name => 'body')
         end
@@ -74,8 +82,24 @@ module Sheet
         self.part('body').content = file.read
       end
     end
+
+    def digest
+      @generated_digest ||= digest!
+    end
+
+    def digest!
+      Digest::MD5.hexdigest(self.render)
+    end
+
+    def child_path(child)
+      clean_path(path + '/' + child.slug + '?' + child.digest)
+    end
   
     private
+
+    def clean_path(path)
+      "/#{ path.to_s.strip }".gsub(%r{//+}, '/')
+    end
   
     def set_title
       self.title = self.slug

data/features/admin/managing_stylesheets.feature

@@ -46,6 +46,33 @@ Feature: Managing stylesheets
       """
       p { color: red; } /* I added this comment */
       """
+      
+  Scenario: Ensuring a homepage exists
+    Given there are no pages
+    And I am logged in as "designer"
+    When I follow "Design"
+    And I follow "Stylesheets"
+    Then I should see "You must first publish a homepage before you may create a Stylesheet"
+    And I should not see "New Stylesheet"
+    And I should see "New Homepage"
+      
+  Scenario: Creating stylesheets from scratch
+    Given there are no pages
+    And I am logged in as "designer"
+    When I follow "Design"
+    And I follow "Stylesheets"
+    Then I should see "You must first publish a homepage before you may create a Stylesheet"
+    And I follow "New Homepage"
+    And I fill in "Page Title" with "Home Page"
+    And I fill in "Slug" with "/"
+    And I fill in "Breadcrumb" with "Home"
+    And I select "Published" from "Status"
+    And I press "Create Page"
+    Then I should see "Home Page"
+    And I follow "Design"
+    And I follow "Stylesheets"
+    And I follow "New Stylesheet"
+    Then I should see "Path: /css/"
     
   Scenario: Rendering CSS
     Given I am logged in as "designer"
@@ -105,4 +132,5 @@ Feature: Managing stylesheets
       """
       p{color:red}p a{color:blue;line-height:1.9}
       """
+    And the "Cache-Control" header should be "max-age=2592000"
     

data/lib/javascript_tags.rb

@@ -9,7 +9,7 @@ as one of the following:
 
 * with no @as@ value the javascript's content is rendered by default.
 * @inline@ - wraps the javascript's content in an (X)HTML @<script>@ element.
-* @url@ - the full path to the javascript.
+* @path@ - the full path to the javascript.
 * @link@ - embeds the url in an (X)HTML @<script>@ element (creating a link to the external javascript).
 
 *Additional Options:*
@@ -38,16 +38,16 @@ The above example will produce the following:
     raise TagError.new("`javascript' tag must contain a `slug' attribute.") unless slug
     if (javascript = JavascriptPage.find_by_slug(slug))
       mime_type = tag.attr['type'] || javascript.headers['Content-Type']
-      url = javascript.url.sub(/\/$/,'') + '?' + javascript.updated_at.to_i.to_s
+      path = javascript.path
       optional_attributes = tag.attr.except('slug', 'name', 'as', 'type').inject('') { |s, (k, v)| s << %{#{k}="#{v}" } }.strip
       optional_attributes = " #{optional_attributes}" unless optional_attributes.empty?
       case tag.attr['as']
-      when 'url'
-        url
+      when 'url','path'
+        path
       when 'inline'
         %{<script type="#{mime_type}"#{optional_attributes}>\n//<![CDATA[\n#{javascript.render_part('body')}\n//]]>\n</script>}
       when 'link'
-        %{<script type="#{mime_type}" src="#{url}"#{optional_attributes}></script>}
+        %{<script type="#{mime_type}" src="#{path}"#{optional_attributes}></script>}
       else
         javascript.render_part('body')
       end

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

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

data/lib/stylesheet_tags.rb

@@ -9,7 +9,7 @@ as one of the following:
 
 * with no @as@ value the stylesheet's content is rendered by default.
 * @inline@ - wraps the stylesheet's content in an (X)HTML @<style>@ element.
-* @url@ - the full path to the stylesheet.
+* @path@ - the full path to the stylesheet.
 * @link@ - embeds the url in an (X)HTML @<link>@ element (creating a link to the external stylesheet).
 
 *Additional Options:*
@@ -40,17 +40,17 @@ The above example will produce the following:
     raise TagError.new("`stylesheet' tag must contain a `slug' attribute.") unless slug
     if (stylesheet = StylesheetPage.find_by_slug(slug))
       mime_type = tag.attr['type'] || stylesheet.headers['Content-Type']
-      url = stylesheet.url.sub(/\/$/,'') + '?' + stylesheet.updated_at.to_i.to_s
+      path = stylesheet.path
       rel = tag.attr.delete('rel') || 'stylesheet'
       optional_attributes = tag.attr.except('slug', 'name', 'as', 'type').inject('') { |s, (k, v)| s << %{#{k}="#{v}" } }.strip
       optional_attributes = " #{optional_attributes}" unless optional_attributes.empty?
       case tag.attr['as']
-      when 'url'
-        url
+      when 'url','path'
+        path
       when 'inline'
         %{<style type="#{mime_type}"#{optional_attributes}>\n/*<![CDATA[*/\n#{stylesheet.render_part('body')}\n/*]]>*/\n</style>}
       when 'link'
-        %{<link rel="#{rel}" type="#{mime_type}" href="#{url}"#{optional_attributes} />}
+        %{<link rel="#{rel}" type="#{mime_type}" href="#{path}"#{optional_attributes} />}
       else
         stylesheet.render_part('body')
       end

data/radiant-sheets-extension.gemspec

@@ -24,9 +24,4 @@ Gem::Specification.new do |s|
   
   s.add_dependency 'sass', '~>3.1.2'
   s.add_dependency 'coffee-script', '~>2.2.0'
-  
-  s.post_install_message = %{
-  Add this to your radiant project with:
-    config.gem 'radiant-sheets-extension', :version => '~>#{RadiantSheetsExtension::VERSION}'
-  }
 end

data/sheets_extension.rb

@@ -20,11 +20,6 @@ class SheetsExtension < Radiant::Extension
   @@javascript_filters ||= []
   @@javascript_filters << CoffeeFilter
   
-  extension_config do |config|
-    config.gem 'coffee-script', :version => '~> 2.2.0'
-    config.gem 'sass', :version => '~> 3.1.2'
-  end
-  
   def activate
     SassFilter
     ScssFilter
@@ -76,10 +71,11 @@ class SheetsExtension < Radiant::Extension
     end
     
     SiteController.class_eval do
-      cattr_writer :sheet_cache_timeout
-  
       def self.sheet_cache_timeout
-        @@sheet_cache_timeout ||= 30.days
+        @sheet_cache_timeout ||= 30.days
+      end
+      def self.sheet_cache_timeout=(val)
+        @sheet_cache_timeout = val
       end
       
       def set_cache_control_with_sheets

data/spec/lib/javascript_tags_spec.rb

@@ -12,10 +12,10 @@ describe "Javascript Tags" do
     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('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="url" />}).as("/js/site.js?#{javascript_page.digest}") }
+    it { should render(%{<r:javascript slug="site.js" as="link" />}).as(%{<script type="#{javascript_page.headers['Content-Type']}" src="#{javascript_page.path}"></script>}) }
+    it { should render(%{<r:javascript slug="site.js" as="link" type="special/type" />}).as(%{<script type="special/type" src="#{javascript_page.path}"></script>}) }
+    it { should render(%{<r:javascript slug="site.js" as="link" something="custom" />}).as(%{<script type="#{javascript_page.headers['Content-Type']}" src="#{javascript_page.path}" something="custom"></script>}) }
     it { should render(%{<r:javascript slug="site.js" as="inline" />}).as(%{<script type="#{javascript_page.headers['Content-Type']}">
 //<![CDATA[
 alert("site!");

data/spec/lib/stylesheet_tags_spec.rb

@@ -12,11 +12,11 @@ describe "Stylesheet Tags" do
     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("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}" />}) }
-    it { should render(%{<r:stylesheet slug="site.css" as="link" something="custom" />}).as(%{<link rel="stylesheet" type="text/css" href="/css/site.css?#{site_css.updated_at.to_i.to_s}" something="custom" />}) }
-    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="url" />}).as("/css/site.css?#{site_css.digest}") }
+    it { should render(%{<r:stylesheet slug="site.css" as="link" />}).as(%{<link rel="stylesheet" type="text/css" href="/css/site.css?#{site_css.digest}" />}) }
+    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.digest}" />}) }
+    it { should render(%{<r:stylesheet slug="site.css" as="link" something="custom" />}).as(%{<link rel="stylesheet" type="text/css" href="/css/site.css?#{site_css.digest}" something="custom" />}) }
+    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.digest}" />}) }
     it { should render(%{<r:stylesheet slug="site.css" as="inline" />}).as(%{<style type="text/css">
 /*<![CDATA[*/
 p { color: blue; }

data/spec/models/javascript_page_spec.rb

@@ -41,6 +41,21 @@ describe JavascriptPage do
     end
   end
   
+  describe '#digest' do
+    it 'should return an md5 hash of the rendered contents' do
+      site_js.digest.should == Digest::MD5.hexdigest(site_js.render)
+    end
+  end
+ 
+  describe '#path' do
+    it 'should include an md5 hash of the rendered contents' do
+      site_js.path.should == "/js/site.js?#{site_js.digest}"
+    end
+    it 'should not include an md5 hash of the rendered contents for the root' do
+      javascript.path.should == "/js/"
+    end
+  end
+  
   context 'when validating a new page' do
     it "should automatically set the title to the given slug" do
       j = JavascriptPage.new(:slug => 'site.js')

data/spec/models/stylesheet_page_spec.rb

@@ -41,6 +41,21 @@ describe StylesheetPage do
     end
   end
   
+  describe '#digest' do
+    it 'should return an md5 hash of the rendered contents' do
+      site_css.digest.should == Digest::MD5.hexdigest(site_css.render)
+    end
+  end
+ 
+  describe '#path' do
+    it 'should include an md5 hash of the rendered contents' do
+      site_css.path.should == "/css/site.css?#{site_css.digest}"
+    end
+    it 'should not include an md5 hash of the rendered contents for the root' do
+      css.path.should == "/css/"
+    end
+  end
+
   context 'when validating a new page' do
     it "should automatically set the title to the given slug" do
       j = StylesheetPage.new(:slug => 'site.css')
@@ -77,4 +92,5 @@ describe StylesheetPage do
       end
     end
   end
+
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-sheets-extension
 version: !ruby/object:Gem::Version 
-  hash: 961915988
-  prerelease: 6
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 0
   - 0
-  - pre
-  version: 1.0.0.pre
+  version: 1.0.0
 platform: ruby
 authors: 
 - Radiant CMS Dev Team
@@ -16,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -04:00
-default_executable: 
+date: 2011-09-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sass
@@ -113,11 +111,10 @@ files:
 - spec/models/stylesheet_page_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://radiantcms.org/
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-sheets-extension', :version => '~>1.0.0.pre'\n  "
+post_install_message: 
 rdoc_options: []
 
 require_paths: 
@@ -134,18 +131,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Sheets for Radiant CMS