radiant-images-extension 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/app/models/image.rb

@@ -3,6 +3,8 @@ class Image < ActiveRecord::Base
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
   
+  has_many   :attachments, :dependent => :destroy
+  
   before_save :assign_title
   validates_uniqueness_of :asset_file_name, :message => 'This file already exists', :allow_nil => true
   validates_uniqueness_of :title

data/images_extension.rb

@@ -5,7 +5,7 @@ require 'will_paginate'
 
 class ImagesExtension < Radiant::Extension
   version YAML::load_file(File.join(File.dirname(__FILE__), 'VERSION'))
-  description "Images stores images on s3"
+  description "Image management tool, meant only to be useful to pages and extensions that require images."
   url "http://github.com/squaretalent/radiant-images-extension"
     
   extension_config do |config|

data/lib/images/tags/core.rb

@@ -40,12 +40,10 @@ module Images
         <pre><code><r:images:each [limit=0] [offset=0] [order="asc|desc"] [by="position|title|..."]>...</r:images:each></code></pre>
       }
       tag 'images:each' do |tag|
-        context = ''
-        Helpers.all_images_with_options(tag).each do |image|
+        content = tag.locals.images.map { |image|
           tag.locals.image = image
-          context << tag.expand
-        end
-        context
+          tag.expand
+        }
       end
       
       desc %{
@@ -57,7 +55,8 @@ module Images
       }
       tag 'image' do |tag|
         tag.locals.image = Helpers.current_image(tag)
-        tag.expand
+        
+        tag.expand if tag.locals.image.present?
       end
       
       desc %{
@@ -68,12 +67,8 @@ module Images
         <pre><code><r:image title='image'><r:url [style="preview|original"] /></r:image></code></pre>
       }
       tag 'image:url' do |tag|
-        result = nil
-        if tag.locals.image ||= Helpers.current_image(tag)
-          style = tag.attr['style'] || Radiant::Config['images.default'].to_sym
-          result = tag.locals.image.url(style, false)
-        end
-        result
+        style = tag.attr['style'] || Radiant::Config['images.default']
+        Helpers.current_image(tag).url(style.to_sym, false)
       end
       
       desc %{
@@ -81,30 +76,22 @@ module Images
         The style of the image can be specified by passing the style attribute.
         
         *Usage:*
-        <pre><code><r:image title='image'><r:tag [style="preview|original"] /></r:image></code></pre>
+        <pre><code><r:image title='image' style='preview'><r:tag [style="original"] /></r:image></code></pre>
       }
       tag 'image:tag' do |tag|
-        result = nil
-        if tag.locals.image ||= Helpers.current_image(tag)
-          style = tag.attr['style'] || Radiant::Config['images.default'].to_sym
-          result = %{<img src="#{tag.locals.image.url(style, false)}" />}
-        end
-        result
+        style = tag.attr['style'] || Radiant::Config['images.default']
+        %{<img src="#{Helpers.current_image(tag).url(style.to_sym, false)}" />}
       end
       
-      [:id, :title, :position].each do |method|
+      [:id, :title, :position].each do |symbol|
         desc %{
-          Outputs the #{method} of the current image
+          Outputs the #{symbol} of the current image
           
           *Usage:*
-          <pre><code><r:image title='image'><r:#{method} /></code></pre>
+          <pre><code><r:image title='image'><r:#{symbol} /></code></pre>
         }
-        tag "image:#{method}" do |tag|
-          result = nil
-          if tag.locals.image ||= Helpers.current_image(tag)
-            result = tag.locals.image.send(method)
-          end
-          result
+        tag "image:#{symbol}" do |tag|
+          Helpers.current_image(tag).send(symbol)
         end
       end
       

data/lib/images/tags/helpers.rb

@@ -1,64 +1,77 @@
 module Images
   module Tags
     class Helpers
-    
+      
+      CONDITIONS = ['images.position','images.title','images.id']
+      
       class TagError < StandardError; end
       
       class << self
         
-        def all_images_with_options(tag)
-          Image.all image_options(tag)
-        end
-        
         def current_images(tag)
-          result = nil
+          @conditions = CONDITIONS.dup
           
-          if tag.locals.images.present?
-            result = tag.locals.images
-          elsif tag.attr['key'] and tag.attr['value']
-            result = Image.find(:all, :conditions => { tag.attr['key'].to_sym => tag.attr['value'].to_s }) rescue nil
-          else
-            result = Image.all
+          if tag.locals.images.nil?
+            return Image.all image_conditions(tag).merge(image_options(tag))
+          end
+        
+          if tag.locals.images.empty?
+            return tag.locals.images
+          end
+        
+          images = tag.locals.images
+          if images.first.is_a?(Image)
+            images.all image_conditions(tag).merge(image_options(tag))
+          else            
+            # We're looking based on attachment positions, not image positions
+            @conditions.map! { |term| term.gsub('images.position','attachments.position') }
+            images.all image_conditions(tag).merge(image_options(tag)).merge(:joins => 'JOIN images ON images.id = attachments.image_id')
           end
-          
-          result
         end
         
         def current_image(tag)
-          result = nil
+          @conditions = CONDITIONS.dup
           
