radiant-images-extension 0.3.3 → 0.3.4

data/public/stylesheets/sass/admin/extensions/images/index.sass

@@ -99,5 +99,9 @@
 
 #actions
 
+  ul
+    :width                    120px
+    :float                    left
+
   form
     :display                  inline

data/radiant-images-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-images-extension}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["squaretalent"]
-  s.date = %q{2010-10-23}
+  s.date = %q{2010-11-02}
   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,7 +18,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
-     "CHANGELOG",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -51,12 +50,12 @@ Gem::Specification.new do |s|
      "public/images/extensions/images/missing_icon.png",
      "public/images/extensions/images/missing_normal.png",
      "public/images/extensions/images/missing_preview.png",
-     "public/javascripts/admin/extensions/images/edit.js",
      "public/stylesheets/sass/admin/extensions/images/edit.sass",
      "public/stylesheets/sass/admin/extensions/images/index.sass",
      "radiant-images-extension.gemspec",
      "spec/controllers/admin/images_controller_spec.rb",
      "spec/datasets/images.rb",
+     "spec/datasets/squaretalent.png",
      "spec/lib/images/tags/core_spec.rb",
      "spec/models/image_spec.rb",
      "spec/spec.opts",
@@ -80,20 +79,23 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<paperclip>, ["~> 2.3.1.1"])
+      s.add_runtime_dependency(%q<radiant>, [">= 0.9.1"])
+      s.add_runtime_dependency(%q<paperclip>, ["~> 2.3.5"])
       s.add_runtime_dependency(%q<aws-s3>, [">= 0.6.2"])
       s.add_runtime_dependency(%q<acts_as_list>, [">= 0.1.2"])
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_development_dependency(%q<rr>, [">= 1.0.0"])
     else
-      s.add_dependency(%q<paperclip>, ["~> 2.3.1.1"])
+      s.add_dependency(%q<radiant>, [">= 0.9.1"])
+      s.add_dependency(%q<paperclip>, ["~> 2.3.5"])
       s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
       s.add_dependency(%q<acts_as_list>, [">= 0.1.2"])
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_dependency(%q<rr>, [">= 1.0.0"])
     end
   else
-    s.add_dependency(%q<paperclip>, ["~> 2.3.1.1"])
+    s.add_dependency(%q<radiant>, [">= 0.9.1"])
+    s.add_dependency(%q<paperclip>, ["~> 2.3.5"])
     s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
     s.add_dependency(%q<acts_as_list>, [">= 0.1.2"])
     s.add_dependency(%q<rspec>, [">= 1.3.0"])

data/spec/controllers/admin/images_controller_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Admin::ImagesController do
+  
   dataset :users
   dataset :images
   
@@ -8,64 +9,120 @@ describe Admin::ImagesController do
     @image = images(:first)
     @images = Image.all
   end
-   
-  context 'user not logged in' do
+  
+  context 'index action' do
+    
+    context 'user not logged in' do
 
-    it 'should redirect to login path' do
-      get :index
-      response.should redirect_to login_path
-    end
+      it 'should redirect to login path' do
+        get :index
+        response.should redirect_to login_path
+      end
 
-  end
-  
-  context 'user logged in' do
-    before :each do
-      login_as :admin
-      stub(AWS::S3::Base).establish_connection!
     end
     
-    context 'index action' do
-    
+    context 'user logged in' do
+
+      before :each do
+        login_as :admin
+        stub(AWS::S3::Base).establish_connection!
+      end
+
       it 'should render the index template on index action' do
         get :index
         response.should render_template(:index)
       end
-      
+
       it 'should have a list of images' do
         get :index
         assigns(:images).should == @images
       end
-      
+
       it 'should use pagination' do
         get :index
         assigns(:images).class.should == WillPaginate::Collection
       end
