radiant-images-extension 0.1.1 → 0.3.2

data/CHANGELOG

@@ -0,0 +1,9 @@
+== Change Log
+
+
+=== 0.1.1 (September 16, 2010)
+
+* Fixed a bug where passenger wouldn't pickup the ImageMagick install [Dirk Kelly, Mario Visic]
+
+=== 0.1.0 (September 16, 2010)
+* Initial Release [Dirk Kelly, Mario Visic]

data/README.md

@@ -26,6 +26,17 @@ Radiant Images is an IMAGE management tool, meant only to be useful to pages and
 
     rake radiant:extensions:images:migrate_from_paperclipped
 
+## Installation
+
+The recommended way to install the radiant images extension is by installing the gem and configuring it in your radiant app, here are the instructions:
+
+    gem install radiant-images-extension
+    # add the following line to your config/environment.rb: config.gem 'radiant-images-extension', :lib => false
+    rake radiant:extensions:images:update
+    rake radiant:extensions:images:migrate
+
+If you want to run a development copy of images simply clone a copy into radiant's vendor/extensions folder and then run a update/migrate on the extension.
+
 ## Host Alias Settings
 
 By default the images extension uses the following url for images:

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gem.add_development_dependency 'rr',    '>= 1.0.0'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
+    Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. This is only required if you plan to package images as a gem."
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.3.2

data/app/controllers/admin/images_controller.rb

@@ -2,13 +2,7 @@ class Admin::ImagesController < Admin::ResourceController
   
   before_filter :index_assets, :only => [ :index ]
   before_filter :edit_assets, :only => [ :show, :edit ]
-  around_filter :rescue_exceptions, :only => [:create, :edit, :destroy]
-  
-  # GET /admin/images
-  # GET /admin/images.js
-  # GET /admin/images.xml
-  # GET /admin/images.json                                        AJAX and HTML
-  #----------------------------------------------------------------------------
+  around_filter :rescue_s3_exceptions, :only => [:create, :edit, :destroy]
   
   def index
     @images = Image.paginate :page => params[:page], :per_page => 20
@@ -38,7 +32,7 @@ private
     include_stylesheet 'admin/extensions/images/edit'
   end
   
-  def rescue_exceptions
+  def rescue_s3_exceptions
     begin
       yield
     rescue AWS::S3::ResponseError => e

data/app/models/image.rb

@@ -9,7 +9,7 @@ class Image < ActiveRecord::Base
   
   default_scope :order => 'position ASC'
   acts_as_list
-
+  
   has_attached_file :asset,
                     :styles           => lambda { Image.config_styles },
                     :whiny_thumbnails => false,
@@ -25,13 +25,16 @@ class Image < ActiveRecord::Base
                                         
   validates_attachment_presence :asset
   validates_attachment_content_type :asset, :content_type => ['image/jpeg', 'image/png', 'image/gif']
-
+  
   def assign_title
     self.title = self.asset_file_name if title.blank?
   end
-
   
-  # We need to ovveried the url method for our attachment so 
+  def url(style = :original, include_updated_timestamp = true, secure = false)
+    self.asset.url(style, include_updated_timestamp, secure)
+  end
+  
+  # We need to overide the url method for our attachment so 
   # we can dynamically swap between aliased and non aliased domain names
   module ::Paperclip
     class Attachment
@@ -58,7 +61,7 @@ class Image < ActiveRecord::Base
   end
   
 private
-
+  
   class << self
     def search(search, page)
       unless search.blank?
@@ -66,7 +69,7 @@ private
         queries << 'LOWER(title) LIKE (:term)'
         queries << 'LOWER(caption) LIKE (:term)'
         queries << 'LOWER(asset_file_name) LIKE (:term)'
-
+        
         sql = queries.join(' OR ')
         @conditions = [sql, {:term => "%#{search.downcase}%" }]
       else
@@ -79,7 +82,7 @@ private
     
     def config_styles
       styles = []
