scene7-wrapper 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/scene7/crop.rb

@@ -3,17 +3,18 @@ require 'active_support/core_ext'
 module Scene7
   module Crop
     def self.convert_from_scale_first_and_format(params, additional_params = {})
-      format_url_params convert_params_from_scale_first(params, additional_params)
+      format_url_params convert_params_from_scale_first(params), additional_params
     end
 
-    def self.format_url_params(params)
+    def self.format_url_params(params, additional_params = {})
       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('&')
+      query = "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)}"
+      query << "&" + additional_params.map {|k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&') if additional_params.length > 0
+      query
     end
 
-    def self.convert_params_from_scale_first(orig_params, additional_params = {})
+    def self.convert_params_from_scale_first(orig_params)
       {}.tap do |params|
         scale_factor = orig_params[:scale_factor].to_f
         params[:scale_factor] = 1.0 / scale_factor
@@ -22,7 +23,7 @@ module Scene7
         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
   end
 end

data/scene7-wrapper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scene7-wrapper}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   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

@@ -57,8 +57,9 @@ describe Scene7::Crop do
         } }
 
         it "converts, then formats" do
-          subject.convert_from_scale_first_and_format(params).should == "scl=0.5&crop=50,125,225,150&qlt=70"
+          subject.convert_from_scale_first_and_format(params, :extra => true).should == "scl=0.5&crop=50,125,225,150&qlt=70&extra=true"
         end
+
       end
     end
 
@@ -87,11 +88,6 @@ describe Scene7::Crop do
       it "converts the top coordinate from the scale-first style" do
         @result[:y].should == 125
       end
-
-      it "accepts additional params" do
-        @result = subject.convert_params_from_scale_first(params, {:extra => true})
-        @result[:extra].should == true
-      end
     end
   end
 end

metadata

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