dugway 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7dcecd0162a10e803937e86ecc97601bf6ee155
-  data.tar.gz: 2586fa50d420763edfea6fe51effea36382efd50
+  metadata.gz: 598df617fd2f3808e13f02534a7bc0c37565f1a4
+  data.tar.gz: ef91ee5c5c39ca4dbddb27fcd16023d737c88c11
 SHA512:
-  metadata.gz: 41f5dc95f6de48a0617e8cb684cb5a017d0780e872d670ef1f9da81c186cd968ccf1599dc4a5796eff931b3cb70bd5abc00484ee6503b4b33ae90adde4f69477
-  data.tar.gz: 8da215f70a623699c2907b8cf1a08efae0b5b0114650621310ea4534519f70d3eccfe49f9a38c4ae8df640da70307c515f799f866e934b99c014859054e9ad9b
+  metadata.gz: 0fd2fc3af1ab70430c5203af1da553d5139ed48622092b3712c1ef5822366ae29b6bc4b16396150eb605d2a33a14b3345dc08a4f06661f8a8ec922d415b4ba14
+  data.tar.gz: 6fe7dbbd2264902e3ea462f34bc4286feee5e85954131e6277c63c80af9a84c4b9a0b50f18509bb7627274f29eb7d5c30ed3d73cfbb5975a3a250223c9d8b7da

data/lib/dugway/liquid/filters/url_filters.rb

@@ -8,14 +8,20 @@ module Dugway
         content_tag :a, text, options
       end
 
-      def constrain(url = nil, width = 0, height = 0)
-        image_url url, width, height if url
+      def constrain(url = nil, width = '-', height = '-')
+        return unless url
+        uri = URI.parse(url)
+        query = Rack::Utils.parse_nested_query uri.query
+        query.update('w' => width, 'h' => height)
+        query.delete_if { |k,v| v.nil? || v == '-' }
+        uri.query = query.to_query
+        uri.to_s
       end
 
       def product_image_url(image = nil, size = nil)
         url = image ? image['url'] : 'http://images.bigcartel.com/missing.png'
         size = legacy_size_for(size)
-        image_url url, size, size
+        constrain url, size, size
       end
 
       def theme_js_url(name)
@@ -52,13 +58,6 @@ module Dugway
         options
       end
 
-      def image_url(url, width, height)
-        uri = URI.parse(url)
-        query_hash = Rack::Utils.parse_nested_query uri.query
-        uri.query = query_hash.update('w' => width, 'h' => height).to_query
-        uri.to_s
-      end
-
       def legacy_size_for(size)
         case size
         when 'large'  then 300

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "0.10.4"
+  VERSION = "0.10.5"
 end

data/spec/units/dugway/liquid/filters/url_filters_spec.rb

@@ -43,10 +43,20 @@ describe Dugway::Filters::UrlFilters do
     end
 
     describe "#constrain" do
-      it 'should constrain the image to the specified size' do
+      it "should constrain the image to the specified size" do
         template = rendered_template("{{ image | product_image_url | constrain: '123', '456' }}", 'image' => product_image)
         template.should include("#{image_url}?h=456&w=123")
       end
+
+      it "should support an optional width argument" do
+        template = rendered_template("{{ image | product_image_url | constrain: '-', '456' }}", 'image' => product_image)
+        template.should include("#{image_url}?h=456")
+      end
+
+      it "should support an optional height argument" do
+        template = rendered_template("{{ image | product_image_url | constrain: '123' }}", 'image' => product_image)
+        template.should include("#{image_url}?w=123")
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Big Cartel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler