rdoc/classes/Class.html rdoc/classes/Fleximage/Helper.html rdoc/files/lib/dsl_accessor_rb.html rdoc/files/lib/fleximage/helper_rb.html rdoc/files/lib/fleximage/legacy_view_rb.html test/fixtures/100x1.jpg test/fixtures/100x100.jpg test/fixtures/1x1.jpg test/fixtures/1x100.jpg test/rails_root/app/locales/de.yml test/rails_root/app/locales/en.yml test/rails_root/app/models/photo_custom_error.rb test/rails_root/config/initializers/load_translations.rb test/rails_root/tmp/fleximage/1x1.jpg test/rails_root/tmp/fleximage/1x100.jpg test/unit/i18n_messages_test.rb test/unit/minimum_image_size_test.rb @@ -1,4 +1,56 @@ -= Fleximage += I18n + +== Overview + +Uses the Rails I18n to translate error messages. +While they still can be set by using the 'missing_image_message' and 'invalid_image_message' accessors, it's better to configure them in your locale: + + en: + activerecord: + errors: + messages: + missing_image: is really required + invalid_image: seems to be broken + image_too_small: "seems to be too small, it needs to be {{minimum}} pixels" + +They can also be set on a model level: + + en: + activerecord: + errors: + models: + photo: + missing_image: needs to be attached + invalid_image: is broken + image_too_small: "is too small (should be >= {{minimum}})" + +If no message is set in your locale, the default one of the original plugin will be shown. + +== Model class accessor minimum_image_size + +If this option is set, the model validates that the image is bigger than or equal to a minimum size. + + minimum_image_size [800, 600] + +You can set one integer to 1 if you just want one dimension be checked. (E.g. [800, 1] for images wider than 799 px) + +The corresponding error message can be set either via + + image_too_small_message "too small image (min {{minimum}})" + +or as shown above via I18n. + +== Installation + +Using git: + + git submodule add git://github.com/moser/fleximage_i18n.git vendor/plugins/fleximage_i18n + +or using: + + ./script/plugin install git://github.com/moser/fleximage_i18n.git + += Fleximage (original Doc) == Overview README.rdoc @@ -117,11 +117,64 @@ module Fleximage # Require a valid image. Defaults to true. Set to false if its ok to have no image for dsl_accessor :require_image, :default => true + + def self.translate_error_message(name, fallback, options = {}) + translation = I18n.translate "activerecord.errors.models.#{self.model_name.underscore}.#{name}", options + if translation.match /translation missing:/ + I18n.translate "activerecord.errors.messages.#{name}", options.merge({ :default => fallback }) + end + end + # Missing image message - dsl_accessor :missing_image_message, :default => 'is required' + #dsl_accessor :missing_image_message, :default => 'is required' + def self.missing_image_message(str = nil) + if str.nil? + if @missing_image_message + @missing_image_message + else + translate_error_message("missing_image", "is required") + end + + else + @missing_image_message = str + end + end + # Invalid image message - dsl_accessor :invalid_image_message, :default => 'was not a readable image' + #dsl_accessor :invalid_image_message, :default => 'was not a readable image' + def self.invalid_image_message(str = nil) + if str.nil? + if @invalid_image_message + @invalid_image_message + else + translate_error_message("invalid_image", "was not a readable image") + end + else + @invalid_image_message = str + end + end + + # Image too small message + # Should include {{minimum}} + def self.image_too_small_message(str = nil) + fb = "is too small (Minimum: {{minimum}})" + if str.nil? + if @image_too_small_message + @image_too_small_message.gsub("{{minimum}}", minimum_image_size_to_s) + else + translate_error_message("image_too_small", fb.gsub("{{minimum}}", minimum_image_size_to_s), :minimum => minimum_image_size_to_s) + end + else + @image_too_small_message = str + end + end + + def self.minimum_image_size_to_s + if minimum_image_size.is_a?(Array) && minimum_image_size.size == 2 + "#{minimum_image_size[0]}x#{minimum_image_size[1]}" + end + end # Sets the quality of rendered JPGs dsl_accessor :output_image_jpg_quality, :default => 85 @@ -137,6 +190,11 @@ module Fleximage # the "preprocess_image { |image| ... }" class method. dsl_accessor :preprocess_image_operation + # Set a minimum size ([x, y] e.g. [800, 600]) + # Set [0, 600] to just enforce y size or + # [800, 0] to just validate x size. + dsl_accessor :minimum_image_size + # Image related save and destroy callbacks after_destroy :delete_image_file before_save :pre_save @@ -414,6 +472,13 @@ module Fleximage errors.add field_name, self.class.invalid_image_message elsif self.class.require_image && !has_image? errors.add field_name, self.class.missing_image_message + elsif self.class.minimum_image_size.is_a?(Array) && + self.class.minimum_image_size.size == 2 && + !@uploaded_image.nil? + if @uploaded_image.columns < self.class.minimum_image_size[0] || + @uploaded_image.rows < self.class.minimum_image_size[1] + errors.add field_name, self.class.image_too_small_message + end end end lib/fleximage/model.rb @@ -55,30 +55,50 @@ <tr class="top-aligned-row"> <td>In:</td> <td> - <a href="../files/lib/fleximage/image_proxy_rb.html"> - lib/fleximage/image_proxy.rb - </a> - <a href="../files/lib/fleximage/model_rb.html"> lib/fleximage/model.rb </a> - <a href="../files/lib/fleximage/operator/base_rb.html"> - lib/fleximage/operator/base.rb + <a href="../files/lib/fleximage/view_rb.html"> + lib/fleximage/view.rb + </a> + + <a href="../files/lib/fleximage/helper_rb.html"> + lib/fleximage/helper.rb + </a> + + <a href="../files/lib/fleximage/image_proxy_rb.html"> + lib/fleximage/image_proxy.rb + </a> + + <a href="../files/lib/fleximage/legacy_view_rb.html"> + lib/fleximage/legacy_view.rb </a> <a href="../files/lib/fleximage/operator/border_rb.html"> lib/fleximage/operator/border.rb </a> + <a href="../files/lib/fleximage/operator/text_rb.html"> + lib/fleximage/operator/text.rb + </a> + <a href="../files/lib/fleximage/operator/crop_rb.html"> lib/fleximage/operator/crop.rb </a> + <a href="../files/lib/fleximage/operator/unsharp_mask_rb.html"> + lib/fleximage/operator/unsharp_mask.rb + </a> + <a href="../files/lib/fleximage/operator/image_overlay_rb.html"> lib/fleximage/operator/image_overlay.rb </a> + <a href="../files/lib/fleximage/operator/base_rb.html"> + lib/fleximage/operator/base.rb + </a> + <a href="../files/lib/fleximage/operator/resize_rb.html"> lib/fleximage/operator/resize.rb </a> @@ -87,22 +107,10 @@ lib/fleximage/operator/shadow.rb </a> - <a href="../files/lib/fleximage/operator/text_rb.html"> - lib/fleximage/operator/text.rb - </a> - <a href="../files/lib/fleximage/operator/trim_rb.html"> lib/fleximage/operator/trim.rb </a> - <a href="../files/lib/fleximage/operator/unsharp_mask_rb.html"> - lib/fleximage/operator/unsharp_mask.rb - </a> - - <a href="../files/lib/fleximage/view_rb.html"> - lib/fleximage/view.rb - </a> - </td> </tr> @@ -131,7 +139,8 @@ <div id="class-list"> <h3 class="section-bar">Classes and Modules</h3> - Module <a href="Fleximage/Model.html" class="link">Fleximage::Model</a> + Module <a href="Fleximage/Helper.html" class="link">Fleximage::Helper</a> +Module <a href="Fleximage/Model.html" class="link">Fleximage::Model</a> Module <a href="Fleximage/Operator.html" class="link">Fleximage::Operator</a> Class <a href="Fleximage/ImageProxy.html" class="link">Fleximage::ImageProxy</a> rdoc/classes/Fleximage.html @@ -104,8 +104,8 @@ href="ImageProxy.html">ImageProxy</a> <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000027">method_missing</a>   - <a href="#M000026">new</a>   + <a href="#M000039">method_missing</a>   + <a href="#M000038">new</a>   </div> </div> @@ -143,23 +143,22 @@ The image to be manipulated by operators. <div id="methods"> <h3 class="section-bar">Public Class methods</h3> - <div id="method-M000026" class="method-detail"> - <a name="M000026"></a> + <div id="method-M000038" class="method-detail"> + <a name="M000038"></a> <div class="method-heading"> - <a href="#M000026" class="method-signature"> + <a href="#M000038" class="method-signature"> new(image, model_obj) </a> </div> <div class="method-description"> -Create a <a href="ImageProxy.html#M000026">new</a> image operator proxy. -Just provide the name of the image +Create a <a href="ImageProxy.html#M000038">new</a> image operator proxy. <a class="source-toggle" href="#" - onclick="toggleCode('M000026-source');return false;">[Source]</a> - <div class="method-source-code" id="M000026-source"> + onclick="toggleCode('M000038-source');return false;">[Source]</a> + <div class="method-source-code" id="M000038-source"> <pre> # File lib/fleximage/image_proxy.rb, line 21 21: def initialize(image, model_obj) @@ -173,11 +172,11 @@ Just provide the name of the image <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000027" class="method-detail"> - <a name="M000027"></a> + <div id="method-M000039" class="method-detail"> + <a name="M000039"></a> <div class="method-heading"> - <a href="#M000027" class="method-signature"> + <a href="#M000039" class="method-signature"> method_missing(method_name, *args) </a> </div> @@ -186,28 +185,31 @@ Just provide the name of the image A call to an unknown method will look for an <a href="Operator.html">Operator</a> by that method‘s name. If it finds -one, it will execute that operator, otherwise it will simply call super for -the default method missing behavior. +one, it will execute that operator. <a class="source-toggle" href="#" - onclick="toggleCode('M000027-source');return false;">[Source]</a> - <div class="method-source-code" id="M000027-source"> + onclick="toggleCode('M000039-source');return false;">[Source]</a> + <div class="method-source-code" id="M000039-source"> <pre> - # File lib/fleximage/image_proxy.rb, line 29 -29: def method_missing(method_name, *args) -30: # Find the operator class -31: operator_class = "Fleximage::Operator::#{method_name.to_s.camelcase}".constantize + # File lib/fleximage/image_proxy.rb, line 28 +28: def method_missing(method_name, *args) +29: # Find the operator class +30: class_name = method_name.to_s.camelcase +31: operator_class = "Fleximage::Operator::#{class_name}".constantize 32: -33: # Execute the operator -34: @image = operator_class.new(self, @image, @model).execute(*args) -35: -36: rescue NameError => e -37: if e.to_s =~ /uninitialized constant Fleximage::Operator::#{method_name.to_s.camelcase}/ -38: raise OepratorNotFound, "No correspoding operator found for the method \"#{method_name}\"" -39: else -40: raise e -41: end -42: end +33: # Define a method for this operator so future calls to this operation are faster +34: self.class.module_eval "def \#{method_name}(*args)\n@image = execute_operator(\#{operator_class}, *args)\nend\n" +35: +36: # Call the method that was just defined to perform its functionality. +37: send(method_name, *args) +38: +39: rescue NameError => e +40: if e.to_s =~ /uninitialized constant Fleximage::Operator::#{class_name}/ +41: raise OperatorNotFound, "No operator Fleximage::Operator::#{class_name} found for the method \"#{method_name}\"" +42: else +43: raise e +44: end +45: end </pre> </div> </div> rdoc/classes/Fleximage/ImageProxy.html @@ -76,7 +76,7 @@ Provides class methods for <a href="../../Fleximage.html">Fleximage</a> for use in model classes. The only class method is <a -href="ClassMethods.html#M000001">acts_as_fleximage</a> which integrates <a +href="ClassMethods.html#M000002">acts_as_fleximage</a> which integrates <a href="../../Fleximage.html">Fleximage</a> functionality into a model class. @@ -108,13 +108,15 @@ raise a validation error if no image is uploaded with the record. Setting to false allows record to be saved with no images. </li> -<li><tt>missing_image_message</tt>: (String, default "is required") -Validation message to display when no image was uploaded for a record. +<li><tt><a href="ClassMethods.html#M000006">missing_image_message</a></tt>: +(String, default "is required") Validation message to display +when no image was uploaded for a record. </li> -<li><tt>invalid_image_message</tt>: (String default "was not a readable -image") Validation message when an image is uploaded, but is not an -image format that can be read by RMagick. +<li><tt><a href="ClassMethods.html#M000007">invalid_image_message</a></tt>: +(String default "was not a readable image") Validation message +when an image is uploaded, but is not an image format that can be read by +RMagick. </li> <li><tt>output_image_jpg_quality</tt>: (Integer, default 85) When rendering @@ -128,7 +130,15 @@ for this record, the image at this path will be used instead. Useful for a placeholder graphic for new content that may not have an image just yet. </li> -<li><tt><a href="ClassMethods.html#M000002">preprocess_image</a></tt>: (Block, +<li><tt>default_image</tt>: A hash which defines an empty starting image. This +hash look like: <tt>:size => ‘123x456’, :color => +:transparent</tt>, where <tt>:size</tt> defines the dimensions of the +default image, and <tt>:color</tt> defines the fill. <tt>:color</tt> can be +a named color as a string (‘red’), :transparent, or a +Magick::Pixel object. + +</li> +<li><tt><a href="ClassMethods.html#M000003">preprocess_image</a></tt>: (Block, no default) Call this class method just like you would call <tt>operate</tt> in a view. The image transoformation in the provided block will be run on every uploaded image before its saved as the master image. @@ -146,8 +156,8 @@ Example: image_storage_format :png require_image true missing_image_message 'is required' - invalid_image_message 'was not a readable image' - default_image_path 'public/images/no_photo_yet.png' + invalid_image_message 'was not a readable image' # default_image_path 'public/images/no_photo_yet.png' + default_image nil output_image_jpg_quality 85 preprocess_image do |image| @@ -168,9 +178,15 @@ Example: <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000001">acts_as_fleximage</a>   - <a href="#M000003">db_store?</a>   - <a href="#M000002">preprocess_image</a>   + <a href="#M000002">acts_as_fleximage</a>   + <a href="#M000004">db_store?</a>   + <a href="#M000005">has_store?</a>   + <a href="#M000010">image_file_exists</a>   + <a href="#M000008">image_too_small_message</a>   + <a href="#M000007">invalid_image_message</a>   + <a href="#M000009">minimum_image_size_to_s</a>   + <a href="#M000006">missing_image_message</a>   + <a href="#M000003">preprocess_image</a>   </div> </div> @@ -199,11 +215,11 @@ Example: <div id="methods"> <h3 class="section-bar">Public Class methods</h3> - <div id="method-M000003" class="method-detail"> - <a name="M000003"></a> + <div id="method-M000004" class="method-detail"> + <a name="M000004"></a> <div class="method-heading"> - <a href="#M000003" class="method-signature"> + <a href="#M000004" class="method-signature"> db_store?() </a> </div> @@ -213,25 +229,196 @@ Example: Internal method to ask this class if it stores image in the DB. <a class="source-toggle" href="#" - onclick="toggleCode('M000003-source');return false;">[Source]</a> - <div class="method-source-code" id="M000003-source"> + onclick="toggleCode('M000004-source');return false;">[Source]</a> + <div class="method-source-code" id="M000004-source"> <pre> - # File lib/fleximage/model.rb, line 85 -85: def self.db_store? -86: columns.find do |col| -87: col.name == 'image_file_data' -88: end -89: end + # File lib/fleximage/model.rb, line 88 +88: def self.db_store? +89: columns.find do |col| +90: col.name == 'image_file_data' +91: end +92: end </pre> </div> </div> </div> - <div id="method-M000002" class="method-detail"> - <a name="M000002"></a> + <div id="method-M000005" class="method-detail"> + <a name="M000005"></a> <div class="method-heading"> - <a href="#M000002" class="method-signature"> + <a href="#M000005" class="method-signature"> + has_store?() + </a> + </div> + + <div class="method-description"> + <a class="source-toggle" href="#" + onclick="toggleCode('M000005-source');return false;">[Source]</a> + <div class="method-source-code" id="M000005-source"> +<pre> + # File lib/fleximage/model.rb, line 94 +94: def self.has_store? +95: db_store? || image_directory +96: end +</pre> + </div> + </div> + </div> + + <div id="method-M000008" class="method-detail"> + <a name="M000008"></a> + + <div class="method-heading"> + <a href="#M000008" class="method-signature"> + image_too_small_message(str = nil) + </a> + </div> + + <div class="method-description"> + +Image too small message Should include {{minimum}} + + <a class="source-toggle" href="#" + onclick="toggleCode('M000008-source');return false;">[Source]</a> + <div class="method-source-code" id="M000008-source"> +<pre> + # File lib/fleximage/model.rb, line 158 +158: def self.image_too_small_message(str = nil) +159: fb = "is too small (Minimum: #{minimum_image_size_to_s})" +160: if str.nil? +161: if @image_too_small_message +162: @image_too_small_message +163: else +164: translation = I18n.translate "activerecord.errors.models.#{self.model_name.underscore}.image_too_small", :minimum => minimum_image_size_to_s +165: translation = I18n.translate "activerecord.errors.messages.image_too_small", :minimum => minimum_image_size_to_s, :default => fb.gsub("{{minimum}}", minimum_image_size_to_s) if translation.match /translation missing:/ +166: translation +167: end +168: else +169: @image_too_small_message = str +170: end +171: end +</pre> + </div> + </div> + </div> + + <div id="method-M000007" class="method-detail"> + <a name="M000007"></a> + + <div class="method-heading"> + <a href="#M000007" class="method-signature"> + invalid_image_message(str = nil) + </a> + </div> + + <div class="method-description"> + <pre> + Invalid image message +</pre> + +dsl_accessor :<a +href="ClassMethods.html#M000007">invalid_image_message</a>, :default => +‘was not a readable image‘ + + <a class="source-toggle" href="#" + onclick="toggleCode('M000007-source');return false;">[Source]</a> + <div class="method-source-code" id="M000007-source"> +<pre> + # File lib/fleximage/model.rb, line 141 +141: def self.invalid_image_message(str = nil) +142: fb = 'was not a readable image' +143: if str.nil? +144: if @invalid_image_message +145: @invalid_image_message +146: else +147: translation = I18n.translate "activerecord.errors.models.#{self.model_name.underscore}.invalid_image" +148: translation = I18n.translate "activerecord.errors.messages.invalid_image", :default => fb if translation.match /translation missing:/ +149: translation +150: end +151: else +152: @invalid_image_message = str +153: end +154: end +</pre> + </div> + </div> + </div> + + <div id="method-M000009" class="method-detail"> + <a name="M000009"></a> + + <div class="method-heading"> + <a href="#M000009" class="method-signature"> + minimum_image_size_to_s() + </a> + </div> + + <div class="method-description"> + <a class="source-toggle" href="#" + onclick="toggleCode('M000009-source');return false;">[Source]</a> + <div class="method-source-code" id="M000009-source"> +<pre> + # File lib/fleximage/model.rb, line 173 +173: def self.minimum_image_size_to_s +174: if minimum_image_size.is_a?(Array) && minimum_image_size.size == 2 +175: #if minimum_image_size[0] > 0 && minimum_image_size[1] > 0 +176: "#{minimum_image_size[0]}x#{minimum_image_size[1]}" +177: end +178: end +</pre> + </div> + </div> + </div> + + <div id="method-M000006" class="method-detail"> + <a name="M000006"></a> + + <div class="method-heading"> + <a href="#M000006" class="method-signature"> + missing_image_message(str = nil) + </a> + </div> + + <div class="method-description"> + <pre> + Missing image message +</pre> + +dsl_accessor :<a +href="ClassMethods.html#M000006">missing_image_message</a>, :default => +‘is required‘ + + <a class="source-toggle" href="#" + onclick="toggleCode('M000006-source');return false;">[Source]</a> + <div class="method-source-code" id="M000006-source"> +<pre> + # File lib/fleximage/model.rb, line 122 +122: def self.missing_image_message(str = nil) +123: fb = 'is required' +124: if str.nil? +125: if @missing_image_message +126: @missing_image_message +127: else +128: translation = I18n.translate "activerecord.errors.models.#{self.model_name.underscore}.missing_image" +129: translation = I18n.translate "activerecord.errors.messages.missing_image", :default => fb if translation.match /translation missing:/ +130: translation +131: end +132: +133: else +134: @missing_image_message = str +135: end +136: end +</pre> + </div> + </div> + </div> + + <div id="method-M000003" class="method-detail"> + <a name="M000003"></a> + + <div class="method-heading"> + <a href="#M000003" class="method-signature"> preprocess_image(&block) </a> </div> @@ -243,13 +430,13 @@ The image transoformation in the provided block will be run on every uploaded image before its saved as the master image. <a class="source-toggle" href="#" - onclick="toggleCode('M000002-source');return false;">[Source]</a> - <div class="method-source-code" id="M000002-source"> + onclick="toggleCode('M000003-source');return false;">[Source]</a> + <div class="method-source-code" id="M000003-source"> <pre> - # File lib/fleximage/model.rb, line 80 -80: def self.preprocess_image(&block) -81: preprocess_image_operation(block) -82: end + # File lib/fleximage/model.rb, line 83 +83: def self.preprocess_image(&block) +84: preprocess_image_operation(block) +85: end </pre> </div> </div> @@ -257,11 +444,11 @@ uploaded image before its saved as the master image. <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000001" class="method-detail"> - <a name="M000001"></a> + <div id="method-M000002" class="method-detail"> + <a name="M000002"></a> <div class="method-heading"> - <a href="#M000001" class="method-signature"> + <a href="#M000002" class="method-signature"> acts_as_fleximage(options = {}) {|if block_given?| ...} </a> </div> @@ -275,77 +462,185 @@ directory you want your images stored on your server. Or configure with a nice looking block. <a class="source-toggle" href="#" - onclick="toggleCode('M000001-source');return false;">[Source]</a> - <div class="method-source-code" id="M000001-source"> + onclick="toggleCode('M000002-source');return false;">[Source]</a> + <div class="method-source-code" id="M000002-source"> <pre> - # File lib/fleximage/model.rb, line 71 - 71: def acts_as_fleximage(options = {}) - 72: - 73: # Insert class methods - 74: class_eval do - 75: include Fleximage::Model::InstanceMethods - 76: - 77: # Call this class method just like you would call +operate+ in a view. - 78: # The image transoformation in the provided block will be run on every uploaded image before its saved as the - 79: # master image. - 80: def self.preprocess_image(&block) - 81: preprocess_image_operation(block) - 82: end - 83: - 84: # Internal method to ask this class if it stores image in the DB. - 85: def self.db_store? - 86: columns.find do |col| - 87: col.name == 'image_file_data' - 88: end - 89: end - 90: end - 91: - 92: # Where images get stored - 93: dsl_accessor :image_directory - 94: - 95: # Put uploads from different days into different subdirectories - 96: dsl_accessor :use_creation_date_based_directories, :default => true + # File lib/fleximage/model.rb, line 75 + 75: def acts_as_fleximage(options = {}) + 76: + 77: # Include the necesary instance methods + 78: include Fleximage::Model::InstanceMethods + 79: + 80: # Call this class method just like you would call +operate+ in a view. + 81: # The image transoformation in the provided block will be run on every uploaded image before its saved as the + 82: # master image. + 83: def self.preprocess_image(&block) + 84: preprocess_image_operation(block) + 85: end + 86: + 87: # Internal method to ask this class if it stores image in the DB. + 88: def self.db_store? + 89: columns.find do |col| + 90: col.name == 'image_file_data' + 91: end + 92: end + 93: + 94: def self.has_store? + 95: db_store? || image_directory + 96: end 97: - 98: # The format are master images are stored in - 99: dsl_accessor :image_storage_format, :default => Proc.new { :png } + 98: # validation callback + 99: validate :validate_image 100: -101: # Require a valid image. Defaults to true. Set to false if its ok to have no image for -102: dsl_accessor :require_image, :default => true -103: -104: # Missing image message -105: dsl_accessor :missing_image_message, :default => 'is required' -106: -107: # Invalid image message -108: dsl_accessor :invalid_image_message, :default => 'was not a readable image' -109: -110: # Sets the quality of rendered JPGs -111: dsl_accessor :output_image_jpg_quality, :default => 85 -112: -113: # Set a default image to use when no image has been assigned to this record -114: dsl_accessor :default_image_path -115: -116: # A block that processes an image before it gets saved as the master image of a record. -117: # Can be helpful to resize potentially huge images to something more manageable. Set via -118: # the "preprocess_image { |image| ... }" class method. -119: dsl_accessor :preprocess_image_operation -120: -121: # Image related save and destroy callbacks -122: after_destroy :delete_image_file -123: before_save :pre_save -124: after_save :post_save -125: -126: # execute configuration block -127: yield if block_given? -128: -129: # set the image directory from passed options -130: image_directory options[:image_directory] if options[:image_directory] -131: -132: # Require the declaration of a master image storage directory -133: if !image_directory && !db_store? -134: raise "No place to put images! Declare this via the :image_directory => 'path/to/directory' option\n"+ -135: "Or add a database column named image_file_data for DB storage" +101: # The filename of the temp image. Used for storing of good images when validation fails +102: # and the form needs to be redisplayed. +103: attr_reader :image_file_temp +104: +105: # Setter for jpg compression quality at the instance level +106: attr_accessor :jpg_compression_quality +107: +108: # Where images get stored +109: dsl_accessor :image_directory +110: +111: # Put uploads from different days into different subdirectories +112: dsl_accessor :use_creation_date_based_directories, :default => true +113: +114: # The format are master images are stored in +115: dsl_accessor :image_storage_format, :default => Proc.new { :png } +116: +117: # Require a valid image. Defaults to true. Set to false if its ok to have no image for +118: dsl_accessor :require_image, :default => true +119: +120: # Missing image message +121: #dsl_accessor :missing_image_message, :default => 'is required' +122: def self.missing_image_message(str = nil) +123: fb = 'is required' +124: if str.nil? +125: if @missing_image_message +126: @missing_image_message +127: else +128: translation = I18n.translate "activerecord.errors.models.#{self.model_name.underscore}.missing_image" +129: translation = I18n.translate "activerecord.errors.messages.missing_image", :default => fb if translation.match /translation missing:/ +130: translation +131: end +132: +133: else +134: @missing_image_message = str +135: end 136: end -137: end +137: +138: +139: # Invalid image message +140: #dsl_accessor :invalid_image_message, :default => 'was not a readable image' +141: def self.invalid_image_message(str = nil) +142: fb = 'was not a readable image' +143: if str.nil? +144: if @invalid_image_message +145: @invalid_image_message +146: else +147: translation = I18n.translate "activerecord.errors.models.#{self.model_name.underscore}.invalid_image" +148: translation = I18n.translate "activerecord.errors.messages.invalid_image", :default => fb if translation.match /translation missing:/ +149: translation +150: end +151: else +152: @invalid_image_message = str +153: end +154: end +155: +156: # Image too small message +157: # Should include {{minimum}} +158: def self.image_too_small_message(str = nil) +159: fb = "is too small (Minimum: #{minimum_image_size_to_s})" +160: if str.nil? +161: if @image_too_small_message +162: @image_too_small_message +163: else +164: translation = I18n.translate "activerecord.errors.models.#{self.model_name.underscore}.image_too_small", :minimum => minimum_image_size_to_s +165: translation = I18n.translate "activerecord.errors.messages.image_too_small", :minimum => minimum_image_size_to_s, :default => fb.gsub("{{minimum}}", minimum_image_size_to_s) if translation.match /translation missing:/ +166: translation +167: end +168: else +169: @image_too_small_message = str +170: end +171: end +172: +173: def self.minimum_image_size_to_s +174: if minimum_image_size.is_a?(Array) && minimum_image_size.size == 2 +175: #if minimum_image_size[0] > 0 && minimum_image_size[1] > 0 +176: "#{minimum_image_size[0]}x#{minimum_image_size[1]}" +177: end +178: end +179: +180: # Sets the quality of rendered JPGs +181: dsl_accessor :output_image_jpg_quality, :default => 85 +182: +183: # Set a default image to use when no image has been assigned to this record +184: dsl_accessor :default_image_path +185: +186: # Set a default image based on a a size and fill +187: dsl_accessor :default_image +188: +189: # A block that processes an image before it gets saved as the master image of a record. +190: # Can be helpful to resize potentially huge images to something more manageable. Set via +191: # the "preprocess_image { |image| ... }" class method. +192: dsl_accessor :preprocess_image_operation +193: +194: # Set a minimum size ([x, y] e.g. [800, 600]) +195: # Set [0, 600] to just enforce y size or +196: # [800, 0] to just validate x size. +197: dsl_accessor :minimum_image_size +198: +199: # Image related save and destroy callbacks +200: after_destroy :delete_image_file +201: before_save :pre_save +202: after_save :post_save +203: +204: # execute configuration block +205: yield if block_given? +206: +207: # set the image directory from passed options +208: image_directory options[:image_directory] if options[:image_directory] +209: +210: # Require the declaration of a master image storage directory +211: if !image_directory && !db_store? && !default_image && !default_image_path +212: raise "No place to put images! Declare this via the :image_directory => 'path/to/directory' option\n"+ +213: "Or add a database column named image_file_data for DB storage" +214: end +215: end +</pre> + </div> + </div> + </div> + + <div id="method-M000010" class="method-detail"> + <a name="M000010"></a> + + <div class="method-heading"> + <a href="#M000010" class="method-signature"> + image_file_exists(file) + </a> + </div> + + <div class="method-description"> + <a class="source-toggle" href="#" + onclick="toggleCode('M000010-source');return false;">[Source]</a> + <div class="method-source-code" id="M000010-source"> +<pre> + # File lib/fleximage/model.rb, line 217 +217: def image_file_exists(file) +218: # File must be a valid object +219: return false if file.nil? +220: +221: # Get the size of the file. file.size works for form-uploaded images, file.stat.size works +222: # for file object created by File.open('foo.jpg', 'rb'). It must have a size > 0. +223: return false if (file.respond_to?(:size) ? file.size : file.stat.size) <= 0 +224: +225: # object must respond to the read method to fetch its contents. +226: return false if !file.respond_to?(:read) +227: +228: # file validation passed, return true +229: true +230: end </pre> </div> </div> rdoc/classes/Fleximage/Model/ClassMethods.html @@ -86,14 +86,16 @@ Provides methods that every model instance that acts_as_fleximage needs. <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000011">delete_image_file</a>   - <a href="#M000004">directory_path</a>   - <a href="#M000005">file_path</a>   - <a href="#M000009">has_image?</a>   - <a href="#M000006">image_file=</a>   - <a href="#M000008">image_file_url</a>   - <a href="#M000007">image_file_url=</a>   - <a href="#M000010">operate</a>   + <a href="#M000020">delete_image_file</a>   + <a href="#M000011">directory_path</a>   + <a href="#M000012">file_path</a>   + <a href="#M000017">has_image?</a>   + <a href="#M000018">has_saved_image?</a>   + <a href="#M000013">image_file=</a>   + <a href="#M000015">image_file_temp=</a>   + <a href="#M000016">image_file_url</a>   + <a href="#M000014">image_file_url=</a>   + <a href="#M000019">operate</a>   </div> </div> @@ -115,11 +117,11 @@ Provides methods that every model instance that acts_as_fleximage needs. <div id="methods"> <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000011" class="method-detail"> - <a name="M000011"></a> + <div id="method-M000020" class="method-detail"> + <a name="M000020"></a> <div class="method-heading"> - <a href="#M000011" class="method-signature"> + <a href="#M000020" class="method-signature"> delete_image_file() </a> </div> @@ -131,23 +133,33 @@ record gets destroyed, but you can call it manually if you want to remove the image from the record. <a class="source-toggle" href="#" - onclick="toggleCode('M000011-source');return false;">[Source]</a> - <div class="method-source-code" id="M000011-source"> + onclick="toggleCode('M000020-source');return false;">[Source]</a> + <div class="method-source-code" id="M000020-source"> <pre> - # File lib/fleximage/model.rb, line 327 -327: def delete_image_file -328: File.delete(file_path) if File.exists?(file_path) -329: end + # File lib/fleximage/model.rb, line 455 +455: def delete_image_file +456: return unless self.class.has_store? +457: +458: if self.class.db_store? +459: update_attribute :image_file_data, nil unless frozen? +460: else +461: File.delete(file_path) if File.exists?(file_path) +462: end +463: +464: clear_magic_attributes +465: +466: self +467: end </pre> </div> </div> </div> - <div id="method-M000004" class="method-detail"> - <a name="M000004"></a> + <div id="method-M000011" class="method-detail"> + <a name="M000011"></a> <div class="method-heading"> - <a href="#M000004" class="method-signature"> + <a href="#M000011" class="method-signature"> directory_path() </a> </div> @@ -168,34 +180,34 @@ number files in a directory. @some_image.directory_path #=> /var/www/myapp/uploaded_images/2008/3/30 </pre> <a class="source-toggle" href="#" - onclick="toggleCode('M000004-source');return false;">[Source]</a> - <div class="method-source-code" id="M000004-source"> + onclick="toggleCode('M000011-source');return false;">[Source]</a> + <div class="method-source-code" id="M000011-source"> <pre> - # File lib/fleximage/model.rb, line 152 -152: def directory_path -153: raise 'No image directory was defined, cannot generate path' unless self.class.image_directory -154: -155: # base directory -156: directory = "#{RAILS_ROOT}/#{self.class.image_directory}" -157: -158: # specific creation date based directory suffix. -159: creation = self[:created_at] || self[:created_on] -160: if self.class.use_creation_date_based_directories && creation -161: "#{directory}/#{creation.year}/#{creation.month}/#{creation.day}" -162: else -163: directory -164: end -165: end + # File lib/fleximage/model.rb, line 245 +245: def directory_path +246: raise 'No image directory was defined, cannot generate path' unless self.class.image_directory +247: +248: # base directory +249: directory = "#{RAILS_ROOT}/#{self.class.image_directory}" +250: +251: # specific creation date based directory suffix. +252: creation = self[:created_at] || self[:created_on] +253: if self.class.use_creation_date_based_directories && creation +254: "#{directory}/#{creation.year}/#{creation.month}/#{creation.day}" +255: else +256: directory +257: end +258: end </pre> </div> </div> </div> - <div id="method-M000005" class="method-detail"> - <a name="M000005"></a> + <div id="method-M000012" class="method-detail"> + <a name="M000012"></a> <div class="method-heading"> - <a href="#M000005" class="method-signature"> + <a href="#M000012" class="method-signature"> file_path() </a> </div> @@ -208,23 +220,23 @@ Returns the path to the master image file for this record. @some_image.file_path #=> /var/www/myapp/uploaded_images/123.png </pre> <a class="source-toggle" href="#" - onclick="toggleCode('M000005-source');return false;">[Source]</a> - <div class="method-source-code" id="M000005-source"> + onclick="toggleCode('M000012-source');return false;">[Source]</a> + <div class="method-source-code" id="M000012-source"> <pre> - # File lib/fleximage/model.rb, line 170 -170: def file_path -171: "#{directory_path}/#{id}.#{self.class.image_storage_format}" -172: end + # File lib/fleximage/model.rb, line 263 +263: def file_path +264: "#{directory_path}/#{id}.#{self.class.image_storage_format}" +265: end </pre> </div> </div> </div> - <div id="method-M000009" class="method-detail"> - <a name="M000009"></a> + <div id="method-M000017" class="method-detail"> + <a name="M000017"></a> <div class="method-heading"> - <a href="#M000009" class="method-signature"> + <a href="#M000017" class="method-signature"> has_image?() </a> </div> @@ -234,23 +246,46 @@ Returns the path to the master image file for this record. Return true if this record has an image. <a class="source-toggle" href="#" - onclick="toggleCode('M000009-source');return false;">[Source]</a> - <div class="method-source-code" id="M000009-source"> + onclick="toggleCode('M000017-source');return false;">[Source]</a> + <div class="method-source-code" id="M000017-source"> +<pre> + # File lib/fleximage/model.rb, line 379 +379: def has_image? +380: @uploaded_image || @output_image || has_saved_image? +381: end +</pre> + </div> + </div> + </div> + + <div id="method-M000018" class="method-detail"> + <a name="M000018"></a> + + <div class="method-heading"> + <a href="#M000018" class="method-signature"> + has_saved_image?() + </a> + </div> + + <div class="method-description"> + <a class="source-toggle" href="#" + onclick="toggleCode('M000018-source');return false;">[Source]</a> + <div class="method-source-code" id="M000018-source"> <pre> - # File lib/fleximage/model.rb, line 264 -264: def has_image? -265: self.class.db_store? ? image_file_data : File.exists?(file_path) -266: end + # File lib/fleximage/model.rb, line 383 +383: def has_saved_image? +384: self.class.db_store? ? !!image_file_data : File.exists?(file_path) +385: end </pre> </div> </div> </div> - <div id="method-M000006" class="method-detail"> - <a name="M000006"></a> + <div id="method-M000013" class="method-detail"> + <a name="M000013"></a> <div class="method-heading"> - <a href="#M000006" class="method-signature"> + <a href="#M000013" class="method-signature"> image_file=(file) </a> </div> @@ -282,78 +317,120 @@ situations you would expect it to. p.images.create(params[:photo]) </pre> <a class="source-toggle" href="#" - onclick="toggleCode('M000006-source');return false;">[Source]</a> - <div class="method-source-code" id="M000006-source"> + onclick="toggleCode('M000013-source');return false;">[Source]</a> + <div class="method-source-code" id="M000013-source"> +<pre> + # File lib/fleximage/model.rb, line 289 +289: def image_file=(file) +290: if self.class.image_file_exists(file) +291: +292: # Create RMagick Image object from uploaded file +293: if file.path +294: @uploaded_image = Magick::Image.read(file.path).first +295: else +296: @uploaded_image = Magick::Image.from_blob(file.read).first +297: end +298: +299: # Sanitize image data +300: @uploaded_image.colorspace = Magick::RGBColorspace +301: @uploaded_image.density = '72' +302: +303: # Save meta data to database +304: set_magic_attributes(file) +305: +306: # Success, make sure everything is valid +307: @invalid_image = false +308: save_temp_image(file) unless @dont_save_temp +309: end +310: rescue Magick::ImageMagickError => e +311: error_strings = [ +312: 'Improper image header', +313: 'no decode delegate for this image format', +314: 'UnableToOpenBlob' +315: ] +316: if e.to_s =~ /#{error_strings.join('|')}/ +317: @invalid_image = true +318: else +319: raise e +320: end +321: end +</pre> + </div> + </div> + </div> + + <div id="method-M000015" class="method-detail"> + <a name="M000015"></a> + + <div class="method-heading"> + <a href="#M000015" class="method-signature"> + image_file_temp=(file_name) + </a> + </div> + + <div class="method-description"> + +Sets the uploaded image to the name of a file in RAILS_ROOT/tmp that was +just uploaded. Use as a hidden field in your forms to keep an uploaded +image when validation fails and the form needs to be redisplayed + + <a class="source-toggle" href="#" + onclick="toggleCode('M000015-source');return false;">[Source]</a> + <div class="method-source-code" id="M000015-source"> <pre> - # File lib/fleximage/model.rb, line 196 -196: def image_file=(file) -197: # Get the size of the file. file.size works for form-uploaded images, file.stat.size works -198: # for file object created by File.open('foo.jpg', 'rb') -199: file_size = file.respond_to?(:size) ? file.size : file.stat.size -200: -201: if file.respond_to?(:read) && file_size > 0 -202: # Create RMagick Image object from uploaded file -203: if file.path -204: @uploaded_image = Magick::Image.read(file.path).first -205: else -206: @uploaded_image = Magick::Image.from_blob(file.read).first -207: end -208: -209: set_magic_attributes(file) -210: -211: # Success, make sure everything is valid -212: @missing_image = false -213: @invalid_image = false -214: else -215: if self.class.require_image && !@uploaded_image -216: @missing_image = true -217: end -218: end -219: rescue Magick::ImageMagickError => e -220: if e.to_s =~ /no decode delegate for this image format/ -221: @invalid_image = true -222: else -223: raise e -224: end -225: end + # File lib/fleximage/model.rb, line 357 +357: def image_file_temp=(file_name) +358: if !@uploaded_image && file_name && file_name.any? +359: @image_file_temp = file_name +360: file_path = "#{RAILS_ROOT}/tmp/fleximage/#{file_name}" +361: +362: @dont_save_temp = true +363: if File.exists?(file_path) +364: File.open(file_path, 'rb') do |f| +365: self.image_file = f +366: end +367: end +368: @dont_save_temp = false +369: end +370: end </pre> </div> </div> </div> - <div id="method-M000008" class="method-detail"> - <a name="M000008"></a> + <div id="method-M000016" class="method-detail"> + <a name="M000016"></a> <div class="method-heading"> - <a href="#M000008" class="method-signature"> + <a href="#M000016" class="method-signature"> image_file_url() </a> </div> <div class="method-description"> -Return the @<a href="InstanceMethods.html#M000008">image_file_url</a> that +Return the @<a href="InstanceMethods.html#M000016">image_file_url</a> that was previously assigned. This is not saved in the database, and only exists to make forms happy. <a class="source-toggle" href="#" - onclick="toggleCode('M000008-source');return false;">[Source]</a> - <div class="method-source-code" id="M000008-source"> + onclick="toggleCode('M000016-source');return false;">[Source]</a> + <div class="method-source-code" id="M000016-source"> <pre> - # File lib/fleximage/model.rb, line 259 -259: def image_file_url -260: @image_file_url -261: end + # File lib/fleximage/model.rb, line 374 +374: def image_file_url +375: @image_file_url +376: end </pre> </div> </div> </div> - <div id="method-M000007" class="method-detail"> - <a name="M000007"></a> + <div id="method-M000014" class="method-detail"> + <a name="M000014"></a> <div class="method-heading"> - <a href="#M000007" class="method-signature"> + <a href="#M000014" class="method-signature"> image_file_url=(file_url) </a> </div> @@ -370,35 +447,38 @@ machine, or pull from the internet. @photo.image_file_url = 'http://foo.com/bar.jpg' </pre> <a class="source-toggle" href="#" - onclick="toggleCode('M000007-source');return false;">[Source]</a> - <div class="method-source-code" id="M000007-source"> + onclick="toggleCode('M000014-source');return false;">[Source]</a> + <div class="method-source-code" id="M000014-source"> <pre> - # File lib/fleximage/model.rb, line 234 -234: def image_file_url=(file_url) -235: @image_file_url = file_url -236: if file_url =~ %r{^https?://} -237: file = open(file_url) -238: -239: # Force a URL based file to have an original_filename -240: eval "class << file\ndef original_filename\n\"\#{file_url}\"\nend\nend\n" -241: -242: self.image_file = file -243: elsif file_url.empty? -244: @missing_image = true unless @uploaded_image -245: else -246: @invalid_image = true -247: end -248: end + # File lib/fleximage/model.rb, line 330 +330: def image_file_url=(file_url) +331: @image_file_url = file_url +332: if file_url =~ %r{^https?://} +333: file = open(file_url) +334: +335: # Force a URL based file to have an original_filename +336: eval "def file.original_filename\n\"\#{file_url}\"\nend\n" +337: +338: self.image_file = file +339: +340: elsif file_url.empty? +341: # Nothing to process, move along +342: +343: else +344: # invalid URL, raise invalid image validation error +345: @invalid_image = true +346: end +347: end </pre> </div> </div> </div> - <div id="method-M000010" class="method-detail"> - <a name="M000010"></a> + <div id="method-M000019" class="method-detail"> + <a name="M000019"></a> <div class="method-heading"> - <a href="#M000010" class="method-signature"> + <a href="#M000019" class="method-signature"> operate(&block) </a> </div> @@ -417,17 +497,17 @@ code inside a block passed to this method. end </pre> <a class="source-toggle" href="#" - onclick="toggleCode('M000010-source');return false;">[Source]</a> - <div class="method-source-code" id="M000010-source"> + onclick="toggleCode('M000019-source');return false;">[Source]</a> + <div class="method-source-code" id="M000019-source"> <pre> - # File lib/fleximage/model.rb, line 277 -277: def operate(&block) -278: returning self do -279: proxy = ImageProxy.new(load_image, self) -280: block.call(proxy) -281: @output_image = proxy.image -282: end -283: end + # File lib/fleximage/model.rb, line 396 +396: def operate(&block) +397: returning self do +398: proxy = ImageProxy.new(load_image, self) +399: block.call(proxy) +400: @output_image = proxy.image +401: end +402: end </pre> </div> </div> rdoc/classes/Fleximage/Model/InstanceMethods.html @@ -55,22 +55,30 @@ <tr class="top-aligned-row"> <td>In:</td> <td> - <a href="../../files/lib/fleximage/operator/base_rb.html"> - lib/fleximage/operator/base.rb - </a> - <a href="../../files/lib/fleximage/operator/border_rb.html"> lib/fleximage/operator/border.rb </a> + <a href="../../files/lib/fleximage/operator/text_rb.html"> + lib/fleximage/operator/text.rb + </a> + <a href="../../files/lib/fleximage/operator/crop_rb.html"> lib/fleximage/operator/crop.rb </a> + <a href="../../files/lib/fleximage/operator/unsharp_mask_rb.html"> + lib/fleximage/operator/unsharp_mask.rb + </a> + <a href="../../files/lib/fleximage/operator/image_overlay_rb.html"> lib/fleximage/operator/image_overlay.rb </a> + <a href="../../files/lib/fleximage/operator/base_rb.html"> + lib/fleximage/operator/base.rb + </a> + <a href="../../files/lib/fleximage/operator/resize_rb.html"> lib/fleximage/operator/resize.rb </a> @@ -79,18 +87,10 @@ lib/fleximage/operator/shadow.rb </a> - <a href="../../files/lib/fleximage/operator/text_rb.html"> - lib/fleximage/operator/text.rb - </a> - <a href="../../files/lib/fleximage/operator/trim_rb.html"> lib/fleximage/operator/trim.rb </a> - <a href="../../files/lib/fleximage/operator/unsharp_mask_rb.html"> - lib/fleximage/operator/unsharp_mask.rb - </a> - </td> </tr> rdoc/classes/Fleximage/Operator.html @@ -83,13 +83,13 @@ The <a href="Base.html">Operator::Base</a> class is what all other <a href="../Operator.html">Operator</a> classes inherit from. To write your own <a href="../Operator.html">Operator</a> class, simply inherit from this -class, and implement your own <a href="Base.html#M000018">operate</a> +class, and implement your own <a href="Base.html#M000027">operate</a> methods, with your own arguments. Just return a new RMagick image object that represents the new image, and the model will be updated automatically. You have access to a few instance variables in the <a -href="Base.html#M000018">operate</a> method: +href="Base.html#M000027">operate</a> method: <ul> <li>@image : The current image from the model. Use this is a starting point for @@ -111,12 +111,14 @@ in. Use it to get data out of your model for display in your image. <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000018">operate</a>   - <a href="#M000020">scale</a>   - <a href="#M000021">scale_and_crop</a>   - <a href="#M000019">size_to_xy</a>   - <a href="#M000022">stretch</a>   - <a href="#M000023">symbol_to_blending_mode</a>   + <a href="#M000027">operate</a>   + <a href="#M000030">scale</a>   + <a href="#M000031">scale_and_crop</a>   + <a href="#M000029">size_to_xy</a>   + <a href="#M000028">size_to_xy</a>   + <a href="#M000032">stretch</a>   + <a href="#M000033">symbol_to_blending_mode</a>   + <a href="#M000034">symbol_to_gravity</a>   </div> </div> @@ -136,13 +138,52 @@ in. Use it to get data out of your model for display in your image.  <div id="methods"> + <h3 class="section-bar">Public Class methods</h3> + + <div id="method-M000028" class="method-detail"> + <a name="M000028"></a> + + <div class="method-heading"> + <a href="#M000028" class="method-signature"> + size_to_xy(size) + </a> + </div> + + <div class="method-description"> + +Allows access to size conversion globally. See <a +href="Base.html#M000028">size_to_xy</a> for a more detailed explanation + + <a class="source-toggle" href="#" + onclick="toggleCode('M000028-source');return false;">[Source]</a> + <div class="method-source-code" id="M000028-source"> +<pre> + # File lib/fleximage/operator/base.rb, line 56 +56: def self.size_to_xy(size) +57: case +58: when size.is_a?(Array) && size.size == 2 # [320, 240] +59: size +60: +61: when size.to_s.include?('x') # "320x240" +62: size.split('x').collect(&:to_i) +63: +64: else # Anything else, convert the object to an integer and assume square dimensions +65: [size.to_i, size.to_i] +66: +67: end +68: end +</pre> + </div> + </div> + </div> + <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000018" class="method-detail"> - <a name="M000018"></a> + <div id="method-M000027" class="method-detail"> + <a name="M000027"></a> <div class="method-heading"> - <a href="#M000018" class="method-signature"> + <a href="#M000027" class="method-signature"> operate(*args) </a> </div> @@ -154,24 +195,24 @@ href="Base.html">Operator::Base</a> subclasses in order to write your own image operators. <a class="source-toggle" href="#" - onclick="toggleCode('M000018-source');return false;">[Source]</a> - <div class="method-source-code" id="M000018-source"> + onclick="toggleCode('M000027-source');return false;">[Source]</a> + <div class="method-source-code" id="M000027-source"> <pre> - # File lib/fleximage/operator/base.rb, line 41 -41: def operate(*args) -42: raise "Override this method in your own subclass." -43: end + # File lib/fleximage/operator/base.rb, line 47 +47: def operate(*args) +48: raise OperationNotImplemented, "Override this method in your own subclass." +49: end </pre> </div> </div> </div> - <div id="method-M000020" class="method-detail"> - <a name="M000020"></a> + <div id="method-M000030" class="method-detail"> + <a name="M000030"></a> <div class="method-heading"> - <a href="#M000020" class="method-signature"> - scale(size, img = nil) + <a href="#M000030" class="method-signature"> + scale(size, img = @image) </a> </div> @@ -179,31 +220,31 @@ image operators. Scale the image, respecting aspect ratio. Operation will happen in the main <tt>@image</tt> unless you supply the <tt>img</tt> argument to <a -href="Base.html#M000018">operate</a> on instead. +href="Base.html#M000027">operate</a> on instead. <a class="source-toggle" href="#" - onclick="toggleCode('M000020-source');return false;">[Source]</a> - <div class="method-source-code" id="M000020-source"> + onclick="toggleCode('M000030-source');return false;">[Source]</a> + <div class="method-source-code" id="M000030-source"> <pre> - # File lib/fleximage/operator/base.rb, line 72 -72: def scale(size, img = nil) -73: (img || @image).change_geometry!(size_to_xy(size).join('x')) do |cols, rows, img| -74: cols = 1 if cols < 1 -75: rows = 1 if rows < 1 -76: img.resize!(cols, rows) -77: end -78: end + # File lib/fleximage/operator/base.rb, line 87 +87: def scale(size, img = @image) +88: img.change_geometry!(size_to_xy(size).join('x')) do |cols, rows, _img| +89: cols = 1 if cols < 1 +90: rows = 1 if rows < 1 +91: _img.resize!(cols, rows) +92: end +93: end </pre> </div> </div> </div> - <div id="method-M000021" class="method-detail"> - <a name="M000021"></a> + <div id="method-M000031" class="method-detail"> + <a name="M000031"></a> <div class="method-heading"> - <a href="#M000021" class="method-signature"> - scale_and_crop(size, img = nil) + <a href="#M000031" class="method-signature"> + scale_and_crop(size, img = @image) </a> </div> @@ -211,27 +252,27 @@ href="Base.html#M000018">operate</a> on instead. Scale to the desired size and crop edges off to get the exact dimensions needed. Operation will happen in the main <tt>@image</tt> unless you supply -the <tt>img</tt> argument to <a href="Base.html#M000018">operate</a> on +the <tt>img</tt> argument to <a href="Base.html#M000027">operate</a> on instead. <a class="source-toggle" href="#" - onclick="toggleCode('M000021-source');return false;">[Source]</a> - <div class="method-source-code" id="M000021-source"> + onclick="toggleCode('M000031-source');return false;">[Source]</a> + <div class="method-source-code" id="M000031-source"> <pre> - # File lib/fleximage/operator/base.rb, line 83 -83: def scale_and_crop(size, img = nil) -84: (img || @image).crop_resized!(*size_to_xy(size)) -85: end + # File lib/fleximage/operator/base.rb, line 98 + 98: def scale_and_crop(size, img = @image) + 99: img.crop_resized!(*size_to_xy(size)) +100: end </pre> </div> </div> </div> - <div id="method-M000019" class="method-detail"> - <a name="M000019"></a> + <div id="method-M000029" class="method-detail"> + <a name="M000029"></a> <div class="method-heading"> - <a href="#M000019" class="method-signature"> + <a href="#M000029" class="method-signature"> size_to_xy(size) </a> </div> @@ -261,30 +302,24 @@ Usage: x, y = size_to_xy("10x20") </pre> <a class="source-toggle" href="#" - onclick="toggleCode('M000019-source');return false;">[Source]</a> - <div class="method-source-code" id="M000019-source"> + onclick="toggleCode('M000029-source');return false;">[Source]</a> + <div class="method-source-code" id="M000029-source"> <pre> - # File lib/fleximage/operator/base.rb, line 59 -59: def size_to_xy(size) -60: if size.is_a?(Array) && size.size == 2 -61: size -62: elsif size.to_s.include?('x') -63: size.split('x').collect(&:to_i) -64: else -65: [size.to_i, size.to_i] -66: end -67: end + # File lib/fleximage/operator/base.rb, line 80 +80: def size_to_xy(size) +81: self.class.size_to_xy size +82: end </pre> </div> </div> </div> - <div id="method-M000022" class="method-detail"> - <a name="M000022"></a> + <div id="method-M000032" class="method-detail"> + <a name="M000032"></a> <div class="method-heading"> - <a href="#M000022" class="method-signature"> - stretch(size, img = nil) + <a href="#M000032" class="method-signature"> + stretch(size, img = @image) </a> </div> @@ -292,27 +327,27 @@ Usage: <a href="Resize.html">Resize</a> the image, with no respect to aspect ratio. Operation will happen in the main <tt>@image</tt> unless you supply -the <tt>img</tt> argument to <a href="Base.html#M000018">operate</a> on +the <tt>img</tt> argument to <a href="Base.html#M000027">operate</a> on instead. <a class="source-toggle" href="#" - onclick="toggleCode('M000022-source');return false;">[Source]</a> - <div class="method-source-code" id="M000022-source"> + onclick="toggleCode('M000032-source');return false;">[Source]</a> + <div class="method-source-code" id="M000032-source"> <pre> - # File lib/fleximage/operator/base.rb, line 90 -90: def stretch(size, img = nil) -91: (img || @image).resize!(*size_to_xy(size)) -92: end + # File lib/fleximage/operator/base.rb, line 105 +105: def stretch(size, img = @image) +106: img.resize!(*size_to_xy(size)) +107: end </pre> </div> </div> </div> - <div id="method-M000023" class="method-detail"> - <a name="M000023"></a> + <div id="method-M000033" class="method-detail"> + <a name="M000033"></a> <div class="method-heading"> - <a href="#M000023" class="method-signature"> + <a href="#M000033" class="method-signature"> symbol_to_blending_mode(mode) </a> </div> @@ -333,15 +368,44 @@ To use a blend mode remove the <tt>CompositeOp</tt> form the name and <tt>CopyBlackCompositeOp</tt> becomes :<tt>copy_black</tt>. <a class="source-toggle" href="#" - onclick="toggleCode('M000023-source');return false;">[Source]</a> - <div class="method-source-code" id="M000023-source"> + onclick="toggleCode('M000033-source');return false;">[Source]</a> + <div class="method-source-code" id="M000033-source"> +<pre> + # File lib/fleximage/operator/base.rb, line 116 +116: def symbol_to_blending_mode(mode) +117: "Magick::#{mode.to_s.camelize}CompositeOp".constantize +118: rescue NameError +119: raise ArgumentError, ":#{mode} is not a valid blending mode." +120: end +</pre> + </div> + </div> + </div> + + <div id="method-M000034" class="method-detail"> + <a name="M000034"></a> + + <div class="method-heading"> + <a href="#M000034" class="method-signature"> + symbol_to_gravity(gravity_name) + </a> + </div> + + <div class="method-description"> + <a class="source-toggle" href="#" + onclick="toggleCode('M000034-source');return false;">[Source]</a> + <div class="method-source-code" id="M000034-source"> <pre> - # File lib/fleximage/operator/base.rb, line 101 -101: def symbol_to_blending_mode(mode) -102: "Magick::#{mode.to_s.camelize}CompositeOp".constantize -103: rescue NameError -104: raise ArgumentError, ":#{mode} is not a valid blending mode." -105: end + # File lib/fleximage/operator/base.rb, line 122 +122: def symbol_to_gravity(gravity_name) +123: gravity = GRAVITIES[gravity_name] +124: +125: if gravity +126: gravity +127: else +128: raise ArgumentError, ":#{gravity_name} is not a valid gravity name.\n\nValid names are :center, :top, :top_right, :right, :bottom_right, :bottom, :bottom_left, :left, :top_left" +129: end +130: end </pre> </div> </div> rdoc/classes/Fleximage/Operator/Base.html @@ -129,7 +129,7 @@ Example: <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000012">operate</a>   + <a href="#M000023">operate</a>   </div> </div> @@ -151,19 +151,19 @@ Example: <div id="methods"> <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000012" class="method-detail"> - <a name="M000012"></a> + <div id="method-M000023" class="method-detail"> + <a name="M000023"></a> <div class="method-heading"> - <a href="#M000012" class="method-signature"> + <a href="#M000023" class="method-signature"> operate(options = {}) </a> </div> <div class="method-description"> <a class="source-toggle" href="#" - onclick="toggleCode('M000012-source');return false;">[Source]</a> - <div class="method-source-code" id="M000012-source"> + onclick="toggleCode('M000023-source');return false;">[Source]</a> + <div class="method-source-code" id="M000023-source"> <pre> # File lib/fleximage/operator/border.rb, line 33 33: def operate(options = {}) rdoc/classes/Fleximage/Operator/Border.html @@ -91,6 +91,11 @@ down and right from there. Use the following keys in the <tt>options</tt> hash: <ul> +<li><tt>gravity</tt>: Select gravity for the crop. Default is :top_left +(Magick::NorthWestGravity) Choose from GRAVITITES constant defined in +base.rb. + +</li> <li><tt>from</tt>: coorinates for the upper left corner of resulting image. </li> @@ -99,9 +104,9 @@ of the :<tt>from</tt> coordinate. </li> </ul> - -Both options are required. - +<pre> + size and from options are *required*. +</pre> Example: @@ -113,6 +118,18 @@ Example: ) end </pre> + +or + +<pre> + @photo.operate do |image| + image.crop( + :gravity => :center, + :from => '100x50', + :size => '500x350' + ) + end +</pre> </div> @@ -123,7 +140,7 @@ Example: <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000017">operate</a>   + <a href="#M000035">operate</a>   </div> </div> @@ -145,38 +162,39 @@ Example: <div id="methods"> <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000017" class="method-detail"> - <a name="M000017"></a> + <div id="method-M000035" class="method-detail"> + <a name="M000035"></a> <div class="method-heading"> - <a href="#M000017" class="method-signature"> + <a href="#M000035" class="method-signature"> operate(options = {}) </a> </div> <div class="method-description"> <a class="source-toggle" href="#" - onclick="toggleCode('M000017-source');return false;">[Source]</a> - <div class="method-source-code" id="M000017-source"> + onclick="toggleCode('M000035-source');return false;">[Source]</a> + <div class="method-source-code" id="M000035-source"> <pre> - # File lib/fleximage/operator/crop.rb, line 25 -25: def operate(options = {}) -26: options = options.symbolize_keys -27: -28: # required integer keys -29: [:from, :size].each do |key| -30: raise ArgumentError, ":#{key} must be included in crop options" unless options[key] -31: options[key] = size_to_xy(options[key]) -32: end -33: -34: # width and height must not be zero -35: options[:size].each do |dimension| -36: raise ArgumentError, ":size must not be zero for X or Y" if dimension.zero? -37: end -38: -39: # crop -40: @image.crop!(options[:from][0], options[:from][1], options[:size][0], options[:size][1], true) -41: end + # File lib/fleximage/operator/crop.rb, line 37 +37: def operate(options = {}) +38: options = options.symbolize_keys +39: options.reverse_merge!(:gravity => :top_left) +40: +41: # required integer keys +42: [:from, :size].each do |key| +43: raise ArgumentError, ":#{key} must be included in crop options" unless options[key] +44: options[key] = size_to_xy(options[key]) +45: end +46: +47: # width and height must not be zero +48: options[:size].each do |dimension| +49: raise ArgumentError, ":size must not be zero for X or Y" if dimension.zero? +50: end +51: +52: # crop +53: @image.crop!(symbol_to_gravity(options[:gravity]), options[:from][0], options[:from][1], options[:size][0], options[:size][1], true) +54: end </pre> </div> </div> rdoc/classes/Fleximage/Operator/Crop.html @@ -159,7 +159,7 @@ Example: <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000015">operate</a>   + <a href="#M000025">operate</a>   </div> </div> @@ -181,19 +181,19 @@ Example: <div id="methods"> <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000015" class="method-detail"> - <a name="M000015"></a> + <div id="method-M000025" class="method-detail"> + <a name="M000025"></a> <div class="method-heading"> - <a href="#M000015" class="method-signature"> + <a href="#M000025" class="method-signature"> operate(image_overlay_path, options = {}) </a> </div> <div class="method-description"> <a class="source-toggle" href="#" - onclick="toggleCode('M000015-source');return false;">[Source]</a> - <div class="method-source-code" id="M000015-source"> + onclick="toggleCode('M000025-source');return false;">[Source]</a> + <div class="method-source-code" id="M000025-source"> <pre> # File lib/fleximage/operator/image_overlay.rb, line 52 52: def operate(image_overlay_path, options = {}) @@ -217,7 +217,7 @@ Example: 70: #prepare arguments for composite! 71: args = [] 72: args << overlay #overlay image -73: args << GRAVITIES[options[:alignment] || :center] #gravity +73: args << symbol_to_gravity(options[:alignment] || :center) #gravity 74: args += size_to_xy(options[:offset]) if options[:offset] #offset 75: args << symbol_to_blending_mode(options[:blending] || :over) #compositing mode 76: rdoc/classes/Fleximage/Operator/ImageOverlay.html @@ -142,7 +142,7 @@ Example: <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000025">operate</a>   + <a href="#M000036">operate</a>   </div> </div> @@ -164,19 +164,19 @@ Example: <div id="methods"> <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000025" class="method-detail"> - <a name="M000025"></a> + <div id="method-M000036" class="method-detail"> + <a name="M000036"></a> <div class="method-heading"> - <a href="#M000025" class="method-signature"> + <a href="#M000036" class="method-signature"> operate(size, options = {}) </a> </div> <div class="method-description"> <a class="source-toggle" href="#" - onclick="toggleCode('M000025-source');return false;">[Source]</a> - <div class="method-source-code" id="M000025-source"> + onclick="toggleCode('M000036-source');return false;">[Source]</a> + <div class="method-source-code" id="M000036-source"> <pre> # File lib/fleximage/operator/resize.rb, line 39 39: def operate(size, options = {}) rdoc/classes/Fleximage/Operator/Resize.html @@ -147,7 +147,7 @@ Example: <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000016">operate</a>   + <a href="#M000024">operate</a>   </div> </div> @@ -169,19 +169,19 @@ Example: <div id="methods"> <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000016" class="method-detail"> - <a name="M000016"></a> + <div id="method-M000024" class="method-detail"> + <a name="M000024"></a> <div class="method-heading"> - <a href="#M000016" class="method-signature"> + <a href="#M000024" class="method-signature"> operate(options = {}) </a> </div> <div class="method-description"> <a class="source-toggle" href="#" - onclick="toggleCode('M000016-source');return false;">[Source]</a> - <div class="method-source-code" id="M000016-source"> + onclick="toggleCode('M000024-source');return false;">[Source]</a> + <div class="method-source-code" id="M000024-source"> <pre> # File lib/fleximage/operator/shadow.rb, line 48 48: def operate(options = {}) @@ -213,7 +213,7 @@ Example: 74: # apply shadow 75: @image = shadow.composite( 76: @image, -77: GRAVITIES[:top_left], +77: symbol_to_gravity(:top_left), 78: (shadow.columns - @image.columns) / 2 - options[:offset][0], 79: (shadow.rows - @image.rows) / 2 - options[:offset][1], 80: symbol_to_blending_mode(:over) rdoc/classes/Fleximage/Operator/Shadow.html @@ -146,7 +146,7 @@ Example: <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000014">operate</a>   + <a href="#M000026">operate</a>   </div> </div> @@ -168,19 +168,19 @@ Example: <div id="methods"> <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000014" class="method-detail"> - <a name="M000014"></a> + <div id="method-M000026" class="method-detail"> + <a name="M000026"></a> <div class="method-heading"> - <a href="#M000014" class="method-signature"> + <a href="#M000026" class="method-signature"> operate(string_to_write, options = {}) </a> </div> <div class="method-description"> <a class="source-toggle" href="#" - onclick="toggleCode('M000014-source');return false;">[Source]</a> - <div class="method-source-code" id="M000014-source"> + onclick="toggleCode('M000026-source');return false;">[Source]</a> + <div class="method-source-code" id="M000026-source"> <pre> # File lib/fleximage/operator/text.rb, line 37 37: def operate(string_to_write, options = {}) @@ -199,7 +199,7 @@ Example: 50: 51: # prepare drawing surface 52: text = Magick::Draw.new -53: text.gravity = GRAVITIES[options[:alignment]] +53: text.gravity = symbol_to_gravity(options[:alignment]) 54: text.fill = options[:color] 55: text.text_antialias = options[:antialias] 56: text.pointsize = options[:font_size].to_i rdoc/classes/Fleximage/Operator/Text.html @@ -96,7 +96,7 @@ that have the same color. <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000013">operate</a>   + <a href="#M000022">operate</a>   </div> </div> @@ -118,19 +118,19 @@ that have the same color. <div id="methods"> <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000013" class="method-detail"> - <a name="M000013"></a> + <div id="method-M000022" class="method-detail"> + <a name="M000022"></a> <div class="method-heading"> - <a href="#M000013" class="method-signature"> + <a href="#M000022" class="method-signature"> operate() </a> </div> <div class="method-description"> <a class="source-toggle" href="#" - onclick="toggleCode('M000013-source');return false;">[Source]</a> - <div class="method-source-code" id="M000013-source"> + onclick="toggleCode('M000022-source');return false;">[Source]</a> + <div class="method-source-code" id="M000022-source"> <pre> # File lib/fleximage/operator/trim.rb, line 8 8: def operate() rdoc/classes/Fleximage/Operator/Trim.html @@ -125,7 +125,7 @@ Example: <h3 class="section-bar">Methods</h3> <div class="name-list"> - <a href="#M000024">operate</a>   + <a href="#M000037">operate</a>   </div> </div> @@ -147,19 +147,19 @@ Example: <div id="methods"> <h3 class="section-bar">Public Instance methods</h3> - <div id="method-M000024" class="method-detail"> - <a name="M000024"></a> + <div id="method-M000037" class="method-detail"> + <a name="M000037"></a> <div class="method-heading"> - <a href="#M000024" class="method-signature"> + <a href="#M000037" class="method-signature"> operate(options = {}) </a> </div> <div class="method-description"> <a class="source-toggle" href="#" - onclick="toggleCode('M000024-source');return false;">[Source]</a> - <div class="method-source-code" id="M000024-source"> + onclick="toggleCode('M000037-source');return false;">[Source]</a> + <div class="method-source-code" id="M000037-source"> <pre> # File lib/fleximage/operator/unsharp_mask.rb, line 21 21: def operate(options = {}) rdoc/classes/Fleximage/Operator/UnsharpMask.html @@ -1 +1 @@ -Sat, 12 Apr 2008 13:32:13 -0700 +Tue, 17 Mar 2009 15:29:02 +0100 rdoc/created.rid @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Sat Apr 12 13:26:28 -0700 2008</td> + <td>Tue Mar 17 15:28:58 +0100 2009</td> </tr> </table> </div> @@ -69,7 +69,75 @@ <div id="contextContent"> <div id="description"> - <h1><a href="../classes/Fleximage.html">Fleximage</a></h1> + <h1>I18n</h1> +<h2>Overview</h2> + +Uses the Rails I18n to translate error messages. While they still can be +set by using the ‘missing_image_message’ and +‘invalid_image_message’ accessors, it‘s better to +configure them in your locale: + +<pre> + en: + activerecord: + errors: + messages: + missing_image: is really required + invalid_image: seems to be broken + image_too_small: "seems to be too small, it needs to be {{minimum}} pixels" +</pre> + +They can also be set on a model level: + +<pre> + en: + activerecord: + errors: + models: + photo: + missing_image: needs to be attached + invalid_image: is broken + image_too_small: "is too small (should be >= {{minimum}})" +</pre> + +If no message is set in your locale, the default one of the original plugin +will be shown. + +<h2>ModelClassAccessor minimum_image_size</h2> + +If this option is set, the model validates that the image is bigger than or +equal to a minimum size. + +<pre> + minimum_image_size [800, 600] +</pre> + +You can set one integer to 1 if you just want one dimension be checked. +(E.g. [800, 1] for images wider than 799 px) + + +The corresponding error message can be set either via + +<pre> + image_too_small_message "too small image (min {{minimum}})" +</pre> + +or as shown above via I18n. + +<h2>Installation</h2> + +Using git: + +<pre> + git submodule add git://github.com/moser/fleximage_i18n.git vendor/plugins/fleximage_i18n +</pre> + +or using: + +<pre> + ./script/plugin install git://github.com/moser/fleximage_i18n.git +</pre> +<h1><a href="../classes/Fleximage.html">Fleximage</a> (original Doc)</h1> <h2>Overview</h2> <a href="../classes/Fleximage.html">Fleximage</a> is a Rails plugin that rdoc/files/README_rdoc.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Sat Apr 05 21:00:22 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/image_proxy_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Sat Apr 12 13:32:05 -0700 2008</td> + <td>Tue Mar 17 15:04:31 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/model_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Sat Apr 05 21:00:22 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/operator/base_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Fri Apr 04 13:51:47 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/operator/border_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Mon Mar 31 09:26:25 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/operator/crop_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Mon Mar 31 10:35:05 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/operator/image_overlay_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Tue Apr 01 14:30:24 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/operator/resize_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Fri Apr 04 15:06:12 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/operator/shadow_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Sat Apr 05 12:52:24 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/operator/text_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Mon Mar 31 09:35:06 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/operator/trim_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Sat Apr 05 13:18:57 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/operator/unsharp_mask_rb.html @@ -56,7 +56,7 @@ </tr> <tr class="top-aligned-row"> <td>Last Update:</td> - <td>Sat Apr 12 13:32:01 -0700 2008</td> + <td>Sat Feb 28 11:37:01 +0100 2009</td> </tr> </table> </div> rdoc/files/lib/fleximage/view_rb.html @@ -20,7 +20,9 @@ <div id="index"> <h1 class="section-bar">Classes</h1> <div id="index-entries"> + <a href="classes/Class.html">Class</a> <a href="classes/Fleximage.html">Fleximage</a> + <a href="classes/Fleximage/Helper.html">Fleximage::Helper</a> <a href="classes/Fleximage/ImageProxy.html">Fleximage::ImageProxy</a> <a href="classes/Fleximage/Model.html">Fleximage::Model</a> <a href="classes/Fleximage/Model/ClassMethods.html">Fleximage::Model::ClassMethods</a> rdoc/fr_class_index.html @@ -21,7 +21,10 @@ <h1 class="section-bar">Files</h1> <div id="index-entries"> <a href="files/README_rdoc.html">README.rdoc</a> + <a href="files/lib/dsl_accessor_rb.html">lib/dsl_accessor.rb</a> + <a href="files/lib/fleximage/helper_rb.html">lib/fleximage/helper.rb</a> <a href="files/lib/fleximage/image_proxy_rb.html">lib/fleximage/image_proxy.rb</a> + <a href="files/lib/fleximage/legacy_view_rb.html">lib/fleximage/legacy_view.rb</a> <a href="files/lib/fleximage/model_rb.html">lib/fleximage/model.rb</a> <a href="files/lib/fleximage/operator/base_rb.html">lib/fleximage/operator/base.rb</a> <a href="files/lib/fleximage/operator/border_rb.html">lib/fleximage/operator/border.rb</a> rdoc/fr_file_index.html @@ -20,33 +20,45 @@ <div id="index"> <h1 class="section-bar">Methods</h1> <div id="index-entries"> - <a href="classes/Fleximage/Model/ClassMethods.html#M000001">acts_as_fleximage (Fleximage::Model::ClassMethods)</a> - <a href="classes/Fleximage/Model/ClassMethods.html#M000003">db_store? (Fleximage::Model::ClassMethods)</a> - <a href="classes/Fleximage/Model/InstanceMethods.html#M000011">delete_image_file (Fleximage::Model::InstanceMethods)</a> - <a href="classes/Fleximage/Model/InstanceMethods.html#M000004">directory_path (Fleximage::Model::InstanceMethods)</a> - <a href="classes/Fleximage/Model/InstanceMethods.html#M000005">file_path (Fleximage::Model::InstanceMethods)</a> - <a href="classes/Fleximage/Model/InstanceMethods.html#M000009">has_image? (Fleximage::Model::InstanceMethods)</a> - <a href="classes/Fleximage/Model/InstanceMethods.html#M000006">image_file= (Fleximage::Model::InstanceMethods)</a> - <a href="classes/Fleximage/Model/InstanceMethods.html#M000008">image_file_url (Fleximage::Model::InstanceMethods)</a> - <a href="classes/Fleximage/Model/InstanceMethods.html#M000007">image_file_url= (Fleximage::Model::InstanceMethods)</a> - <a href="classes/Fleximage/ImageProxy.html#M000027">method_missing (Fleximage::ImageProxy)</a> - <a href="classes/Fleximage/ImageProxy.html#M000026">new (Fleximage::ImageProxy)</a> - <a href="classes/Fleximage/Operator/Shadow.html#M000016">operate (Fleximage::Operator::Shadow)</a> - <a href="classes/Fleximage/Operator/Trim.html#M000013">operate (Fleximage::Operator::Trim)</a> - <a href="classes/Fleximage/Model/InstanceMethods.html#M000010">operate (Fleximage::Model::InstanceMethods)</a> - <a href="classes/Fleximage/Operator/ImageOverlay.html#M000015">operate (Fleximage::Operator::ImageOverlay)</a> - <a href="classes/Fleximage/Operator/Border.html#M000012">operate (Fleximage::Operator::Border)</a> - <a href="classes/Fleximage/Operator/Crop.html#M000017">operate (Fleximage::Operator::Crop)</a> - <a href="classes/Fleximage/Operator/Base.html#M000018">operate (Fleximage::Operator::Base)</a> - <a href="classes/Fleximage/Operator/UnsharpMask.html#M000024">operate (Fleximage::Operator::UnsharpMask)</a> - <a href="classes/Fleximage/Operator/Resize.html#M000025">operate (Fleximage::Operator::Resize)</a> - <a href="classes/Fleximage/Operator/Text.html#M000014">operate (Fleximage::Operator::Text)</a> - <a href="classes/Fleximage/Model/ClassMethods.html#M000002">preprocess_image (Fleximage::Model::ClassMethods)</a> - <a href="classes/Fleximage/Operator/Base.html#M000020">scale (Fleximage::Operator::Base)</a> - <a href="classes/Fleximage/Operator/Base.html#M000021">scale_and_crop (Fleximage::Operator::Base)</a> - <a href="classes/Fleximage/Operator/Base.html#M000019">size_to_xy (Fleximage::Operator::Base)</a> - <a href="classes/Fleximage/Operator/Base.html#M000022">stretch (Fleximage::Operator::Base)</a> - <a href="classes/Fleximage/Operator/Base.html#M000023">symbol_to_blending_mode (Fleximage::Operator::Base)</a> + <a href="classes/Fleximage/Model/ClassMethods.html#M000002">acts_as_fleximage (Fleximage::Model::ClassMethods)</a> + <a href="classes/Fleximage/Model/ClassMethods.html#M000004">db_store? (Fleximage::Model::ClassMethods)</a> + <a href="classes/Fleximage/Model/InstanceMethods.html#M000020">delete_image_file (Fleximage::Model::InstanceMethods)</a> + <a href="classes/Fleximage/Model/InstanceMethods.html#M000011">directory_path (Fleximage::Model::InstanceMethods)</a> + <a href="classes/Class.html#M000001">dsl_accessor (Class)</a> + <a href="classes/Fleximage/Helper.html#M000021">embedded_image_tag (Fleximage::Helper)</a> + <a href="classes/Fleximage/Model/InstanceMethods.html#M000012">file_path (Fleximage::Model::InstanceMethods)</a> + <a href="classes/Fleximage/Model/InstanceMethods.html#M000017">has_image? (Fleximage::Model::InstanceMethods)</a> + <a href="classes/Fleximage/Model/InstanceMethods.html#M000018">has_saved_image? (Fleximage::Model::InstanceMethods)</a> + <a href="classes/Fleximage/Model/ClassMethods.html#M000005">has_store? (Fleximage::Model::ClassMethods)</a> + <a href="classes/Fleximage/Model/InstanceMethods.html#M000013">image_file= (Fleximage::Model::InstanceMethods)</a> + <a href="classes/Fleximage/Model/ClassMethods.html#M000010">image_file_exists (Fleximage::Model::ClassMethods)</a> + <a href="classes/Fleximage/Model/InstanceMethods.html#M000015">image_file_temp= (Fleximage::Model::InstanceMethods)</a> + <a href="classes/Fleximage/Model/InstanceMethods.html#M000016">image_file_url (Fleximage::Model::InstanceMethods)</a> + <a href="classes/Fleximage/Model/InstanceMethods.html#M000014">image_file_url= (Fleximage::Model::InstanceMethods)</a> + <a href="classes/Fleximage/Model/ClassMethods.html#M000008">image_too_small_message (Fleximage::Model::ClassMethods)</a> + <a href="classes/Fleximage/Model/ClassMethods.html#M000007">invalid_image_message (Fleximage::Model::ClassMethods)</a> + <a href="classes/Fleximage/ImageProxy.html#M000039">method_missing (Fleximage::ImageProxy)</a> + <a href="classes/Fleximage/Model/ClassMethods.html#M000009">minimum_image_size_to_s (Fleximage::Model::ClassMethods)</a> + <a href="classes/Fleximage/Model/ClassMethods.html#M000006">missing_image_message (Fleximage::Model::ClassMethods)</a> + <a href="classes/Fleximage/ImageProxy.html#M000038">new (Fleximage::ImageProxy)</a> + <a href="classes/Fleximage/Operator/Text.html#M000026">operate (Fleximage::Operator::Text)</a> + <a href="classes/Fleximage/Model/InstanceMethods.html#M000019">operate (Fleximage::Model::InstanceMethods)</a> + <a href="classes/Fleximage/Operator/Shadow.html#M000024">operate (Fleximage::Operator::Shadow)</a> + <a href="classes/Fleximage/Operator/ImageOverlay.html#M000025">operate (Fleximage::Operator::ImageOverlay)</a> + <a href="classes/Fleximage/Operator/Trim.html#M000022">operate (Fleximage::Operator::Trim)</a> + <a href="classes/Fleximage/Operator/Base.html#M000027">operate (Fleximage::Operator::Base)</a> + <a href="classes/Fleximage/Operator/UnsharpMask.html#M000037">operate (Fleximage::Operator::UnsharpMask)</a> + <a href="classes/Fleximage/Operator/Resize.html#M000036">operate (Fleximage::Operator::Resize)</a> + <a href="classes/Fleximage/Operator/Crop.html#M000035">operate (Fleximage::Operator::Crop)</a> + <a href="classes/Fleximage/Operator/Border.html#M000023">operate (Fleximage::Operator::Border)</a> + <a href="classes/Fleximage/Model/ClassMethods.html#M000003">preprocess_image (Fleximage::Model::ClassMethods)</a> + <a href="classes/Fleximage/Operator/Base.html#M000030">scale (Fleximage::Operator::Base)</a> + <a href="classes/Fleximage/Operator/Base.html#M000031">scale_and_crop (Fleximage::Operator::Base)</a> + <a href="classes/Fleximage/Operator/Base.html#M000028">size_to_xy (Fleximage::Operator::Base)</a> + <a href="classes/Fleximage/Operator/Base.html#M000029">size_to_xy (Fleximage::Operator::Base)</a> + <a href="classes/Fleximage/Operator/Base.html#M000032">stretch (Fleximage::Operator::Base)</a> + <a href="classes/Fleximage/Operator/Base.html#M000033">symbol_to_blending_mode (Fleximage::Operator::Base)</a> + <a href="classes/Fleximage/Operator/Base.html#M000034">symbol_to_gravity (Fleximage::Operator::Base)</a> </div> </div> </body> rdoc/fr_method_index.html @@ -1,3 +1,6 @@ class PhotoBare < ActiveRecord::Base - acts_as_fleximage :image_directory => 'public/uploads' + acts_as_fleximage do + image_directory 'public/uploads' + minimum_image_size [2, 2] + end end test/rails_root/app/models/photo_bare.rb @@ -5,7 +5,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -63,4 +63,4 @@ Rails::Initializer.run do |config| config.load_paths << "#{File.dirname(__FILE__)}/../../../lib/" end -Dependencies.log_activity = true \ No newline at end of file +#Dependencies.log_activity = true test/rails_root/config/environment.rb @@ -4,7 +4,7 @@ # 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 +config.cache_classes = false # Log error messages when you accidentally call methods on nil. config.whiny_nils = true test/rails_root/config/environments/test.rb @@ -42,6 +42,18 @@ class Test::Unit::TestCase #:nodoc: when :cmyk MockFile.new("#{RAILS_ROOT}/../fixtures/cmyk.jpg") + when :i100x100 + MockFile.new("#{RAILS_ROOT}/../fixtures/100x100.jpg") + + when :i1x100 + MockFile.new("#{RAILS_ROOT}/../fixtures/1x100.jpg") + + when :i100x1 + MockFile.new("#{RAILS_ROOT}/../fixtures/100x1.jpg") + + when :i1x1 + MockFile.new("#{RAILS_ROOT}/../fixtures/1x1.jpg") + end end test/test_helper.rb test/rails_root/db/test.sqlite3 87c1089bd8f861b1bac8f7d015d7501762e37363 5cbc497cf9ca18a9db5426fa4e8c341d61156c80 Alex Wayne alex@beautifulpixel.com http://github.com/Squeegy/fleximage/commit/092abaf3d8daedc2b4b31c2e8ce793c967fdcdfc 092abaf3d8daedc2b4b31c2e8ce793c967fdcdfc

2009-04-10T15:46:29-07:00

Merge branch 'master' of git://github.com/moser/fleximage_i18n Conflicts: .gitignore 77ef8de2cd9b73d67dd0e0f2a5c660a3e25c7517 Alex Wayne alex@beautifulpixel.com