picturesque 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f6ac8ab4b77bc4dfe83044ae0d1456f74eb963f9
-  data.tar.gz: 2bfeb9fd9b87a69548fbf28144afbc42b8bd594d
+SHA256:
+  metadata.gz: fb3490f8acb885a84f2bd888720038a49656cccd4340f88f4462d0b410b709b9
+  data.tar.gz: 504c1bc66d830b6705d921e39483751cb50d6d732f2db0b984d7b9f9ca8b951e
 SHA512:
-  metadata.gz: 3ee9c793467b1c0ae2796946ceeebb440f5b165ec19a6a992e25e0afc745343fa23a391071b47afaeb57aded8949e66726838a066ae9774afe86da1928d3a7aa
-  data.tar.gz: 03bd57d27dc7ab6dd37f5a5c0493077558811a4b28bb3b20adf6f5cb99a9b4d22624f2b812f0ffe55faba02fbfcc02aa7ab075f21c8983839c1168fd0e4f5294
+  metadata.gz: 7b9f1612f2484eaa14054808248c8876f762aa88319cda265c92f01b23bea7cfc77923903f5b46fafab180a265ef0c681a2ab4ad7761f0d84fa81f248bfe7d56
+  data.tar.gz: 2abafc716e2cc484222ec2cb48ec9bf330e0ec3c67f734ddeb642e9cab6ad0fcb24b9cfb4cb62334b1aeb02db259ad128a8781f789486734c075a3efaf378578

data/Rakefile

@@ -14,11 +14,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -30,5 +28,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/app/controllers/picturesque/application_controller.rb

@@ -1,4 +1,5 @@
 module Picturesque
   class ApplicationController < ActionController::Base
+    protect_from_forgery with: :exception
   end
 end

data/app/controllers/picturesque/images_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "picturesque/application_controller"
+require_dependency 'picturesque/application_controller'
 
 module Picturesque
   class ImagesController < ApplicationController
@@ -6,14 +6,20 @@ module Picturesque
     # GET /:id/(:size)(/:quality)(/:slug).(:format)
     def show
       @image = Picturesque::Image.find(params)
-      @file = @image.process(size: params[:size], quality: params[:quality], format: params[:format])
+      @file = @image.process(params.slice(:size, :quality, :format))
 
-      canonical = picturesque.image_url(id: params[:id], slug: params[:slug])
-      response.header['Link'] = "<#{canonical}>; rel=\"canonical\""
+      setup_canonical_link
 
       expires_in 3.years, public: @file
       send_file @file.path, disposition: Picturesque::Image::DISPOSITION
     end
 
