presto 0.0.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9124e378a7b3b0f59475c54788e8824253fcbf9e
-  data.tar.gz: dda68438585b0fb4a1c55d2195b72725de6f2ba3
+  metadata.gz: c18ef6485c81c5391cedf8c73bd98cc28642879f
+  data.tar.gz: c2dd380877ac9bc145cdda90cae8f4675f7f8348
 SHA512:
-  metadata.gz: 9f6f23a0791b28f5c8f0fe962d76abbd81d5ce8b5467c8c79002d3fc7f0871d8c15b46113867caca7b43561a0735c651992c8a17ab8bd647e150de4c0bd3d816
-  data.tar.gz: e120f3060c2a3a97f2652d2e9d5097ffde3ac0b9dd7d071c9ccc7f3edb6673b437b042317c0691caef221d9eb492c60b9441e14a9b4301673655d00df42acda4
+  metadata.gz: 9ae8f94ff4999b672dd23dffbb8d8509bfcc349749a77f20b78157b05dd32969e7a3b5db605f2584dd8a27406d21956cf07f8629f06cb5e6272cdb4810c82400
+  data.tar.gz: df0be1a885b6edda4c47cab7c6980550477f1cf3a54fa3aa6a133be5890107479fa35e5b28bfc278c277ed2f723ad09cada844f829702beab24bbc7620e0de49

data/lib/presto/mini_magick.rb

@@ -9,30 +9,32 @@ module Presto
 				new(params).process(image)
 			end
 			
-			attr_reader :params
+			attr_reader :transformation
 
 			def initialize params={}
-				@params = ::Presto::Transformation.new(params).tap{ |t| t.validate! }
+				@transformation = ::Presto::Transformation.new(params)
 			end
 
 			def process image
-				process_fit(image) if params[:w] || params[:h]
-				process_format(image) if params[:fm]
-				process_quality(image) if params[:q]
+				return image if trans.empty?
+				trans.validate!
+				process_fit(image) if trans[:w] || trans[:h]
+				process_format(image) if trans[:fm]
+				process_quality(image) if trans[:q]
 				image
 			end
 
 			private
 
 			def process_fit image
-				send("process_#{params[:fit]}_fit", image)
+				send("process_#{trans[:fit]}_fit", image)
 			end
 
 			def process_crop_fit image
 				d = replaced_dimensions(image)
 				image.combine_options do |cmd|
 					cmd.resize "#{d.width}x#{d.height}^"
-					cmd.background params[:bg]
+					cmd.background trans[:bg]
 					cmd.gravity 'Center'
 					cmd.extent "#{d.width}x#{d.height}"
 				end
@@ -57,34 +59,38 @@ module Presto
 				d = replaced_dimensions(image)
 				image.combine_options do |cmd|
 					cmd.resize "#{d.width}x#{d.height}"
-					cmd.background params[:bg]
+					cmd.background trans[:bg]
 					cmd.gravity 'Center'
 					cmd.extent "#{d.width}x#{d.height}"
 				end
 			end
 
 			def process_format image
-				image.format params[:fm]
+				image.format trans[:fm]
 			end
 
 			def process_quality image
-				image.quality params[:q]
+				image.quality trans[:q]
 			end
 
 			def resized_dimensions image
-				::Presto::Dimensions.resize(image[:width], image[:height], params[:w], params[:h])
+				::Presto::Dimensions.resize(image[:width], image[:height], trans[:w], trans[:h])
 			end
 
 			def replaced_dimensions image
-				w = params[:w] || image[:width]
-				h = params[:h] || image[:height]
+				w = trans[:w] || image[:width]
+				h = trans[:h] || image[:height]
 				::Presto::Dimensions.new w, h
 			end
+
+			def trans
+				transformation
+			end
 		end
 
 		module Extension
-			def presto params={}
-				::Presto::MiniMagick::Processor.new(params).process(self)
+			def presto transformation={}
+				::Presto::MiniMagick::Processor.process(self, transformation)
 			end
 		end
 	end

data/lib/presto/transformation/validator.rb

@@ -1,6 +1,5 @@
 require 'presto'
-require 'presto/exceptions'
-require 'presto/errors'
+require 'veto'
 
 module Presto
 	class Transformation
@@ -8,126 +7,30 @@ module Presto
 			HEXDECIMAL_ALPHA_REGEX = /^#[a-fA-F0-9]{8}$/
 			HEXDECIMAL_LONG_REGEX = /^#[a-fA-F0-9]{6}$/
 			HEXDECIMAL_SHORT_REGEX = /^#[a-fA-F0-9]{3}$/
