light_resizer 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f9da4815c65b5008c9d4c74001dc936ec747345
-  data.tar.gz: 20eee44a94471ee5e82465d1db90cab5e771a3c6
+  metadata.gz: b76f9ca9dac0e858dc5685b89384519631138d9a
+  data.tar.gz: db86d17a4b10a770456959f9903913fcefdf92f9
 SHA512:
-  metadata.gz: b3455cf873d8f53267062c83d9f2813cd2b7bb5146a5363dafa3ba6f935b86273cd18a38b9d2f483de7f91c24b6698bdb4f5c40c045b055674546a95a78ac9f5
-  data.tar.gz: ea80db8b2d6d8dce3d826eae8bef9e54a415ce29cf39fb3a5bd7044691e3fab0175a70165511ecb6d308b3232f8bc8e1e5471d7e9d86dd72679979e0c51a0296
+  metadata.gz: 3440f1e37a3de3e0fa4de3e41c487c676eccb776360960cff5e45ad3fe6e7679875ea8148132cabcd9d9261de8feda1f93520edf205c26fc6245927f5abc5c61
+  data.tar.gz: 05848c633240e9f965168b82403c755acfe43fd0642e05d996ce1e061da3458552c4383f2b78c213d9f98be06459b5ea886bd3b9d3d4538c75c671d3db13cf11

data/Gemfile

@@ -1,4 +1,16 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in light_resizer.gemspec
-gemspec
+gemspec
+
+# Development gems
+group :development, :test do
+  gem 'rails'
+  gem 'capybara'
+  gem 'bundler'
+  gem 'rake'
+  gem 'rspec'
+  gem 'coveralls'
+  gem 'pry'
+  gem 'carrierwave'
+end

data/README.md

@@ -24,21 +24,11 @@ For example we have image in public folder by next url:
 
 Url of resized image will be:
 
->example.com/images/**light_resize/100x150_kitten.jpg**
+>example.com/images/**light_resize/100x150/kitten.jpg**
 
 light_resizer will find */public/images/kitten.jpg* and create *light_resize* with resized to size of 100x150px image.
 
-If you change extension of original image:
-
->example.com/images/light_resize/100x150_kitten.**png**
-
-light_resize will convert image to a new extension.
-
 Default resize doesn't crop image and fill new space with transparent background.
 
 To crop image use '*crop*' in url:
->example.com/images/light_resize/100x150_crop_kitten.png
-
-
-
-
+>example.com/images/light_resize/crop/100x150/kitten.png

data/lib/light_resizer.rb

@@ -1,8 +1,20 @@
 require 'light_resizer/version'
+require 'light_resizer/resizer'
+require 'light_resizer/dimension_not_found'
 require 'light_resizer/middleware'
 require 'light_resizer/carrierwave_resize'
-require 'RMagick'
+require 'rmagick'
+require 'image_optimizer'
+require 'configurations'
 
 module LightResizer
 
-end
+  include Configurations
+
+  configurable Array, :allowed_dimensions
+
+  configuration_defaults do |default_config|
+    default_config.allowed_dimensions = []
+  end
+
+end

data/lib/light_resizer/carrierwave_resize.rb

@@ -2,32 +2,19 @@ module LightResizer
   module CarrierWaveResize
 
     def resize_without_crop(width, height)
-      filename_prefix = "#{width}x#{height}_"
-      resized_image_path(filename_prefix, 'png')
+      resized_image_path(width, height, false)
     end
 
     alias_method :resize, :resize_without_crop
 
     def resize_with_crop(width, height)
-      filename_prefix = "#{width}x#{height}_crop_"
-      resized_image_path(filename_prefix)
+      resized_image_path(width, height, true)
     end
 
-    def crop(image_path, x, y, width, height)
-      image = ::Magick::Image.read(image_path).first
-      image.crop!(x.to_i, y.to_i, width.to_i, height.to_i)
-      image.write("#{Rails.root}/tmp/cache/#{x}_#{y}_#{width}_#{height}_#{/([^\/]*)$/.match(image_path)[1]}")
-      File.open(image.filename)
-    end
-
-    private
+    protected
 
-    def resized_image_path(prefix, extension = 'png')
-      if url
-        filename = File.basename(url, '.*')
-        new_filename = "#{prefix}#{filename}.#{extension}"
-        File.join(File.dirname(url), 'light_resize', new_filename)
-      end
+    def resized_image_path(width, height, with_crop)
+      File.join(File.dirname(url), 'light_resizer', with_crop ? 'crop' : '', "#{width}x#{height}", file.filename) if url
     end
 
   end

data/lib/light_resizer/dimension_not_found.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+module LightResizer
+  class DimensionNotFound < Exception
+
+  end
+end

