radiant-clipped_asset_roles-extension 1.0.1 → 1.0.2

data/README.md

@@ -22,12 +22,13 @@ An asset role belongs\_to a page\_attachment, not an asset. On the page edit vie
 
 Then, you could use this radius code to select the page_icon e.g. for the current page:
 
-    <r:assets:first roles="page_icon"><r:asset:image /></r:assets:first>
+    <r:asset:image roles="page_icon" />
 
 or do things like:
 
-    <ul class="gallery"><r:assets:each roles="portfolio" order="desc" by="position">
+    <ul class="gallery"><r:assets:each roles="portfolio|cover" order="desc" by="position">
       <li><r:asset:image size="thumbnail"/></li>
     </ul></r:assets:each>
 
-So, r:assets:each, r:assets:first and r:assets:last, r:if\_assets and r:unless_assets all take a 'roles' attribute now.
+So, r:assets:each, r:asset, r:if\_assets and r:unless_assets all take a 'roles' attribute now.
+If more than one role is provided in the context of r:asset, the first matched asset will be returned.

data/lib/clipped_asset_roles/asset_tag_extensions.rb

@@ -1,6 +1,8 @@
 module ClippedAssetRoles::AssetTagExtensions
   include Radiant::Taggable
 
+  class TagError < StandardError; end
+
   def self.included(base)
     base.class_eval {
       alias_method_chain :assets_find_options, :roles
@@ -22,20 +24,6 @@ module ClippedAssetRoles::AssetTagExtensions
     tag.expand
   end
   
-  desc %{
-    References the first asset attached to the current page.  
-    
-    *Usage:* 
-    <pre><code><r:assets:first>...</r:assets:first></code></pre>
-  }
-  tag 'assets:first' do |tag|
-    if role = options.delete('role') && tag.locals.asset = tag.locals.page.attachments_with_role(role).first
-      tag.expand
-    elsif tag.locals.asset = tag.locals.page.assets.first
-      tag.expand
-    end
-  end
-  
   desc %{
     Renders the contained elements only if the current contextual page has one or
     more assets. The @min_count@ attribute specifies the minimum number of required
@@ -51,15 +39,16 @@ module ClippedAssetRoles::AssetTagExtensions
   end
   
   def find_asset_with_roles(tag, options)
-    begin
-      find_asset_without_roles
-    rescue TagError
-      if role = options.delete('role')
-        tag.locals.asset = tag.locals.page.attachments_with_role(role).first
-      else
-        raise(TagError, "Asset not found.")
+    if tag.locals.asset.nil? and roles = options.delete('roles')
+      roles.split('|').each do |role|
+        tag.locals.asset = tag.locals.page.attachments_with_role(role).first.try(:asset)
+        return tag.locals.asset unless tag.locals.asset.nil?
       end
+      raise(TagError, "Asset not found.") unless tag.locals.asset
+    else
+      find_asset_without_roles(tag, options)
     end
+    tag.locals.asset
   end
   
   def assets_find_options_with_roles(tag)
@@ -73,9 +62,8 @@ module ClippedAssetRoles::AssetTagExtensions
         options[:conditions] = [ roles.map { |role| "asset_roles.role = ?" }.join(' OR '),
           *roles.map { |role| role } ]
       end
-      # raise options.to_s
+      
       options[:joins] = "INNER JOIN `page_attachments` pa ON `assets`.id = pa.asset_id INNER JOIN `asset_roles` ON (`asset_roles`.page_attachment_id = pa.id)"
-      # options[:joins] = [:page_attachments, :asset_roles]
     end
     options
   end

data/lib/radiant-clipped_asset_roles-extension.rb

@@ -1,5 +1,5 @@
 module RadiantClippedAssetRolesExtension
-  VERSION     = "1.0.1"
+  VERSION     = "1.0.2"
   SUMMARY     = "Clipped Asset Roles for Radiant CMS"
   DESCRIPTION = "Adds new scoping levels for assets, e.g. a 'portfolio' role for images."
   URL         = "https://github.com/jomz/radiant-clipped_asset_roles-extension"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiant-clipped_asset_roles-extension
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: radiant-clipped-extension
@@ -52,6 +52,7 @@ files:
 - lib/radiant-clipped_asset_roles-extension.rb
 - lib/tasks/clipped_asset_roles_extension_tasks.rake
 - public/stylesheets/admin/asset_roles.sass
+- radiant-clipped_asset_roles-extension-1.0.1.gem
 - radiant-clipped_asset_roles-extension.gemspec
 - Rakefile
 - README.md