+      
+      it 'should include the index stylesheet' do
+        mock(controller).index_assets
+        get :index
+      end
+
+    end
+        
+  end
+    
+  context 'edit action' do
+  
+    context 'user logged in' do
+
+      before :each do
+        login_as :admin
+        stub(AWS::S3::Base).establish_connection!
+      end
+      
+      it 'should include the edit stylesheet' do
+        mock(controller).edit_assets
+        get :edit, :id => @image.id
+      end
     
     end  
     
-    context 'search action' do
-      
+  end
+  
+  context 'show action' do
+  
+    context 'user logged in' do
+
       before :each do
         login_as :admin
         stub(AWS::S3::Base).establish_connection!
       end
       
-      it 'should render the search template on search action' do
-        get :search
-        response.should render_template(:search)
+      it 'should include the edit stylesheet' do
+        mock(controller).edit_assets
+        get :show, :id => @image.id
       end
+    
+    end  
+    
+  end
+  
+  context 'rescusing S3 exceptions' do
+    
+    before :each do
+      controller = Admin::ImagesController.new
+    end
+    
+    it 'should catch any AWS S3 response errors thrown' do
+      stub(controller).redirect_to(anything)
+      controller.send :rescue_s3_exceptions do
+        raise AWS::S3::ResponseError.new('error name', '')
+      end
+    end
+    
+    it 'should set the flash message' do
+      stub(controller).redirect_to(anything)
+      controller.send :rescue_s3_exceptions do
+        raise AWS::S3::ResponseError.new('some error' ,'')
+      end
+      (controller.send :flash)[:error].should == 'some error'
       
-      it 'should return valid search results'
-      
-      it 'should respond to JS requests correctly'
-      
-      it 'should respond to xml requests correctly'
-      
-      it 'should respond to json requests correctly'
-            
+    end
+    
+    it 'should redirect to the admin images url' do
+      mock(controller).redirect_to(admin_images_url)
+      controller.send :rescue_s3_exceptions do
+        raise AWS::S3::ResponseError.new('error' ,'')
+      end
+    end
+    
+    it 'should not catch any other errors thrown' do
+      lambda { controller.send :rescue_s3_exceptions do
+        raise 'another type of error'
+      end }.should raise_error 'another type of error'
     end
     
   end
     
-  
-end
+end

data/spec/datasets/images.rb

@@ -1,6 +1,6 @@
 class ImagesDataset < Dataset::Base
   def load
-    images = [ :first, :second, :third, :fourth, :fifth ]
+    images = [ :first, :second, :third, :fourth, :fifth, :sixth ]
     
     images.each_with_index do |image, i|
       create_record :image, image.to_sym,

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

@@ -1,22 +1,12 @@
 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',
-      'image',
-      'image:url',
-      'image:id',
-      'image:title'].sort
-  end
   
+  dataset :pages, :images
+    
   before(:all) do
-    @images = [ images(:first), images(:second) ]
+    @images = [ images(:first), images(:second), images(:third),
+                images(:fourth), images(:fifth), images(:sixth) ]
   end
   
   before(:each) do
@@ -25,81 +15,209 @@ describe Images::Tags::Core do
   
   describe '<r:images>' do
     
-    it 'should render' do
-      tag = '<r:images>success</r:images>'
-      exp = 'success'
-      
-      pages(:home).should render(tag).as(exp)
+    it 'should render its contents' do
+      input    = '<r:images>success</r:images>'
+      expected = 'success'
+      pages(:home).should render(input).as(expected)
+    end
+    
+    it 'should add the images namespace to nested radius tags' do
+      input = '<r:images><r:if_images>success</r:if_images></r:images>'
+      pages(:home).should render(input)
     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
