snapimage 0.0.5 → 0.0.6

data/lib/snapimage/image/image.rb

@@ -29,12 +29,14 @@ module SnapImage
     # Arguments:
     # * path:: Local path or URL
     def set_image_from_path(path)
+      destroy!
       @image = Magick::ImageList.new(path)
     end
 
     # Arguments:
     # * blob:: Image blob
     def set_image_from_blob(blob)
+      destroy!
       @image = Magick::ImageList.new
       @image.from_blob(blob)
     end
@@ -42,6 +44,7 @@ module SnapImage
     # Arguments:
     # * image:: RMagick Image
     def set_image_from_image(image)
+      destroy!
       @image = image
     end
 
@@ -58,11 +61,10 @@ module SnapImage
     end
 
     def destroy!
-      @image.destroy!
+      @image.destroy! if @image && !@image.destroyed?
     end
 
-    # Crops the image with the given parameters and returns a SnapImage::Image
-    # object.
+    # Crops the image with the given parameters.
     #
     # Arguments:
     # * x:: x coordinate of the top left corner
@@ -70,10 +72,10 @@ module SnapImage
     # * width:: width of the crop rectangle
     # * height:: height of the crop rectangle
     def crop(x, y, width, height)
-      SnapImage::Image.from_image(@image.crop(x, y, width, height))
+      @image.crop!(x, y, width, height)
     end
 
-    # Generates a new resized image and returns it as a SnapImage::Image object.
+    # Resizes the image with the given paramaters.
     #
     # Arguments:
     # * width:: Width to resize to
@@ -85,16 +87,17 @@ module SnapImage
       # resizing.
       height ||= [width, @image.rows].max
       if maintain_aspect_ratio
-        SnapImage::Image.from_image(@image.resize_to_fit(width, height))
+        @image.resize_to_fit!(width, height)
       else
-        SnapImage::Image.from_image(@image.resize(width, height))
+        @image.resize!(width, height)
       end
     end
 
-    # Generates a new sharpened image and returns it as a SnapImage::Image
-    # object.
+    # Sharpens the image.
     def sharpen
-      SnapImage::Image.from_image(@image.sharpen)
+      image = @image.sharpen
+      destroy!
+      @image = image
     end
   end
 end

data/lib/snapimage/server_actions/server_actions.generate_image.rb

@@ -26,7 +26,7 @@ module SnapImage
             image_height: stored_image.height
           )
           # Release memory.
-          stored_image.destroy!
+          GC.start
         else
           @response.set_bad_request
         end
@@ -122,10 +122,7 @@ module SnapImage
             width: @request.json["crop_width"],
             height: @request.json["crop_height"]
           }
-          cropped_image = image.crop(crop[:x], crop[:y], crop[:width], crop[:height])
-          # Release memory.
-          image.destroy!
-          image = cropped_image
+          image.crop(crop[:x], crop[:y], crop[:width], crop[:height])
         end
 
         # Resize.
@@ -136,34 +133,21 @@ module SnapImage
           if width && height
             # When both width and height are specified, resize without
             # maintaining the aspect ratio.
-            resized_image = image.resize(width, height, false)
+            image.resize(width, height, false)
           else
             # When only one of width/height is specified, set the other to the
             # max and maintain the aspect ratio.
-            resized_image = image.resize(width || @config["max_width"], height || @config["max_height"])
+            image.resize(width || @config["max_width"], height || @config["max_height"])
           end
-          # Release memeory.
-          image.destroy!
-          image = resized_image
         end
 
         # Resize to fit.
         resized_to_fit = resize_to_fit?(image)
-        if resized_to_fit
-          resized_image = image.resize(get_max_width, get_max_height)
-          # Release memeory.
-          image.destroy!
-          image = resized_image
-        end
+        image.resize(get_max_width, get_max_height) if resized_to_fit
 
         # Sharpen.
         sharpened = sharpen?
-        if sharpened
-          sharpened_image = image.sharpen
-          # Release memeory.
-          image.destroy!
-          image = sharpened_image
-        end
+        image.sharpen if sharpened
 
         # Get the dimensions at the end.
         if cropped || resized || resized_to_fit || sharpened

data/lib/snapimage/storage/storage_server.rb

@@ -99,13 +99,11 @@ module SnapImage
       def resize_to_fit(image, name)
         # Resize the image if it's larger than the max width/height.
         if image.width > @config["max_width"] || image.height > @config["max_height"]
-          resized_image = image.resize([image.width, @config["max_width"]].min, [image.height, @config["max_height"]].min)
+          image.resize([image.width, @config["max_width"]].min, [image.height, @config["max_height"]].min)
           # Generate a new name.