-          if tag.locals.image.present?
-            result = tag.locals.image
-          elsif tag.attr['id']
-            result = Image.find(tag.attr['id'])
-          elsif tag.attr['title']
-            result = Image.find_by_title(tag.attr['title'])
-          elsif tag.attr['position']
-            begin
-              result = tag.locals.images[(tag.attr['position']-1).to_i]
-            rescue
-              result = Image.find_by_position(tag.attr['position'].to_i)
-            end
+          # Images exist, and we're not looking to change the scope
+          if tag.locals.image.present? and image_conditions(tag).empty?
+            return tag.locals.image
           end
           
-          result
+          unless tag.locals.images.nil?
+            images = tag.locals.images
+            if images.first.is_a?(Image)
+              query = Image.all image_conditions(tag).merge(image_options(tag))
+            else
+              @conditions.map! { |term| term.gsub('images.position','attachments.position') }
+              query = Attachment.all image_conditions(tag).merge(image_options(tag)).merge(:joins => 'JOIN images ON images.id = attachments.image_id')
+              query = query.map { |a| a.image }
+            end
+            return (query && images).first
+          else
+            return Image.first image_conditions(tag).merge(image_options(tag))
+          end
         end
         
+        private
+        
         def image_options(tag)
           attr = tag.attr.symbolize_keys
-          by = attr[:by] || 'position'
-          order = attr[:order] || 'asc'
           
           options = {
-            :order => "#{by} #{order}",
-            :limit => attr[:limit] || nil,
+            :order  => "#{attr[:by]  || 'position'} #{attr[:order] || 'asc'}",
+            :limit  => attr[:limit]  || nil,
             :offset => attr[:offset] || nil
           }
         end
         