+    it 'should render its contents when there are images' do
+      input    = '<r:images><r:if_images>success</r:if_images></r:images>'
+      expected = 'success'
+      pages(:home).should render(input).as(expected)
+    end
+      
+    it 'should not render its contents when there are no images' do
+      mock(Image).all { [] }
+      input    = '<r:images><r:if_images>failure</r:if_images></r:images>'
+      expected = ''
+      pages(:home).should render(input).as(expected)
+    end
+      
+  end
+  
+  describe '<r:images:unless_images>' do
+      
+    it 'should render its contents when there are no images' do
+      mock(Image).all { [] }
+      input    = '<r:images><r:unless_images>success</r:unless_images></r:images>'
+      expected = 'success'
+      pages(:home).should render(input).as(expected)
+    end
+      
+    it 'should not render its contents when there are images' do
+      input    = '<r:images><r:unless_images>failure</r:unless_images></r:images>'
+      expected = ''
+      pages(:home).should render(input).as(expected)
     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
+  
+  describe '<r:images:each>' do
+    
+    it 'should expand its contents once for each of the available images' do
+      input    = '<r:images:each>test </r:images:each>'
+      expected = 'test test test test test test '
+      pages(:home).should render(input).as(expected)
+    end
+    
+    it 'should not expand its contents if there are no images available' do
+      mock(Image).all { [] }
+      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>'
+      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>'
+      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>'
+      expected = 'third fifth first fourth second sixth '
+      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="id" order="asc" ><r:image:title /> </r:images:each>'
+      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="id" order="desc" ><r:image:title /> </r:images:each>'
+      expected = 'sixth fifth fourth third second first '
+      pages(:home).should render(input).as(expected)
     end
     
   end
   
-  describe '<r:images:unless_images>' do
+  describe '<r:image>' 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
+    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
     
-    context 'failure' do
-      it 'should not render' do
-        tag = '<r:images><r:unless_images>failure</r:unless_images></r:images>'
-        exp = ''
+    it 'should render its contents if there is a current image' do
+      input    = '<r:images:each><r:image title="first"><r:title /> </r:image></r:images:each>'
+      expected = 'first second third fourth fifth sixth '
+      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 = ''
+      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'
+      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>'
+      expected = 'third'
+      pages(:home).should render(input).as(expected)
+    end
         
-        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 = ''
+    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
+    
+    it 'should render a valid url given a valid image context'
         
-        pages(:home).should render(tag).as(exp)
-      end
+    it 'should not render a valid url if there is no current image'
+    
+    it 'should render the url with the default style if not specified'
+    
+    it 'should render the url with the style specified by the user'
+    
+  end
+  
+  describe '<r:image:tag>' do
+    
+    it 'should render a valid img tag given a valid image context'
+    
+    it 'should not render a valid img tag if there is no current image'
+    
+    it 'should render the img tag with the default style if not specified'
+    
+    it 'should render the img tag with the style specified by the user'
+    
+  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
+      pages(:home).should render(input).as(expected)
+    end
+    
+    it 'should not render anything if there is no current image context' do
+      input    = '<r:image title="invalid"><r:id /></r:image>'
+      expected = ''
+      pages(:home).should render(input).as(expected)
+    end
+    
+  end
+  
+  describe '<r:image:title>' do
+    
+    it 'should render the title of the current image context' do
+      input    = '<r:image title="fourth"><r:title /></r:image>'
+      expected = 'fourth'
+      pages(:home).should render(input).as(expected)
+    end
+    
+    it 'should not render anything if there is no current image context' do
+      input    = '<r:image title="invalid"><r:title /></r:image>'
+      expected = ''
+      pages(:home).should render(input).as(expected)
+    end
+    
+  end
+  
+  describe '<r:image:position>' do
+    
+    it 'should render the position of the current image context' do
+      input    = '<r:image title="first"><r:position /></r:image>'
+      expected = '1'
+      pages(:home).should render(input).as(expected)
+    end
+    
+    it 'should not render anything if there is no current image context' do
+      input    = '<r:image title="invalid"><r:position /></r:image>'
+      expected = ''
+      pages(:home).should render(input).as(expected)
     end
     
   end