scene7-wrapper 0.3.2 → 0.3.3

data/VERSION

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

data/lib/scene7/crop.rb

@@ -7,18 +7,21 @@ module Scene7
     end
 
     def self.format_url_params(params)
-      "scl=#{params[:scale_factor]}&crop=#{params[:x].round},#{params[:y].round},#{params[:width].round},#{params[:height].round}&qlt=#{params[:quality] || 95}"
+      require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
+
+      basic = "scl=#{params.delete(:scale_factor)}&crop=#{params.delete(:x).round},#{params.delete(:y).round},#{params.delete(:width).round},#{params.delete(:height).round}&qlt=#{params.delete(:quality)}"
+      basic << params.map {|k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
     end
 
     def self.convert_params_from_scale_first(orig_params, additional_params = {})
       {}.tap do |params|
         scale_factor = orig_params[:scale_factor].to_f
         params[:scale_factor] = 1.0 / scale_factor
-        params[:height] = orig_params[:height].to_f / scale_factor
-        params[:width] = orig_params[:width].to_f / scale_factor
-        params[:x] = orig_params[:x].to_f / scale_factor
-        params[:y] = orig_params[:y].to_f / scale_factor
-        params[:quality] = orig_params[:quality] if orig_params[:quality]
+        params[:height] = (orig_params[:height].to_f / scale_factor).round
+        params[:width] = (orig_params[:width].to_f / scale_factor).round
+        params[:x] = (orig_params[:x].to_f / scale_factor).round
+        params[:y] = (orig_params[:y].to_f / scale_factor).round
+        params[:quality] = orig_params[:quality] || 95
       end.merge!(additional_params)
     end
   end

data/scene7-wrapper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scene7-wrapper}
-  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 = ["Brian Rose", "Jim Whiteman"]

data/spec/scene7/crop_spec.rb

@@ -13,7 +13,7 @@ describe Scene7::Crop do
     } }
 
     it 'includes the scale and scale factor and defaults the quality to 95' do
-      subject.format_url_params(params).should == "scl=0.5&crop=50,100,250,150&qlt=95"
+      subject.format_url_params(params).should == "scl=0.5&crop=50,100,250,150&qlt="
     end
 
     context "when quality is specified" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scene7-wrapper
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Brian Rose