refinerycms-images 1.0.3 → 1.0.4

data/app/models/image.rb

@@ -66,6 +66,47 @@ class Image < ActiveRecord::Base
     end
   end
 
+  # Intelligently works out dimensions for a thumbnail of this image based on the Dragonfly geometry string.
+  def thumbnail_dimensions(geometry)
+    geometry = geometry.to_s
+    width = original_width = self.image_width.to_f
+    height = original_height = self.image_height.to_f
+    geometry_width, geometry_height = geometry.to_s.split(%r{\#{1,2}|\+|>|!|x}im)[0..1].map(&:to_f)
+    if (original_width * original_height > 0) && geometry =~ ::Dragonfly::ImageMagick::Processor::THUMB_GEOMETRY
+      if geometry =~ ::Dragonfly::ImageMagick::Processor::RESIZE_GEOMETRY
+        if geometry !~ %r{\d+x\d+>} || (geometry =~ %r{\d+x\d+>} && (width > geometry_width.to_f || height > geometry_height.to_f))
+          # Try scaling with width factor first. (wf = width factor)
+          wf_width = (original_width * (geometry_width / width)).ceil
+          wf_height = (original_height * (geometry_width / width)).ceil
+
+          # Scale with height factor (hf = height factor)
+          hf_width = (original_width * (geometry_height / height)).ceil
+          hf_height = (original_height * (geometry_height / height)).ceil
+
+          # Take the highest value that doesn't exceed either axis limit.
+          use_wf = wf_width <= geometry_width && wf_height <= geometry_height
+          if use_wf && hf_width <= geometry_width && hf_height <= geometry_height
+            use_wf = wf_width * wf_height > hf_width * hf_height
+          end
+
+          if use_wf
+            width = wf_width
+            height = wf_height
+          else
+            width = hf_width
+            height = hf_height
+          end
+        end
+      else
+        # cropping
+        width = geometry_width
+        height = geometry_height
+      end
+    end
+
+    {:width => width.to_i, :height => height.to_i}
+  end
+
   # Returns a titleized version of the filename
   # my_file.jpg returns My File
   def title

data/app/views/admin/images/_existing_image.html.erb

@@ -8,11 +8,11 @@
 <%
       @images.each do |image|
         thumbnail_urls = {
-          :"data-original" => image.url,
-          :"data-grid" => image.thumbnail('135x135#c').url
+          :"data-original" => compute_public_path(image.url, ''),
+          :"data-grid" => compute_public_path(image.thumbnail('135x135#c').url, '')
         }
         ::Image.user_image_sizes.sort_by{|key,geometry| geometry}.each do |size, pixels|
-          thumbnail_urls[:"data-#{size.to_s.parameterize}"] = image.thumbnail(pixels).url
+          thumbnail_urls[:"data-#{size.to_s.parameterize}"] = compute_public_path(image.thumbnail(pixels).url, '')
         end
 -%>
         <li<%= " class='selected'" if @image_id == image.id %>>

data/refinerycms-images.gemspec

@@ -3,10 +3,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-images}
-  s.version           = %q{1.0.3}
+  s.version           = %q{1.0.4}
   s.summary           = %q{Images engine for Refinery CMS}
   s.description       = %q{Handles all image upload and processing functionality in Refinery CMS.}
-  s.date              = %q{2011-06-23}
+  s.date              = %q{2011-08-11}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -96,7 +96,7 @@ Gem::Specification.new do |s|
     'spec/uploads/beach.jpeg'
   ]
 
-  s.add_dependency 'refinerycms-core', '= 1.0.3'
+  s.add_dependency 'refinerycms-core', '= 1.0.4'
   s.add_dependency 'dragonfly',        '~> 0.9.0'
   s.add_dependency 'rack-cache',       '>= 0.5.3'
 end

data/spec/models/image_spec.rb

@@ -69,4 +69,47 @@ describe Image do
     end
   end
 
+  # The sample image has dimensions 500x375
+  describe '#thumbnail_dimensions returns correctly with' do
+    it 'nil' do
+      image.thumbnail_dimensions(nil).should == { :width => 500, :height => 375 }
+    end
+
+    it '200x200#ne' do
+      image.thumbnail_dimensions('200x200#ne').should == { :width => 200, :height => 200 }
+    end
+
+    it '100x150#c' do
+      image.thumbnail_dimensions('100x150#c').should == { :width => 100, :height => 150 }
+    end
+
+    it '250x250>' do
+      image.thumbnail_dimensions('250x250>').should == { :width => 250, :height => 188 }
+    end
+
+    it '600x375>' do
+      image.thumbnail_dimensions('600x375>').should == { :width => 500, :height => 375 }
+    end
+
+    it '100x475>' do
+      image.thumbnail_dimensions('100x475>').should == { :width => 100, :height => 75 }
+    end
+
+    it '100x150' do
+      image.thumbnail_dimensions('100x150').should == { :width => 100, :height => 75 }
+    end
+
+    it '200x150' do
+      image.thumbnail_dimensions('200x150').should == { :width => 200, :height => 150 }
+    end
+
+    it '300x150' do
+      image.thumbnail_dimensions('300x150').should == { :width => 200, :height => 150 }
+    end
+
+    it '5x5' do
+      image.thumbnail_dimensions('5x5').should == { :width => 5, :height => 4 }
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-images
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Resolve Digital
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 Z
+date: 2011-08-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 31
         segments: 
         - 1
         - 0
-        - 3
-        version: 1.0.3
+        - 4
+        version: 1.0.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Images engine for Refinery CMS