data/lib/light_resizer/middleware.rb

@@ -1,47 +1,23 @@
 # encoding: utf-8
-require 'light_resizer/image_loader'
-require 'light_resizer/middleware/path'
-require 'light_resizer/middleware/resizer'
-
 module LightResizer
   class Middleware
 
-    def initialize(app, root, folder = 'public')
-      @app           = app
-      @image_loader  = LightResizer::ImageLoader.new File.join(root, folder)
-      @path          = LightResizer::Middleware::Path.new
-      @resizer       = LightResizer::Middleware::Resizer.new
+    def initialize(app, root)
+      @app = app
+      @public_path = app.try(:public_path) || "#{root}/public"
     end
 
     def call(env)
-      @path.request_path = env['PATH_INFO']
-      if @path.image_path? and resize_request?
-      	resize
-      	Rack::File.new(@image_loader.resized.root_dir).call(env) #todo check
-      else
-      	@app.call(env)
-      end
-
-    end
-
-    def resize_request?
-        @image_loader.original_image_path = @path.image_path
-        @image_loader.resize_prefix = @path.prefix
-        @image_loader.original_image_exist?
+      resize_options = env['PATH_INFO'].match resize_url_regex
+      LightResizer::Resizer.new(@public_path, resize_options).process unless resize_options.nil?
+      @app.call(env)
     end
 
-    private
+    protected
 
-    def resize
-      @resizer.resize(
-        @path.dimensions,
-        @image_loader.original_path,
-        @image_loader.resize_path,
-        @path.crop_path?,
-        @path.image_extension,
-        @path.convert_path?
-      ) unless @image_loader.resized_image_exist?
+    def resize_url_regex
+      /^(?<directory>\/.+?)\/light_resizer\/(?<crop>crop\/)?(?<width>\d+)x(?<height>\d+)\/(?<image>[^\/]+)$/
     end
 
   end
-end
+end

data/lib/light_resizer/resizer.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+module LightResizer
+  class Resizer
+
+    def initialize(public_path, options)
+      @public_path = public_path
+      @options = options
+    end
+
+    def process
+      return if image_exists?
+      resize_or_crop
+      create_directory
+      save_image
+    end
+    
+    protected
+
+    def image_exists?
+      File.exists? full_path
+    end
+
+    def resize_or_crop
+      check_allowed_dimension
+      @options[:crop].nil? ? resize : crop
+    end
+
+    def check_allowed_dimension
+      unless LightResizer.configuration.allowed_dimensions.empty? || LightResizer.configuration.allowed_dimensions.include?([width, height])
+        raise DimensionNotFound, "Dimension #{width}x#{height} is not allowed"
+      end
+    end
+
+    def crop
+      image.resize_to_fill! width, height
+    end
+
+    def resize
+      image.resize_to_fit! width, height
+      image.background_color = 'Transparent'
+      # does not work with simple gravity
+      @image = image.extent width, height, (image.columns - width) / 2, (image.rows - height) / 2
+    end
+    
+    def create_directory
+      directory_name = File.dirname(full_path)
+      FileUtils.mkpath(directory_name) unless Dir.exist? directory_name
+    end
+    
+    def save_image
+      image.write full_path
+      ImageOptimizer.new(full_path, quiet: true).optimize
+    end
+
+    def image
+      @image ||= ::Magick::Image.read("#{@public_path}#{@options[:directory]}/#{@options[:image]}").first
+    end
+
+    def full_path
+      @full_path ||= "#{@public_path}#{@options}"
+    end
+
+    def width
+      @width ||= @options[:width].to_i
+    end
+
+    def height
+      @height ||= @options[:height].to_i
+    end
+
+  end
+end

data/lib/light_resizer/version.rb

@@ -1,3 +1,3 @@
 module LightResizer
-  VERSION = '0.1.7'
-end
+  VERSION = '0.2.0'
+end

data/light_resizer.gemspec

@@ -18,12 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rmagick', '~> 2.13'
-  spec.add_dependency 'rack', '~> 1.5'
+  spec.add_dependency 'rmagick'
+  spec.add_dependency 'rack'
+  spec.add_dependency 'image_optimizer', '~> 1.3.0'
+  spec.add_dependency 'configurations', '~> 2.2.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'pry'
-end
+end

data/spec/dummy/.gitignore

@@ -0,0 +1,17 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
+/log/

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__)
+
+Rails.application.load_tasks

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

@@ -0,0 +1,16 @@
+// 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 jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require_tree .

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

@@ -0,0 +1,15 @@
+/*
+ * 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 bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

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/uploaders/photo_uploader.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+class PhotoUploader < CarrierWave::Uploader::Base
+  include ::LightResizer::CarrierWaveResize
+
+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 ruby
+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 ruby
+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 ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end