radiant-images-extension 0.3.4 → 0.4.0

data/Rakefile

@@ -6,7 +6,7 @@ begin
     gem.description = 'Image Radiant Extension management tool, meant only to be useful to pages and extensions that need to require images.'
     gem.email = "info@squaretalent.com"
     gem.homepage = "http://github.com/squaretalent/radiant-images-extension"
-    gem.authors = ['squaretalent']
+    gem.authors = ['Dirk Kelly', 'Mario Visic']
     gem.add_dependency 'radiant',           '>= 0.9.1'
     gem.add_dependency 'paperclip',         '~> 2.3.5'
     gem.add_dependency 'aws-s3',            '>= 0.6.2'

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/lib/images/tags/core.rb

@@ -41,7 +41,7 @@ module Images
       }
       tag 'images:each' do |tag|
         context = ''
-        tag.locals.images.each do |image|
+        Helpers.all_images_with_options(tag).each do |image|
           tag.locals.image = image
           context << tag.expand
         end

data/lib/images/tags/helpers.rb

@@ -6,6 +6,10 @@ module Images
       
       class << self
         
+        def all_images_with_options(tag)
+          Image.all image_options(tag)
+        end
+        
         def current_images(tag)
           result = nil
           

data/radiant-images-extension.gemspec

@@ -5,10 +5,10 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-images-extension}
-  s.version = "0.3.4"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["squaretalent"]
+  s.authors = ["Dirk Kelly", "Mario Visic"]
   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}

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

@@ -71,7 +71,8 @@ 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() { [] }
+      mock(Image).all(anything) { [] }
       input    = '<r:images:each>test </r:images:each>'
       expected = ''
       pages(:home).should render(input).as(expected)
@@ -91,18 +92,18 @@ describe Images::Tags::Core do
     
     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 '
+      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="id" order="asc" ><r:image:title /> </r:images:each>'
+      input    = '<r:images:each by="position" 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>'
+      input    = '<r:images:each by="position" order="desc" ><r:image:title /> </r:images:each>'
       expected = 'sixth fifth fourth third second first '
       pages(:home).should render(input).as(expected)
     end
@@ -152,25 +153,59 @@ describe Images::Tags::Core do
 
   describe '<r:image:url>' do
     
-    it 'should render a valid url given a valid image context'
-        
-    it 'should not render a valid url if there is no current image'
+    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 = ''
+      pages(:home).should render(input).as(expected)
+    end
     
-    it 'should render the url with the default style if not specified'
+    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'
+      pages(:home).should render(input).as(expected)
+    end
     
-    it 'should render the url with the style specified by the user'
+    it 'should render the url with the style specified by the user' do
+      input    = '<r:image title="first"><r:url style="icon" /></r:image>'
+      expected = '/images/first-icon.png'
+      pages(:home).should render(input).as(expected)
+    end
     
   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'
+    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 = ''
+      pages(:home).should render(input).as(expected)
+    end
     
-    it 'should render the img tag with the default style if not specified'
+    it 'should render the img tag with the default style if not specified' do
+      input    = '<r:image title="first"><r:tag /></r:image>'
+      expected = '<img src="/images/first-original.png" />'
+      pages(:home).should render(input).as(expected)
+    end
     
-    it 'should render the img tag with the style specified by the user'
+    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" />'
+      pages(:home).should render(input).as(expected)
+    end
     
   end
   

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-images-extension
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
   - 4
-  version: 0.3.4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
-- squaretalent
+- Dirk Kelly
+- Mario Visic
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -19,9 +20,9 @@ date: 2010-11-02 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: radiant
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +33,12 @@ dependencies:
         - 9
         - 1
         version: 0.9.1
-  name: radiant
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: paperclip
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +49,12 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  name: paperclip
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,12 +65,12 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  name: aws-s3
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: acts_as_list
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,12 +81,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  name: acts_as_list
-  requirement: *id004
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rspec
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,12 +97,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  name: rspec
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rr
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -112,8 +113,8 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: rr
-  requirement: *id006
+  type: :development
+  version_requirements: *id006
 description: Image Radiant Extension management tool, meant only to be useful to pages and extensions that need to require images.
 email: info@squaretalent.com
 executables: []