imgix 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 027c32d72ff3ee11467364ed4771838dc324f134
-  data.tar.gz: 6df850a7689330e587aa81f536f4308d7c0cb50f
+  metadata.gz: 8c573b0b53304a06886cb1848fd233109975021d
+  data.tar.gz: ab4b939716370098523381acbcbd3817fdc63b02
 SHA512:
-  metadata.gz: 8bc8ca0fafa2733e9c4d2716793c07e3221add977a5870f462410fe414d350b73ac907353a00188fe5457966cec9b624628752f07c663941f9ea0cd46f6b1811
-  data.tar.gz: d17301a5b9a127d8cac312eeaca33c01aa2ec9af693f8003acb20334b5425b3667bb815b5e3bdf06a32da2972c047372c5f700191d021345d4d737ac7703ad47
+  metadata.gz: ef8647b9485547eb1af90b6b7d6758099d7028c72745ab55c37f31076a657ed9a4a88872708137b62101bb5b1aa7b940b9673300cc845dc8d72fd9585cac1cd2
+  data.tar.gz: c0b9567ab4201cb685ce94da7d1d61e2e55af6692d83ac916bfc964e5fca97b1cc4b807071353ab797ea2f803aa0f532cb70dfbd64f97cdd58f8dcec7c4b8b1f

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
 bundler_args: --without development
-before_install: gem install bundler
+before_install:
+  - gem install bundler
+  - rvm get head
 rvm:
-  - 2.2.2
-  - 1.9.2
-  - jruby-1.7.19
-  - rbx-2.2.7
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
+  - jruby-9.0.5.0
+  - rbx-2.11

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.0] - February 24, 2016
+
+* Added automatic Base64 encoding for all Base64 variant parameters.
+* Properly encoding all keys and values output by `Imgix::Path`.
+* Better URL encoding for spaces, with `ERB::Util.url_encode`.
+* Normalize trailing `/` in passed hosts.
+
 ## [1.0.0] - December 9, 2015
 ### Changed
 - Removed `Client#sign_path` to provide a consistent method and code path for generating URLs. [#16](https://github.com/imgix/imgix-rb/issues/16)

data/README.md

@@ -72,7 +72,7 @@ client = Imgix::Client.new(hosts: ['your-subdomain-1.imgix.net',
 
 When the imgix api requires multiple parameters you have to use the method rather than an accessor.
 
-For example to use the [noise reduction](http://www.imgix.com/docs/urlapi/enhance#nr-nrs) options:
+For example to use the noise reduction:
 
 ``` ruby
 path.noise_reduction(50,50)

data/lib/imgix/client.rb

@@ -31,7 +31,7 @@ module Imgix
     def get_host(path)
       host = host_for_crc(path) if @shard_strategy == :crc
       host = host_for_cycle if @shard_strategy == :cycle
-      host.gsub("http://","").gsub("https://","")
+      host.gsub("http://","").gsub("https://","").chomp("/")
     end
 
     def host_for_crc(path)

data/lib/imgix/path.rb

@@ -1,4 +1,6 @@
+require 'base64'
 require 'cgi/util'
+require 'erb'
 require 'imgix/param_helpers'
 
 module Imgix
@@ -90,7 +92,16 @@ module Imgix
     end
 
     def query
-      @options.map { |k, v| "#{k.to_s}=#{CGI.escape(v.to_s)}" }.join('&')
+      @options.map do |key, val|
+        escaped_key = ERB::Util.url_encode(key.to_s)
+
+        if escaped_key.end_with? '64'
+          base64_encoded_val = Base64.urlsafe_encode64(val.to_s).delete('=')
+          "#{escaped_key}=#{base64_encoded_val}"
+        else
+          "#{escaped_key}=#{ERB::Util.url_encode(val.to_s)}"
+        end
+      end.join('&')
     end
 
     def has_query?

data/lib/imgix/version.rb

@@ -1,3 +1,3 @@
 module Imgix
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/test/units/domains_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class DomainsTest < Imgix::Test
-
   def test_deterministically_choosing_a_path
     client = Imgix::Client.new(hosts: [
         "demos-1.imgix.net",
@@ -50,6 +49,15 @@ class DomainsTest < Imgix::Test
     assert_equal 'https://demos-1.imgix.net/bridge.png?s=0233fd6de51f20f11cff6b452b7a9a05', path.to_url
   end
 
+  def test_strips_out_trailing_slash
+    client = Imgix::Client.new(host: "http://demos-1.imgix.net/",
+      secure_url_token: '10adc394',
+      include_library_param: false)
+
+    path = client.path('/bridge.png')
+    assert_equal 'https://demos-1.imgix.net/bridge.png?s=0233fd6de51f20f11cff6b452b7a9a05', path.to_url
+  end
+
   def test_with_full_paths
     client = Imgix::Client.new(hosts: [
         "demos-1.imgix.net",

data/test/units/path_test.rb

@@ -48,6 +48,30 @@ class PathTest < Imgix::Test
     assert_equal url, path.markalign('middle', 'center').to_url
   end
 
+  def test_param_keys_are_escaped
+    ix_url = unsigned_client.path('demo.png').to_url({
+      :'hello world' => 'interesting'
+    })
+
+    assert_equal "https://demo.imgix.net/demo.png?hello%20world=interesting", ix_url
+  end
+
+  def test_param_values_are_escaped
+    ix_url = unsigned_client.path('demo.png').to_url({
+      hello_world: '/foo"> <script>alert("hacked")</script><'
+    })
+
+    assert_equal "https://demo.imgix.net/demo.png?hello_world=%2Ffoo%22%3E%20%3Cscript%3Ealert%28%22hacked%22%29%3C%2Fscript%3E%3C", ix_url
+  end
+
+  def test_base64_param_variants_are_base64_encoded
+    ix_url = unsigned_client.path('~text').to_url({
+      txt64: 'I cannøt belîév∑ it wors! 😱'
+    })
+
+    assert_equal "https://demo.imgix.net/~text?txt64=SSBjYW5uw7h0IGJlbMOuw6l24oiRIGl0IHdvcu-jv3MhIPCfmLE", ix_url
+  end
+
   def test_host_is_required
     assert_raises(ArgumentError) {Imgix::Client.new}
   end
@@ -88,7 +112,7 @@ class PathTest < Imgix::Test
 
   def test_configure_library_param
     library = "sinatra"
-    version = "1.0.0"
+    version = Imgix::VERSION
     client = Imgix::Client.new(host: 'demo.imgix.net', library_param: library, library_version: version) # enabled by default
     url = client.path('/images/demo.png').to_url
 
@@ -96,8 +120,11 @@ class PathTest < Imgix::Test
   end
 
 private
-
   def client
     @client ||= Imgix::Client.new(host: 'demo.imgix.net', secure_url_token: '10adc394', include_library_param: false)
   end
+
+  def unsigned_client
+    @unsigned_client ||= Imgix::Client.new(host: 'demo.imgix.net', include_library_param: false)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imgix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kelly Sutton
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable