radiant-library-extension 2.0.3 → 2.1.0

data/Rakefile

@@ -7,8 +7,8 @@ begin
     gem.email = "will@spanner.org"
     gem.homepage = "http://github.com/spanner/radiant-library-extension"
     gem.authors = ["spanner"]
-    gem.add_dependency "radiant", ">= 0.9.0"
-    gem.add_dependency "radiant-taggable-extension", ">= 1.2.0"
+    gem.add_dependency "radiant", "~> 0.9.0"
+    gem.add_dependency "radiant-taggable-extension", "~> 1.2.0"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. This is only required if you plan to package library as a gem."

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.1.0

data/app/helpers/library_helper.rb

@@ -0,0 +1,23 @@
+require 'sanitize'
+
+module LibraryHelper
+
+  def clean_html(text)
+    Sanitize.clean(text, Sanitize::Config::RELAXED)
+  end
+
+  def strip_html(text)
+    Sanitize.clean(text)
+  end
+
+  def truncate_words(text='', options={})
+    return '' if text.blank?
+    ellipsis = options[:ellipsis] || '…'
+    limit = (options[:limit] || 64).to_i
+    text = strip_html(text) if options[:strip]
+    words = text.split
+    ellipsis = '' unless words.size > limit
+    words[0..(limit-1)].join(" ") + ellipsis
+  end 
+
+end

data/app/views/admin/assets/_edit_title.html.haml

@@ -1,31 +1,14 @@
-- content_for :page_css do
-  :sass 
-    div#a_header
-      :width 99%
-      div#a_title
-        :width 70%
-        :float left
-      div#a_keywords
-        :width 28%
-        :float right
-    div#content 
-      .form-area 
-        .keywords 
-          .textbox
-            :font-family Georgia, Palatino, "Times New Roman", Times, serif
-            :font-size 200%
-            :width 100%
-            :color #c00
+- include_stylesheet 'admin/taggable'
+- include_javascript 'autocomplete'
+- include_javascript 'admin/taggable'
 
 - fields_for :asset, @asset do |fields|
-  #a_header
-    #a_title
-      %p.title
-        %label{:for=>"asset_title"}
-          Title
-        = fields.text_field :title, :class => 'textbox', :maxlength => 100
-    #a_keywords
-      %p.keywords
-        %label{:for=>"asset_keywords"}
-          Tags
-        = fields.text_field :keywords, :class => 'textbox'
+  %p.keywords
+    %label{:for=>"asset_keywords"}
+      Tags
+    = fields.text_field :keywords, :class => 'textbox tagger'
+
+  %p.title
+    %label{:for=>"asset_title"}
+      Title
+    = fields.text_field :title, :class => 'textbox', :maxlength => 100

data/lib/library/library_tags.rb

@@ -1,9 +1,40 @@
 module Library
   module LibraryTags
     include Radiant::Taggable
+    include LibraryHelper
   
     class TagError < StandardError; end
 
+    ############### libraryish utility tags that don't really belong here
+    desc %{
+      Truncates the contained text to the specified number of words. Attributes:
+      * `limit` sets the number of words shown. Default is 64.
+      * `ellipsis` is the suffix used to indicate truncation. Default is '&hellip;'
+      * `strip="true"` will cause all html tags to be stripped from the contained text before it is truncated. Default is false.
+    }
+    tag "truncate" do |tag|
+      # truncate_words is in LibraryHelper
+      truncate_words tag.expand, :limit => tag.attr['limit'], :ellipsis => tag.attr['ellipsis'], :strip => tag.attr['strip'] == 'true'
+    end
+
+    desc %{
+      Strips all html tags from the contained text, leaving the text itself unchanged. 
+      Useful when, for example, using a page part to populate a meta tag.
+    }
+    tag "strip" do |tag|
+      # strip_html is in LibraryHelper
+      strip_html tag.expand
+    end
+
+    desc %{
+      Removes all unsafe html tags and attributes from the enclosed text, protecting from cross-site scripting attacks while leaving the text intact.
+    }
+    tag "clean" do |tag|
+      # clean_html is in LibraryHelper
+      clean_html tag.expand
+    end
+
+
     ############### tags for use on library pages
                   # usually to build a faceted browser
 
@@ -16,13 +47,12 @@ module Library
       Displays a list of the tags that can be used to narrow the set of results displayed. This begins as a list of 
       all available tags, and as they are chosen it shrinks to show only the coincident tags that will further reduce the set.
       
-      This is normally used to display a list or cloud of facets that can be added to a search. The default is to show a cloud.
+      This is normally used to display a list or cloud of facets that can be added to a search.
       
       <pre><code>
         <r:library:tags:each><li><r:tag:link /></li></r:library:tags:each>
         <r:library:tags:list />
         <r:library:tags:cloud />
-        <r:library:tags />
       </code></pre>
 
       To show only those tags attached to a particular kind of object, supply a 'for' parameter. 
@@ -36,21 +66,17 @@ module Library
       You can still display pages associated with those tags, but the list will not include tags that only have pages.
     }
     tag "library:tags" do |tag|
-      tag.locals.tags = _get_coincident_tags(tag)
-      if tag.double?
-        tag.expand
-      else
-        tag.render('tags:cloud', tag.attr.dup)
-      end
+      tag.locals.tags = _get_coincident_tags(tag).sort
+      tag.expand
     end
     tag "library:tags:each" do |tag|
