Merge 5d9b5b7 into 13d2f3d

lib/thumbor/crypto_url.rb

@@ -46,11 +46,7 @@ def calculate_width_and_height(url_parts, options)
                 width = '0' if not has_width and not options[:flip]
             end
 
-            if width or height
-                width = width.to_s
-                height = height.to_s
-                url_parts.push(width << 'x' << height)
-            end
+            url_parts.push("#{width}x#{height}") if width || height
         end
 
         def calculate_centered_crop(options)

spec/thumbor/crypto_url_spec.rb

@@ -227,6 +227,17 @@
       url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => -50, :height => -40, :center => [50, 50]
       expect(url).to eq('0x10:100x90/-50x-40/' << image_md5)
     end
+
+    it "should handle string values" do
+      url = subject.url_for :image => image_url, :width => '40', :height => '50'
+      expect(url).to eq('40x50/' << image_md5)
+    end
+
+    it "should never mutate its arguments" do
+      opts = {:image => image_url, :width => '500'}
+      subject.url_for opts
+      expect(opts).to eq({:image => image_url, :width => '500'})
+    end
   end
 
   describe '#generate' do