-
 			FIT_TYPES = %w(clip crop scale fill max).freeze
 			QUALITY_MAX = 100
 			QUALITY_MIN = 1
 
-			attr_reader :record, :errors
-
-			def initialize record
-				@record = record
-			end
+			include Veto.validator
 
-			def valid?
-				validate
-				errors.empty?
+			def self.config
+				Presto.configuration
 			end
 
-			def validate!
-				raise(::Presto::InvalidTransformation, errors.full_messages.join(", ")) unless valid?
-				true
-			end
+			validates :w, :greater_than_or_equal_to => config.min_width, :less_than_or_equal_to => config.max_width, :unless => "w.nil?"
+			validates :h, :greater_than_or_equal_to => config.min_height, :less_than_or_equal_to => config.max_height, :unless => "h.nil?"
+			validates :fit, :presence => true, :inclusion => FIT_TYPES
+			validate :validate_bg_format, :unless => "bg.nil?"
+			validates :fm, :inclusion => config.extension_white_list, :unless => "fm.nil?"
+			validates :q, :greater_than_or_equal_to => QUALITY_MIN, :less_than_or_equal_to => QUALITY_MAX, :unless => "q.nil?"
 
 			private
 
-			def validate
-				@errors = Errors.new
-				validate_width_max_size! unless record.w.nil?
-				validate_width_min_size! unless record.w.nil?
-				validate_height_max_size! unless record.h.nil?
-				validate_height_min_size! unless record.h.nil?
-				validate_fit_presence!
-				validate_fit_inclusion!
-				validate_bg_format! unless record.bg.nil?
-				validate_format_inclusion! unless record.fm.nil?
-				validate_quality_max_size! unless record.q.nil?
-				validate_quality_min_size! unless record.q.nil?
-			end
-
-			def validate_width_max_size!
-				if record.w > max_width
-					errors.add(:w, "must be equal to or less than #{max_width}")
-				end
-			end
-
-			def validate_width_min_size!
-				if record.w < min_width
-					errors.add(:w, "must be equal to or greater than #{min_width}")
-				end
-			end
-
-			def validate_height_max_size!
-				if record.h > max_height
-					errors.add(:h, "must be equal to or less than #{max_height}")
-				end
-			end
-
-			def validate_height_min_size!
-				if record.h < min_height
-					errors.add(:h, "must be equal to or greater than #{min_height}")
-				end
-			end
-		
-			def validate_fit_presence!
-				if record.fit.nil? || record.fit.empty?
-					errors.add(:fit, "can't be blank")
-				end
-			end
-
-			def validate_fit_inclusion!
-				unless FIT_TYPES.include?(record.fit)
-					errors.add(:fit, "is not valid")
-				end
-			end
-
-			def validate_bg_format!
-				unless record.bg =~ HEXDECIMAL_LONG_REGEX || record.bg =~ HEXDECIMAL_SHORT_REGEX || record.bg =~ HEXDECIMAL_ALPHA_REGEX 
+			def validate_bg_format
+				unless entity.bg =~ HEXDECIMAL_LONG_REGEX || entity.bg =~ HEXDECIMAL_SHORT_REGEX || entity.bg =~ HEXDECIMAL_ALPHA_REGEX 
 					errors.add(:bg, "is not valid")
 				end
 			end
-
-			def validate_format_inclusion!
-				unless extension_white_list.include?(record.fm)
-					errors.add(:fm, "is not valid")
-				end
-			end
-
-			def validate_quality_max_size!
-				if record.q > QUALITY_MAX
-					errors.add(:q, "must be equal to or less than #{QUALITY_MAX}")
-				end
-			end
-
-			def validate_quality_min_size!
-				if record.q < QUALITY_MIN
-					errors.add(:q, "must be equal to or greater than #{QUALITY_MIN}")
-				end
-			end
-
-			def min_width
-				config.min_width
-			end
-
-			def max_width
-				config.max_width
-			end
-
-			def min_height
-				config.min_height
-			end
-
-			def max_height
-				config.max_height
-			end
-
-			def extension_white_list
-				config.extension_white_list
-			end
-
-			def config
-				Presto.configuration
-			end
 		end
 	end
 end

data/lib/presto/transformation.rb

@@ -1,33 +1,53 @@
 require 'presto/transformation/validator'
+require 'veto'
 
 module Presto
 	class Transformation
-		extend Forwardable
+		DEFAULT_BG = "#ffffff00"
+		DEFAULT_FIT = 'clip'
 
-		def_delegators :validator, :validate!, :valid?
+		include Veto.model(Validator)
 
