radiant-sheets-extension 1.0.4 → 1.0.5

data/README.md

@@ -4,6 +4,24 @@ Sheets is a way to manage stylesheets and scripts from your existing page tree.
 
 Pages of these types are Sheets.
 
+## Configuration
+
+Sheets have an option to output paths with a cache parameter which will create a digest of the rendered content.
+
+By setting `Radiant::Config['sheets.use_cache_param?]` to `true` the paths output from the `<r:stylesheet>` and `<r:javascript>` tags will appear like
+
+	/css/styles.css?bc4150d023d3255136db671d61ac93f2
+	/js/scripts.js?d6c5855a62cf32a4dadbc2831f0f295f
+	
+where the parameter is created from the rendered content of the sheet.
+	
+Without this set, the paths will be:
+
+	/css/styles.css
+	/js/scripts.js
+	
+and the pages will not be rendered to generate the path.
+
 ## Features
 
 The basic features:

data/app/models/javascript_page.rb

@@ -1,6 +1,5 @@
 class JavascriptPage < Page
   include Sheet::Instance
-  in_menu false
   
   def headers
     {'Content-Type' => 'text/javascript'}

data/app/models/sheet.rb

@@ -76,8 +76,6 @@ module Sheet
         self.errors.add(:upload, 'not given. Please upload a file.')
       when !file.kind_of?(ActionController::UploadedFile)
         self.errors.add(:upload, 'is an unusable format.')
-      when file.size > 262144 # 256k (that's a HUGE script or stylesheet)
-        self.errors.add(:upload, 'file size is larger than 256kB. Please upload a smaller file.')
       else
         self.slug = file.original_filename.to_slug().gsub(/-css$/,'.css').gsub(/-js/,'.js')
         self.part('body').content = file.read
@@ -93,7 +91,11 @@ module Sheet
     end
 
     def child_path(child)
-      clean_path(path + '/' + child.slug + '?' + child.digest)
+      clean_path(path + '/' + child.slug + child.cache_marker)
+    end
+    
+    def cache_marker
+      Radiant::Config['sheets.use_cache_param?'] ? "?#{digest}" : ''
     end
   
     private

data/app/models/stylesheet_page.rb

@@ -1,6 +1,5 @@
 class StylesheetPage < Page
   include Sheet::Instance
-  in_menu false
     
   def headers
     {'Content-Type' => 'text/css'}

data/app/views/admin/scripts/edit.html.haml

@@ -1,12 +1,12 @@
 %h1= model.new_record? ? t('new_javascript') : t('edit_javascript')
 - form_for [:admin, model], :url => (model.new_record? ? admin_scripts_url : admin_script_url(model)) do |f|
   %p.title