-        def image_and_options(tag)
-          options = tag.attr.dup
-          [find_image(tag, options), options]
+        def image_conditions(tag)
+          attr = tag.attr.symbolize_keys
+          
+          @conditions.reject! { |term| attr[term.split('.').last.to_sym].nil? }
+          
+          query = @conditions.map { |term| %{#{term} = ?} }.join(' AND ')
+          values = @conditions.map { |term| %{#{attr[term.split('.').last.to_sym]}} }
+          query.blank? ? {} : { :conditions => [query,*values] } 
         end
         
       end

data/radiant-images-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-images-extension}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "Mario Visic"]
-  s.date = %q{2010-12-09}
+  s.date = %q{2010-12-13}
   s.description = %q{Image Radiant Extension management tool, meant only to be useful to pages and extensions that need to require images.}
   s.email = %q{info@squaretalent.com}
   s.extra_rdoc_files = [

data/spec/lib/images/tags/core_spec.rb

@@ -5,8 +5,6 @@ describe Images::Tags::Core do
   dataset :pages, :images
     
   before(:all) do
-    @images = [ images(:first), images(:second), images(:third),
-                images(:fourth), images(:fifth), images(:sixth) ]
     Radiant::Config['images.default'] = "original"
     Radiant::Config['images.path']    = ":rails_root/public/:class/:basename-:style.:extension"
     Radiant::Config['images.storage'] = "local"
@@ -42,7 +40,7 @@ describe Images::Tags::Core do
     end
       
     it 'should not render its contents when there are no images' do
-      mock(Image).all { [] }
+      mock(Images::Tags::Helpers).current_images(anything) { [] }
       input    = '<r:images><r:if_images>failure</r:if_images></r:images>'
       expected = ''
       pages(:home).should render(input).as(expected)
@@ -53,7 +51,7 @@ describe Images::Tags::Core do
   describe '<r:images:unless_images>' do
       
     it 'should render its contents when there are no images' do
-      mock(Image).all { [] }
+      mock(Images::Tags::Helpers).current_images(anything) { [] }
       input    = '<r:images><r:unless_images>success</r:unless_images></r:images>'
       expected = 'success'
       pages(:home).should render(input).as(expected)
@@ -76,39 +74,38 @@ describe Images::Tags::Core do
     end
     
     it 'should not expand its contents if there are no images available' do
-      mock(Image).all() { [] }
-      mock(Image).all(anything) { [] }
+      mock(Images::Tags::Helpers).current_images(anything) { [] }
       input    = '<r:images:each>test </r:images:each>'
       expected = ''
       pages(:home).should render(input).as(expected)
     end
     
     it 'should limit the number of images based on the limit parameter passed' do
-      input    = '<r:images:each limit="3"><r:image:title /> </r:images:each>'
+      input    = '<r:images limit="3"><r:each><r:image:title /> </r:each></r:images>'
       expected = 'first second third '
       pages(:home).should render(input).as(expected)
     end
     
     it 'should use the offset parameter to ignore results before the offset' do
-      input    = '<r:images:each limit="3" offset="2"><r:image:title /> </r:images:each>'
+      input    = '<r:images limit="3" offset="2"><r:each><r:image:title /> </r:each></r:images>'
       expected = 'third fourth fifth '
       pages(:home).should render(input).as(expected)
     end
     
     it 'should order the results based by the key passed' do
-      input    = '<r:images:each by="title"><r:image:title /> </r:images:each>'
+      input    = '<r:images by="title"><r:each><r:image:title /> </r:each></r:images>'
       expected = 'fifth first fourth second sixth third '
       pages(:home).should render(input).as(expected)
     end
     
     it 'should order the results by ascending order when asc is passed for the order' do
-      input    = '<r:images:each by="position" order="asc" ><r:image:title /> </r:images:each>'
+      input    = '<r:images by="position" order="asc"><r:each><r:image:title /> </r:each></r:images>'
       expected = 'first second third fourth fifth sixth '
       pages(:home).should render(input).as(expected)
     end
     
     it 'should order the results by descending order when desc is passed for the order' do
-      input    = '<r:images:each by="position" order="desc" ><r:image:title /> </r:images:each>'
+      input    = '<r:images by="position" order="desc"><r:each><r:image:title /> </r:each></r:images>'
       expected = 'sixth fifth fourth third second first '
       pages(:home).should render(input).as(expected)
     end
@@ -117,54 +114,34 @@ describe Images::Tags::Core do
   
   describe '<r:image>' do
     
-    it 'should add the image namespace to nested radius tags' do
-      input    = '<r:image title="first"><r:title /></r:image>'
-      expected = 'first'
-      pages(:home).should render(input).as(expected)
-    end
-    
-    it 'should render its contents if there is a current image' do
+    it 'should render overide the above context' do
       input    = '<r:images:each><r:image title="first"><r:title /> </r:image></r:images:each>'
-      expected = 'first second third fourth fifth sixth '
+      expected = 'first first first first first first '
       pages(:home).should render(input).as(expected)
     end
     
-    it 'should not render its contents if there is no current image' do
-      input    = '<r:image title="invalid"><r:title /></r:image>'
-      expected = ''
+    it 'should allow images to be looked up by their title attribute' do
+      input    = %{<r:image title="fifth"><r:title /></r:image>}
+      expected = 'fifth'
       pages(:home).should render(input).as(expected)
     end
     
     it 'should allow images to be looked up by their id attribute' do
-      mock(Image).find('5') { @images[4] }
-      input    = '<r:image id="5"><r:title /></r:image>'
-      expected = 'fifth'
+      input    = %{<r:image id="#{images(:second).id}"><r:title /></r:image>}
+      expected = 'second'
       pages(:home).should render(input).as(expected)
     end
     
     it 'should allow images to be looked up by their position attribute' do
-      input    = '<r:image position="3"><r:title /></r:image>'
+      input    = %{<r:image:title position="3" />}
       expected = 'third'
       pages(:home).should render(input).as(expected)
     end
-        
-    it 'should allow images to be looked up by their title attribute' do
-      input    = '<r:image title="sixth"><r:title /></r:image>'
-      expected = 'sixth'
-      pages(:home).should render(input).as(expected)
-    end
-    
+
   end
 
   describe '<r:image:url>' do
     
-    before :each do
-      asset = Paperclip::Attachment.new('asset', @images[0], { :url => Radiant::Config['images.url'] })
-      stub(Image).find_by_title('first') { @images[0] }
-      stub.proxy(Image).find_by_title('invalid')
-      stub(@images[0]).asset { asset }
-    end
-            
     it 'should not render a valid url if there is no current image' do
       input    = '<r:image title="invalid"><r:url /></r:image>'
       expected = ''
@@ -172,8 +149,8 @@ describe Images::Tags::Core do
     end
     
     it 'should render the url with the default style if not specified' do
-      input    = '<r:image title="first"><r:url /></r:image>'
-      expected = '/images/first-original.png'
+      input    = '<r:image title="fourth"><r:url /></r:image>'
+      expected = '/images/fourth-original.png'
       pages(:home).should render(input).as(expected)
     end
     
@@ -187,13 +164,6 @@ describe Images::Tags::Core do
   
   describe '<r:image:tag>' do
     
-    before :each do
-      asset = Paperclip::Attachment.new('asset', @images[0], { :url => Radiant::Config['images.url'] })
-      stub(Image).find_by_title('first') { @images[0] }
-      stub.proxy(Image).find_by_title('invalid')
-      stub(@images[0]).asset { asset }
-    end
-        
     it 'should not render a valid img tag if there is no current image' do
       input    = '<r:image title="invalid"><r:tag /></r:image>'
       expected = ''
@@ -207,18 +177,18 @@ describe Images::Tags::Core do
     end
     
     it 'should render the img tag with the style specified by the user' do
-      input    = '<r:image title="first"><r:tag style="icon"/></r:image>'
-      expected = '<img src="/images/first-icon.png" />'
+      input    = '<r:image title="second"><r:tag style="icon"/></r:image>'
+      expected = '<img src="/images/second-icon.png" />'
       pages(:home).should render(input).as(expected)
     end
-    
+  
   end
   
   describe '<r:image:id>' do
     
     it 'should render the id of the current image context' do
       input    = '<r:image title="sixth"><r:id /></r:image>'
-      expected = @images[5].id.to_s
+      expected = images(:sixth).id.to_s
       pages(:home).should render(input).as(expected)
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-images-extension
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +08:00
+date: 2010-12-13 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency