radiant-images-extension 0.1.1 → 0.3.2

data/lib/images/tags/helpers.rb

@@ -0,0 +1,64 @@
+module Images
+  module Tags
+    class Helpers
+    
+      class TagError < StandardError; end
+      
+      class << self
+        
+        def current_images(tag)
+          result = nil
+          
+          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
+          end
+          
+          result
+        end
+        
+        def current_image(tag)
+          result = nil
+          
+          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
+          end
+          
+          result
+        end
+        
+        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,
+            :offset => attr[:offset] || nil
+          }
+        end
+        
+        def image_and_options(tag)
+          options = tag.attr.dup
+          [find_image(tag, options), options]
+        end
+        
+      end
+      
+    end
+  end
+end

data/lib/tasks/images_extension_tasks.rake

@@ -20,6 +20,7 @@ namespace :radiant do
           if asset.asset_type.name == :image
             Image.create({
               :title              => asset.title,
+              :caption            => asset.caption,
               :asset_file_name    => asset.asset_file_name,
               :asset_content_type => asset.asset_content_type,
               :asset_file_size    => asset.asset_file_size

data/radiant-images-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-images-extension}
-  s.version = "0.1.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["squaretalent"]
-  s.date = %q{2010-09-16}
+  s.date = %q{2010-10-09}
   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 = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -38,12 +39,15 @@ Gem::Specification.new do |s|
      "cucumber.yml",
      "db/migrate/20100601042237_create_images.rb",
      "db/migrate/20100602044124_add_position_to_images.rb",
+     "db/migrate/20100929150930_change_images_to_created_by_id.rb",
      "features/support/env.rb",
      "features/support/paths.rb",
      "images_extension.rb",
      "lib/images/interface/admin/images.rb",
-     "lib/images/tags/image.rb",
+     "lib/images/tags/core.rb",
+     "lib/images/tags/helpers.rb",
      "lib/tasks/images_extension_tasks.rake",
+     "public/images/admin/extensions/images/sort.png",
      "public/images/extensions/images/missing_icon.png",
      "public/images/extensions/images/missing_normal.png",
      "public/images/extensions/images/missing_preview.png",
@@ -53,7 +57,7 @@ Gem::Specification.new do |s|
      "radiant-images-extension.gemspec",
      "spec/controllers/admin/images_controller_spec.rb",
      "spec/datasets/images.rb",
-     "spec/lib/images/tags/image_spec.rb",
+     "spec/lib/images/tags/core_spec.rb",
      "spec/models/image_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -66,7 +70,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/controllers/admin/images_controller_spec.rb",
      "spec/datasets/images.rb",
-     "spec/lib/images/tags/image_spec.rb",
+     "spec/lib/images/tags/core_spec.rb",
      "spec/models/image_spec.rb",
      "spec/spec_helper.rb"
   ]

data/spec/controllers/admin/images_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Admin::ImagesController do
   dataset :users
@@ -9,7 +9,6 @@ describe Admin::ImagesController do
     @images = Image.all
   end
    
-    
   context 'user not logged in' do
 
     it 'should redirect to login path' do
@@ -20,7 +19,6 @@ describe Admin::ImagesController do
   end
   
   context 'user logged in' do
-  
     before :each do
       login_as :admin
       stub(AWS::S3::Base).establish_connection!
@@ -37,98 +35,36 @@ describe Admin::ImagesController do
         get :index
         assigns(:images).should == @images
       end
-    
-    end
-    
-    context 'show action' do
       
-      it 'should redirect to the edit action' do
-        get :show, :id => @image.id
-        response.should redirect_to edit_admin_image_url(@image)
+      it 'should use pagination' do
+        get :index
+        assigns(:images).class.should == WillPaginate::Collection
       end
-      
-    end
     
-    context 'edit action' do
-      
-      it 'should render the edit template' do
-        get :edit, :id => @image.id
-        response.should render_template(:edit)
-      end
-      
-      it 'should redirect to the index on invalid image id' do
-        get :edit, :id => 999999
-        response.should redirect_to admin_images_url
-      end
-      
-    end
+    end  
     
-    context 'new action' do
+    context 'search action' do
       
-      it 'should render the new template' do
-        get :new
-        response.should render_template(:new)
+      before :each do
+        login_as :admin
+        stub(AWS::S3::Base).establish_connection!
       end
       
-    end
-    
-    context 'update action' do
-      
-      it 'should redirect to the index on valid image' do
-        put :update, :id => @image.id
-        response.should redirect_to admin_images_url
+      it 'should render the search template on search action' do
+        get :search
+        response.should render_template(:search)
       end
       
-      it 'should render the edit template on invalid model' do
-        any_instance_of(Image, :valid? => false)
-        put :update, :id => @image.id
-        response.should render_template(:edit)
-      end
+      it 'should return valid search results'
       
-    end
-    
-    context 'create action' do
-      
-      it "create action should render new template when model is invalid" do
-        stub.instance_of(Image).valid? {false}
-        post :create
-        response.should render_template(:new)
-      end
-
-      it "create action should redirect when model is valid" do
-        stub.instance_of(Image).valid? {true}
-        post :create
-        response.should redirect_to admin_images_url
-      end
+      it 'should respond to JS requests correctly'
       
+      it 'should respond to xml requests correctly'
       
+      it 'should respond to json requests correctly'
+            
     end
     