-          resized_name = SnapImage::ImageNameUtils.get_resized_image_name(name, resized_image.width, resized_image.height)
-          # Release memory.
-          image.destroy!
+          name = SnapImage::ImageNameUtils.get_resized_image_name(name, image.width, image.height)
         end
-        { image: resized_image || image, name: resized_name || name }
+        { image: image, name: name }
       end
     end
   end

data/lib/snapimage/version.rb

@@ -1,3 +1,3 @@
 module SnapImage
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/snapimage/image/image_spec.rb

@@ -9,20 +9,12 @@ describe SnapImage::Image do
     before do
       @image = SnapImage::Image.new
       @image.set_image_from_path(@image_path)
-      @original_width = @image.width
-      @original_height = @image.height
     end
 
-    it "returns the correctly cropped image" do
-      image = @image.crop(10, 30, 20, 30)
-      image.width.should eq 20
-      image.height.should eq 30
-    end
-
-    it "does not modify the original image" do
-      image = @image.crop(10, 30, 20, 30)
-      @image.width.should eq @original_width
-      @image.height.should eq @original_height
+    it "correctly crops image" do
+      @image.crop(10, 30, 20, 30)
+      @image.width.should eq 20
+      @image.height.should eq 30
     end
   end
 
@@ -30,42 +22,34 @@ describe SnapImage::Image do
     before do
       @image = SnapImage::Image.new
       @image.set_image_from_path(@image_path)
-      @original_width = @image.width
-      @original_height = @image.height
     end
 
     it "raises an error when no height is specified and maintaining aspect ratio is false" do
       expect { @image.resize(100, nil, false) }.should raise_error
     end
 
-    it "returns an appropriately resized image when the width is larger or equal to the height" do
-      image = @image.resize(330)
-      image.width.should eq 330
-      image.height.should eq 220
-    end
-
-    it "returns an appropriately resized image when the width is less than the height" do
-      image = @image.resize(150)
-      image.width.should eq 150
-      image.height.should eq 100
+    it "resizes the image when the width is larger or equal to the height" do
+      @image.resize(330)
+      @image.width.should eq 330
+      @image.height.should eq 220
     end
 
-    it "returns an image that fits within the width/height while maintaining aspect ratio" do
-      image = @image.resize(150, 200)
-      image.width.should eq 150
-      image.height.should eq 100
+    it "resizes the image when the width is less than the height" do
+      @image.resize(150)
+      @image.width.should eq 150
+      @image.height.should eq 100
     end
 
-    it "returns a stretched image when not maintaining aspect ratio" do
-      image = @image.resize(100, 200, false)
-      image.width.should eq 100
-      image.height.should eq 200
+    it "resizes the image to fit within the width/height while maintaining aspect ratio" do
+      @image.resize(150, 200)
+      @image.width.should eq 150
+      @image.height.should eq 100
     end
 
-    it "does not modify the original image" do
-      image = @image.resize(100)
-      @image.width.should eq @original_width
-      @image.height.should eq @original_height
+    it "stretches image when not maintaining aspect ratio" do
+      @image.resize(100, 200, false)
+      @image.width.should eq 100
+      @image.height.should eq 200
     end
   end
 end

data/spec/snapimage/storage/storage_server_spec.rb

@@ -79,16 +79,16 @@ describe SnapImage::StorageServer::Base do
     end
 
     it "returns the resized image and name given a base image" do
-      image = @image.resize(2048, 100, false)
-      result = @server.send(:resize_to_fit, image, "12345678-2048x100.png")
+      @image.resize(2048, 100, false)
+      result = @server.send(:resize_to_fit, @image, "12345678-2048x100.png")
       result[:image].width.should eq 1024
       result[:image].height.should eq 50
       result[:name].should eq "12345678-1024x50.png"
     end
 
     it "returns the resized image and name given a modified image" do
-      image = @image.resize(2048, 100, false)
-      result = @server.send(:resize_to_fit, image, "12345678-1x1-0x0x1x1-2048x100-0.png")
+      @image.resize(2048, 100, false)
+      result = @server.send(:resize_to_fit, @image, "12345678-1x1-0x0x1x1-2048x100-0.png")
       result[:image].width.should eq 1024
       result[:image].height.should eq 50
       result[:name].should eq "12345678-1x1-0x0x1x1-1024x50-0.png"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snapimage
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1963487119924646018
+      hash: 1128448920208195157
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1963487119924646018
+      hash: 1128448920208195157
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23