-
+      
       if Radiant::Config['images.styles']
         styles = Radiant::Config['images.styles'].gsub(/\s+/,'').split(',') 
         styles = styles.collect{|s| s.split('=')}.inject({}) {|ha, (k, v)| ha[k.to_sym] = v; ha}

data/app/views/admin/images/_bottom.haml

@@ -7,7 +7,7 @@
       %li
         - form_tag nil, :method => 'get' do
           = text_field_tag 'search', params[:search], :type => 'search'
-          = observe_field 'search', :frequency => 2, :update => 'images', :url =>  { :controller => 'images', :action=> 'search' }, :method => 'get', :with => "'search=' + escape(value)"
+          = observe_field 'search', :frequency => 2, :update => 'images', :url =>  { :controller => 'images', :action=> 'index' }, :method => 'get', :with => "'search=' + escape(value)"
 - render_region :paginate do |paginate|
   - paginate.pagination do
-    = will_paginate(@images)
+    = pagination_for(@images)

data/app/views/admin/images/remove.haml

@@ -2,9 +2,9 @@
   = t('remove_image')
 
 %p
-  = t('text.remove_image.warning')
+  = t('remove_image_warning')
 
-- form_for [:admin, @image.becomes(Image)], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing Image…"} do
+- form_for [:admin, @image.becomes(Image)], :html => {:method => :delete, 'data-onsubmit_status'=>"#{t('deleting_image')}…"} do
   
   %p.buttons
     %input.button{:type=>"submit", :value => t('delete_image') }/

data/config/locales/en.yml

@@ -1,8 +1,8 @@
 ---
 en:
   images: Images
-  new_image: 'New Image'
-  remove_image: 'Remove Image'
-  delete_image: 'Delete Image'
-  text.remove_image.warning: 'Are you sure you want to permanently remove the following Images?'
-  
+  new_image: New Image
+  remove_image: Remove Image
+  remove_image_warning: Are you sure you want to delete this image as well as its ties to any other parts of the site?
+  delete_image: Delete Image
+  deleting_image: Deleting Image

data/db/migrate/20100929150930_change_images_to_created_by_id.rb

@@ -0,0 +1,15 @@
+class ChangeImagesToCreatedById < ActiveRecord::Migration
+  def self.up
+    add_column :images,    :created_by_id,   :integer
+    add_column :images,    :updated_by_id,   :integer
+    remove_column :images, :created_by
+    remove_column :images, :updated_by
+  end
+
+  def self.down
+    add_column :images,    :created_by_id,   :integer
+    add_column :images,    :updated_by_id,   :integer
+    remove_column :images, :created_by
+    remove_column :images, :updated_by
+  end
+end

data/images_extension.rb

@@ -1,6 +1,8 @@
 # Uncomment this if you reference any of your controllers in activate
 # require_dependency 'application_controller'
 
+require 'paperclip'
+
 class ImagesExtension < Radiant::Extension
   version "0.1"
   description "Images stores images on s3"
@@ -32,7 +34,7 @@ class ImagesExtension < Radiant::Extension
     end
     
     
-    Page.send :include, Images::Tags::Image
+    Page.send :include, Images::Tags::Core
 
     UserActionObserver.instance.send :add_observer!, Image 
     

data/lib/images/tags/core.rb