-    context 'remove action' do
-      
-      it 'should render the remove template' do
-        get :remove, :id => @image.id
-        response.should render_template(:remove)
-        
-      end
-      
-    end
-    
-    context 'destroy action' do
-      
-      it 'should redirect to the index' do
-        # we need to stop destroy_attached_files running (as it'll error with no S3 details)
-        mock(@images[1]).destroy_attached_files
-        
-        @images[1].destroy
-        delete :destroy, :id => @images[1].id
-        response.should redirect_to admin_images_url
-        Image.exists?(@images[1].id).should be_false
-      end
-      
-    end
-  
-    
   end
     
   

data/spec/datasets/images.rb

@@ -5,7 +5,7 @@ class ImagesDataset < Dataset::Base
     images.each_with_index do |image, i|
       create_record :image, image.to_sym,
         :title              => image.to_s,
-        :caption            => 'brief description',
+        :caption            => "caption for #{image.to_s}",
         :asset_file_name    => "#{image.to_s}.png",
         :asset_content_type => "image/png",
         :asset_file_size    => i+1*1000,

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

@@ -0,0 +1,110 @@
+require 'spec_helper'
+
+describe Images::Tags::Core do
+  dataset :pages, :images
+  
+  it 'should describe these tags' do
+    Images::Tags::Core.tags.sort.should == [
+      'images',
+      'images:if_images',
+      'images:unless_images',
+      'images:each',
+      'images:first',
+      'image',
+      'image:if_first',
+      'image:unless_first',
+      'image:url',
+      'image:id',
+      'image:title'].sort
+  end
+  
+  before(:all) do
+    @images = [ images(:first), images(:second) ]
+  end
+  
+  before(:each) do
+    stub(AWS::S3::Base).establish_connection!
+  end
+  
+  describe '<r:images>' do
+    
+    it 'should render' do
+      tag = '<r:images>success</r:images>'
+      exp = 'success'
+      
+      pages(:home).should render(tag).as(exp)
+    end
+    
+  end
+  
+  describe '<r:images:if_images>' do
+    
+    context 'success' do
+      it 'should render' do
+        tag = '<r:images><r:if_images>success</r:if_images></r:images>'
+        exp = 'success'
+        
+        pages(:home).should render(tag).as(exp)
+      end
+      it 'should render' do
+        tag = '<r:images key="title" value="first"><r:if_images>success</r:if_images></r:images>'
+        exp = 'success'
+        
+        pages(:home).should render(tag).as(exp)
+      end
+    end
+    
+    context 'failure' do
+      it 'should not render' do
+        mock(Image).all { [] }
+        tag = '<r:images><r:if_images>failure</r:if_images></r:images>'
+        exp = ''
+        
+        pages(:home).should render(tag).as(exp)
+      end
+      it 'should not render' do
+        tag = '<r:images key="title" value="notme"><r:if_images>failure</r:if_images></r:images>'
+        exp = ''
+        
+        pages(:home).should render(tag).as(exp)
+      end
+    end
+    
+  end
+  
+  describe '<r:images:unless_images>' do
+    
+    context 'success' do
+      it 'should render' do
+        mock(Image).all { [] }
+        tag = '<r:images><r:unless_images>success</r:unless_images></r:images>'
+        exp = 'success'
+        
+        pages(:home).should render(tag).as(exp)
+      end
+      it 'should render' do
+        tag = '<r:images key="title" value="notme"><r:unless_images>success</r:unless_images></r:images>'
+        exp = 'success'
+        
+        pages(:home).should render(tag).as(exp)
+      end
+    end
+    
+    context 'failure' do
+      it 'should not render' do
+        tag = '<r:images><r:unless_images>failure</r:unless_images></r:images>'
+        exp = ''
+        
+        pages(:home).should render(tag).as(exp)
+      end
+      it 'should not render' do
+        tag = '<r:images key="title" value="first"><r:unless_images>failure</r:unless_images></r:images>'
+        exp = ''
+        
+        pages(:home).should render(tag).as(exp)
+      end
+    end
+    
+  end
+  
+end

data/spec/models/image_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Image do
   dataset :images
@@ -13,7 +13,7 @@ describe Image do
   end
   
   it 'should have a caption' do
-    @image.caption.should == 'brief description'
+    @image.caption.should == "caption for #{@image.title.to_s}"
   end
   
   it 'should require a unique title' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-images-extension
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - squaretalent
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 +08:00
+date: 2010-10-09 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,6 +110,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.md
 - Rakefile
@@ -130,12 +131,15 @@ files:
 - cucumber.yml
 - db/migrate/20100601042237_create_images.rb
 - db/migrate/20100602044124_add_position_to_images.rb
+- db/migrate/20100929150930_change_images_to_created_by_id.rb
 - features/support/env.rb
 - features/support/paths.rb
 - images_extension.rb
 - lib/images/interface/admin/images.rb
-- lib/images/tags/image.rb
+- lib/images/tags/core.rb
+- lib/images/tags/helpers.rb
 - lib/tasks/images_extension_tasks.rake
+- public/images/admin/extensions/images/sort.png
 - public/images/extensions/images/missing_icon.png
 - public/images/extensions/images/missing_normal.png
 - public/images/extensions/images/missing_preview.png
@@ -145,7 +149,7 @@ files:
 - radiant-images-extension.gemspec
 - spec/controllers/admin/images_controller_spec.rb
 - spec/datasets/images.rb
-- spec/lib/images/tags/image_spec.rb
+- spec/lib/images/tags/core_spec.rb
 - spec/models/image_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -186,6 +190,6 @@ summary: Images Extension for Radiant CMS
 test_files: 
 - spec/controllers/admin/images_controller_spec.rb
 - spec/datasets/images.rb
-- spec/lib/images/tags/image_spec.rb
+- spec/lib/images/tags/core_spec.rb
 - spec/models/image_spec.rb
 - spec/spec_helper.rb