+  private
+
+    def setup_canonical_link
+      canonical = picturesque.image_url(params.slice(:id, :slug))
+      response.header['Link'] = %(<#{canonical}>; rel="canonical")
+    end
+
   end
 end

data/app/helpers/picturesque/application_helper.rb

@@ -2,13 +2,29 @@ module Picturesque
   module ApplicationHelper
 
     def picturesque_image_tag(image, size:, slug:, alt:, scales: (1..3))
-      matches = size.match(/(?<w>\d+)\D(?<h>\d+)/)
-      w , h = Integer(matches[:w]) , Integer(matches[:h])
+      matches = size.match(/(?<width>\d+)\D(?<height>\d+)/)
+      width = Integer(matches[:width])
+      height = Integer(matches[:height])
 
-      image_tag picturesque.image_url(image, size: "#{w}x#{h}", slug: image.slug),
-        srcset: scales.map { |s| "#{picturesque.image_url(image, size: "#{w * s}x#{h * s}", slug: slug)} #{s}x" }.join(','),
-        size: "#{w}×#{h}", alt: alt
+      image_tag(
+        picturesque_src(image, width: width, height: height, slug: slug),
+        srcset: picturesque_srcset(image, scales: scales, width: width, height: height, slug: slug),
+        size: "#{width}×#{height}", alt: alt
+      )
     end
 
+    def picturesque_srcset(image, scales:, width:, height:, slug:)
+      picturesque_srcs(image, scales: scales, width: width, height: height, slug: slug).join(',')
+    end
+
+    def picturesque_srcs(image, scales:, width:, height:, slug:)
+      scales.map do |scale|
+        "#{picturesque_src(image, width: width * scale, height: height * scale, slug: slug)} #{scale}x"
+      end
+    end
+
+    def picturesque_src(image, width:, height:, slug:)
+      picturesque.image_url(image, size: "#{width}×#{height}", slug: slug)
+    end
   end
 end

data/app/models/picturesque/image.rb

@@ -2,41 +2,43 @@ module Picturesque
   class Image
     include ActiveModel::Model
 
-    DISPOSITION = "inline".freeze
+    DISPOSITION = 'inline'.freeze
 
     module Format
-      JPG = "jpg".freeze
-      PNG = "png".freeze
-      GIF = "gif".freeze
+      JPG = 'jpg'.freeze
+      PNG = 'png'.freeze
+      GIF = 'gif'.freeze
     end
 
     module Quality
-      HIGH = 90.freeze
+      HIGH = 90
     end
 
     attr_accessor :url
 
+    def self.find(params)
+      Picturesque.config.find.call(params)
+    end
+
     def initialize(url)
       self.url = url
     end
 
     def process(size: nil, quality: nil, format: nil)
-      MiniMagick::Image.open(self.url).format(format || Format::JPG) do |file|
+      MiniMagick::Image.open(url).format(format || Format::JPG) do |file|
         file.quality(quality || Quality::HIGH)
-
-        if size
-          w,h = size.split("x")
-          if w && Integer(w) > 0 && h && Integer(h) > 0
-            file.resize("#{w}x#{h}^")
-            file.gravity "center"
-            file.extent "#{w}x#{h}"
-          end
-        end
+        resize(file: file, size: size) if size
       end
     end
 
-    def self.find(params)
-      Picturesque.config.find.call(params)
+  private
+
+    def resize(file:, size:)
+      width, height = size.split('x')
+      return unless width && Integer(width).positive? && height && Integer(height).positive?
+      file.resize("#{width}x#{height}^")
+      file.gravity 'center'
+      file.extent "#{width}x#{height}"
     end
 
   end

data/config/routes.rb

@@ -3,7 +3,7 @@ Picturesque::Engine.routes.draw do
   get ':id(/:size)(/:quality)(/:slug).:format', to: 'images#show', as: :image, constraints: {
     size: /\d+x\d+/,
     quality: /\d{2}/,
-    format: /(bmp|bpg|gif|jpg|jpe|jpeg|png|webp)/
-    }, defaults: { quality: Picturesque::Image::Quality::HIGH, format: Picturesque::Image::Format::JPG }
+    format: /(bmp|bpg|gif|jpg|jpe|jpeg|png|webp)/,
+  }, defaults: { quality: Picturesque::Image::Quality::HIGH, format: Picturesque::Image::Format::JPG }
 
 end

data/lib/picturesque.rb

@@ -1,16 +1,16 @@
-require "mini_magick"
+require 'mini_magick'
 
-require "picturesque/engine"
-require "picturesque/config"
+require 'picturesque/engine'
+require 'picturesque/config'
 
 module Picturesque
 
   def self.config
-    @@config ||= Picturesque::Config.new
+    @config ||= Picturesque::Config.new
   end
 
   def self.setup(&block)
-    block.call(self.config)
+    block.call(config)
   end
 
 end

data/lib/picturesque/version.rb

@@ -1,3 +1,3 @@
 module Picturesque
-  VERSION = "1.0.1"
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picturesque
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slim-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: slim-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,7 +102,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- README.rdoc
 - Rakefile
 - app/assets/javascripts/picturesque/application.js
 - app/assets/stylesheets/picturesque/application.css
@@ -126,12 +111,10 @@ files:
 - app/models/picturesque/image.rb
 - app/views/layouts/picturesque/application.html.erb
 - config/routes.rb
-- db/migrate/20141218101647_create_picturesque_images.rb
 - lib/picturesque.rb
 - lib/picturesque/config.rb
 - lib/picturesque/engine.rb
 - lib/picturesque/version.rb
-- lib/tasks/picturesque_tasks.rake
 homepage: https://github.com/ksylvest/picturesque
 licenses:
 - MIT
@@ -151,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Picturesque makes image resizing simple

data/README.rdoc

@@ -1,83 +0,0 @@
-= Picturesque
-
-Picturesque is an engine for resizing and formatting images on the fly. It makes generating responsive images a snap:
-
-    <%= picturesque_image_tag(image, slug: image.slug, alt: image.name, size: '160x160') %>
-
-    <img alt="Steve Jobs and Bill Gates" height=160 width=160
-         src="https://.../picturesque/1/160x160/steve-jobs-and-bill-gates.jpg"
-      srcset="https://.../picturesque/1/160x160/steve-jobs-and-bill-gates.jpg 1x,
-              https://.../picturesque/1/320x320/steve-jobs-and-bill-gates.jpg 2x,
-              https://.../picturesque/1/480x480/steve-jobs-and-bill-gates.jpg 3x" />
-
-== Requirements
-
-The gem is tested with:
-
-* Ruby on Rails 4.2.5.1
-* Ruby 2.3.0
-* JRuby 9.0.4.0
-
-== Installation
-
-  gem install picturesque
-
-== Additional
-
-  brew install imagemagick
-
-== Configuration
-
-  # config/initializers/picturesque.rb
-  Picturesque.setup do |config|
-    config.find = -> (params) { Picturesque::Image.new(Image.find(params[:id]).url) }
-  end
-
-== Examples
-
-=== Migration
-
-  rails g model image url:string name:string
-
-  class CreateImage < ActiveRecord::Migration
-    def self.up
-      create_table :images do |t|
-        t.string :url, presence: true, index: { unique: true }
-        t.string :name, presence: true, index: { unique: true }
-
-        t.timestamps
-      end
-    end
-
-    def self.down
-      drop_table :images
-    end
-  end
-
-=== Model
-
-  class Image < ActiveRecord::Base
-    validates :name, presence: true, uniqueness: true
-    validates :url, presence: true, uniqueness: true
-
-    def slug
-      name.parameterize if name
-    end
-  end
-
-=== View
-
-  <%- @images.each do |image| -%>
-  <%= picturesque_image_tag(image, slug: image.slug, alt: image.name, size: '160x160') %>
-  <%- end -%>
-
-== Status
-
-{<img src="https://img.shields.io/gemnasium/ksylvest/picturesque.svg" />}[https://gemnasium.com/ksylvest/picturesque]
-{<img src="https://img.shields.io/travis/ksylvest/picturesque.svg" />}[https://travis-ci.org/ksylvest/picturesque]
-{<img src="https://img.shields.io/coveralls/ksylvest/picturesque.svg" />}[https://coveralls.io/r/ksylvest/picturesque]
-{<img src="https://img.shields.io/codeclimate/github/ksylvest/picturesque.svg" />}[https://codeclimate.com/github/ksylvest/picturesque]
-
-== Copyright
-
-Copyright (c) 2014 - 2016 Kevin Sylvestre. See LICENSE for details.

data/db/migrate/20141218101647_create_picturesque_images.rb

@@ -1,8 +0,0 @@
-class CreatePicturesqueImages < ActiveRecord::Migration
-  def change
-    create_table :picturesque_images do |t|
-
-      t.timestamps null: false
-    end
-  end
-end

data/lib/tasks/picturesque_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :picturesque do
-#   # Task goes here
-# end