rails_imager 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b546f1f66157369214f3bc2013c61ad0140d8ea7
-  data.tar.gz: 56b8886cbca53177aaf22f08fc0f5d632bfb9470
+  metadata.gz: f04126925985bb64dc3e56a9260c42bacf152dad
+  data.tar.gz: c1221e0713d7640f147139272ea0f578a0fd8e09
 SHA512:
-  metadata.gz: 759b9ed42a830f1d8144cc678d1f375a4a643ac1658fab938bff1ed784abd032ce04e851b3f524059dbe59a4e7f048a0d123dae8d1b5c83e61df504b273bb845
-  data.tar.gz: c0baff05c3c1c8c139f71444cefd9060b0f49e81d3da44d37d2167b9c10511880ee777c2e3fe2f8a1642cf25a993e7d3112988a1bccccb2d3450e362e464c0cd
+  metadata.gz: c45f32971ceb7439d753ced646a807ce954a65bc10e953617a55ef7a6207123cecc6e63dff07b1f03aca53f6421d76896ed8a84cf25bd97d529133e0d1721214
+  data.tar.gz: b0e2f3664caa12cca9d5b78739e6883b9ce3378bed3b466d83c64184ca201ee4d9a9643f212cd1d8b87fde9fb6555834ebaec55d926a3e5e1981863da46f219a

data/app/controllers/rails_imager/images_controller.rb

@@ -1,5 +1,11 @@
+# encoding: utf-8
 class RailsImager::ImagesController < ApplicationController
   PARAMS_ARGS = [:width, :height, :smartsize, :maxwidth, :maxheight, :rounded_corners, :border, :border_color, :force]
+  URI_REPLACES = {
+    "%C3%A6" => "æ",
+    "%C3%B8" => "ø",
+    "%C3%A5" => "å"
+  }
 
   def show
     set_and_validate_parameters
@@ -10,16 +16,21 @@ class RailsImager::ImagesController < ApplicationController
     set_headers
 
     if not_modified? && !force?
-      render :nothing => true, :status => "304 Not Modified"
+      render nothing: true, status: "304 Not Modified"
     else
-      send_file @cache_path, :type => "image/png", :disposition => "inline", :filename => "picture.png"
+      send_file @cache_path, type: "image/png", disposition: "inline", filename: "picture.png"
     end
   end
 
 private
 
   def set_path
-    @path = "#{Rails.public_path}/#{params[:id]}"
+    id = params[:id]
+    URI_REPLACES.each do |key, val|
+      id = id.gsub(key, val)
+    end
+
+    @path = "#{Rails.public_path}/#{id}"
     @full_path = File.realpath(@path)
     validate_path
   end
@@ -190,7 +201,7 @@ private
   def apply_rounded_corners
     @image = @image.clone
     @image.format = "png" # Needs PNG format for transparency.
-    args = {:img => @image, :radius => @image_params[:rounded_corners].to_i}
+    args = {img: @image, radius: @image_params[:rounded_corners].to_i}
 
     if @image_params[:border] && @image_params[:border_color]
       args[:border] = @image_params[:border].to_i

data/lib/rails_imager/version.rb

@@ -1,3 +1,3 @@
 module RailsImager
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

data/spec/controllers/rails_imager/images_controller_spec.rb