-		attr_reader :w, :h, :fit, :fm, :bg, :q
-
-		def initialize args={}
-			defaults = {:fit => 'clip', :bg => 'ffffff00'}
-			params = defaults.merge(args)
-
-			@bg = "##{params[:bg]}" if params.key?(:bg)
-			@fit = params[:fit]
-			@fm = params[:fm]
-			@h = params[:h].to_i if params.key?(:h)
-			@w = params[:w].to_i if params.key?(:w)
-			@q = params[:q].to_i if params.key?(:q)
+		def initialize params={}
+			@params = params
 		end
 
 		def [] val
 			send(val)
 		end
 
+		def bg
+			params.key?(:bg) ? "##{params[:bg]}" : DEFAULT_BG
+		end
+
+		def fit
+			params[:fit] || DEFAULT_FIT
+		end
+
+		def fm
+			params[:fm]
+		end
+
+		def h
+			params[:h].to_i if params.key?(:h)
+		end
+
+		def w
+			params[:w].to_i if params.key?(:w)
+		end
+
+		def q
+			params[:q].to_i if params.key?(:q)
+		end
+
+		def empty?
+			params.empty?
+		end
+
 		private
 
-		def validator
-			::Presto::Transformation::Validator.new(self)
+		def params
+			@params
 		end
 	end
 end

data/lib/presto/version.rb

@@ -1,3 +1,3 @@
 module Presto
-  VERSION = "0.0.1"
+  VERSION = "0.6.0"
 end

data/presto.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "veto", "~> 0.1.2"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "guard-minitest", "~> 1.0.1"
   spec.add_development_dependency "mocha", "~> 0.14.0"
   spec.add_development_dependency "mini_magick", "~> 3.6.0"
 end

data/spec/mini_magick/processor_spec.rb

@@ -5,11 +5,11 @@ describe Presto::MiniMagick::Processor do
 	let(:file) { ::File.open(File.expand_path('../../fixtures/images/test.gif', __FILE__)) }
 	let(:image) { ::MiniMagick::Image.open(file.path) }
 
-	describe "#initalize" do
-		describe "when params are not valid" do
+	describe "#process" do
+		describe "when transformation is not valid" do
 			it "raises error" do
-				e = proc{ Presto::MiniMagick::Processor.new(:fm => 'xml') }.must_raise(::Presto::InvalidTransformation)
-				e.message.must_equal 'fm is not valid'
+				e = proc{ Presto::MiniMagick::Processor.new(:fm => 'xml').process(image) }.must_raise(Veto::InvalidEntity)
+				e.message.must_include "fm is not in set: [\\\"jpg\\\", \\\"png\\\"]\""
 			end
 		end
 	end

data/spec/spec_helper.rb

@@ -1,2 +1,6 @@
 require 'minitest/autorun'
-require 'mocha/setup'
+require 'mocha/setup'
+
+def context *args, &block
+	describe *args, &block
+end

data/spec/transformation/validator_spec.rb

@@ -11,125 +11,74 @@ describe Presto::Transformation::Validator do
 	let(:transformation) { stub(:w => w, :h => h, :fit => fit, :bg => bg, :fm => fm, :q => q) }
 	let(:validator){ Presto::Transformation::Validator.new(transformation) }
 