@@ -0,0 +1,295 @@
+module Images
+  module Tags
+    module Core
+      include Radiant::Taggable
+      
+      class TagError < StandardError; end
+      
+      desc %{
+        The namespace for referencing images. You may specify the title
+        attribute for this tag to use only images with the specified title.
+      
+        *Usage:* 
+        <pre><code><r:images>...</r:images></code></pre>
+      }
+      tag 'images' do |tag|
+        tag.locals.images = Helpers.current_images(tag)
+        
+        tag.expand
+      end
+      
+      desc %{
+        Expands if images exist
+      }
+      tag 'images:if_images' do |tag|
+        tag.expand if tag.locals.images.present?
+      end
+      
+      desc %{
+        Expands unless images exist
+      }
+      tag 'images:unless_images' do |tag|
+        tag.expand unless tag.locals.images.present?
+      end
+      
+      desc %{
+        Goes through each of the available images.
+        Use the limit and offset attributes to render a specific number of images.
+        Use the by and order attributes to control the order of images.
+      
+        *Usage:* 
+        <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 = ''
+        
+        tag.locals.images.each do |image|
+          tag.locals.image = image
+          context << tag.expand
+        end
+        
+        content
+      end
+      
+      desc %{
+        Expands the current image context
+        
+        *Usage:*
+        <pre><code><r:image>...</r:image></code></pre>
+      }
+      tag 'image' do |tag|
+        tag.locals.image = Helpers.current_image(tag)
+        
+        tag.expand if tag.locals.image.present?
+      end
+      
+      desc %{
+        Outputs the full URL of the image including the filename. Specify the style
+        using the style option.
+        
+        *Usage:*
+        <pre><code><r:image title='image'><r:url [style="preview|original"] /></r:image></code></pre>
+      }
+      tag 'image:url' do |tag|
+        style = tag.attr['style'] || :original
+        
+        tag.locals.image.url(style, false)
+      end
+      
+      [:id, :title].each do |method|
+        desc %{
+          Outputs the title of the current image
+        
+          *Usage:*
+          <pre><code><r:image title='image'><r:#{method} /></code></pre>
+        }
+        tag "image:#{method}" do |tag|
+          tag.locals.image.send(method)
+        end
+      end
+      
+    end
+  end
+end
+
+
+
+# describe '<r:images:each>' do
+#   
+#   it 'should expand on all images' do
+#     content = '<r:images:each>test!</r:images:each>'
+#     expected = ''
+#     @images.length.times { expected += 'test!' }
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+#   it 'should be running through the image objects' do
+#     content = '<r:images:each><r:images:url/></r:images:each>'
+#     expected = ''
+#     @images.each { |image| expected += image.asset.url }
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+#   it 'should only run through however many images we specify with limit' do
+#     content = '<r:images:each limit="2"><r:images:url/></r:images:each>'
+#     expected = ''
+#     @images[0..1].each { |image| expected += image.asset.url }
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+#   it 'should start at the image number we give it using offset' do
+#     content = '<r:images:each limit="2" offset="1"><r:images:url/></r:images:each>'
+#     expected = ''
+#     @images[1..2].each { |image| expected += image.asset.url }
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+#   it 'should display images in the order we give' do
+#     # asc
+#     content = '<r:images:each order="asc" by="position"><r:images:url/></r:images:each>'
+#     expected = ''
+#     @images.each { |image| expected += image.asset.url }
+#     pages(:home).should render(content).as(expected)
+#     
+#     #desc
+#     content = '<r:images:each order="desc" by="position"><r:images:url/></r:images:each>'
+#     expected = ''
+#     @images.reverse.each { |image| expected += image.asset.url }
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+#   it 'should allow us to order images by title' do
+#     content = '<r:images:each order="asc" by="title"><r:images:url/></r:images:each>'
+#     expected = ''
+#     @images.sort! { |a,b| a.title <=> b.title }
+#     @images.each { |image| expected += image.asset.url }
+#     pages(:home).should render(content).as(expected)
+#   end
+#       
+# end
+# 
+# describe '<r:images:first>' do
+#   
+#   it 'should render the first image' do
+#     content   = '<r:images:first><r:images:url/></r:images:first>'
+#     expected  = @images.first.asset.url
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+# end
+# 
+# describe '<r:images:if_first>' do
+#   
+#   it 'should expand the tag if the image is the first' do
+#     content   = '<r:images><r:each><r:if_first><r:url /></r:if_first></r:each></r:images>'
+#     expected  = @images.first.asset.url
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+# end
+# 
+# describe '<r:images:unless_first>' do
+#   
+#   it 'should expand the tag if the image is not the first' do
+#     content   = '<r:images><r:each><r:unless_first><r:url /></r:unless_first></r:each></r:images>'
+#     expected  = ''
+#     
+#     @images.each do |image|
+#       expected += image.asset.url unless image == @images.first
+#     end
+#     
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+# end
+# 
+# describe '<r:if_images>' do
+#   
+#   it 'should expand the contents if there are images' do
+#     content = '<r:images:if_images>test text</r:images:if_images>'
+#     expected = 'test text'
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+#   it 'should not expand the contents if there are no images' do
+#     Image.delete_all
+#     content   = '<r:images:if_images>test text</r:images:if_images>'
+#     expected  = ''
+#     pages(:home).should render(content).as(expected)    
+#   end
+#   
+#   it 'should expand if the min count is equal to the image count' do
+#     min_count = Image.count
+#     content   = '<r:images:if_images min_count="' + min_count.to_s + '">test text</r:images:if_images>'
+#     expected  = 'test text'
+#     pages(:home).should render(content).as(expected)      
+#   end
+#   
+#   it 'should not expand if the min count is greater than the image count' do
+#     min_count = Image.count + 1
+#     content   = '<r:images:if_images min_count="' + min_count.to_s + '">test text</r:images:if_images>'
+#     expected  = ''
+#     pages(:home).should render(content).as(expected)    
+#   end
+#   
+# end
+# 
+# describe '<r:unless_images>' do
+#   
+#   it 'should not the contents if there are images' do
+#     content = '<r:images:unless_images>test text</r:images:unless_images>'
+#     expected = ''
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+#   it 'should expand the contents if there are no images' do
+#     Image.delete_all
+#     content   = '<r:images:unless_images>test text</r:images:unless_images>'
+#     expected  = 'test text'
+#     pages(:home).should render(content).as(expected)    
+#   end
+#   
+#   it 'should not expand if the min count is equal to the image count' do
+#     min_count = Image.count
+#     content   = '<r:images:unless_images min_count="' + min_count.to_s + '">test text</r:images:unless_images>'
+#     expected  = ''
+#     pages(:home).should render(content).as(expected)      
+#   end
+#   
+#   it 'should expand if the min count is greater than the image count' do
+#     min_count = Image.count + 1
+#     content   = '<r:images:unless_images min_count="' + min_count.to_s + '">test text</r:images:unless_images>'
+#     expected  = 'test text'
+#     pages(:home).should render(content).as(expected)    
+#   end
+#   
+# end
+# 
+# describe '<r:images:url/>' do
+#   
+#   it 'should output the url for a valid image' do
+#     content   = '<r:images title="' + @images.first.title + '"><r:images:url/></r:images>'
+#     expected  = @images.first.asset.url 
+#     pages(:home).should render(content).as(expected)    
+#   end
+#   
+# end
+# 
+# describe '<r:images:title/>' do
+#   
+#   it 'should output the title for a valid image' do
+#     content   = '<r:images title="' + @images.first.title + '"><r:images:title/></r:images>'
+#     expected  = @images.first.title 
+#     pages(:home).should render(content).as(expected)    
+#   end
+#   
+# end
+# 
+# describe '<r:images:tag/>' do
+#   
+#   it 'should output a valid image tag when given a valid image' do
+#     content   = '<r:images title="' + @images.first.title + '"><r:images:tag /></r:images>'
+#     expected  = '<img src="' + @images.first.asset.url + '"  alt="' + @images.first.title + '" />' 
+#     pages(:home).should render(content).as(expected)    
+#   end
+#   
+#   it 'should output a valid image tag when specifying an image by title' do
+#     content   = '<r:images:tag title="' + @images.first.title + '" />'
+#     expected  = '<img src="' + @images.first.asset.url + '"  alt="' + @images.first.title + '" />' 
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+#   it 'should output an image tag with the specified size' do
+#     content   = '<r:images:tag title="' + @images.first.title + '" size="icon" />'
+#     expected  = '<img src="' + @images.first.asset.url(:icon) + '"  alt="' + @images.first.title + '" />' 
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+#   it 'should use the given alt text specified' do
+#     content   = '<r:images:tag title="' + @images.first.title + '" alt="new alt text" />'
+#     expected  = '<img src="' + @images.first.asset.url + '" alt="new alt text" />' 
+#     pages(:home).should render(content).as(expected)
+#   end
+#   
+# end
+#