-    = label :sheet_page, :slug, 'Slug'
+    = label :sheet_page, :slug, t('slug')
     = f.text_field :slug, :class => 'textbox', :maxlength => 255, :id => 'sheet_page_slug'
     %span.hint= %{#{t('path')}: #{@root.url}<span id="this_slug">#{model.slug}</span>}
   - f.fields_for :parts do |p|
     %p.content
-      = p.label :content, 'Body'
+      = p.label :content, t('content')
       = p.hidden_field :name, :value => 'body' if model.new_record?
       = p.text_area :content, :class => 'textarea large', :style => 'width: 100%'
     %p

data/app/views/admin/scripts/index.html.haml

@@ -3,9 +3,9 @@
   %table.index
     %thead
       %tr
-        %th Javascript
-        %th Filter
-        %th Modify
+        %th= t('javascript_page')
+        %th= t('filter')
+        %th= t('modify')
     %tbody
       - unless models.blank?
         - models.each do |javascript|

data/app/views/admin/styles/edit.html.haml

@@ -1,12 +1,12 @@
 %h1= model.new_record? ? t('new_stylesheet') : t('edit_stylesheet')
 - form_for [:admin, model], :url => (model.new_record? ? admin_styles_url() : admin_style_url(model)) do |f|
   %p.title
-    = label :sheet_page, :slug, 'Slug'
+    = label :sheet_page, :slug, t('slug')
     = f.text_field :slug, :class => 'textbox', :maxlength => 255, :id => "sheet_page_slug"
     %span.hint= %{Path: #{@root.url}<span id="this_slug">#{model.slug}</span>}
   - f.fields_for :parts do |p|
     %p.content
-      = p.label :content, 'Body'
+      = p.label :content, t('content')
       = p.hidden_field :name, :value => 'body' if model.new_record?
       = p.text_area :content, :class => 'textarea large', :style => 'width: 100%'
     %p

data/app/views/admin/styles/index.html.haml

@@ -3,9 +3,9 @@
   %table.index
     %thead
       %tr
-        %th Stylesheet
-        %th Filter
-        %th Modify
+        %th= t('stylesheet_page')
+        %th= t('filter')
+        %th= t('modify')
     %tbody
       - unless models.blank?
         - models.each do |stylesheet|

data/app/views/admin/styles/new.html.haml

@@ -1,12 +1,12 @@
 %h1= model.new_record? ? t('new_stylesheet') : t('edit_stylesheet')
 - form_for [:admin, model], :url => (model.new_record? ? admin_styles_url() : admin_style_url(model)) do |f|
   %p.title
-    = label :sheet_page, :slug, 'Slug'
+    = label :sheet_page, :slug, t('slug')
     = f.text_field :slug, :class => 'textbox', :maxlength => 255, :id => "sheet_page_slug"
     %span.hint= %{Path: #{@root.url}<span id="this_slug">#{model.slug}</span>}
   - f.fields_for :parts do |p|
     %p.content
-      = p.label :content, 'Body'
+      = p.label :content, t('content')
       = p.hidden_field :name, :value => 'body' if model.new_record?
       = p.text_area :content, :class => 'textarea large', :style => 'width: 100%'
     %p

data/config/locales/nl.yml

@@ -0,0 +1,17 @@
+---
+nl: 
+  create_javascript: Creëer Javascript
+  create_stylesheet: Creëer Stylesheet
+  edit_javascript: Javascript aanpassen
+  edit_stylesheet: Stylesheet aanpassen
+  new_javascript: Nieuwe Javascript
+  new_stylesheet: Nieuwe Stylesheet
+  path: Pad
+  sheets: Sheets
+  upload: Uploaden
+  stylesheet_page: Stylesheet
+  javascript_page: Javascript
+  sheets:
+    root_required: "Je moet een homepage publiceren voor je een %{model} kunt maken."
+  no_styles: 'Geen Stylesheets'
+  no_scripts: 'Geen Javascripts'

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

@@ -1,3 +1,3 @@
 module RadiantSheetsExtension
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/radiant-sheets-extension.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   # s.executables   = Dir['bin/*'] - ignores
   s.require_paths = ["lib"]
   
-  s.add_dependency 'sass', '~>3.1.2'
+  s.add_dependency 'sass', '~>3.1.12'
   s.add_dependency 'coffee-script', '~>2.2.0'
 end

data/sheets_extension.rb

@@ -36,22 +36,9 @@ class SheetsExtension < Radiant::Extension
       alias_method_chain :filter_options_for_select, :sheet_restrictions
     end
     
-    # Will only be called in 0.9.1 and below, avoid redeclaring
-    unless Page.respond_to?('in_menu')
-      Page.class_eval do
-        class_inheritable_accessor :in_menu
-        self.in_menu = true
-
-        class << self
-          alias_method :in_menu?, :in_menu
-          alias_method :in_menu, :in_menu=
-        end
-      end
-    end
-    
     Page.class_eval do      
       def sheet?
-        self.class.included_modules.include?(Sheet::Instance)
+        self.is_a?(Sheet::Instance)
       end
 
       include JavascriptTags

data/spec/lib/javascript_tags_spec.rb

@@ -8,6 +8,9 @@ describe "Javascript Tags" do
     let(:javascript_page){ pages(:site_js)}
 
   describe "<r:javascript>" do
+    before do
+      Radiant::Config['sheets.use_cache_param?'] = true
+    end
     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") }

data/spec/lib/stylesheet_tags_spec.rb

@@ -7,6 +7,9 @@ describe "Stylesheet Tags" do
   let(:page){ pages(:home) }
 
   describe "<r:stylesheet>" do
+    before do
+      Radiant::Config['sheets.use_cache_param?'] = true
+    end
     let(:site_css){pages(:site_css)}
     subject { page }
     it { should render(%{<r:stylesheet />}).with_error("`stylesheet' tag must contain a `slug' attribute.") }

data/spec/models/javascript_page_spec.rb

@@ -48,6 +48,11 @@ describe JavascriptPage do
   end
  
   describe '#path' do
+
+    before do
+      Radiant::Config['sheets.use_cache_param?'] = true
+    end
+    
     it 'should include an md5 hash of the rendered contents' do
       site_js.path.should == "/js/site.js?#{site_js.digest}"
     end

data/spec/models/stylesheet_page_spec.rb

@@ -48,6 +48,9 @@ describe StylesheetPage do
   end
  
   describe '#path' do
+    before do
+      Radiant::Config['sheets.use_cache_param?'] = true
+    end
     it 'should include an md5 hash of the rendered contents' do
       site_css.path.should == "/css/site.css?#{site_css.digest}"
     end

metadata

@@ -1,46 +1,64 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: radiant-sheets-extension
-version: !ruby/object:Gem::Version
-  version: 1.0.4
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 5
+  version: 1.0.5
 platform: ruby
-authors:
+authors: 
 - Radiant CMS Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-29 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sass
-  requirement: &2166707820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.2
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 3
+        - 1
+        - 12
+        version: 3.1.12
   type: :runtime
-  prerelease: false
-  version_requirements: *2166707820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: coffee-script
-  requirement: &2166707320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2166707320
-description: Manage CSS and Javascript content in Radiant CMS as Sheets, a subset
-  of Pages.
-email:
+  version_requirements: *id002
+description: Manage CSS and Javascript content in Radiant CMS as Sheets, a subset of Pages.
+email: 
 - radiant@radiantcms.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - app/controllers/admin/scripts_controller.rb
 - app/controllers/admin/sheet_resource_controller.rb
 - app/controllers/admin/styles_controller.rb
@@ -58,6 +76,7 @@ files:
 - app/views/admin/styles/index.html.haml
 - app/views/admin/styles/new.html.haml
 - config/locales/en.yml
+- config/locales/nl.yml
 - config/routes.rb
 - cucumber.yml
 - features/admin/managing_javascripts.feature
@@ -95,29 +114,38 @@ files:
 - spec/spec_helper.rb
 homepage: http://radiantcms.org/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Sheets for Radiant CMS
-test_files:
+test_files: 
 - spec/controllers/admin/scripts_controller_spec.rb
 - spec/controllers/admin/styles_controller_spec.rb
 - spec/datasets/javascripts_dataset.rb