radiant-clipped-extension 1.0.8 → 1.0.9

data/lib/radiant-clipped-extension.rb

@@ -1,5 +1,5 @@
 module RadiantClippedExtension
-  VERSION     = "1.0.8"
+  VERSION     = "1.0.9"
   SUMMARY     = %q{Assets for Radiant CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
   URL         = "http://radiantcms.org"

data/spec/datasets/assets_dataset.rb

@@ -3,8 +3,8 @@ class AssetsDataset < Dataset::Base
   
   def load
     create_page "pictured", :slug => 'pictured' do
-      create_asset "test1", :caption => "testing"
-      create_asset "test2", :caption => "also testing"
+      create_asset "test1", :caption => "testing", :position => 1
+      create_asset "test2", :caption => "also testing", :position => 2
     end
     create_asset "video", :asset_content_type => 'video/mpeg', :asset_file_name => 'asset.mpg'
     create_asset "audio", :asset_content_type => 'audio/mp3', :asset_file_name => 'asset.mp3'
@@ -13,6 +13,7 @@ class AssetsDataset < Dataset::Base
   
   helpers do
     def create_asset(name, attributes={})
+      pos = attributes.delete(:position)
       create_record :asset, name.symbolize, {
         :title => name,
         :asset_file_name =>  'asset.jpg',
@@ -25,7 +26,8 @@ class AssetsDataset < Dataset::Base
       if @current_page_id
         create_record :page_attachment, "#{name}_attachment".symbolize, {
           :page_id => @current_page_id,
-          :asset_id => asset_id(name.symbolize)
+          :asset_id => asset_id(name.symbolize),
+          :position => pos
         }
       end
     end

data/spec/lib/asset_tags_spec.rb

@@ -43,58 +43,58 @@ describe AssetTags do
     end
     
     it "asset:name" do
-      page.should render('<r:assets:first><r:asset:name /></r:assets:first>').as( asset.title )
+      page.should render(%{<r:asset:name id="#{asset_id(:test1)}" />}).as( asset.title )
     end
     
     it "asset:filename" do
-      page.should render('<r:assets:first><r:asset:filename /></r:assets:first>').as( asset.asset_file_name )
+      page.should render(%{<r:asset:filename id="#{asset_id(:test1)}" />}).as( asset.asset_file_name )
     end
     
     it "asset:url" do
-      page.should render('<r:assets:first><r:asset:url /></r:assets:first>').as( asset.thumbnail )
-      page.should render('<r:assets:first><r:asset:url size="icon" /></r:assets:first>').as( asset.thumbnail('icon') )
+      page.should render(%{<r:asset:url id="#{asset_id(:test1)}" />}).as( asset.thumbnail )
+      page.should render(%{<r:asset:url size="icon" id="#{asset_id(:test1)}" />}).as( asset.thumbnail('icon') )
     end
     
     it "asset:link" do
-      page.should render('<r:assets:first><r:asset:link /></r:assets:first>').as( %{<a href="#{asset.thumbnail}">#{asset.title}</a>} )
-      page.should render('<r:assets:first><r:asset:link size="icon" /></r:assets:first>').as( %{<a href="#{asset.thumbnail('icon')}">#{asset.title}</a>} )
+      page.should render(%{<r:asset:link id="#{asset_id(:test1)}" />}).as( %{<a href="#{asset.thumbnail}">#{asset.title}</a>} )
+      page.should render(%{<r:asset:link size="icon" id="#{asset_id(:test1)}" />}).as( %{<a href="#{asset.thumbnail('icon')}">#{asset.title}</a>} )
     end
     
     it "asset:image" do
-      page.should render('<r:assets:first><r:asset:image /></r:assets:first>').as( %{<img src="#{asset.thumbnail}" alt='#{asset.title}' />} )
-      page.should render('<r:assets:first><r:asset:image size="icon" /></r:assets:first>').as( %{<img src="#{asset.thumbnail('icon')}" alt='#{asset.title}' />} )
+      page.should render(%{<r:asset:image id="#{asset_id(:test1)}" />}).as( %{<img src="#{asset.thumbnail}" alt='#{asset.title}' />} )
+      page.should render(%{<r:asset:image size="icon" id="#{asset_id(:test1)}" />}).as( %{<img src="#{asset.thumbnail('icon')}" alt='#{asset.title}' />} )
     end
 
     it "asset:caption" do
-      page.should render('<r:assets:first><r:asset:caption /></r:assets:first>').as( asset.caption )
+      page.should render(%{<r:asset:caption id="#{asset_id(:test1)}" />}).as( asset.caption )
     end    
     
     it "asset:top_padding" do
-      page.should render('<r:assets:first><r:asset:top_padding container="500" /></r:assets:first>').as( "229" )
+      page.should render(%{<r:asset:top_padding id="#{asset_id(:test1)}" container="500" />}).as( "229" )
     end    
 
     it "asset:top_padding for a specified style" do
-      page.should render('<r:assets:first><r:asset:top_padding container="500" size="thumbnail" /></r:assets:first>').as( "200" )
+      page.should render(%{<r:asset:top_padding id="#{asset_id(:test1)}" container="500" size="thumbnail" />}).as( "200" )
     end    
 
     it "asset:width" do
-      page.should render('<r:assets:first><r:asset:width /></r:assets:first>').as( "400" )
-      page.should render('<r:assets:first><r:asset:width size="icon" /></r:assets:first>').as( "42" )
+      page.should render(%{<r:asset:width id="#{asset_id(:test1)}" />}).as( "400" )
+      page.should render(%{<r:asset:width id="#{asset_id(:test1)}" size="icon" />}).as( "42" )
     end
 
     it "asset:height" do
-      page.should render('<r:assets:first><r:asset:height /></r:assets:first>').as( "200" )      
-      page.should render('<r:assets:first><r:asset:height size="icon" /></r:assets:first>').as( "42" )
+      page.should render(%{<r:asset:height id="#{asset_id(:test1)}" container="500" />}).as( "200" )      
+      page.should render(%{<r:asset:height id="#{asset_id(:test1)}" size="icon" />}).as( "42" )
     end
 
     it "asset:orientation" do
-      page.should render('<r:assets:first><r:asset:orientation /></r:assets:first>').as( "horizontal" )      
-      page.should render('<r:assets:first><r:asset:orientation size="icon" /></r:assets:first>').as( "square" )      
+      page.should render(%{<r:asset:orientation id="#{asset_id(:test1)}" />}).as( "horizontal" )      
+      page.should render(%{<r:asset:orientation id="#{asset_id(:test1)}" size="icon" />}).as( "square" )      
     end
     
     it "asset:aspect" do
-      page.should render('<r:assets:first><r:asset:aspect /></r:assets:first>').as( 2.to_f.to_s )
-      page.should render('<r:assets:first><r:asset:aspect size="icon" /></r:assets:first>').as( 1.to_f.to_s )
+      page.should render(%{<r:asset:aspect id="#{asset_id(:test1)}" />}).as( 2.to_f.to_s )
+      page.should render(%{<r:asset:aspect id="#{asset_id(:test1)}" size="icon" />}).as( 1.to_f.to_s )
     end
     
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Keith Bingman
@@ -18,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 +01:00
-default_executable: 
+date: 2011-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_list
@@ -201,7 +200,6 @@ files:
 - wireframes/edit-page-assets.png
 - wireframes/edit-page.bmml
 - wireframes/edit-page.png
-has_rdoc: true
 homepage: http://radiantcms.org
 licenses: []
 
@@ -231,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Assets for Radiant CMS