@@ -0,0 +1,129 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'RMagick'
+
+describe RailsImager::ImagesController do
+  before do
+    RailsImager.config do |config|
+      config.allowed_paths << File.realpath("#{File.dirname(__FILE__)}/../../dummy/public")
+    end
+  end
+
+  it "smartsize" do
+    get :show, use_route: :rails_imager, id: "test.png", image: {smartsize: 200}
+    assert_response :success
+    assert "image/png", response.content_type
+    img = ::Magick::Image.from_blob(response.body).first
+    img.columns.should eq 200
+    img.rows.should eq 196
+  end
+
+  it "cache via expires" do
+    get :show, use_route: :rails_imager, id: "test.png", image: {smartsize: 200, rounded_corners: 8}
+    image_path = "#{Rails.public_path}/test.png"
+    response.headers["Expires"].should_not eq nil
+    assert_equal response.headers["Last-Modified"], File.mtime(image_path).httpdate
+  end
+
+  it "should not accept invalid parameters" do
+    expect {
+      get :show, use_route: :rails_imager, id: "test.png", image: {invalid_param: "kasper"}
+    }.to raise_error(ArgumentError)
+  end
+
+  it "should do exact sizes" do
+    get :show, use_route: :rails_imager, id: "test.png", image: {width: "640", height: "480"}
+    img = ::Magick::Image.from_blob(response.body).first
+    img.columns.should eq 640
+    img.rows.should eq 480
+  end
+
+  it "should work correctly with special characters" do
+    get :show, use_route: :rails_imager, id: "test_æ_%C3%B8_å.png", image: {width: 640, height: 480}
+    response.should be_success
+    img = ::Magick::Image.from_blob(response.body).first
+    img.columns.should eq 640
+    img.rows.should eq 480
+  end
+
+  it "should do rounded corners" do
+    get :show, use_route: :rails_imager, id: "test.png", image: {smartsize: "640", rounded_corners: "15", border: "1", border_color: "black"}
+
+    old_file_path = File.realpath("#{File.dirname(__FILE__)}/../../test.png")
+    old_img = Magick::Image.read(old_file_path).first
+
+    img = ::Magick::Image.from_blob(response.body).first
+    img.columns.should eq 640
+    img.rows.should eq 629
+
+    #Test that corner pixels are transparent.
+    4.times do |time|
+      pixel = img.pixel_color(time, time)
+      pixel.opacity.should eq 65535
+
+      pixel_orig = old_img.pixel_color(time, time)
+      pixel_orig.opacity.should eq 0
+    end
+
+    #Test that it got a black border.
+    pixel = img.pixel_color(2, 5)
+    pixel.red.should eq 0
+    pixel.green.should eq 0
+    pixel.blue.should eq 0
+    pixel.opacity.should eq 0
+
+    #Test that middle pixels are not transparent.
+    100.upto(200) do |time|
+      pixel = img.pixel_color(time, time)
+      pixel.opacity.should eq 0
+
+      pixel_orig = old_img.pixel_color(time, time)
+      pixel_orig.opacity.should eq 0
+    end
+  end
+
+  it "should do max width" do
+    get :show, use_route: :rails_imager, id: "test.png", image: {maxwidth: 200}
+    img = ::Magick::Image.from_blob(response.body).first
+    img.columns.should eq 200
+    img.rows.should eq 196
+  end
+
+  it "should do max height" do
+    get :show, use_route: :rails_imager, id: "test.png", image: {maxheight: 200}
+    img = ::Magick::Image.from_blob(response.body).first
+    img.rows.should eq 200
+    img.columns.should eq 203
+  end
+
+  it "should be able to generate valid cache names" do
+    get :show, use_route: :rails_imager, id: "test.png", image: {smartsize: 400}
+    assigns(:cache_name).should include "test.png__ARGS__width-_height-_smartsize-400_maxwidth-_maxheight-_rounded_corners-_border-_border_color-"
+  end
+
+  it "should be able to generate cache" do
+    get :show, use_route: :rails_imager, id: "test.png", image: {smartsize: 400, force: true}
+    assigns(:image).should_not eq nil
+    controller.instance_variable_set(:@image, nil)
+    get :show, use_route: :rails_imager, id: "test.png", image: {smartsize: 400}
+    response.code.should eq "200"
+    assigns(:image).should eq nil
+  end
+
+  it "should send not modified" do
+    old_file_path = File.realpath("#{File.dirname(__FILE__)}/../../test.png")
+
+    get :show, use_route: :rails_imager, id: "test.png", image: {smartsize: 350}
+    request.headers["If-Modified-Since"] = File.mtime(old_file_path)
+    get :show, use_route: :rails_imager, id: "test.png", image: {smartsize: 350}
+
+    response.code.should eq "304"
+  end
+
+  it "should not allow paths that havent specifically been allowed" do
+    expect {
+      get :show, use_route: :rails_imager, id: "/../config.ru", image: {smartsize: 200}
+    }.to raise_error(ArgumentError)
+  end
+end

data/spec/dummy/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/spec/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */

data/spec/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/spec/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
+  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby2.0
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby2.0
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby2.0
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/config/application.rb

@@ -0,0 +1,23 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(*Rails.groups)
+require "rails_imager"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+  end
+end
+

data/spec/dummy/config/boot.rb

@@ -0,0 +1,5 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/database.yml

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/spec/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Dummy::Application.initialize!

data/spec/dummy/config/environments/development.rb

@@ -0,0 +1,29 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+end

data/spec/dummy/config/environments/production.rb

@@ -0,0 +1,80 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Generate digests for assets URLs.
+  config.assets.digest = true
+
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+  # config.assets.precompile += %w( search.js )
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+end

data/spec/dummy/config/environments/test.rb

@@ -0,0 +1,36 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+end

data/spec/dummy/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/spec/dummy/config/initializers/filter_parameter_logging.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]

data/spec/dummy/config/initializers/inflections.rb

@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end

data/spec/dummy/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/spec/dummy/config/initializers/secret_token.rb

@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure your secret_key_base is kept private
+# if you're sharing your code publicly.
+Dummy::Application.config.secret_key_base = '38592eb56d7625dae555fe965d8bdc56bb3d186911b2b28094b88b5ddd2d19c7834c19ebc6114c7933e0a907e99faf8969947198bd0c1e4a9876071c19d72c6d'

data/spec/dummy/config/initializers/session_store.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+end
+
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end

data/spec/dummy/config/locales/en.yml

@@ -0,0 +1,23 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+en:
+  hello: "Hello world"

data/spec/dummy/config/routes.rb

@@ -0,0 +1,3 @@
+Dummy::Application.routes.draw do
+  mount RailsImager::Engine => "/rails_imager"
+end

data/spec/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Rails.application