radiant-images-extension 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/app/models/image.rb

@@ -42,8 +42,8 @@ class Image < ActiveRecord::Base
       def url(style = :original, include_updated_timestamp = true, secure = false)
         style  = style.to_s
         prefix = secure ? 'https://' : 'http://'
-        domain = Radiant::Config['s3.host_alias'].empty? ? 's3.amazonaws.com' : Radiant::Config['s3.host_alias']
-        bucket = Radiant::Config['s3.host_alias'].empty? ? '/' + Radiant::Config['s3.bucket'] : ''
+        domain = Radiant::Config['s3.host_alias'].present? ? Radiant::Config['s3.host_alias'] : 's3.amazonaws.com'
+        bucket = Radiant::Config['s3.host_alias'].present? ? '' : "/#{Radiant::Config['s3.bucket']}"
 
         url = prefix + domain + bucket + '/images/' + basename + '-' + style + '.' + extension
         include_updated_timestamp && updated_at ? [url, updated_at].compact.join(url.include?("?") ? "&" : "?") : url

data/images_extension.rb

@@ -2,6 +2,7 @@
 # require_dependency 'application_controller'
 
 require 'paperclip'
+require 'aws/s3'
 
 class ImagesExtension < Radiant::Extension
   version "0.1"
@@ -27,7 +28,7 @@ class ImagesExtension < Radiant::Extension
       warn 'Either install the Settings extension or remove Images.'
       exit(1)
     end
-
+    
     unless defined? admin.image
       Radiant::AdminUI.send :include, Images::Interface::Admin::Images
       admin.image = Radiant::AdminUI.load_default_image_regions

data/lib/images/tags/core.rb

@@ -60,7 +60,7 @@ module Images
       tag 'image' do |tag|
         tag.locals.image = Helpers.current_image(tag)
         
-        tag.expand if tag.locals.image.present?
+        tag.expand
       end
       
       desc %{
@@ -71,20 +71,45 @@ module Images
         <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
+        result = nil
+        
+        if tag.locals.image ||= Helpers.current_image(tag)
+          style = tag.attr['style'] || :original
+          result = tag.locals.image.url(style, false)
+        end
         
-        tag.locals.image.url(style, false)
+        result
+      end
+      
+      desc %{
+        Outputs a very simple image tag
+      }
+      tag 'image:tag' do |tag|
+        result = nil
+
+        if tag.locals.image ||= Helpers.current_image(tag)
+          style = tag.attr['style'] || :original
+          result = %{<img src="#{tag.locals.image.url(style, false)}" />}
+        end
+        
+        result
       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)
+          result = nil
+          
+          if tag.locals.image ||= Helpers.current_image(tag)
+            result = tag.locals.image.send(method)
+          end
+          
+          result
         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.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["squaretalent"]
-  s.date = %q{2010-10-09}
+  s.date = %q{2010-10-23}
   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

@@ -9,10 +9,7 @@ describe Images::Tags::Core do
       'images:if_images',
       'images:unless_images',
       'images:each',
-      'images:first',
       'image',
-      'image:if_first',
-      'image:unless_first',
       'image:url',
       'image:id',
       'image:title'].sort

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-images-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - squaretalent
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +08:00
+date: 2010-10-23 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: paperclip
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +33,12 @@ dependencies:
         - 1
         - 1
         version: 2.3.1.1
-  type: :runtime
-  version_requirements: *id001
+  name: paperclip
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +49,12 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  type: :runtime
-  version_requirements: *id002
+  name: aws-s3
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: acts_as_list
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,12 +65,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  type: :runtime
-  version_requirements: *id003
+  name: acts_as_list
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,12 +81,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :development
-  version_requirements: *id004
+  name: rspec
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rr
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,8 +97,8 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
-  version_requirements: *id005
+  name: rr
+  requirement: *id005
 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: []