westarete-skylinecms 3.0.8.20100329 → 3.0.8.20100330

data/Rakefile

@@ -67,7 +67,7 @@ namespace :gem do
     gemspec.description = "Skyline is an extremely flexible and expandable open source content management system. Its feature rich interface allows for fast and intuitive management of websites."
     gemspec.email = "info@digitpaint.nl"
     gemspec.homepage = "http://www.skylinecms.nl"
-    gemspec.authors = ["DigitPaint", "West Arete Computing"]
+    gemspec.authors = ["DigitPaint", "WestAreteComputing"]
   
     gemspec.files.exclude "tasks/testing.rake"
     gemspec.files.exclude "Gemfile"
@@ -87,7 +87,7 @@ namespace :gem do
     gemspec.add_dependency "polyglot", "0.3.0"
     gemspec.add_dependency "sprockets", "1.0.2"
     gemspec.add_dependency "mime-types", "1.16"
-    gemspec.add_dependency "rmagick", "1.15.13"
+    gemspec.add_dependency "image_science", "1.2.1"
     gemspec.add_dependency "hpricot", "0.8.2"
     gemspec.add_dependency "guid", "0.1.1"
     gemspec.add_dependency "will_paginate", "~>2.3.11"

data/app/models/skyline/media_file.rb

@@ -26,12 +26,17 @@ class Skyline::MediaFile < Skyline::MediaNode
   # ==== Returns
   # <ImageBlob>:: blob of the Magick::Image  
   def thumbnail(width=100,height=100)
-    img = Magick::Image::read(self.file_path).first
-    
-    width,height = self.proportional_dimension(width,height,img.columns,img.rows)
-    
-    stream = img.change_geometry!("#{width}x#{height}"){ |c,r,i| i.resize!(c,r) }
-    stream.to_blob        
+    # img = Magick::Image::read(self.file_path).first
+    # 
+    # width,height = self.proportional_dimension(width,height,img.columns,img.rows)
+    # 
+    # stream = img.change_geometry!("#{width}x#{height}"){ |c,r,i| i.resize!(c,r) }
+    # stream.to_blob        
+    ImageScience.with_image(self.file_path) do |img|
+      img.resize(width, height) do |thumb|
+        
+      end
+    end
   end
 
   # returns the dimension of the original image
@@ -125,14 +130,23 @@ class Skyline::MediaFile < Skyline::MediaNode
     begin
       img = case self.data
       when ActionController::UploadedTempfile,Tempfile
-        Magick::Image::read(self.data.path).first
+        # Magick::Image::read(self.data.path).first
+        ImageScience.with_image(self.data.path) do |img|
+          self.width = img.width
+          self.height = img.height
+        end
       else
-        Magick::Image::from_blob(self.data.read).first
-        self.data.rewind        
+        # Magick::Image::from_blob(self.data.read).first
+        # self.data.rewind        
+        
+        ImageScience.with_image_from_memory(self.data.read) do |img|
+          self.width = img.width
+          self.height = img.height
+        end
       end
       
-      self.width = img.columns
-      self.height = img.rows
+      # self.width = img.columns
+      # self.height = img.rows
     rescue
     end
   end

data/config/initializers/dependencies.rb

@@ -15,7 +15,7 @@ require 'mootools-on-rails/lib/mootools_on_rails'
 require "polyglot"
 require "sprockets"
 require "mime/types"
-require "RMagick"
+require "image_science"
 require "hpricot"
 require "guid"
 require "will_paginate"

metadata

@@ -6,12 +6,12 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 8
-  - 20100329
-  version: 3.0.8.20100329
+  - 20100330
+  version: 3.0.8.20100330
 platform: ruby
 authors: 
 - DigitPaint
-- West Arete Computing
+- WestAreteComputing
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -103,7 +103,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rmagick
+  name: image_science
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
@@ -111,9 +111,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 15
-        - 13
-        version: 1.15.13
+        - 2
+        - 1
+        version: 1.2.1
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency