imgix 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f024036dd9183dd1a68b09faf50a4115a1f67cb
-  data.tar.gz: 2d6a4ccebcc9812512c00175afa578d55a34255a
+  metadata.gz: c065af1834dc3934c519fffe6ade364cae32993e
+  data.tar.gz: 96ea6ed38526442c99b6ff62a655ba75f8e44992
 SHA512:
-  metadata.gz: 73f7c3044711d3382b067fdcdb8c6648a3572ad0f383eefc164b5005183e06b1057facb3eaca7ac83151a633b3d23d4e45b8fdfdf5162f5850a9a78790186516
-  data.tar.gz: 11b9615037a7509fd579c94b1507c6eb2fa972ae8190da2b9366f07dbeea36f7e0c095c75c0b3138999cd97d6ba4e539dac6751ec4cda5e7cf18280df4ef0fcc
+  metadata.gz: c0272a45ae8ce8e0d496c345aa97228807f38aff0858aac459ffae0d1a166222f2dafc608c6e4f6a4bdc605e792795c89aded140fb56f9c38689de54f10868d3
+  data.tar.gz: 7c56ae3fd51c9d45dc2b37ca5d917ca9e3787e3101b43d169e6948d1437ef23fca425ce81b3d0176cd906125397a342d9c91aa2977531c0c864a4fec25aa93d6

data/.travis.yml

@@ -1,8 +1,16 @@
 language: ruby
 bundler_args: --without development
 before_install:
-  - gem install bundler
-  - rvm get head
+  # Extracts the ruby version number
+  - RUBY_VERS="$(bc -l<<<$(ruby -v | cut -d' ' -f 2 | cut -d'.' -f 1,2))"
+  # Bundler 2.0 requires at least ruby vers 2.3.0
+  - LATEST_VERS=2.3
+  # Based on a given job's ruby version, install either
+  # Bundler 2.x or 1.17
+  - if (( $(echo "$RUBY_VERS >= $LATEST_VERS" | bc -l) ));
+      then echo $(gem install bundler); 
+      else echo $(gem install bundler -v '< 2'); 
+    fi
 rvm:
   - 2.3.0
   - 2.2.4

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.0] - February 25, 2019
+
+* Add domain validation during Client initialization [#42](https://github.com/imgix/imgix-rb/pull/42)
+* Expand Travis CI config to include bundler v2.x [#41](https://github.com/imgix/imgix-rb/pull/41)
+
 ## [1.2.2] - November 14, 2018
 
 * Improvements to memory usage [#35](https://github.com/imgix/imgix-rb/pull/35)

data/imgix.gemspec

@@ -6,8 +6,8 @@ require 'imgix/version'
 Gem::Specification.new do |spec|
   spec.name          = 'imgix'
   spec.version       = Imgix::VERSION
-  spec.authors       = ['Kelly Sutton', 'Sam Soffes', 'Ryan LeFevre', 'Antony Denyer', 'Paul Straw']
-  spec.email         = ['kelly@imgix.com', 'sam@soff.es', 'ryan@layervault.com', 'email@antonydenyer.co.uk', 'paul@imgix.com']
+  spec.authors       = ['Kelly Sutton', 'Sam Soffes', 'Ryan LeFevre', 'Antony Denyer', 'Paul Straw', 'Sherwin Heydarbeygi']
+  spec.email         = ['kelly@imgix.com', 'sam@soff.es', 'ryan@layervault.com', 'email@antonydenyer.co.uk', 'paul@imgix.com', 'sherwin@imgix.com']
   spec.description   = 'Easily create and sign imgix URLs.'
   spec.summary       = 'Official Ruby Gem for easily creating and signing imgix URLs.'
   spec.homepage      = 'https://github.com/imgix/imgix-rb'

data/lib/imgix.rb

@@ -6,4 +6,5 @@ require 'imgix/path'
 
 module Imgix
   STRATEGIES = [:crc, :cycle]
+  DOMAIN_REGEX = /^(?:[a-z\d\-_]{1,62}\.){0,125}(?:[a-z\d](?:\-(?=\-*[a-z\d])|[a-z]|\d){0,62}\.)[a-z\d]{1,63}$/i
 end

data/lib/imgix/client.rb

@@ -49,7 +49,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://","").chomp("/")
+      host
     end
 
     def host_for_crc(path)
@@ -75,6 +75,11 @@ module Imgix
       unless @hosts.length > 0
         raise ArgumentError, "The :host or :hosts option must be specified"
       end
+      @hosts.each do |host|
+        if host.match(DOMAIN_REGEX) == nil
+          raise ArgumentError, "Domains must be passed in as fully-qualified domain names and should not include a protocol or any path element, i.e. \"example.imgix.net\"."
+        end
+      end
     end
 
   end

data/lib/imgix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Imgix
-  VERSION = '1.2.2'
+  VERSION = '2.0.0'
 end

data/test/units/domains_test.rb

@@ -42,24 +42,6 @@ class DomainsTest < Imgix::Test
     assert_equal 'https://demos-1.imgix.net/bridge.png?s=0233fd6de51f20f11cff6b452b7a9a05', path.to_url
   end
 
-  def test_strips_out_protocol
-    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_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",
@@ -73,4 +55,16 @@ class DomainsTest < Imgix::Test
     path = 'https://google.com/cats.gif'
     assert_equal "https://demos-1.imgix.net/#{CGI.escape(path)}?s=e686099fbba86fc2b8141d3c1ff60605", client.path(path).to_url
   end
+
+  def test_invalid_domain_append_slash
+    assert_raises(ArgumentError) {Imgix::Client.new(hosts: ["assets.imgix.net/"])}
+  end
+
+  def test_invalid_domain_prepend_scheme
+    assert_raises(ArgumentError) {Imgix::Client.new(hosts: ["https://assets.imgix.net"])}
+  end
+
+  def test_invalid_domain_append_dash
+    assert_raises(ArgumentError) {Imgix::Client.new(hosts: ["assets.imgix.net-"])}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imgix
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Kelly Sutton
@@ -9,10 +9,11 @@ authors:
 - Ryan LeFevre
 - Antony Denyer
 - Paul Straw
+- Sherwin Heydarbeygi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -49,6 +50,7 @@ email:
 - ryan@layervault.com
 - email@antonydenyer.co.uk
 - paul@imgix.com
+- sherwin@imgix.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -92,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Official Ruby Gem for easily creating and signing imgix URLs.