-	describe "#validate!" do
-		describe "when valid" do
-			it "returns true" do
-				validator.validate!.must_equal true
-			end
-		end
-
-		describe "when w is nil" do
-			let(:w) { nil }
-
-			it "does not raise error" do
-				validator.validate!.must_equal true
-			end
-		end
-
-		describe "when w is greater than max w" do
-			let(:w) { Presto.configuration.max_width + 1 }
-
-			it "raises error" do
-				e = proc { validator.validate! }.must_raise(Presto::InvalidTransformation)
-				e.message.must_match "w must be equal to or less than"
-			end
-		end
-
-		describe "when w is less than min w" do
-			let(:w) { Presto.configuration.min_width - 1 }
-
-			it "raises error" do
-				e = proc { validator.validate! }.must_raise(Presto::InvalidTransformation)
-				e.message.must_match "w must be equal to or greater than"
-			end
-		end
-
-		describe "when h is nil" do
-			let(:h) { nil }
-
-			it "does not raise error" do
-				validator.validate!.must_equal true
-			end
-		end
-
-		describe "when h is greater than max h" do
-			let(:h) { Presto.configuration.max_height + 1 }
-
-			it "raises error" do
-				e = proc { validator.validate! }.must_raise(Presto::InvalidTransformation)
-				e.message.must_match "h must be equal to or less than"
-			end
-		end
-
-		describe "when h is less than min h" do
-			let(:h) { Presto.configuration.min_height - 1 }
-
-			it "raises error" do
-				e = proc { validator.validate! }.must_raise(Presto::InvalidTransformation)
-				e.message.must_match "h must be equal to or greater than"
-			end
-		end
-
-		describe "when fit is nil" do
-			let(:fit) { nil }
-
-			it "raises error" do
-				e = proc { validator.validate! }.must_raise(Presto::InvalidTransformation)
-				e.message.must_match "fit can't be blank"
-			end
-		end
-
-		describe "when fit is invalid" do
-			let(:fit) { 'blah' }
-
-			it "raises error" do
-				e = proc { validator.validate! }.must_raise(Presto::InvalidTransformation)
-				e.message.must_match "fit is not valid"
-			end
-		end
-
-		describe "when bg is wrong formal" do
-			let(:bg) { 'fhff' }
-
-			it "raises error" do
-				e = proc { validator.validate! }.must_raise(Presto::InvalidTransformation)
-				e.message.must_match "bg is not valid"
-			end
-		end
-
-		describe "when fm is invalid" do
-			let(:fm) { 'tif' }
-
-			it "raises error" do
-				e = proc { validator.validate! }.must_raise(Presto::InvalidTransformation)
-				e.message.must_match "fm is not valid"
-			end
-		end
-
-		describe "when q is nil" do
-			let(:q) { nil }
-
-			it "does not raise error" do
-				validator.validate!.must_equal true
-			end
-		end
-
-		describe "when q is greater than max q" do
-			let(:q) { ::Presto::Transformation::Validator::QUALITY_MAX + 1 }
-
-			it "raises error" do
-				e = proc { validator.validate! }.must_raise(Presto::InvalidTransformation)
-				e.message.must_match "q must be equal to or less than #{::Presto::Transformation::Validator::QUALITY_MAX}"
-			end
-		end
-
-		describe "when q is less than min q" do
-			let(:q) { ::Presto::Transformation::Validator::QUALITY_MIN - 1 }
-
-			it "raises error" do
-				e = proc { validator.validate! }.must_raise(Presto::InvalidTransformation)
-				e.message.must_match "q must be equal to or greater than #{::Presto::Transformation::Validator::QUALITY_MIN}"
-			end
-		end
+	let(:errors) { validator.valid?; validator.errors }
+
+	context 'when valid' do
+		it { errors.must_be_empty }
+	end
+
+	context 'when w is nil' do
+		let(:w) { nil }
+		it { errors.must_be_empty }
+	end
+
+	context "when w is greater than max w" do
+		let(:w) { Presto.configuration.max_width + 1 }
+		it { errors[:w].must_include "must be less than or equal to 2000" }
+	end
+
+	context "when w is greater than max w" do
+		let(:w) { Presto.configuration.min_width - 1 }
+		it { errors[:w].must_include "must be greater than or equal to 1" }
+	end
+
+	context 'when h is nil' do
+		let(:h) { nil }
+		it { errors.must_be_empty }
+	end
+
+	context 'when h is greater than max h' do
+		let(:h) { Presto.configuration.max_width + 1 }
+		it { errors[:h].must_include "must be less than or equal to 2000" }
+	end
+
+	context 'when h is greater than max h' do
+		let(:h) { Presto.configuration.min_width - 1 }
+		it { errors[:h].must_include "must be greater than or equal to 1" }
+	end
+
+	context 'when fit is nil' do
+		let(:fit) { nil }
+		it { errors[:fit].must_include "is not present" }
+	end
+
+	context 'when fit is invalid' do
+		let(:fit) { 'blah' }
+		it { errors[:fit].must_include "is not in set: [\"clip\", \"crop\", \"scale\", \"fill\", \"max\"]" }
+	end
+
+	context 'when bg is wrong format' do
+		let(:bg) { 'fhff' }
+		it { errors[:bg].must_include "is not valid" }
+	end
+
+	context 'when fm is invalid' do
+		let(:fm) { 'tif' }
+		it { errors[:fm].must_include "is not in set: [\"jpg\", \"png\"]" }
+	end
+
+	context 'when q is nil' do
+		let(:q) { nil }
+		it { errors[:q].must_be_nil }
+	end
+
+	context "when q is greater than max q" do
+		let(:q) { ::Presto::Transformation::Validator::QUALITY_MAX + 1 }
+		it { errors[:q].must_include "must be less than or equal to 100" }
+	end
+
+	context "when q is less than min q" do
+		let(:q) { ::Presto::Transformation::Validator::QUALITY_MIN - 1 }
+		it { errors[:q].must_include "must be greater than or equal to 1" }
 	end
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: presto
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: veto
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: 0.1.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -146,3 +146,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/transformation/validator_spec.rb
 - spec/transformation_spec.rb
+has_rdoc: