imgix-rails 2.1.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c75754475382bc08cea7f12c6d5bee8d0b794cc
-  data.tar.gz: b2bc84807ab40633b2fa05c57a4c24a8484b7bb6
+  metadata.gz: 685c398ffbc9325b01ab084285513ec1587d71dc
+  data.tar.gz: d661d482080130d3af706b7815616825d9fd8785
 SHA512:
-  metadata.gz: cd75ed3285539c743aada0c7ce94c1cf72a297f85b4545e0b3439e9cd4ebe3df5c56f84c90c789782191d054fd1287082b2a13a6bdf785e9b67f8d61ab204d54
-  data.tar.gz: 6ee0e5ac18b1d7a4321b81e6c825e40dc4b1718dd20e11109c8eb6706dbb217ad1ebe5983d743b2faa056df602cf2047dc94703843a70b39741297eaa726dac5
+  metadata.gz: 797dd684241810df8b30356c6faca343e34f911129f7646fd1a37758a110a870363f951d2c20aedffbb480593434ec902f16882cda4dc2fa25f77a2730501334
+  data.tar.gz: a543310314e39172cc523188ef2e053fff42997f0f28276763dbe479de23131325886b654e7d57712f73837666b1bbb3a6592c2f1d6d5f15288ffcc1509791d8