-      tag.render('tags:each', tag.attr.dup, &tag.block)
+      tag.render('each_tag', tag.attr.dup, &tag.block)
     end
     tag "library:tags:list" do |tag|
-      tag.render('tags:list', tag.attr.dup)
+      tag.render('tag_list', tag.attr.dup)
     end
     tag "library:tags:cloud" do |tag|
-      tag.render('tags:cloud', tag.attr.dup)
+      tag.render('tag_cloud', tag.attr.dup)
     end
     
     desc %{
@@ -64,7 +90,7 @@ module Library
       </code></pre>
     }
     tag "library:if_tags" do |tag|
-      tag.locals.tags = _get_coincident_tags(tag)
+      tag.locals.tags = _get_coincident_tags(tag).sort
       tag.expand if tag.locals.tags.length > 1
     end
     desc %{
@@ -76,7 +102,7 @@ module Library
       </code></pre>
     }
     tag "library:unless_tags" do |tag|
-      tag.locals.tags = _get_coincident_tags(tag)
+      tag.locals.tags = _get_coincident_tags(tag).sort
       tag.expand if tag.locals.tags.length > 1
     end
         
@@ -91,7 +117,7 @@ module Library
       </code></pre>
     }
     tag "library:requested_tags" do |tag|
-      tag.locals.tags = _get_requested_tags(tag)
+      tag.locals.tags = _get_requested_tags(tag).sort
       if tag.double?
         tag.expand
       else
@@ -99,7 +125,7 @@ module Library
       end
     end
     tag "library:requested_tags:each" do |tag|
-      tag.render('tags:each', tag.attr.dup, &tag.block)
+      tag.render('each_tag', tag.attr.dup, &tag.block)
     end
 
     desc %{
@@ -113,7 +139,7 @@ module Library
       </code></pre>
     }
     tag "library:if_requested_tags" do |tag|
-      tag.locals.tags = _get_requested_tags(tag)
+      tag.locals.tags = _get_requested_tags(tag).sort
       tag.expand if tag.locals.tags.any?
     end
     

data/library_extension.rb

@@ -1,10 +1,14 @@
 require_dependency 'application_controller'
 
 class LibraryExtension < Radiant::Extension
-  version "2.0.3"
+  version "2.1.0"
   description "Combines paperclipped and taggable to create a general purpose faceted library"
   url "http://github.com/spanner/radiant-library-extension"
-    
+  
+  extension_config do |config|
+    config.gem 'sanitize'
+  end
+  
   def activate
     Asset.send :is_taggable                                            # make assets taggable
     Asset.send :include, Library::TaggedAsset                          # add a keywords method for likeness with pages

data/radiant-library-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-library-extension}
-  s.version = "2.0.3"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2011-04-20}
   s.description = %q{Combines paperclipped and taggable to create a general purpose faceted library}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     "README.md",
      "Rakefile",
      "VERSION",
+     "app/helpers/library_helper.rb",
      "app/models/library_page.rb",
      "app/views/admin/assets/_edit_metadata.html.haml",
      "app/views/admin/assets/_edit_title.html.haml",
@@ -36,9 +37,6 @@ Gem::Specification.new do |s|
      "lib/library/tagged_asset.rb",
      "lib/tasks/library_extension_tasks.rake",
      "library_extension.rb",
-     "pkg/radiant-library-extension-2.0.0.gem",
-     "pkg/radiant-library-extension-2.0.1.gem",
-     "pkg/radiant-library-extension-2.0.2.gem",
      "public/images/library/bigframe.png",
      "public/images/library/close.png",
      "public/images/library/detag.png",
@@ -77,15 +75,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<radiant>, [">= 0.9.0"])
-      s.add_runtime_dependency(%q<radiant-taggable-extension>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<radiant>, ["~> 0.9.0"])
+      s.add_runtime_dependency(%q<radiant-taggable-extension>, ["~> 1.2.0"])
     else
-      s.add_dependency(%q<radiant>, [">= 0.9.0"])
-      s.add_dependency(%q<radiant-taggable-extension>, [">= 1.2.0"])
+      s.add_dependency(%q<radiant>, ["~> 0.9.0"])
+      s.add_dependency(%q<radiant-taggable-extension>, ["~> 1.2.0"])
     end
   else
-    s.add_dependency(%q<radiant>, [">= 0.9.0"])
-    s.add_dependency(%q<radiant-taggable-extension>, [">= 1.2.0"])
+    s.add_dependency(%q<radiant>, ["~> 0.9.0"])
+    s.add_dependency(%q<radiant-taggable-extension>, ["~> 1.2.0"])
   end
 end
 

data/spec/controllers/library_site_controller_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-Radiant::Config['reader.layout'] = 'Main'
 
 describe SiteController do
   dataset :library_pages

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-library-extension
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 3
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +01:00
+date: 2011-04-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 59
         segments: 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 31
         segments: 
@@ -62,6 +62,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- app/helpers/library_helper.rb
 - app/models/library_page.rb
 - app/views/admin/assets/_edit_metadata.html.haml
 - app/views/admin/assets/_edit_title.html.haml
@@ -79,9 +80,6 @@ files:
 - lib/library/tagged_asset.rb
 - lib/tasks/library_extension_tasks.rake
 - library_extension.rb
-- pkg/radiant-library-extension-2.0.0.gem
-- pkg/radiant-library-extension-2.0.1.gem
-- pkg/radiant-library-extension-2.0.2.gem
 - public/images/library/bigframe.png
 - public/images/library/close.png
 - public/images/library/detag.png