picturesque 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a5c98f1b75feb62c9031b691cd99d8e2171677
-  data.tar.gz: c9b08b1c89bf406181c2e3e6d7f42a433a9dbd23
+  metadata.gz: f6ac8ab4b77bc4dfe83044ae0d1456f74eb963f9
+  data.tar.gz: 2bfeb9fd9b87a69548fbf28144afbc42b8bd594d
 SHA512:
-  metadata.gz: 8a43dd0921bb16f07cd06c0492403f2af7fad87f817b27ab787b63626b75c76f9feb308cfd1cb5618660e76b4993632b89a7a31203d7fe93dafbd3baef8abb22
-  data.tar.gz: 7217bf12941fe331a9090c6d4590c50d55b5f918d54d4904bdc5410e7304646f4778654f0d90590a57a9de176cb71fa74468c71bfa4bc4471efa5dfb91132937
+  metadata.gz: 3ee9c793467b1c0ae2796946ceeebb440f5b165ec19a6a992e25e0afc745343fa23a391071b47afaeb57aded8949e66726838a066ae9774afe86da1928d3a7aa
+  data.tar.gz: 03bd57d27dc7ab6dd37f5a5c0493077558811a4b28bb3b20adf6f5cb99a9b4d22624f2b812f0ffe55faba02fbfcc02aa7ab075f21c8983839c1168fd0e4f5294

data/README.rdoc

@@ -1,14 +1,22 @@
 = Picturesque
 
-Picturesque is an engine for resizing and formatting images on the fly.
+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.3
-* Ruby 2.2.2
-* JRuby 9.0.0.0
+* Ruby on Rails 4.2.5.1
+* Ruby 2.3.0
+* JRuby 9.0.4.0
 
 == Installation
 
@@ -22,39 +30,45 @@ The gem is tested with:
 
   # config/initializers/picturesque.rb
   Picturesque.setup do |config|
-    config.url -> (id) { Photo.find(id).url }
+    config.find = -> (params) { Picturesque::Image.new(Image.find(params[:id]).url) }
   end
 
 == Examples
 
-Migration:
+=== Migration
 
-  rails g model photo url:string
+  rails g model image url:string name:string
 
-  class CreatePhoto < ActiveRecord::Migration
+  class CreateImage < ActiveRecord::Migration
     def self.up
-      create_table :videos do |t|
-        t.string :url
+      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 :videos
+      drop_table :images
     end
   end
 
-Model:
+=== Model
 
-  class Photo < ActiveRecord::Base
-    validates_presence_of :url
+  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:
+=== View
 
-  <%- @photos.each do |photo| -%>
-  <%= image_tag(picturesque_image_url(photo, size: '64x64'), size: '64x64') %>
+  <%- @images.each do |image| -%>
+  <%= picturesque_image_tag(image, slug: image.slug, alt: image.name, size: '160x160') %>
   <%- end -%>
 
 == Status
@@ -66,4 +80,4 @@ View:
 
 == Copyright
 
-Copyright (c) 2014 - 2015 Kevin Sylvestre. See LICENSE for details.
+Copyright (c) 2014 - 2016 Kevin Sylvestre. See LICENSE for details.

data/app/controllers/picturesque/images_controller.rb

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

data/app/helpers/picturesque/application_helper.rb

@@ -1,4 +1,14 @@
 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])
+
+      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
+    end
+
   end
 end

data/app/models/picturesque/image.rb

@@ -12,7 +12,6 @@ module Picturesque
 
     module Quality
       HIGH = 90.freeze
-      WEAK = 10.freeze
     end
 
     attr_accessor :url
@@ -36,8 +35,8 @@ module Picturesque
       end
     end
 
-    def self.find(id)
-      new(Picturesque.config.url.call(id))
+    def self.find(params)
+      Picturesque.config.find.call(params)
     end
 
   end

data/config/routes.rb

@@ -1,6 +1,6 @@
 Picturesque::Engine.routes.draw do
 
-  get ':id(/:size)(/:quality)(/*slug)(.:format)', to: 'images#show', as: :image, constraints: {
+  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)/

data/db/migrate/20141218101647_create_picturesque_images.rb

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

data/lib/picturesque/config.rb

@@ -1,5 +1,5 @@
 module Picturesque
   class Config
-    attr_accessor :url
+    attr_accessor :find
   end
 end

data/lib/picturesque/version.rb

@@ -1,3 +1,3 @@
 module Picturesque
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picturesque
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Picturesque makes image resizing simple