data/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2018, Zebrafish Labs Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+	Redistributions of source code must retain the above copyright notice,
+	this list of conditions and the following disclaimer.
+
+	Redistributions in binary form must reproduce the above copyright notice,
+	this list of conditions and the following disclaimer in the documentation 
+	and/or other materials provided with the distribution.
+	
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,6 +1,6 @@
 [![imgix logo](https://assets.imgix.net/imgix-logo-web-2014.pdf?page=2&fm=png&w=200&h=200)](https://imgix.com)
 
-# imgix-rails [![Build Status](https://travis-ci.org/imgix/imgix-rails.svg?branch=master)](https://travis-ci.org/imgix/imgix-rails) [![Slack Status](http://slack.imgix.com/badge.svg)](http://slack.imgix.com)
+# imgix-rails [![Build Status](https://travis-ci.org/imgix/imgix-rails.svg?branch=master)](https://travis-ci.org/imgix/imgix-rails)
 
 `imgix-rails` is a gem designed to make integrating imgix into your Rails app easier. It builds on [imgix-rb](https://github.com/imgix/imgix-rb) to offer a few Rails-specific interfaces.
 
@@ -15,7 +15,6 @@ We recommend using something like [Paperclip](https://github.com/thoughtbot/pape
   * [ix_picture_tag](#ix_picture_tag)
   * [ix_image_url](#ix_image_url)
     * [Usage in Sprockets](#usage-in-sprockets)
-  * [Hostname Removal](#hostname-removal)
 * [Using With Image Uploading Libraries](#using-with-image-uploading-libraries)
   * [Paperclip and CarrierWave](#paperclip-and-carrierwave)
   * [Refile](#refile)
@@ -50,7 +49,7 @@ Before you get started, you will need to define your imgix configuration in your
 ```ruby
 Rails.application.configure do
   config.imgix = {
-    source: "Name of your source, e.g. assets.imgix.net"
+    source: "assets.imgix.net"
   }
 end
 ```
@@ -59,8 +58,30 @@ The following configuration flags will be respected:
 
 - `:use_https` toggles the use of HTTPS. Defaults to `true`
 - `:source` a String or Array that specifies the imgix Source address. Should be in the form of `"assets.imgix.net"`.
-- `:secure_url_token` a optional secure URL token found in your dashboard (https://webapp.imgix.com) used for signing requests
-- `:hostnames_to_replace` an Array of hostnames to replace with the value(s) specified by `:source`. This is useful if you store full-qualified S3 URLs in your database, but want to serve images through imgix.
+- `:srcset_width_tolerance` an optional numeric value determining the maximum tolerance allowable, between the downloaded dimensions and rendered dimensions of the image (default `.08` i.e. `8%`).
+- `:secure_url_token` an optional secure URL token found in your dashboard (https://dashboard.imgix.com) used for signing requests
+- `:shard_strategy` Specify [domain sharding strategy](https://github.com/imgix/imgix-rb#domain-sharded-urls) with multiple sources. Acceptable values are `:cycle` and `:crc`. `:crc` is used by default.
+
+#### Multi-source configuration
+
+In addition to the standard configuration flags, the following options can be used for multi-source support.
+
+- `:sources` a Hash of imgix source-secure_url_token key-value pairs. If the value for a source is `nil`, URLs generated for the corresponding source won't be secured. `:sources` and `:source` *cannot* be used together.
+- `:default_source` optionally specify a default source for generating URLs.
+
+Example:
+
+```ruby
+Rails.application.configure do
+  config.imgix = {
+    sources: {
+      "assets.imgix.net"  => "foobarbaz",
+      "assets2.imgix.net" => nil,   # Will generate unsigned URLs
+    },
+    default_source: "assets.imgix.net"
+  }
+end
+```
 
 <a name="ix_image_tag"></a>
 ### ix_image_tag
@@ -69,8 +90,15 @@ The `ix_image_tag` helper method makes it easy to pass parameters to imgix to ha
 
 `ix_image_tag` generates `<img>` tags with a filled-out `srcset` attribute that leans on imgix to do the hard work. If you already know the minimum or maximum number of physical pixels that this image will need to be displayed at, you can pass the `min_width` and/or `max_width` options. This will result in a smaller, more tailored `srcset`.
 
+`ix_image_tag` takes the following arguments:
+
+* `source`: an optional String indicating the source to be used. If unspecified `:source` or `:default_source` will be used. If specified, the value must be defined in the config.
+* `path`: The path or URL of the image to display.
+* `tag_options`: Any options to apply to the parent `picture` element. This is useful for adding class names, etc.
+* `url_params`: Default imgix options. These will be used to generate a fallback `img` tag for older browsers, and used in each `source` unless overridden by `breakpoints`.
+
 ```erb
-<%= ix_image_tag('/unsplash/hotairballoon.jpg', { w: 300, h: 500, fit: 'crop', crop: 'right', alt: 'A hot air balloon on a sunny day' }) %>
+<%= ix_image_tag('/unsplash/hotairballoon.jpg', url_params: { w: 300, h: 500, fit: 'crop', crop: 'right'}, tag_options: { alt: 'A hot air balloon on a sunny day' }) %>
 ```
 
 Will render out HTML like the following:
@@ -89,11 +117,19 @@ Will render out HTML like the following:
 >
 ```
 
+Similarly
+
+```erb
+<%= ix_image_tag('assets2.imgix.net', '/unsplash/hotairballoon.jpg') %>
+```
+
+Will generate URLs using `assets2.imgix.net` source.
+
 We recommend leveraging this to generate powerful helpers within your application like the following:
 
 ```ruby
 def profile_image_tag(user)
-  ix_image_tag(user.profile_image_url, { w: 100, h: 200, fit: 'crop' })
+  ix_image_tag(user.profile_image_url, url_params: { w: 100, h: 200, fit: 'crop' })
 end
 ```
 
@@ -106,7 +142,7 @@ Then rendering the portrait in your application is very easy:
 If you already know all the exact widths you need images for, you can specify that by passing the `widths` option as an array. In this case, imgix-rails will only generate `srcset` pairs for the specified `widths`.
 
 ```erb
-<%= ix_image_tag('/unsplash/hotairballoon.jpg', { widths: [320, 640, 960, 1280] w: 300, h: 500, fit: 'crop', crop: 'right', alt: 'A hot air balloon on a sunny day' }) %>
+<%= ix_image_tag('/unsplash/hotairballoon.jpg', widths: [320, 640, 960, 1280], url_params: { w: 300, h: 500, fit: 'crop', crop: 'right'}, tag_options: { alt: 'A hot air balloon on a sunny day' }) %>
 ```
 
 
@@ -115,54 +151,89 @@ If you already know all the exact widths you need images for, you can specify th
 
 The `ix_picture_tag` helper method makes it easy to generate `picture` elements in your Rails app. `picture` elements are useful when an images needs to be art directed differently at different screen sizes.
 
-`ix_picture_tag` takes four arguments:
+`ix_picture_tag` takes the following arguments:
 
-* `source`: The path or URL of the image to display.
-* `picture_tag_options`: Any options to apply to the parent `picture` element. This is useful for adding class names, etc.
-* `imgix_default_options`: Default imgix options. These will be used to generate a fallback `img` tag for older browsers, and used in each `source` unless overridden by `breakpoints`.
+* `source`: an optional String indicating the source to be used. If unspecified `:source` or `:default_source` will be used. If specified, the value must be defined in the config.
+* `path`: The path or URL of the image to display.
+* `tag_options`: Any options to apply to the parent `picture` element. This is useful for adding class names, etc.
+* `url_params`: Default imgix options. These will be used to generate a fallback `img` tag for older browsers, and used in each `source` unless overridden by `breakpoints`.
 * `breakpoints`: A hash describing the variants. Each key must be a media query (e.g. `(max-width: 880px)`), and each value must be a hash of param overrides for that media query. A `source` element will be generated for each breakpoint specified.
 
 ```erb
 <%= ix_picture_tag('bertandernie.jpg',
-  picture_tag_options: {
+  tag_options: {
     class: 'a-picture-tag'
   },
-  imgix_default_options: {
+  url_params: {
     w: 300,
     h: 300,
     fit: 'crop',
   },
   breakpoints: {
     '(max-width: 640px)' => {
-      h: 100,
-      sizes: 'calc(100vw - 20px)'
+      url_params: {
+        h: 100,
+      },
+      tag_options: {
+        sizes: 'calc(100vw - 20px)'
+      }
     },
     '(max-width: 880px)' => {
-      crop: 'right',
-      sizes: 'calc(100vw - 20px - 50%)'
+      url_params: {
+        crop: 'right',
+      },
+      tag_options: {
+        sizes: 'calc(100vw - 20px - 50%)'
+      }
     },
     '(min-width: 881px)' => {
-      crop: 'left',
-      sizes: '430px'
+      url_params: {
+        crop: 'left',
+      },
+      tag_options: {
+        sizes: '430px'
+      }
     }
   }
 ) %>
 ```
 
+To generate a `picture` element on a different source:
+
+```erb
+<%= ix_picture_tag('assets2.imgix.net', 'bertandernie.jpg',
+      tag_options: {},
+      url_params: {},
+      breakpoints: {
+        '(max-width: 640px)' => {
+          url_params: { h: 100 },
+          tag_options: { sizes: 'calc(100vw - 20px)' }
+        },
+      }
+   ) %>
+```
 
 <a name="ix_image_url"></a>
 ### ix_image_url
 
 The `ix_image_url` helper makes it easy to generate a URL to an image in your Rails app.
 
+`ix_image_url` takes four arguments:
+
+* `source`: an optional String indicating the source to be used. If unspecified `:source` or `:default_source` will be used. If specified, the value must be defined in the config.
+* `path`: The path or URL of the image to display.
+* `options`: Any options to apply to the parent `picture` element. This is useful for adding class names, etc.
+
 ```erb
 <%= ix_image_url('/users/1/avatar.png', { w: 400, h: 300 }) %>
+<%= ix_image_url('assets2.imgix.net', '/users/1/avatar.png', { w: 400, h: 300 }) %>
 ```
 
-Will generate the following URL:
+Will generate the following URLs:
 
 ```html
 https://assets.imgix.net/users/1/avatar.png?w=400&h=300
+https://assets2.imgix.net/users/1/avatar.png?w=400&h=300
 ```
 
 Since `ix_image_url` lives inside `UrlHelper`, it can also be used in places other than your views quite easily. This is useful for things such as including imgix URLs in JSON output from a serializer class.
@@ -185,40 +256,6 @@ puts ix_image_url('/users/1/avatar.png', { w: 400, h: 300 })
 }
 ```
 
-### Hostname Removal
-
-You can also configure imgix-rails to disregard given hostnames and only use the path component from given URLs. This is useful if you have [a Web Folder or an Amazon S3 imgix Source configured](https://www.imgix.com/docs/tutorials/creating-sources) but store the fully-qualified URLs for those resources in your database.
-
-For example, let's say you are using S3 for storage. An `#avatar_url` value might look like the following in your application:
-
-```ruby
-@user.avatar_url #=> "https://s3.amazonaws.com/my-bucket/users/1.png"
-```
-
-You would then configure imgix in your Rails application to disregard the `'s3.amazonaws.com'` hostname:
-
-```ruby
-Rails.application.configure do
-  config.imgix = {
-    source: "my-imgix-source.imgix.net",
-    hostname_to_replace: "s3.amazonaws.com"
-  }
-end
-```
-
-Now when you call `ix_image_tag` or another helper, you get an imgix URL:
-
-```erb
-<%= ix_image_tag(@user.avatar_url) %>
-```
-
-Renders:
-
-```html
-<img src="https://my-imgix-source.imgix.net/my-bucket/users/1.png" />
-```
-
-
 <a name="using-with-image-uploading-libraries"></a>
 ## Using With Image Uploading Libraries
 
@@ -283,3 +320,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+## Code of Conduct
+Users contributing to or participating in the development of this project are subject to the terms of imgix's [Code of Conduct](https://github.com/imgix/code-of-conduct).

data/imgix-rails.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Imgix::Rails::VERSION
   spec.authors       = ["Kelly Sutton", "Paul Straw"]
   spec.email         = ["kelly@imgix.com", "ixemail"]
-  spec.licenses      = ["MIT"]
+  spec.licenses      = ["BSD-2-Clause"]
 
   spec.summary       = %q{Makes integrating imgix into your Rails app easier. It builds on imgix-rb to offer a few Rails-specific interfaces.}
   spec.description   = %q{Makes integrating imgix into your Rails app easier. It builds on imgix-rb to offer a few Rails-specific interfaces. Please see https://github.com/imgix/imgix-rails for more details.}

data/lib/imgix/rails.rb

@@ -8,6 +8,7 @@ require "active_support"
 
 module Imgix
   module Rails
+    STRATEGIES = [:crc, :cycle]
     class Config < ::ActiveSupport::OrderedOptions; end
 
     def self.config

data/lib/imgix/rails/image_tag.rb

@@ -1,13 +1,11 @@
 require "imgix/rails/tag"
 
 class Imgix::Rails::ImageTag < Imgix::Rails::Tag
-  def render
-    @options[:srcset] = srcset
-    @options[:sizes] ||= '100vw'
 
-    @source = replace_hostname(@source)
-    normal_opts = @options.slice!(*self.class.available_parameters)
+  def render
+    @tag_options[:srcset] = srcset
+    @tag_options[:sizes] ||= '100vw'
 
-    image_tag(ix_image_url(@source, @options.except(:widths)), normal_opts)
+    image_tag(ix_image_url(@source, @path, @url_params), @tag_options)
   end
 end

data/lib/imgix/rails/picture_tag.rb

@@ -4,25 +4,32 @@ require "imgix/rails/image_tag"
 class Imgix::Rails::PictureTag < Imgix::Rails::Tag
   include ActionView::Context
 
-  def initialize(source, options, default_options, breakpoints)
+  def initialize(path, source: nil, tag_options: {}, url_params: {}, breakpoints: {}, widths: [])
+    @path = path
     @source = source
-    @options = options
-    @default_options = default_options
+    @tag_options = tag_options
+    @url_params = url_params
     @breakpoints = breakpoints
+    @widths = widths.length > 0 ? widths : target_widths
   end
 
   def render
-    content_tag(:picture, @options) do
+    content_tag(:picture, @tag_options) do
       @breakpoints.each do |media, opts|
-        html_opts = opts.except(*self.class.available_parameters)
-        html_opts[:media] ||= media
-        html_opts[:srcset] ||= srcset(@default_options.clone.merge(opts))
+        source_tag_opts = opts[:tag_options] || {}
+        source_tag_url_params = opts[:url_params] || {}
+        widths = opts[:widths]
+        unsupported_opts = opts.except(:tag_options, :url_params, :widths)
+        if unsupported_opts.length > 0
+          raise "'#{unsupported_opts.keys.join("', '")}' key(s) not supported; use tag_options, url_params, widths."
+        end
 
-
-        concat(content_tag(:source, nil, html_opts))
+        source_tag_opts[:media] ||= media
+        source_tag_opts[:srcset] ||= srcset(url_params: @url_params.clone.merge(source_tag_url_params), widths: widths)
+        concat(content_tag(:source, nil, source_tag_opts))
       end
 
-      concat Imgix::Rails::ImageTag.new(@source, @default_options).render
+      concat Imgix::Rails::ImageTag.new(@path, source: @source, url_params: @url_params).render
     end
   end
 end

data/lib/imgix/rails/tag.rb

@@ -4,171 +4,78 @@ class Imgix::Rails::Tag
   include Imgix::Rails::UrlHelper
   include ActionView::Helpers
 
-  @@parameters = nil
-
-  # Store our parameter information on the class instance so that
-  # each instance of any this class or our subclasses doesn't have to
-  # go back to disk to get this configuration information
-  def self.available_parameters
-    @@available_parameters ||= parameters.keys
-  end
-
-  def self.parameters
-    return @@parameters if @@parameters
-
-    path = File.expand_path("../../../../vendor/parameters.json", __FILE__)
-    @@parameters = JSON.parse(File.read(path), symbolize_names: true)[:parameters]
-    @@parameters[:widths] = nil
-
-    @@parameters
-  end
-
-  def initialize(source, options={})
+  def initialize(path, source: nil, tag_options: {}, url_params: {}, widths: [])
+    @path = path
     @source = source
-    @options = options
+    @tag_options = tag_options
+    @url_params = url_params
+    @widths = widths.length > 0 ? widths : target_widths
   end
 
 protected
 
-  def srcset(opts=@options)
-    @source = replace_hostname(@source)
-    widths = opts[:widths] || target_widths
+  def srcset(url_params: @url_params, widths: @widths)
+    widths = widths || target_widths
 
-    widths.map do |width|
-      srcset_options = opts.slice(*self.class.available_parameters).except(:widths)
-      srcset_options[:w] = width
+    srcset_url_params = url_params.clone
+    srcsetvalue = widths.map do |width|
+      srcset_url_params[:w] = width
 
-      if opts[:w].present? && opts[:h].present?
-        srcset_options[:h] = (width * (opts[:h].to_f / opts[:w])).round
+      if url_params[:w].present? && url_params[:h].present?
+        srcset_url_params[:h] = (width * (url_params[:h].to_f / url_params[:w])).round
       end
 
-      "#{ix_image_url(@source, srcset_options)} #{width}w"
+      "#{ix_image_url(@source, @path, srcset_url_params)} #{width}w"
     end.join(', ')
+
+    srcsetvalue += ", #{ix_image_url(@source, @path, srcset_url_params.except(:w, :h))}"
   end
 
-private
+  @@standard_widths = nil
 
-  MAXIMUM_SCREEN_WIDTH = 2560 * 2 # Physical resolution of 27" iMac (2016)
-  SCREEN_STEP = 100
-
-  # Taken from http://mydevice.io/devices/
-
-  # Phones
-  IPHONE = { css_width: 320, dpr: 1 }
-  IPHONE_4 = { css_width: 320, dpr: 2 }
-  IPHONE_6 = { css_width: 375, dpr: 2 }
-  LG_G3 = { css_width: 360, dpr: 4 }
-
-  # Phablets
-  IPHONE_6_PLUS = { css_width: 414, dpr: 3 }
-  IPHONE_6_PLUS_LANDSCAPE = { css_width: 736, dpr: 3 }
-  MOTO_NEXUS_6 = { css_width: 412, dpr: 3.5 }
-  MOTO_NEXUS_6_LANDSCAPE = { css_width: 690, dpr: 3.5 }
-  LUMIA_1520 = { css_width: 432, dpr: 2.5 }
-  LUMIA_1520_LANDSCAPE = { css_width: 768, dpr: 2.5 }
-  GALAXY_NOTE_3 = { css_width: 360, dpr: 3 }
-  GALAXY_NOTE_3_LANDSCAPE = { css_width: 640, dpr: 3 }
-  GALAXY_NOTE_4 = { css_width: 360, dpr: 4 }
-  GALAXY_NOTE_4_LANDSCAPE = { css_width: 640, dpr: 4 }
-
-  # Tablets
-  IPAD = { css_width: 768, dpr: 1 };
-  IPAD_LANDSCAPE = { css_width: 1024, dpr: 1 };
-  IPAD_3 = { css_width: 768, dpr: 2 };
-  IPAD_3_LANDSCAPE = { css_width: 1024, dpr: 2 };
-  IPAD_PRO = { css_width: 1024, dpr: 2 };
-  IPAD_PRO_LANDSCAPE = { css_width: 1366, dpr: 2 };
-
-  BOOTSTRAP_SM = { css_width: 576, dpr: 1 }
-  BOOTSTRAP_MD = { css_width: 720, dpr: 1 }
-  BOOTSTRAP_LG = { css_width: 940, dpr: 1 }
-  BOOTSTRAP_XL = { css_width: 1140, dpr: 1 }
-
-  def devices
-    phones + phablets + tablets + bootstrap_breaks
+  def compute_standard_widths
+    tolerance = ::Imgix::Rails.config.imgix[:srcset_width_tolerance] || SRCSET_TOLERANCE
+    prev = MINIMUM_SCREEN_WIDTH
+    widths = []
+    while prev <= MAXIMUM_SCREEN_WIDTH do
+      widths.append(2 * (prev/2).round)   # Ensure widths are even
+      prev = prev * (1 + tolerance*2.0)
+    end
+
+    widths
   end
 
-  def bootstrap_breaks
-    breaks = [
-      BOOTSTRAP_SM,
-      BOOTSTRAP_MD,
-      BOOTSTRAP_LG,
-      BOOTSTRAP_XL
-    ]
+  def standard_widths
+    return @@standard_widths if @@standard_widths
 
-    breaks + breaks.map { |b| b[:dpr] = 2; b }
-  end
+    @@standard_widths = compute_standard_widths
+    @@standard_widths.freeze
 
-  def phones
-    [
-      IPHONE,
-      IPHONE_4,
-      IPHONE_6,
-      LG_G3
-    ]
+    @@standard_widths
   end
 
-  def phablets
-    [
-      IPHONE_6_PLUS,
-      IPHONE_6_PLUS_LANDSCAPE,
-      MOTO_NEXUS_6,
-      MOTO_NEXUS_6_LANDSCAPE,
-      LUMIA_1520,
-      LUMIA_1520_LANDSCAPE,
-      GALAXY_NOTE_3,
-      GALAXY_NOTE_3_LANDSCAPE,
-      GALAXY_NOTE_4,
-      GALAXY_NOTE_4_LANDSCAPE
-    ]
-  end
+private
 
-  def tablets
-    [
-      IPAD,
-      IPAD_LANDSCAPE,
-      IPAD_3,
-      IPAD_3_LANDSCAPE,
-      IPAD_PRO,
-      IPAD_PRO_LANDSCAPE
-    ]
-  end
+  MINIMUM_SCREEN_WIDTH = 100
+  MAXIMUM_SCREEN_WIDTH = 8192   # Maximum width supported by imgix
+  SRCSET_TOLERANCE = 0.08
 
   # Return the widths to generate given the input `sizes`
   # attribute.
   #
   # @return {Array} An array of {Fixnum} instances representing the unique `srcset` URLs to generate.
   def target_widths
-    min_screen_width_required = @options[:min_width] || SCREEN_STEP
-    max_screen_width_required = @options[:max_width] || MAXIMUM_SCREEN_WIDTH
-
-    widths = (device_widths + screen_widths).select do |w|
-      w <= max_screen_width_required && w >= min_screen_width_required
-    end.compact.uniq.sort
-
-    # Add exact widths for 1x, 2x, and 3x devices
-    if @options[:w]
-      widths.push(@options[:w], @options[:w] * 2, @options[:w] * 3)
+    min_width = @tag_options[:min_width]
+    max_width = @tag_options[:max_width]
+    if min_width || max_width
+      min_width = min_width || MINIMUM_SCREEN_WIDTH
+      max_width = max_width || MAXIMUM_SCREEN_WIDTH
+      widths = standard_widths.select { |w| min_width <= w && w <= max_width }
+    else
+      widths = standard_widths
     end
 
     widths
   end
 
-  def device_widths
-    devices.map do |device|
-      (device[:css_width] * device[:dpr]).round
-    end
-  end
-
-  # Generates an array of physical screen widths to represent
-  # the different potential viewport sizes.
-  #
-  # We step by `SCREEN_STEP` to give some sanity to the amount
-  # of widths we output.
-  #
-  # The upper bound is the widest known screen on the planet.
-  # @return {Array} An array of {Fixnum} instances
-  def screen_widths
-    (0..MAXIMUM_SCREEN_WIDTH).step(SCREEN_STEP).to_a + [MAXIMUM_SCREEN_WIDTH]
-  end
 end