From 3d752ad6da033ab0fad65e96b3b7fe44fd5f2fc5 Mon Sep 17 00:00:00 2001 From: "Gun.io Whitespace Robot" Date: Wed, 26 Oct 2011 20:05:41 -0400 Subject: [PATCH] Remove whitespace [Gun.io WhitespaceBot] --- README.rdoc | 34 +-- lib/fleximage/aviary_controller.rb | 38 +-- lib/fleximage/blank.rb | 20 +- lib/fleximage/helper.rb | 16 +- lib/fleximage/image_proxy.rb | 22 +- lib/fleximage/legacy_view.rb | 26 +- lib/fleximage/model.rb | 258 ++++++++-------- lib/fleximage/operator/background.rb | 20 +- lib/fleximage/operator/base.rb | 74 ++--- lib/fleximage/operator/border.rb | 20 +- lib/fleximage/operator/crop.rb | 8 +- lib/fleximage/operator/image_overlay.rb | 44 +-- lib/fleximage/operator/resize.rb | 34 +-- lib/fleximage/operator/shadow.rb | 32 +- lib/fleximage/operator/text.rb | 10 +- lib/fleximage/operator/trim.rb | 4 +- lib/fleximage/operator/unsharp_mask.rb | 6 +- lib/fleximage/view.rb | 24 +- tasks/fleximage_tasks.rake | 54 ++-- test/mock_file.rb | 8 +- test/rails_root/app/models/abstract.rb | 2 +- test/rails_root/config/environment.rb | 6 +- .../config/initializers/inflections.rb | 2 +- test/rails_root/public/.htaccess | 6 +- test/rails_root/public/index.html | 54 ++-- .../rails_root/public/javascripts/controls.js | 122 ++++---- .../rails_root/public/javascripts/dragdrop.js | 288 +++++++++--------- test/rails_root/public/javascripts/effects.js | 250 +++++++-------- test/test_helper.rb | 36 +-- test/unit/abstract_test.rb | 8 +- test/unit/basic_model_test.rb | 10 +- test/unit/blank_test.rb | 8 +- test/unit/default_image_path_option_test.rb | 2 +- test/unit/file_upload_from_local_test.rb | 6 +- test/unit/file_upload_from_strings_test.rb | 6 +- test/unit/file_upload_from_url_test.rb | 6 +- test/unit/file_upload_to_db_test.rb | 10 +- test/unit/i18n_messages_test.rb | 16 +- test/unit/image_directory_option_test.rb | 2 +- test/unit/image_proxy_test.rb | 2 +- test/unit/image_storage_format_option_test.rb | 6 +- test/unit/magic_columns_test.rb | 8 +- test/unit/minimum_image_size_test.rb | 8 +- test/unit/operator_base_test.rb | 54 ++-- test/unit/operator_resize_test.rb | 6 +- test/unit/preprocess_image_option_test.rb | 8 +- test/unit/require_image_option_test.rb | 6 +- test/unit/temp_image_test.rb | 6 +- ...tion_date_based_directories_option_test.rb | 2 +- 49 files changed, 849 insertions(+), 849 deletions(-) diff --git a/README.rdoc b/README.rdoc index eab90e9..5b3bb3a 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,14 +1,14 @@ == Installation Gem: (Recommended) - + gem install fleximage - + # in config/environment.rb config.gem 'fleximage' Plugin: - + ./script/plugin install git://github.com/Squeegy/fleximage.git @@ -49,21 +49,21 @@ Fleximage uses a simple templating engine that allows you to re-render images ex == 1. Installation Gem: (Recommended) - + gem install fleximage - + # in config/environment.rb config.gem 'fleximage' Plugin: - + ./script/plugin install git://github.com/Squeegy/fleximage.git == 2. Activating your model You need to let your model know it should be Fleximage-friendly. Lets say you have a model for photos. - + # app/models/photo.rb class Photo < ActiveRecord::Base acts_as_fleximage :image_directory => 'public/images/uploaded_photos' @@ -77,9 +77,9 @@ There are many other options for your model. Refer to the Fleximage::Model: == 3. The upload form Your users need a way to upload their images into your site. Here is how we might render a form to create a photo record. - + # app/views/photos/new.html.erb - + <% form_for @photo, :html => { :multipart => true } do |f| %>

Name
@@ -101,7 +101,7 @@ Your users need a way to upload their images into your site. Here is how we mig <%= f.submit "Create" %>

<% end %> - + *NOTE*: The ":html => { :multipart => true }" is *VERY* *IMPORTANT*. Without this snippet your browser will not send binary data to the server. If things aren't working, check to make sure you have this in your form declaration. The relevant bit of our form code is: @@ -119,7 +119,7 @@ Right along side the upload field is a simple text field, which maps to the "ima You can have just one of these fields, or both. The model will know how to do the right thing either way. When the user submits the form, all you have to do is assign the form contents to your object in standard Rails fashion, and the image is uploaded and saved for you. Creating a new photo may look like this in your controller: - + # app/controllers/photos_controller.rb def create @photo = Photo.new(params[:photo]) @@ -137,10 +137,10 @@ When the user submits the form, all you have to do is assign the form contents t Rails 2 has amazing support for format driven responses. Given a photo object, by default it would have an HTML view that describes information about that photo. With Fleximage, the JPG or (GIF or PNG) view can be the image data itself. A photo HTML view may look like this: - + # app/views/photos/show.html.erb # http://mysite.com/photos/123 - +

<%= image_tag formatted_photo_path(@photo, :jpg) %>

@@ -169,7 +169,7 @@ The filename of the template should look like this: action_name.jpg.flexi '20x20' image.border :size => 10, :color => 'green' image.text 'I like Cheese' - image.unsharp_mask + image.unsharp_mask image.shadow end @@ -221,7 +221,7 @@ You don't want to render JPGs? That's fine. Just link to the format you want ( # app/views/photos/show.html.erb <%= image_tag photo_path(@photo, :gif) %> - + # app/views/photos/show.gif.flexi @photo.operate do |image| @photo.resize '150x150', :crop => true @@ -232,7 +232,7 @@ The Fleximage template engine will automatically detect the format that is being == Converting/Upgrading your master image store Are you upgrading your live app to the new file store creation date based format? Did you start out with PNG image storage, and later realize you need to store with the more space economic JPG instead? Not problem, Fleximage provides some rake tasks to help you out. - + Each conversion rake task requires that you tell it the class for which that you are changing the file store. For example, if you want to change to the new creation date based storage structure, for the class +Photo+, you can run a rake task like this: rake fleximage:convert:to_nested FLEXIMAGE_CLASS=Photo diff --git a/lib/fleximage/aviary_controller.rb b/lib/fleximage/aviary_controller.rb index 532c2f0..aa745a2 100644 --- a/lib/fleximage/aviary_controller.rb +++ b/lib/fleximage/aviary_controller.rb @@ -1,75 +1,75 @@ module Fleximage - + module AviaryController def self.api_key(value = nil) value ? @api_key = value : @api_key end - + def self.api_key=(value = nil) api_key value end - + # Include acts_as_fleximage class method def self.included(base) #:nodoc: base.extend(ClassMethods) end - + module ClassMethods - + # Invoke this method to enable this controller to allow editing of images via Aviary def editable_in_aviary(model_class, options = {}) unless options.has_key?(:secret) raise ArgumentError, ":secret key in options is required.\nExample: editable_in_aviary(Photo, :secret => \"My-deep-dark-secret\")" end - + # Don't verify authenticity for aviary callback - protect_from_forgery :except => :aviary_image_update - + protect_from_forgery :except => :aviary_image_update + # Include the necesary instance methods include Fleximage::AviaryController::InstanceMethods - + # Add before_filter to secure aviary actions before_filter :aviary_image_security, :only => [:aviary_image, :aviary_image_update] - + # Allow the view access to the image hash generation method helper_method :aviary_image_hash - + # Save the Fleximage model class model_class = model_class.constantize if model_class.is_a?(String) dsl_accessor :aviary_model_class, :default => model_class dsl_accessor :aviary_secret, :default => options[:secret] end - + end - + module InstanceMethods - + # Deliver the master image to aviary def aviary_image render :text => @model.load_image.to_blob, :content_type => Mime::Type.lookup_by_extension(self.class.aviary_model_class.image_storage_format.to_s) end - + # Aviary posts the edited image back to the controller here def aviary_image_update @model.image_file_url = params[:imageurl] @model.save render :text => 'Image Updated From Aviary' end - + protected def aviary_image_hash(model) Digest::SHA1.hexdigest("fleximage-aviary-#{model.id}-#{model.created_at}-#{self.class.aviary_secret}") end - + def aviary_image_security @model = self.class.aviary_model_class.find(params[:id]) unless aviary_image_hash(@model) == params[:key] render :text => '

403 Not Authorized

', :status => '403' end end - + end end - + end \ No newline at end of file diff --git a/lib/fleximage/blank.rb b/lib/fleximage/blank.rb index 1be44f5..0e432a2 100644 --- a/lib/fleximage/blank.rb +++ b/lib/fleximage/blank.rb @@ -1,5 +1,5 @@ module Fleximage - + # The +Blank+ class allows easy creation of dynamic images for views which depends models that # do not store images. For example, perhaps you want a rendering of a text label, or a comment, # or some other type of data that is not inherently image based. @@ -8,27 +8,27 @@ module Fleximage # a new Fleximage::Blank object right in your view. # # Usage: - # + # # Fleximage::Blank.new(size, options = {}).operate { |image| ... } # # Use the following keys in the +options+ hash: # # * color: the color the image will be. Can be a named color or a Magick::Pixel object. - # + # # Example: # # # app/views/comments/show.png.flexi # Fleximage::Blank.new('400x150')).operate do |image| # # Start with a chat bubble image as the background # image.image_overlay('public/images/comment_bubble.png') - # + # # # Assuming that the user model acts_as_fleximage, this will draw the users image. # image.image_overlay(@comment.user.file_path, # :size => '50x50', # :alignment => :top_left, # :offset => '10x10' # ) - # + # # # Add the author name text # image.text(@comment.author, # :alignment => :top_left, @@ -40,9 +40,9 @@ module Fleximage # :opacity => 0.5, # } # ) - # + # # # Add the comment body text - # image.text(@comment.body, + # image.text(@comment.body, # :alignment => :top_left, # :offset => '10x90', # :color => color(128, 128, 128), @@ -52,10 +52,10 @@ module Fleximage class Blank include Fleximage::Model acts_as_fleximage - + def initialize(size, options = {}) width, height = Fleximage::Operator::Base.size_to_xy(size) - + @uploaded_image = Magick::Image.new(width, height) do self.colorspace = Magick::RGBColorspace self.depth = 8 @@ -63,7 +63,7 @@ def initialize(size, options = {}) self.format = 'PNG' self.background_color = options[:color] || 'none' end - + @output_image = @uploaded_image end end diff --git a/lib/fleximage/helper.rb b/lib/fleximage/helper.rb index 8672692..8241395 100644 --- a/lib/fleximage/helper.rb +++ b/lib/fleximage/helper.rb @@ -1,6 +1,6 @@ module Fleximage module Helper - + # Creates an image tag that links directly to image data. Recommended for displays of a # temporary upload that is not saved to a record in the databse yet. def embedded_image_tag(model, options = {}) @@ -9,20 +9,20 @@ def embedded_image_tag(model, options = {}) mime = Mime::Type.lookup_by_extension(format.to_s).to_s image = model.output_image(:format => format) data = Base64.encode64(image) - + options = { :alt => model.class.to_s }.merge(options) - + result = image_tag("data:#{mime};base64,#{data}", options) result.gsub(%r{src=".*/images/data:}, 'src="data:') - + rescue Fleximage::Model::MasterImageNotFound => e nil end - + # Creates a link that opens an image for editing in Aviary. # # Options: - # + # # * image_url: url to the master image used by Aviary for editing. Defauls to url_for(:action => 'aviary_image', :id => model, :only_path => false) # * post_url: url where Aviary will post the updated image. Defauls to url_for(:action => 'aviary_image_update', :id => model, :only_path => false) # @@ -33,9 +33,9 @@ def link_to_edit_in_aviary(text, model, options = {}) post_url = options.delete(:image_update_url) || url_for(:action => 'aviary_image_update', :id => model, :only_path => false, :key => key) api_key = Fleximage::AviaryController.api_key url = "http://aviary.com/flash/aviary/index.aspx?tid=1&phoenix&apil=#{api_key}&loadurl=#{CGI.escape image_url}&posturl=#{CGI.escape post_url}" - + link_to text, url, { :target => 'aviary' }.merge(options) end - + end end diff --git a/lib/fleximage/image_proxy.rb b/lib/fleximage/image_proxy.rb index 2721ce6..ff00837 100644 --- a/lib/fleximage/image_proxy.rb +++ b/lib/fleximage/image_proxy.rb @@ -1,5 +1,5 @@ module Fleximage - + # An instance of this class is yielded when Model#operate is called. It enables image operators # to be called to transform the image. You should never need to directly deal with this class. # You simply call image operators on this object when inside an Model#operate block @@ -10,13 +10,13 @@ module Fleximage # # In this example, +image+ is an instance of ImageProxy class ImageProxy - + class OperatorNotFound < NameError #:nodoc: end - + # The image to be manipulated by operators. attr_accessor :image - + # Create a new image operator proxy. def initialize(image, model_obj) @image = image @@ -32,24 +32,24 @@ def width def height @image.rows end - + # A call to an unknown method will look for an Operator by that method's name. # If it finds one, it will execute that operator. def method_missing(method_name, *args) # Find the operator class class_name = method_name.to_s.camelcase operator_class = "Fleximage::Operator::#{class_name}".constantize - + # Define a method for this operator so future calls to this operation are faster self.class.module_eval <<-EOF def #{method_name}(*args) @image = execute_operator(#{operator_class}, *args) end EOF - + # Call the method that was just defined to perform its functionality. send(method_name, *args) - + rescue NameError => e if e.to_s =~ /uninitialized constant Fleximage::Operator::#{class_name}/ raise OperatorNotFound, "No operator Fleximage::Operator::#{class_name} found for the method \"#{method_name}\"" @@ -57,13 +57,13 @@ def #{method_name}(*args) raise e end end - + private # Instantiate and execute the requested image Operator. def execute_operator(operator_class, *args) operator_class.new(self, @image, @model).execute(*args) end - + end - + end \ No newline at end of file diff --git a/lib/fleximage/legacy_view.rb b/lib/fleximage/legacy_view.rb index 1a2a7aa..4c36611 100644 --- a/lib/fleximage/legacy_view.rb +++ b/lib/fleximage/legacy_view.rb @@ -1,18 +1,18 @@ module Fleximage - + # Renders a .flexi template class LegacyView #:nodoc: class TemplateDidNotReturnImage < RuntimeError #:nodoc: end - + def initialize(view) @view = view end - + def render(template, local_assigns = {}) # process the view result = @view.instance_eval do - + # Shorthand color creation def color(*args) if args.size == 1 && args.first.is_a?(String) @@ -21,40 +21,40 @@ def color(*args) Magick::Pixel.new(*args) end end - + # inject assigns into instance variables assigns.each do |key, value| instance_variable_set "@#{key}", value end - + # inject local assigns into reader methods local_assigns.each do |key, value| class << self; self; end.send(:define_method, key) { value } end - + #execute the template eval(template) end - + # Raise an error if object returned from template is not an image record unless result.class.include?(Fleximage::Model::InstanceMethods) raise TemplateDidNotReturnImage, ".flexi template was expected to return a model instance that acts_as_fleximage, but got an instance of <#{result.class}> instead." end - + # Figure out the proper format requested_format = (@view.params[:format] || :jpg).to_sym raise 'Image must be requested with an image type format. jpg, gif and png only are supported.' unless [:jpg, :gif, :png].include?(requested_format) - + # Set proper content type @view.controller.headers["Content-Type"] = Mime::Type.lookup_by_extension(requested_format.to_s).to_s - + # get rendered result rendered_image = result.output_image(:format => requested_format) - + # Return image data return rendered_image ensure - + # ensure garbage collection happens after every flex image render rendered_image.dispose! GC.start diff --git a/lib/fleximage/model.rb b/lib/fleximage/model.rb index a1c96e7..8527a9c 100644 --- a/lib/fleximage/model.rb +++ b/lib/fleximage/model.rb @@ -1,40 +1,40 @@ module Fleximage - + # Container for Fleximage model method inclusion modules module Model - + class MasterImageNotFound < RuntimeError #:nodoc: end - + # Include acts_as_fleximage class method def self.included(base) #:nodoc: base.extend(ClassMethods) end - + # Provides class methods for Fleximage for use in model classes. The only class method is # acts_as_fleximage which integrates Fleximage functionality into a model class. # # The following class level accessors also get inserted. # - # * +image_directory+: (String, no default) Where the master images are stored, directory path relative to your + # * +image_directory+: (String, no default) Where the master images are stored, directory path relative to your # app root. - # * s3_bucket: Name of the bucket on Amazon S3 where your master images are stored. To use this you must + # * s3_bucket: Name of the bucket on Amazon S3 where your master images are stored. To use this you must # call establish_connection! on the aws/s3 gem form your app's initilization to authenticate with your # S3 account. # * +use_creation_date_based_directories+: (Boolean, default +true+) If true, master images will be stored in # directories based on creation date. For example: "#{image_directory}/2007/11/24/123.png" for an # image with an id of 123 and a creation date of November 24, 2007. Turing this off would cause the path - # to be "#{image_directory}/123.png" instead. This helps keep the OS from having directories that are too + # to be "#{image_directory}/123.png" instead. This helps keep the OS from having directories that are too # full. - # * +image_storage_format+: (:png or :jpg, default :png) The format of your master images. Using :png will give - # you the best quality, since the master images as stored as lossless version of the original upload. :jpg - # will apply lossy compression, but the master image file sizes will be much smaller. If storage space is a + # * +image_storage_format+: (:png or :jpg, default :png) The format of your master images. Using :png will give + # you the best quality, since the master images as stored as lossless version of the original upload. :jpg + # will apply lossy compression, but the master image file sizes will be much smaller. If storage space is a # concern, us :jpg. # * +require_image+: (Boolean, default +true+) The model will raise a validation error if no image is uploaded # with the record. Setting to false allows record to be saved with no images. - # * +missing_image_message+: (String, default "is required") Validation message to display when no image was uploaded for + # * +missing_image_message+: (String, default "is required") Validation message to display when no image was uploaded for # a record. - # * +invalid_image_message+: (String default "was not a readable image") Validation message when an image is uploaded, but is not an + # * +invalid_image_message+: (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. # * +output_image_jpg_quality+: (Integer, default 85) When rendering JPGs, this represents the amount of # compression. Valid values are 0-100, where 0 is very small and very ugly, and 100 is near lossless but @@ -45,13 +45,13 @@ def self.included(base) #:nodoc: # :color => :transparent, where :size defines the dimensions of the default image, and :color # defines the fill. :color can be a named color as a string ('red'), :transparent, or a Magick::Pixel object. # * +preprocess_image+: (Block, no default) Call this class method just like you would call +operate+ in a view. - # The image transoformation in the provided block will be run on every uploaded image before its saved as the + # The image transoformation in the provided block will be run on every uploaded image before its saved as the # master image. # # Example: # # class Photo < ActiveRecord::Base - # acts_as_fleximage do + # acts_as_fleximage do # image_directory 'public/images/uploaded' # use_creation_date_based_directories true # image_storage_format :png @@ -61,32 +61,32 @@ def self.included(base) #:nodoc: # default_image_path 'public/images/no_photo_yet.png' # default_image nil # output_image_jpg_quality 85 - # + # # preprocess_image do |image| # image.resize '1024x768' # end # end - # + # # # normal model methods... # end module ClassMethods - - # Use this method to include Fleximage functionality in your model. It takes an - # options hash with a single required key, :+image_directory+. This key should + + # Use this method to include Fleximage functionality in your model. It takes an + # options hash with a single required key, :+image_directory+. This key should # point to the directory you want your images stored on your server. Or # configure with a nice looking block. def acts_as_fleximage(options = {}) - + # Include the necesary instance methods include Fleximage::Model::InstanceMethods - + # Call this class method just like you would call +operate+ in a view. - # The image transoformation in the provided block will be run on every uploaded image before its saved as the + # The image transoformation in the provided block will be run on every uploaded image before its saved as the # master image. def self.preprocess_image(&block) preprocess_image_operation(block) end - + # Internal method to ask this class if it stores image in the DB. def self.db_store? return false if s3_store? @@ -98,52 +98,52 @@ def self.db_store? false end end - + def self.s3_store? !!s3_bucket end - + def self.file_store? !db_store? && !s3_store? end - + def self.has_store? respond_to?(:columns) && (db_store? || s3_store? || image_directory) end - + # validation callback validate :validate_image if respond_to?(:validate) - + # The filename of the temp image. Used for storing of good images when validation fails # and the form needs to be redisplayed. attr_reader :image_file_temp - + # Setter for jpg compression quality at the instance level attr_accessor :jpg_compression_quality - + # Where images get stored dsl_accessor :image_directory - + # Amazon S3 bucket where the master images are stored dsl_accessor :s3_bucket - + # Put uploads from different days into different subdirectories dsl_accessor :use_creation_date_based_directories, :default => true - + # The format are master images are stored in dsl_accessor :image_storage_format, :default => Proc.new { :png } - + # 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' def self.missing_image_message(str = nil) @@ -153,13 +153,13 @@ def self.missing_image_message(str = nil) 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' def self.invalid_image_message(str = nil) @@ -173,7 +173,7 @@ def self.invalid_image_message(str = nil) @invalid_image_message = str end end - + # Image too small message # Should include {{minimum}} def self.image_too_small_message(str = nil) @@ -189,36 +189,36 @@ def self.image_too_small_message(str = nil) @image_too_small_message = str end end - + # Sets the quality of rendered JPGs dsl_accessor :output_image_jpg_quality, :default => 85 - + # Set a default image to use when no image has been assigned to this record dsl_accessor :default_image_path - + # Set a default image based on a a size and fill dsl_accessor :default_image - + # A block that processes an image before it gets saved as the master image of a record. # Can be helpful to resize potentially huge images to something more manageable. Set via # the "preprocess_image { |image| ... }" class method. dsl_accessor :preprocess_image_operation - + # Set a minimum size ([x, y] e.g. 200, '800x600', [800, 600]) # Set '0x600' to just enforce y size or # '800x0' to just validate x size. dsl_accessor :validates_image_size - + # Image related save and destroy callbacks if respond_to?(:before_save) after_destroy :delete_image_file before_save :pre_save after_save :post_save end - + # execute configuration block yield if block_given? - + # Create S3 bucket if it's not present if s3_bucket begin @@ -227,10 +227,10 @@ def self.image_too_small_message(str = nil) AWS::S3::Bucket.create(s3_bucket) end end - + # set the image directory from passed options image_directory options[:image_directory] if options[:image_directory] - + # Require the declaration of a master image storage directory if respond_to?(:validate) && !image_directory && !db_store? && !s3_store? && !default_image && !default_image_path raise "No place to put images! Declare this via the :image_directory => 'path/to/directory' option\n"+ @@ -239,31 +239,31 @@ def self.image_too_small_message(str = nil) "Or set a default image to show with :default_image or :default_image_path" end end - + def image_file_exists(file) # File must be a valid object return false if file.nil? - + # Get the size of the file. file.size works for form-uploaded images, file.stat.size works # for file object created by File.open('foo.jpg', 'rb'). It must have a size > 0. return false if (file.respond_to?(:size) ? file.size : file.stat.size) <= 0 - + # object must respond to the read method to fetch its contents. return false if !file.respond_to?(:read) - + # file validation passed, return true true end end - + # Provides methods that every model instance that acts_as_fleximage needs. module InstanceMethods - + # Returns the path to the master image file for this record. - # + # # @some_image.directory_path #=> /var/www/myapp/uploaded_images # - # If this model has a created_at field, it will use a directory + # If this model has a created_at field, it will use a directory # structure based on the creation date, to prevent hitting the OS imposed # limit on the number files in a directory. # @@ -271,21 +271,21 @@ module InstanceMethods def directory_path directory = self.class.image_directory raise 'No image directory was defined, cannot generate path' unless directory - + # base directory directory = "#{RAILS_ROOT}/#{directory}" unless /^\// =~ directory - + # specific creation date based directory suffix. creation = self[:created_at] || self[:created_on] - if self.class.use_creation_date_based_directories && creation + if self.class.use_creation_date_based_directories && creation "#{directory}/#{creation.year}/#{creation.month}/#{creation.day}" else directory end end - + # Returns the path to the master image file for this record. - # + # # @some_image.file_path #=> /var/www/myapp/uploaded_images/123.png def file_path "#{directory_path}/#{id}.#{extension}" @@ -305,16 +305,16 @@ def extension self.class.image_storage_format end end - + def url_format extension.to_sym end - # Sets the image file for this record to an uploaded file. This can - # be called directly, or passively like from an ActiveRecord mass + # Sets the image file for this record to an uploaded file. This can + # be called directly, or passively like from an ActiveRecord mass # assignment. - # - # Rails will automatically call this method for you, in most of the + # + # Rails will automatically call this method for you, in most of the # situations you would expect it to. # # # via mass assignment, the most common form you'll probably use @@ -324,31 +324,31 @@ def url_format # # via explicit assignment hash # Photo.new(:image_file => params[:photo][:image_file]) # Photo.create(:image_file => params[:photo][:image_file]) - # + # # # Direct Assignment, usually not needed # photo = Photo.new # photo.image_file = params[:photo][:image_file] - # + # # # via an association proxy # p = Product.find(1) # p.images.create(params[:photo]) def image_file=(file) if self.class.image_file_exists(file) - + # Create RMagick Image object from uploaded file if file.path @uploaded_image = Magick::Image.read(file.path).first else @uploaded_image = Magick::Image.from_blob(file.read).first end - + # Sanitize image data @uploaded_image.colorspace = Magick::RGBColorspace @uploaded_image.density = '72' - + # Save meta data to database set_magic_attributes(file) - + # Success, make sure everything is valid @invalid_image = false save_temp_image(file) unless @dont_save_temp @@ -370,10 +370,10 @@ def image_file=(file) def image_file has_image? end - + # Assign the image via a URL, which will make the plugin go # and fetch the image at the provided URL. The image will be stored - # locally as a master image for that record from then on. This is + # locally as a master image for that record from then on. This is # intended to be used along side the image upload to allow people the # choice to upload from their local machine, or pull from the internet. # @@ -382,25 +382,25 @@ def image_file_url=(file_url) @image_file_url = file_url if file_url =~ %r{^(https?|ftp)://} file = open(file_url) - + # Force a URL based file to have an original_filename eval <<-CODE def file.original_filename "#{file_url}" end CODE - + self.image_file = file - + elsif file_url.empty? # Nothing to process, move along - + else # invalid URL, raise invalid image validation error @invalid_image = true end end - + # Set the image for this record by reading in file data as a string. # # data = File.read('my_image_file.jpg') @@ -428,7 +428,7 @@ def image_file_temp=(file_name) if !@uploaded_image && file_name && file_name.present? && file_name !~ %r{\.\./} @image_file_temp = file_name file_path = "#{RAILS_ROOT}/tmp/fleximage/#{file_name}" - + @dont_save_temp = true if File.exists?(file_path) File.open(file_path, 'rb') do |f| @@ -444,12 +444,12 @@ def image_file_temp=(file_name) def image_file_url @image_file_url end - + # Return true if this record has an image. def has_image? @uploaded_image || @output_image || has_saved_image? end - + def has_saved_image? if self.class.db_store? !!image_file_data @@ -459,11 +459,11 @@ def has_saved_image? File.exists?(file_path) end end - - # Call from a .flexi view template. This enables the rendering of operators + + # Call from a .flexi view template. This enables the rendering of operators # so that you can transform your image. This is the method that is the foundation # of .flexi views. Every view should consist of image manipulation code inside a - # block passed to this method. + # block passed to this method. # # # app/views/photos/thumb.jpg.flexi # @photo.operate do |image| @@ -485,42 +485,42 @@ def operate!(&block) save end - # Load the image from disk/DB, or return the cached and potentially + # Load the image from disk/DB, or return the cached and potentially # processed output image. def load_image #:nodoc: @output_image ||= @uploaded_image - + # Return the current image if we have loaded it already return @output_image if @output_image - + # Load the image from disk if self.class.db_store? # Load the image from the database column if image_file_data && image_file_data.present? @output_image = Magick::Image.from_blob(image_file_data).first end - + elsif self.class.s3_store? # Load image from S3 filename = "#{id}.#{self.class.image_storage_format}" bucket = self.class.s3_bucket - + if AWS::S3::S3Object.exists?(filename, bucket) @output_image = Magick::Image.from_blob(AWS::S3::S3Object.value(filename, bucket)).first end - + else # Load the image from the disk @output_image = Magick::Image.read(file_path).first - + end - + if @output_image @output_image else master_image_not_found end - + rescue Magick::ImageMagickError => e if e.to_s =~ /unable to open (file|image)/ master_image_not_found @@ -528,7 +528,7 @@ def load_image #:nodoc: raise e end end - + # Convert the current output image to a jpg, and return it in binary form. options support a # :format key that can be :jpg, :gif or :png def output_image(options = {}) #:nodoc: @@ -544,12 +544,12 @@ def output_image(options = {}) #:nodoc: ensure GC.start end - - # Delete the image file for this record. This is automatically ran after this record gets + + # Delete the image file for this record. This is automatically ran after this record gets # destroyed, but you can call it manually if you want to remove the image from the record. def delete_image_file return unless self.class.has_store? - + if self.class.db_store? update_attribute :image_file_data, nil unless frozen? elsif self.class.s3_store? @@ -557,69 +557,69 @@ def delete_image_file else File.delete(file_path) if File.exists?(file_path) end - + clear_magic_attributes - + self end - + # Execute image presence and validity validations. def validate_image #:nodoc: field_name = (@image_file_url && @image_file_url.present?) ? :image_file_url : :image_file - + # Could not read the file as an image if @invalid_image errors.add field_name, self.class.invalid_image_message - + # no image uploaded and one is required elsif self.class.require_image && !has_image? errors.add field_name, self.class.missing_image_message - + # Image does not meet minimum size elsif self.class.validates_image_size && !@uploaded_image.nil? x, y = Fleximage::Operator::Base.size_to_xy(self.class.validates_image_size) - + if @uploaded_image.columns < x || @uploaded_image.rows < y errors.add field_name, self.class.image_too_small_message end - + end end - + private # Perform pre save tasks. Preprocess the image, and write it to DB. def pre_save if @uploaded_image # perform preprocessing perform_preprocess_operation - + # Convert to storage format @uploaded_image.format = self.class.image_storage_format.to_s.upcase unless respond_to?(:image_format) - + # Write image data to the DB field if self.class.db_store? self.image_file_data = @uploaded_image.to_blob end end end - + # Write image to file system/S3 and cleanup garbage. def post_save if @uploaded_image if self.class.file_store? # Make sure target directory exists FileUtils.mkdir_p(directory_path) - + # Write master image file @uploaded_image.write(file_path) - + elsif self.class.s3_store? blob = StringIO.new(@uploaded_image.to_blob) AWS::S3::S3Object.store("#{id}.#{self.class.image_storage_format}", blob, self.class.s3_bucket) - + end end - + # Cleanup temp files delete_temp_image @@ -628,7 +628,7 @@ def post_save GC.start end end - + # Preprocess this image before saving def perform_preprocess_operation if self.class.preprocess_image_operation @@ -637,7 +637,7 @@ def perform_preprocess_operation @uploaded_image = @output_image end end - + def clear_magic_attributes unless frozen? self.image_filename = nil if respond_to?(:image_filename=) @@ -646,7 +646,7 @@ def clear_magic_attributes self.image_format = nil if respond_to?(:image_format=) end end - + # If any magic column names exists fill them with image meta data. def set_magic_attributes(file = nil) if file && self.respond_to?(:image_filename=) @@ -658,7 +658,7 @@ def set_magic_attributes(file = nil) self.image_height = @uploaded_image.rows if self.respond_to?(:image_height=) self.image_format = @uploaded_image.format if self.respond_to?(:image_format=) end - + # Save the image in the rails tmp directory def save_temp_image(file) file_name = file.respond_to?(:original_filename) ? file.original_filename : file.path @@ -670,42 +670,42 @@ def save_temp_image(file) f.write file.read end end - + # Delete the temp image after its no longer needed def delete_temp_image FileUtils.rm_rf "#{RAILS_ROOT}/tmp/fleximage/#{@image_file_temp}" end - + # Load the default image, or raise an expection def master_image_not_found # Load the default image from a path if self.class.default_image_path @output_image = Magick::Image.read("#{RAILS_ROOT}/#{self.class.default_image_path}").first - + # Or create a default image elsif self.class.default_image x, y = Fleximage::Operator::Base.size_to_xy(self.class.default_image[:size]) color = self.class.default_image[:color] - + @output_image = Magick::Image.new(x, y) do self.background_color = color if color && color != :transparent end - + # No default, not master image, so raise exception else message = "Master image was not found for this record" - + if !self.class.db_store? message << "\nExpected image to be at:" message << "\n #{file_path}" end - + raise MasterImageNotFound, message end ensure GC.start end end - + end end diff --git a/lib/fleximage/operator/background.rb b/lib/fleximage/operator/background.rb index 445e3d8..8aa1ed0 100644 --- a/lib/fleximage/operator/background.rb +++ b/lib/fleximage/operator/background.rb @@ -8,28 +8,28 @@ module Operator # * +color+: the color of the background image. # Use an RMagick named color or use the +color+ method in Fleximage::Controller, or a # Magick::Pixel object. - # - # * +size+: The size of the background image, in Fleximage *size* format. + # + # * +size+: The size of the background image, in Fleximage *size* format. # By default the background image is the same size as the foreground image - # - # * +alignment+: A symbol that tells Fleximage where to put the foreground image on + # + # * +alignment+: A symbol that tells Fleximage where to put the foreground image on # top of the background image. Can be any of the following: # :center, :top, :top_right, :right, :bottom_right, :bottom, :bottom_left, :left, :top_left. # Default is :+center+ - # - # * +offset+: the number of pixels to offset the foreground image from it's :+alignment+ anchor, in FlexImage + # + # * +offset+: the number of pixels to offset the foreground image from it's :+alignment+ anchor, in FlexImage # *size* format. Useful to give a bit a space between your image and the edge of the background, for instance. # *NOTE:* Due to some unexpected (buggy?) RMagick behaviour :+offset+ will work strangely # if :+alignment+ is set to a corner non-corner value, such as :+top+ or :+center+. Using :+offset+ in # these cases will force the overlay into a corner anyway. - # - # * +blending+: The blending mode governs how the foreground image gets composited onto the background. You can + # + # * +blending+: The blending mode governs how the foreground image gets composited onto the background. You can # get some funky effects with modes like :+copy_cyan+ or :+screen+. For a full list of blending # modes checkout the RMagick documentation (http://www.simplesystems.org/RMagick/doc/constants.html#CompositeOperator). # To use a blend mode remove the +CompositeOp+ form the name and "unserscorize" the rest. For instance, # +MultiplyCompositeOp+ becomes :+multiply+, and +CopyBlackCompositeOp+ becomes :+copy_black+. - class Background < Operator::Base + class Background < Operator::Base def operate(options = {}) options = options.symbolize_keys @@ -40,7 +40,7 @@ def operate(options = {}) width, height = options.key?(:size) ? size_to_xy(options[:size]) : [@image.columns, @image.rows] #create the background image onto which we will composite the foreground image - bg = Magick::Image.new(width, height) do + bg = Magick::Image.new(width, height) do self.background_color = color self.format = 'PNG' end diff --git a/lib/fleximage/operator/base.rb b/lib/fleximage/operator/base.rb index 7ae904f..970cb61 100644 --- a/lib/fleximage/operator/base.rb +++ b/lib/fleximage/operator/base.rb @@ -1,21 +1,21 @@ module Fleximage module Operator - + class BadOperatorResult < Exception #:nodoc: end - + class OperationNotImplemented < Exception #:nodoc: end - + # The Operator::Base class is what all other Operator classes inherit from. - # To write your own Operator class, simply inherit from this class, and - # implement your own operate methods, with your own arguments. Just + # To write your own Operator class, simply inherit from this class, and + # implement your own operate 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 operate method: # - # * @image : The current image from the model. Use this is a starting + # * @image : The current image from the model. Use this is a starting # point for all transformations. # * @model : The model instance that this image transformation is happenining # in. Use it to get data out of your model for display in your image. @@ -26,47 +26,47 @@ def initialize(proxy, image, model_obj) #:nodoc: @image = image @model = model_obj end - + # Start the operation def execute(*args) #:nodoc: # Get the result of the Operators #operate method result = operate(*args) - + # Ensure that the result is an RMagick:Image object unless result.is_a?(Magick::Image) raise BadOperatorResult, "expected #{self.class}#operate to return an instance of Magick::Image. \n"+ "Got instance of #{result.class} instead." end - + # Save the result to the operator proxy @proxy.image = result end - + # Perform the operation. Override this method in your Operator::Base subclasses # in order to write your own image operators. def operate(*args) raise OperationNotImplemented, "Override this method in your own subclass." end - + # --- # - SUPPORT METHODS # --- - + # Allows access to size conversion globally. See size_to_xy for a more detailed explanation def self.size_to_xy(size) - case + case when size.is_a?(Array) && size.size == 2 # [320, 240] size - + when size.to_s.include?('x') # "320x240" size.split('x').collect(&:to_i) - + else # Anything else, convert the object to an integer and assume square dimensions [size.to_i, size.to_i] - + end end - + # This method will return a valid color Magick::Pixel object. It will also auto adjust # for the bit depth of your ImageMagick configuration. # @@ -83,7 +83,7 @@ def self.color(*args) if args.size == 1 && args.first.is_a?(String) args.first else - + # adjust color to proper bit depth if Magick::QuantumDepth != 8 max = case Magick::QuantumDepth @@ -92,23 +92,23 @@ def self.color(*args) when 32 4_294_967_295 end - + args.map! do |value| (value.to_f/255 * max).to_i end end - + # create the pixel Magick::Pixel.new(*args) end end - + def color(*args) self.class.color(*args) end - + # Converts a size object to an [x,y] array. Acceptible formats are: - # + # # * 10 # * "10" # * "10x20" @@ -120,8 +120,8 @@ def color(*args) def size_to_xy(size) self.class.size_to_xy size end - - # Scale the image, respecting aspect ratio. + + # Scale the image, respecting aspect ratio. # Operation will happen in the main @image unless you supply the +img+ argument # to operate on instead. def scale(size, img = @image) @@ -131,24 +131,24 @@ def scale(size, img = @image) _img.resize!(cols, rows) end end - + # Scale to the desired size and crop edges off to get the exact dimensions needed. # Operation will happen in the main @image unless you supply the +img+ argument # to operate on instead. def scale_and_crop(size, img = @image) img.crop_resized!(*size_to_xy(size)) end - - # Resize the image, with no respect to aspect ratio. + + # Resize the image, with no respect to aspect ratio. # Operation will happen in the main @image unless you supply the +img+ argument # to operate on instead. def stretch(size, img = @image) img.resize!(*size_to_xy(size)) end - + # Convert a symbol to an RMagick blending mode. - # - # The blending mode governs how the overlay gets composited onto the image. You can + # + # The blending mode governs how the overlay gets composited onto the image. You can # get some funky effects with modes like :+copy_cyan+ or :+screen+. For a full list of blending # modes checkout the RMagick documentation (http://www.simplesystems.org/RMagick/doc/constants.html#CompositeOperator). # To use a blend mode remove the +CompositeOp+ form the name and "unserscorize" the rest. For instance, @@ -158,20 +158,20 @@ def symbol_to_blending_mode(mode) rescue NameError raise ArgumentError, ":#{mode} is not a valid blending mode." end - + def symbol_to_gravity(gravity_name) gravity = GRAVITIES[gravity_name] - + if gravity gravity else 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" end end - - + + end # Base - + # Conversion table for mapping alignment symbols to their equivalent RMagick gravity constants. GRAVITIES = { :center => Magick::CenterGravity, @@ -184,6 +184,6 @@ def symbol_to_gravity(gravity_name) :left => Magick::WestGravity, :top_left => Magick::NorthWestGravity, } unless defined?(GRAVITIES) - + end # Operator end # Fleximage \ No newline at end of file diff --git a/lib/fleximage/operator/border.rb b/lib/fleximage/operator/border.rb index 80a6680..75163f3 100644 --- a/lib/fleximage/operator/border.rb +++ b/lib/fleximage/operator/border.rb @@ -1,28 +1,28 @@ module Fleximage module Operator - + # Add a border to the outside of the image # # image.border(options = {}) - # + # # Use the following keys in the +options+ hash: # # * +size+: Width of the border on each side. You can use a 2 dimensional value ('5x10') if you want - # different widths for the sides and top borders, but a single integer will apply the same border on + # different widths for the sides and top borders, but a single integer will apply the same border on # all sides. - # - # * +color+: the color of the border. Use an RMagick named color or use the +color+ method in + # + # * +color+: the color of the border. Use an RMagick named color or use the +color+ method in # FlexImage::Controller, or a Magick::Pixel object. - # + # # Example: - # + # # @photo.operate do |image| # # Defaults # image.border( # :size => 10, # :color => 'white' # or color(255, 255, 255) # ) - # + # # # Big, pink and wide # image.border( # :size => '200x100', @@ -37,7 +37,7 @@ def operate(options = {}) :color => 'white' } options = options.is_a?(Hash) ? defaults.update(options) : defaults - + # Get border size options[:size] = size_to_xy(options[:size]) @@ -45,6 +45,6 @@ def operate(options = {}) @image.border!(options[:size][0], options[:size][1], options[:color]) end end - + end end \ No newline at end of file diff --git a/lib/fleximage/operator/crop.rb b/lib/fleximage/operator/crop.rb index f55377a..3ff44aa 100644 --- a/lib/fleximage/operator/crop.rb +++ b/lib/fleximage/operator/crop.rb @@ -1,9 +1,9 @@ module Fleximage module Operator - + # Crops the image without doing any resizing first. The operation crops from the :+from+ coordinate, # and returns an image of size :+size+ down and right from there. - # + # # image.crop(options = {}) # # Use the following keys in the +options+ hash: @@ -12,7 +12,7 @@ module Operator # Choose from GRAVITITES constant defined in base.rb. # * +from+: coorinates for the upper left corner of resulting image. # * +size+: The size of the resulting image, going down and to the right of the :+from+ coordinate. - # + # # size and from options are *required*. # # Example: @@ -53,6 +53,6 @@ def operate(options = {}) @image.crop!(symbol_to_gravity(options[:gravity]), options[:from][0], options[:from][1], options[:size][0], options[:size][1], true) end end - + end end \ No newline at end of file diff --git a/lib/fleximage/operator/image_overlay.rb b/lib/fleximage/operator/image_overlay.rb index 058b40d..5186060 100644 --- a/lib/fleximage/operator/image_overlay.rb +++ b/lib/fleximage/operator/image_overlay.rb @@ -1,46 +1,46 @@ module Fleximage module Operator - + # Adds an overlay to the base image. It's useful for things like attaching a logo, # watermark, or even a border to the image. It will work best with a 24-bit PNG with # alpha channel since it will properly deal with partial transparency. - # + # # image.resize(image_overlay_path, options = {}) - # + # # +image_overlay_path+ is the path, relative to +RAILS_ROOT+ where the image you want superimposed # can be found. - # + # # Use the following keys in the +options+ hash: - # - # * +size+: The size of the overlayed image, as '123x456' or [123, 456]. + # + # * +size+: The size of the overlayed image, as '123x456' or [123, 456]. # By default the overlay is not resized before compositing. # Use this options if you want to resize the overlay, perhaps to have a small # logo on thumbnails and a big logo on full size images. Other than just numerical dimensions, the - # size parameter takes 2 special values :+scale_to_fit+ and :+stretch_to_fit+. :+scale_to_fit+ will - # make the overlay fit as + # size parameter takes 2 special values :+scale_to_fit+ and :+stretch_to_fit+. :+scale_to_fit+ will + # make the overlay fit as # much as it can inside the image without changing the aspect ratio. :+stretch_to_fit+ # will make the overlay the exact same size as the image but with a distorted aspect ratio to make # it fit. :+stretch_to_fit+ is designed to add border to images. - # + # # * +alignment+: A symbol that tells Fleximage where to put the overlay. Can be any of the following: # :center, :top, :top_right, :right, :bottom_right, :bottom, :bottom_left, :left, :top_left. # Default is :+center+ - # - # * +offset+: the number of pixels to offset the overlay from it's :+alignment+ anchor, in - # '123x456' or [123, 456] format. Useful to give a bit a space between your logo + # + # * +offset+: the number of pixels to offset the overlay from it's :+alignment+ anchor, in + # '123x456' or [123, 456] format. Useful to give a bit a space between your logo # and the edge of the image, for instance. # *NOTE:* Due to some unexpected (buggy?) RMagick behaviour :+offset+ will work strangely # if :+alignment+ is set to a non-corner value, such as :+top+ or :+center+. Using :+offset+ in # these cases will force the overlay into a corner anyway. - # - # * +blending+: The blending mode governs how the overlay gets composited onto the image. You can + # + # * +blending+: The blending mode governs how the overlay gets composited onto the image. You can # get some funky effects with modes like :+copy_cyan+ or :+screen+. For a full list of blending # modes checkout the RMagick documentation (http://www.simplesystems.org/RMagick/doc/constants.html#CompositeOperator). # To use a blend mode remove the +CompositeOp+ form the name and "unserscorize" the rest. For instance, # +MultiplyCompositeOp+ becomes :+multiply+, and +CopyBlackCompositeOp+ becomes :+copy_black+. # # Example: - # + # # @photo.operate do |image| # image.image_overlay('images/my_logo_with_alpha.png', # :size => '25x25', @@ -51,10 +51,10 @@ module Operator class ImageOverlay < Operator::Base def operate(image_overlay_path, options = {}) options = options.symbolize_keys - + #load overlay overlay = Magick::Image.read(image_overlay_path).first - + #resize overlay if options[:size] if options[:size] == :scale_to_fit || options[:size] == :stretch_to_fit @@ -62,24 +62,24 @@ def operate(image_overlay_path, options = {}) else x, y = size_to_xy(options[:size]) end - + method = options[:size] == :stretch_to_fit ? :stretch : :scale send(method, [x, y], overlay) end - + #prepare arguments for composite! args = [] args << overlay #overlay image args << symbol_to_gravity(options[:alignment] || :center) #gravity args += size_to_xy(options[:offset]) if options[:offset] #offset args << symbol_to_blending_mode(options[:blending] || :over) #compositing mode - + #composite @image.composite!(*args) - + return @image end end - + end end \ No newline at end of file diff --git a/lib/fleximage/operator/resize.rb b/lib/fleximage/operator/resize.rb index 6040eac..bac85e3 100644 --- a/lib/fleximage/operator/resize.rb +++ b/lib/fleximage/operator/resize.rb @@ -1,44 +1,44 @@ module Fleximage module Operator - + # Resize this image, constraining proportions. Options allow cropping, stretching, upsampling and # padding. - # + # # image.resize(size, options = {}) - # + # # +size+ is size of the output image after the resize operation. Accepts either '123x456' # format or [123, 456] format. # # Use the following keys in the +options+ hash: - # - # * +crop+: pass true to this option to make the ouput image exactly + # + # * +crop+: pass true to this option to make the ouput image exactly # the same dimensions as +size+. The default behaviour will resize the image without # cropping any part meaning the image will be no bigger than the +size+. When :crop - # is true the final image is resized to fit as much as possible in the frame, and then crops it + # is true the final image is resized to fit as much as possible in the frame, and then crops it # to make it exactly the dimensions declared by the +size+ argument. - # - # * +upsample+: By default the image will never display larger than its original dimensions, + # + # * +upsample+: By default the image will never display larger than its original dimensions, # no matter how large the +size+ argument is. Pass +true+ to use this option to allow # upsampling, disabling the default behaviour. # # * +padding+: This option will pad the space around your image with a solid color to make it exactly the requested - # size. Pass +true+, for the default of +white+, or give it a text or pixel color like "red" or - # color(255, 127, 0). This is like the opposite of the +crop+ option. Instead of trimming the - # image to make it exactly the requested size, it will make sure the entire image is visible, but adds space + # size. Pass +true+, for the default of +white+, or give it a text or pixel color like "red" or + # color(255, 127, 0). This is like the opposite of the +crop+ option. Instead of trimming the + # image to make it exactly the requested size, it will make sure the entire image is visible, but adds space # around the edges to make it the right dimensions. # # * +stretch+: Set this option to true and the image will not preserve its aspect ratio. The final image will # stretch to fit the requested +size+. The resulting image is exactly the size you ask for. - # + # # Example: - # + # # @photo.operate do |image| # image.resize '200x200', :crop => true # end class Resize < Operator::Base def operate(size, options = {}) options = options.symbolize_keys - + # Find dimensions x, y = size_to_xy(size) @@ -69,7 +69,7 @@ def operate(size, options = {}) # get color padding_color = 'white' if padding_color == true - # get original x and y. This makes it play nice if the requested size is larger + # get original x and y. This makes it play nice if the requested size is larger # than the image and upsampling is not allowed. x, y = size_to_xy(size) @@ -83,10 +83,10 @@ def operate(size, options = {}) # crop to remove possible extra pixel @image.crop!(0, 0, x, y, true) end - + return @image end end - + end end \ No newline at end of file diff --git a/lib/fleximage/operator/shadow.rb b/lib/fleximage/operator/shadow.rb index deca029..7c69745 100644 --- a/lib/fleximage/operator/shadow.rb +++ b/lib/fleximage/operator/shadow.rb @@ -1,30 +1,30 @@ module Fleximage module Operator - + # Add a drop shadow to the image. # # image.shadow(options = {}) - # + # # Use the following keys in the +options+ hash: # # * +offset+: distance of the dropsahdow form the image, in FlexImage *size* format. Positive # number move it down and right, negative numbers move it up and left. - # + # # * +blur+: how blurry the shadow is. Roughly corresponds to distance in pixels of the blur. - # - # * +background+: a color for the background of the image. What the shadow fades into. + # + # * +background+: a color for the background of the image. What the shadow fades into. # Use an RMagick named color or use the +color+ method in FlexImage::Controller, or a # Magick::Pixel object. - # + # # * +color+: color of the shadow itself. # Use an RMagick named color or use the +color+ method in FlexImage::Controller, or a # Magick::Pixel object. - # + # # * +opacity+: opacity of the shadow. A value between 0.0 and 1.0, where 1 is opaque and 0 is # transparent. - # + # # Example: - # + # # @photo.operate do |image| # # Default settings # image.shadow( @@ -32,9 +32,9 @@ module Operator # :background => 'white', # or color(255, 255, 255) # :blur => 8, # :offset => '2x2', - # :opacity => 0.75 + # :opacity => 0.75 # ) - # + # # # Huge, red shadow # image.shadow( # :color => color(255, 0, 0), @@ -73,15 +73,15 @@ def operate(options = {}) # apply shadow @image = shadow.composite( - @image, - symbol_to_gravity(:top_left), - (shadow.columns - @image.columns) / 2 - options[:offset][0], - (shadow.rows - @image.rows) / 2 - options[:offset][1], + @image, + symbol_to_gravity(:top_left), + (shadow.columns - @image.columns) / 2 - options[:offset][0], + (shadow.rows - @image.rows) / 2 - options[:offset][1], symbol_to_blending_mode(:over) ) @image.trim! end end - + end end \ No newline at end of file diff --git a/lib/fleximage/operator/text.rb b/lib/fleximage/operator/text.rb index 26ba496..70dd601 100644 --- a/lib/fleximage/operator/text.rb +++ b/lib/fleximage/operator/text.rb @@ -1,12 +1,12 @@ module Fleximage module Operator - + # Draw text on the image. Customize size, position, color, dropshadow, and font. - # + # # image.text(string_to_write, options = {}) # # Use the following keys in the +options+ hash: - # + # # * alignment: symbol like in ImageOverlay # * offset: size string # * antialias: true or false @@ -66,7 +66,7 @@ def operate(string_to_write, options = {}) text.pointsize = options[:font_size].to_i text.rotation = options[:rotate] text.font_weight = options[:font_weight] if options[:font_weight] - + if options[:stroke][:width] > 0 text.stroke_width = options[:stroke][:width] text.stroke = options[:stroke][:color] @@ -99,6 +99,6 @@ def operate(string_to_write, options = {}) @image.composite!(temp_image, 0, 0, symbol_to_blending_mode(:over)) end end - + end end \ No newline at end of file diff --git a/lib/fleximage/operator/trim.rb b/lib/fleximage/operator/trim.rb index 857a320..6def64e 100644 --- a/lib/fleximage/operator/trim.rb +++ b/lib/fleximage/operator/trim.rb @@ -1,6 +1,6 @@ module Fleximage module Operator - + # Trim off all the pixels around the image border that have the same color. # # image.trim @@ -9,6 +9,6 @@ def operate() @image.trim!(true) end end - + end end \ No newline at end of file diff --git a/lib/fleximage/operator/unsharp_mask.rb b/lib/fleximage/operator/unsharp_mask.rb index 5aa8c80..e9c539e 100644 --- a/lib/fleximage/operator/unsharp_mask.rb +++ b/lib/fleximage/operator/unsharp_mask.rb @@ -1,8 +1,8 @@ module Fleximage module Operator - + # Sharpen an image using an unsharp mask filter. - # + # # image.unsharp_mask(options = {}) # # Use the following keys in the +options+ hash: @@ -31,6 +31,6 @@ def operate(options = {}) @image = @image.unsharp_mask(options[:radius], options[:sigma], options[:amount], options[:threshold]) end end - + end end \ No newline at end of file diff --git a/lib/fleximage/view.rb b/lib/fleximage/view.rb index 6a86f82..4ee8f1b 100644 --- a/lib/fleximage/view.rb +++ b/lib/fleximage/view.rb @@ -1,10 +1,10 @@ module Fleximage - + # Renders a .flexi template class View < ActionView::TemplateHandler #:nodoc: class TemplateDidNotReturnImage < RuntimeError #:nodoc: end - + def self.call(template) "Fleximage::View.new(self).render(template)" end @@ -12,44 +12,44 @@ def self.call(template) def initialize(action_view) @view = action_view end - + def render(template) # process the view result = @view.instance_eval do - + # Shorthand color creation def color(*args) Fleximage::Operator::Base.color(*args) end - + #execute the template eval(template.source) end - + # Raise an error if object returned from template is not an image record unless result.class.include?(Fleximage::Model::InstanceMethods) - raise TemplateDidNotReturnImage, + raise TemplateDidNotReturnImage, ".flexi template was expected to return a model instance that acts_as_fleximage, but got an instance of <#{result.class}> instead." end - + # Figure out the proper format requested_format = (@view.params[:format] || :jpg).to_sym unless [:jpg, :gif, :png].include?(requested_format) raise 'Image must be requested with an image type format. jpg, gif and png only are supported.' end - + # Set proper content type @view.controller.response.content_type = Mime::Type.lookup_by_extension(requested_format.to_s).to_s - + # Set proper caching headers if defined?(Rails) && Rails.env == 'production' @view.controller.response.headers['Cache-Control'] = 'public, max-age=86400' end - + # return rendered result return result.output_image(:format => requested_format) ensure - + # ensure garbage collection happens after every flex image render GC.start end diff --git a/tasks/fleximage_tasks.rake b/tasks/fleximage_tasks.rake index a88ea2c..4945d28 100644 --- a/tasks/fleximage_tasks.rake +++ b/tasks/fleximage_tasks.rake @@ -1,11 +1,11 @@ namespace :fleximage do - + # Find the model class def model_class raise 'You must specify a FLEXIMAGE_CLASS=MyClass' unless ENV['FLEXIMAGE_CLASS'] @model_class ||= ENV['FLEXIMAGE_CLASS'].camelcase.constantize end - + desc "Populate width and height magic columns from the current image store. Useful when migrating from on old installation." task :dimensions => :environment do model_class.find(:all).each do |obj| @@ -16,19 +16,19 @@ namespace :fleximage do end end end - + namespace :convert do - + def convert_directory_format(to_format) model_class.find(:all).each do |obj| - + # Get the creation date creation = obj[:created_at] || obj[:created_on] - + # Generate both types of file paths flat_path = "#{RAILS_ROOT}/#{model_class.image_directory}/#{obj.id}.#{model_class.image_storage_format}" - nested_path = "#{RAILS_ROOT}/#{model_class.image_directory}/#{creation.year}/#{creation.month}/#{creation.day}/#{obj.id}.#{model_class.image_storage_format}" - + nested_path = "#{RAILS_ROOT}/#{model_class.image_directory}/#{creation.year}/#{creation.month}/#{creation.day}/#{obj.id}.#{model_class.image_storage_format}" + # Assign old path and new path based on desired directory format if to_format == :nested old_path = flat_path @@ -37,7 +37,7 @@ namespace :fleximage do old_path = nested_path new_path = flat_path end - + # Move the files if old_path != new_path && File.exists?(old_path) FileUtils.mkdir_p(File.dirname(new_path)) @@ -46,10 +46,10 @@ namespace :fleximage do end end end - + def convert_image_format(to_format) model_class.find(:all).each do |obj| - + # convert DB stored images if model_class.db_store? if obj.image_file_data && obj.image_file_data.any? @@ -62,16 +62,16 @@ namespace :fleximage do puts "Could not convert image for #{model_class} with id #{obj.id}\n #{e.class} #{e}\n" end end - + # Convert file system stored images - else + else # Generate both types of file paths png_path = obj.file_path.gsub(/\.jpg$/, '.png') jpg_path = obj.file_path.gsub(/\.png$/, '.jpg') - + # Output stub output = (to_format == :jpg) ? 'PNG -> JPG' : 'JPG -> PNG' - + # Assign old path and new path based on desired image format if to_format == :jpg old_path = png_path @@ -80,47 +80,47 @@ namespace :fleximage do old_path = jpg_path new_path = png_path end - + # Perform conversion if File.exists?(old_path) image = Magick::Image.read(old_path).first image.format = to_format.to_s.upcase image.write(new_path) File.delete(old_path) - + puts "#{output} : Image #{obj.id}" end end end end - + def ensure_db_store col = model_class.columns.find {|c| c.name == 'image_file_data'} unless col && col.type == :binary raise "No image_file_data field of type :binary for this model!" end end - + desc "Convert a flat images/123.png style image store to a images/2007/11/12/123.png style. Requires FLEXIMAGE_CLASS=ModelName" task :to_nested => :environment do convert_directory_format :nested end - + desc "Convert a nested images/2007/11/12/123.png style image store to a images/123.png style. Requires FLEXIMAGE_CLASS=ModelName" task :to_flat => :environment do convert_directory_format :flat end - + desc "Convert master images stored as JPGs to PNGs" task :to_png => :environment do convert_image_format :png end - + desc "Convert master images stored as PNGs to JPGs" task :to_jpg => :environment do convert_image_format :jpg end - + desc "Convert master image storage to use the database. Loads all file-stored images into the database." task :to_db => :environment do ensure_db_store @@ -132,10 +132,10 @@ namespace :fleximage do end end end - + puts "--- All images successfully moved to the database. Check to make sure the transfer worked cleanly before deleting your file system image store." end - + desc "Convert master image storage to use the file system. Loads all database images into files." task :to_filestore => :environment do ensure_db_store @@ -146,9 +146,9 @@ namespace :fleximage do end end end - + puts "--- All images successfully moved to the file system. Remember to remove your image_file_data field from your models database table." end - + end end diff --git a/test/mock_file.rb b/test/mock_file.rb index 17dea65..6ef212b 100644 --- a/test/mock_file.rb +++ b/test/mock_file.rb @@ -4,18 +4,18 @@ class MockFile def initialize(path) @path = path end - + def size 1 end - + def original_filename @path.split('/').last end - + def read File.open(@path) { |f| f.read } end - + def rewind; end end \ No newline at end of file diff --git a/test/rails_root/app/models/abstract.rb b/test/rails_root/app/models/abstract.rb index 00360b1..ea5f807 100644 --- a/test/rails_root/app/models/abstract.rb +++ b/test/rails_root/app/models/abstract.rb @@ -1,6 +1,6 @@ class Abstract < ActiveRecord::Base set_table_name :photo_dbs - + acts_as_fleximage do require_image false default_image :size => '320x240', :color => 'red' diff --git a/test/rails_root/config/environment.rb b/test/rails_root/config/environment.rb index 166187f..9bed49d 100644 --- a/test/rails_root/config/environment.rb +++ b/test/rails_root/config/environment.rb @@ -20,7 +20,7 @@ # To use Rails without a database, you must remove the Active Record framework # config.frameworks -= [ :active_record, :active_resource, :action_mailer ] - # Only load the plugins named here, in the order given. By default, all plugins + # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order. # :all can be used as a placeholder for all plugins not explicitly named # config.plugins = [ :exception_notification, :ssl_requirement, :all ] @@ -34,7 +34,7 @@ # Your secret key for verifying cookie session data integrity. # If you change this key, all old sessions will become invalid! - # Make sure the secret is at least 30 characters and all random, + # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. config.action_controller.session = { :session_key => '_rails_root_session', @@ -56,7 +56,7 @@ # Make Active Record use UTC-base instead of local time # config.active_record.default_timezone = :utc - + config.log_level = :debug config.cache_classes = false config.whiny_nils = true diff --git a/test/rails_root/config/initializers/inflections.rb b/test/rails_root/config/initializers/inflections.rb index 09158b8..5261cd1 100644 --- a/test/rails_root/config/initializers/inflections.rb +++ b/test/rails_root/config/initializers/inflections.rb @@ -1,6 +1,6 @@ # Be sure to restart your server when you modify this file. -# Add new inflection rules using the following format +# Add new inflection rules using the following format # (all these examples are active by default): # Inflector.inflections do |inflect| # inflect.plural /^(ox)$/i, '\1en' diff --git a/test/rails_root/public/.htaccess b/test/rails_root/public/.htaccess index d9d211c..1d37bd9 100644 --- a/test/rails_root/public/.htaccess +++ b/test/rails_root/public/.htaccess @@ -5,14 +5,14 @@ Options +FollowSymLinks +ExecCGI # If you don't want Rails to look in certain directories, # use the following rewrite rules so that Apache won't rewrite certain requests -# +# # Example: # RewriteCond %{REQUEST_URI} ^/notrails.* # RewriteRule .* - [L] # Redirect all requests not available on the filesystem to Rails # By default the cgi dispatcher is used which is very slow -# +# # For better performance replace the dispatcher with the fastcgi one # # Example: @@ -33,7 +33,7 @@ RewriteRule ^(.*)$ dispatch.cgi [QSA,L] # In case Rails experiences terminal errors # Instead of displaying this message you can supply a file here which will be rendered instead -# +# # Example: # ErrorDocument 500 /500.html diff --git a/test/rails_root/public/index.html b/test/rails_root/public/index.html index 84b7b57..be32234 100644 --- a/test/rails_root/public/index.html +++ b/test/rails_root/public/index.html @@ -14,20 +14,20 @@ font-size: 13px; color: #333; } - + h1 { font-size: 28px; color: #000; } - + a {color: #03c} a:hover { background-color: #03c; color: white; text-decoration: none; } - - + + #page { background-color: #f0f0f0; width: 750px; @@ -35,7 +35,7 @@ margin-left: auto; margin-right: auto; } - + #content { float: left; background-color: white; @@ -44,7 +44,7 @@ padding: 25px; width: 500px; } - + #sidebar { float: right; width: 175px; @@ -53,7 +53,7 @@ #footer { clear: both; } - + #header, #about, #getting-started { padding-left: 75px; @@ -73,14 +73,14 @@ font-weight: normal; font-size: 16px; } - - + + #about h3 { margin: 0; margin-bottom: 10px; font-size: 14px; } - + #about-content { background-color: #ffd; border: 1px solid #fc0; @@ -99,7 +99,7 @@ } #about-content td.name {color: #555} #about-content td.value {color: #000} - + #about-content.failure { background-color: #fcc; border: 1px solid #f00; @@ -108,8 +108,8 @@ margin: 0; padding: 10px; } - - + + #getting-started { border-top: 1px solid #ccc; margin-top: 25px; @@ -145,8 +145,8 @@ color: #555; font-size: 13px; } - - + + #search { margin: 0; padding-top: 10px; @@ -158,8 +158,8 @@ margin: 2px; } #search-text {width: 170px} - - + + #sidebar ul { margin-left: 0; padding-left: 0; @@ -176,7 +176,7 @@ #sidebar ul.links li { margin-bottom: 5px; } - + @@ -189,11 +189,11 @@ onComplete: function() {new Effect.BlindDown('about-content', {duration: 0.25})} }); } else { - new Effect[Element.visible('about-content') ? + new Effect[Element.visible('about-content') ? 'BlindUp' : 'BlindDown']('about-content', {duration: 0.25}); } } - + window.onload = function() { $('search-text').value = ''; $('search').onsubmit = function() { @@ -213,7 +213,7 @@ the Rails site - +

  • Join the community

    • - +

  • Browse the documentation

      @@ -247,22 +247,22 @@

      You’re riding Ruby on Rails!

      About your application’s environment

      - +

      Getting started

      Here’s how to get rolling:

      - +

      1. Create your databases and edit config/database.yml

        Rails needs to know your login and password.

        2. - +

      2. Use script/generate to create your models and controllers

        To see all available options, run it without parameters.

        3. - +

      3. Set up a default route and remove or rename this file

        Routes are set up in config/routes.rb.

        @@ -270,7 +270,7 @@

        Set up a default route and remove or rename this file

      - + diff --git a/test/rails_root/public/javascripts/controls.js b/test/rails_root/public/javascripts/controls.js index fbc4418..88f74a9 100644 --- a/test/rails_root/public/javascripts/controls.js +++ b/test/rails_root/public/javascripts/controls.js @@ -5,18 +5,18 @@ // Richard Livsey // Rahul Bhargava // Rob Wills -// +// // script.aculo.us is freely distributable under the terms of an MIT-style license. // For details, see the script.aculo.us web site: http://script.aculo.us/ -// Autocompleter.Base handles all the autocompletion functionality +// Autocompleter.Base handles all the autocompletion functionality // that's independent of the data source for autocompletion. This // includes drawing the autocompletion menu, observing keyboard // and mouse events, and similar. // -// Specific autocompleters need to provide, at the very least, +// Specific autocompleters need to provide, at the very least, // a getUpdatedChoices function that will be invoked every time -// the text inside the monitored textbox changes. This method +// the text inside the monitored textbox changes. This method // should get the text for which to provide autocompletion by // invoking this.getToken(), NOT by directly accessing // this.element.value. This is to allow incremental tokenized @@ -30,8 +30,8 @@ // will incrementally autocomplete with a comma as the token. // Additionally, ',' in the above example can be replaced with // a token array, e.g. { tokens: [',', '\n'] } which -// enables autocompletion on multiple tokens. This is most -// useful when one of the tokens is \n (a newline), as it +// enables autocompletion on multiple tokens. This is most +// useful when one of the tokens is \n (a newline), as it // allows smart autocompletion after linebreaks. if(typeof Effect == 'undefined') @@ -41,12 +41,12 @@ var Autocompleter = { } Autocompleter.Base = Class.create({ baseInitialize: function(element, update, options) { element = $(element) - this.element = element; - this.update = $(update); - this.hasFocus = false; - this.changed = false; - this.active = false; - this.index = 0; + this.element = element; + this.update = $(update); + this.hasFocus = false; + this.changed = false; + this.active = false; + this.index = 0; this.entryCount = 0; this.oldElementValue = this.element.value; @@ -59,28 +59,28 @@ Autocompleter.Base = Class.create({ this.options.tokens = this.options.tokens || []; this.options.frequency = this.options.frequency || 0.4; this.options.minChars = this.options.minChars || 1; - this.options.onShow = this.options.onShow || - function(element, update){ + this.options.onShow = this.options.onShow || + function(element, update){ if(!update.style.position || update.style.position=='absolute') { update.style.position = 'absolute'; Position.clone(element, update, { - setHeight: false, + setHeight: false, offsetTop: element.offsetHeight }); } Effect.Appear(update,{duration:0.15}); }; - this.options.onHide = this.options.onHide || + this.options.onHide = this.options.onHide || function(element, update){ new Effect.Fade(update,{duration:0.15}) }; - if(typeof(this.options.tokens) == 'string') + if(typeof(this.options.tokens) == 'string') this.options.tokens = new Array(this.options.tokens); // Force carriage returns as token delimiters anyway if (!this.options.tokens.include('\n')) this.options.tokens.push('\n'); this.observer = null; - + this.element.setAttribute('autocomplete','off'); Element.hide(this.update); @@ -91,10 +91,10 @@ Autocompleter.Base = Class.create({ show: function() { if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update); - if(!this.iefix && + if(!this.iefix && (Prototype.Browser.IE) && (Element.getStyle(this.update, 'position')=='absolute')) { - new Insertion.After(this.update, + new Insertion.After(this.update, ''); @@ -102,7 +102,7 @@ Autocompleter.Base = Class.create({ } if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50); }, - + fixIEOverlapping: function() { Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)}); this.iefix.style.zIndex = 1; @@ -150,15 +150,15 @@ Autocompleter.Base = Class.create({ Event.stop(event); return; } - else - if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || + else + if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return; this.changed = true; this.hasFocus = true; if(this.observer) clearTimeout(this.observer); - this.observer = + this.observer = setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000); }, @@ -170,35 +170,35 @@ Autocompleter.Base = Class.create({ onHover: function(event) { var element = Event.findElement(event, 'LI'); - if(this.index != element.autocompleteIndex) + if(this.index != element.autocompleteIndex) { this.index = element.autocompleteIndex; this.render(); } Event.stop(event); }, - + onClick: function(event) { var element = Event.findElement(event, 'LI'); this.index = element.autocompleteIndex; this.selectEntry(); this.hide(); }, - + onBlur: function(event) { // needed to make click events working setTimeout(this.hide.bind(this), 250); this.hasFocus = false; - this.active = false; - }, - + this.active = false; + }, + render: function() { if(this.entryCount > 0) { for (var i = 0; i < this.entryCount; i++) - this.index==i ? - Element.addClassName(this.getEntry(i),"selected") : + this.index==i ? + Element.addClassName(this.getEntry(i),"selected") : Element.removeClassName(this.getEntry(i),"selected"); - if(this.hasFocus) { + if(this.hasFocus) { this.show(); this.active = true; } @@ -207,27 +207,27 @@ Autocompleter.Base = Class.create({ this.hide(); } }, - + markPrevious: function() { if(this.index > 0) this.index-- else this.index = this.entryCount-1; this.getEntry(this.index).scrollIntoView(true); }, - + markNext: function() { if(this.index < this.entryCount-1) this.index++ else this.index = 0; this.getEntry(this.index).scrollIntoView(false); }, - + getEntry: function(index) { return this.update.firstChild.childNodes[index]; }, - + getCurrentEntry: function() { return this.getEntry(this.index); }, - + selectEntry: function() { this.active = false; this.updateElement(this.getCurrentEntry()); @@ -244,7 +244,7 @@ Autocompleter.Base = Class.create({ if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select); } else value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal'); - + var bounds = this.getTokenBounds(); if (bounds[0] != -1) { var newValue = this.element.value.substr(0, bounds[0]); @@ -257,7 +257,7 @@ Autocompleter.Base = Class.create({ } this.oldElementValue = this.element.value; this.element.focus(); - + if (this.options.afterUpdateElement) this.options.afterUpdateElement(this.element, selectedElement); }, @@ -269,20 +269,20 @@ Autocompleter.Base = Class.create({ Element.cleanWhitespace(this.update.down()); if(this.update.firstChild && this.update.down().childNodes) { - this.entryCount = + this.entryCount = this.update.down().childNodes.length; for (var i = 0; i < this.entryCount; i++) { var entry = this.getEntry(i); entry.autocompleteIndex = i; this.addObservers(entry); } - } else { + } else { this.entryCount = 0; } this.stopIndicator(); this.index = 0; - + if(this.entryCount==1 && this.options.autoSelect) { this.selectEntry(); this.hide(); @@ -298,7 +298,7 @@ Autocompleter.Base = Class.create({ }, onObserverEvent: function() { - this.changed = false; + this.changed = false; this.tokenBounds = null; if(this.getToken().length>=this.options.minChars) { this.getUpdatedChoices(); @@ -351,16 +351,16 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, { getUpdatedChoices: function() { this.startIndicator(); - - var entry = encodeURIComponent(this.options.paramName) + '=' + + + var entry = encodeURIComponent(this.options.paramName) + '=' + encodeURIComponent(this.getToken()); this.options.parameters = this.options.callback ? this.options.callback(this.element, entry) : entry; - if(this.options.defaultParams) + if(this.options.defaultParams) this.options.parameters += '&' + this.options.defaultParams; - + new Ajax.Request(this.url, this.options); }, @@ -382,7 +382,7 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, { // - choices - How many autocompletion choices to offer // // - partialSearch - If false, the autocompleter will match entered -// text only at the beginning of strings in the +// text only at the beginning of strings in the // autocomplete array. Defaults to true, which will // match text at the beginning of any *word* in the // strings in the autocomplete array. If you want to @@ -399,7 +399,7 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, { // - ignoreCase - Whether to ignore case when autocompleting. // Defaults to true. // -// It's possible to pass in a custom function as the 'selector' +// It's possible to pass in a custom function as the 'selector' // option, if you prefer to write your own autocompletion logic. // In that case, the other options above will not apply unless // you support them. @@ -427,20 +427,20 @@ Autocompleter.Local = Class.create(Autocompleter.Base, { var entry = instance.getToken(); var count = 0; - for (var i = 0; i < instance.options.array.length && - ret.length < instance.options.choices ; i++) { + for (var i = 0; i < instance.options.array.length && + ret.length < instance.options.choices ; i++) { var elem = instance.options.array[i]; - var foundPos = instance.options.ignoreCase ? - elem.toLowerCase().indexOf(entry.toLowerCase()) : + var foundPos = instance.options.ignoreCase ? + elem.toLowerCase().indexOf(entry.toLowerCase()) : elem.indexOf(entry); while (foundPos != -1) { - if (foundPos == 0 && elem.length != entry.length) { - ret.push("
    • " + elem.substr(0, entry.length) + "" + + if (foundPos == 0 && elem.length != entry.length) { + ret.push("
    • " + elem.substr(0, entry.length) + "" + elem.substr(entry.length) + "
      • "); break; - } else if (entry.length >= instance.options.partialChars && + } else if (entry.length >= instance.options.partialChars && instance.options.partialSearch && foundPos != -1) { if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) { partial.push("
    • " + elem.substr(0, foundPos) + "" + @@ -450,8 +450,8 @@ Autocompleter.Local = Class.create(Autocompleter.Base, { } } - foundPos = instance.options.ignoreCase ? - elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : + foundPos = instance.options.ignoreCase ? + elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : elem.indexOf(entry, foundPos + 1); } @@ -937,7 +937,7 @@ Ajax.InPlaceCollectionEditor.DefaultOptions = { loadingCollectionText: 'Loading options...' }; -// Delayed observer, like Form.Element.Observer, +// Delayed observer, like Form.Element.Observer, // but waits for delay after last key input // Ideal for live-search fields @@ -947,7 +947,7 @@ Form.Element.DelayedObserver = Class.create({ this.element = $(element); this.callback = callback; this.timer = null; - this.lastValue = $F(this.element); + this.lastValue = $F(this.element); Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this)); }, delayedListener: function(event) { diff --git a/test/rails_root/public/javascripts/dragdrop.js b/test/rails_root/public/javascripts/dragdrop.js index ccf4a1e..c356ddf 100644 --- a/test/rails_root/public/javascripts/dragdrop.js +++ b/test/rails_root/public/javascripts/dragdrop.js @@ -1,6 +1,6 @@ // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz) -// +// // script.aculo.us is freely distributable under the terms of an MIT-style license. // For details, see the script.aculo.us web site: http://script.aculo.us/ @@ -32,7 +32,7 @@ var Droppables = { options._containers.push($(containment)); } } - + if(options.accept) options.accept = [options.accept].flatten(); Element.makePositioned(element); // fix IE @@ -40,34 +40,34 @@ var Droppables = { this.drops.push(options); }, - + findDeepestChild: function(drops) { deepest = drops[0]; - + for (i = 1; i < drops.length; ++i) if (Element.isParent(drops[i].element, deepest.element)) deepest = drops[i]; - + return deepest; }, isContained: function(element, drop) { var containmentNode; if(drop.tree) { - containmentNode = element.treeNode; + containmentNode = element.treeNode; } else { containmentNode = element.parentNode; } return drop._containers.detect(function(c) { return containmentNode == c }); }, - + isAffected: function(point, element, drop) { return ( (drop.element!=element) && ((!drop._containers) || this.isContained(element, drop)) && ((!drop.accept) || - (Element.classNames(element).detect( + (Element.classNames(element).detect( function(v) { return drop.accept.include(v) } ) )) && Position.within(drop.element, point[0], point[1]) ); }, @@ -87,12 +87,12 @@ var Droppables = { show: function(point, element) { if(!this.drops.length) return; var drop, affected = []; - + this.drops.each( function(drop) { if(Droppables.isAffected(point, element, drop)) affected.push(drop); }); - + if(affected.length>0) drop = Droppables.findDeepestChild(affected); @@ -101,7 +101,7 @@ var Droppables = { Position.within(drop.element, point[0], point[1]); if(drop.onHover) drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element)); - + if (drop != this.last_active) Droppables.activate(drop); } }, @@ -112,8 +112,8 @@ var Droppables = { if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active)) if (this.last_active.onDrop) { - this.last_active.onDrop(element, this.last_active.element, event); - return true; + this.last_active.onDrop(element, this.last_active.element, event); + return true; } }, @@ -126,20 +126,20 @@ var Droppables = { var Draggables = { drags: [], observers: [], - + register: function(draggable) { if(this.drags.length == 0) { this.eventMouseUp = this.endDrag.bindAsEventListener(this); this.eventMouseMove = this.updateDrag.bindAsEventListener(this); this.eventKeypress = this.keyPress.bindAsEventListener(this); - + Event.observe(document, "mouseup", this.eventMouseUp); Event.observe(document, "mousemove", this.eventMouseMove); Event.observe(document, "keypress", this.eventKeypress); } this.drags.push(draggable); }, - + unregister: function(draggable) { this.drags = this.drags.reject(function(d) { return d==draggable }); if(this.drags.length == 0) { @@ -148,24 +148,24 @@ var Draggables = { Event.stopObserving(document, "keypress", this.eventKeypress); } }, - + activate: function(draggable) { - if(draggable.options.delay) { - this._timeout = setTimeout(function() { - Draggables._timeout = null; - window.focus(); - Draggables.activeDraggable = draggable; - }.bind(this), draggable.options.delay); + if(draggable.options.delay) { + this._timeout = setTimeout(function() { + Draggables._timeout = null; + window.focus(); + Draggables.activeDraggable = draggable; + }.bind(this), draggable.options.delay); } else { window.focus(); // allows keypress events if window isn't currently focused, fails for Safari this.activeDraggable = draggable; } }, - + deactivate: function() { this.activeDraggable = null; }, - + updateDrag: function(event) { if(!this.activeDraggable) return; var pointer = [Event.pointerX(event), Event.pointerY(event)]; @@ -173,36 +173,36 @@ var Draggables = { // the same coordinates, prevent needless redrawing (moz bug?) if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return; this._lastPointer = pointer; - + this.activeDraggable.updateDrag(event, pointer); }, - + endDrag: function(event) { - if(this._timeout) { - clearTimeout(this._timeout); - this._timeout = null; + if(this._timeout) { + clearTimeout(this._timeout); + this._timeout = null; } if(!this.activeDraggable) return; this._lastPointer = null; this.activeDraggable.endDrag(event); this.activeDraggable = null; }, - + keyPress: function(event) { if(this.activeDraggable) this.activeDraggable.keyPress(event); }, - + addObserver: function(observer) { this.observers.push(observer); this._cacheObserverCallbacks(); }, - + removeObserver: function(element) { // element instead of observer fixes mem leaks this.observers = this.observers.reject( function(o) { return o.element==element }); this._cacheObserverCallbacks(); }, - + notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag' if(this[eventName+'Count'] > 0) this.observers.each( function(o) { @@ -210,7 +210,7 @@ var Draggables = { }); if(draggable.options[eventName]) draggable.options[eventName](draggable, event); }, - + _cacheObserverCallbacks: function() { ['onStart','onEnd','onDrag'].each( function(eventName) { Draggables[eventName+'Count'] = Draggables.observers.select( @@ -234,12 +234,12 @@ var Draggable = Class.create({ }, endeffect: function(element) { var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0; - new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, + new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, queue: {scope:'_draggable', position:'end'}, - afterFinish: function(){ - Draggable._dragging[element] = false + afterFinish: function(){ + Draggable._dragging[element] = false } - }); + }); }, zindex: 1000, revert: false, @@ -250,57 +250,57 @@ var Draggable = Class.create({ snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] } delay: 0 }; - + if(!arguments[1] || Object.isUndefined(arguments[1].endeffect)) Object.extend(defaults, { starteffect: function(element) { element._opacity = Element.getOpacity(element); Draggable._dragging[element] = true; - new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); + new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); } }); - + var options = Object.extend(defaults, arguments[1] || { }); this.element = $(element); - + if(options.handle && Object.isString(options.handle)) this.handle = this.element.down('.'+options.handle, 0); - + if(!this.handle) this.handle = $(options.handle); if(!this.handle) this.handle = this.element; - + if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) { options.scroll = $(options.scroll); this._isScrollChild = Element.childOf(this.element, options.scroll); } - Element.makePositioned(this.element); // fix IE + Element.makePositioned(this.element); // fix IE this.options = options; - this.dragging = false; + this.dragging = false; this.eventMouseDown = this.initDrag.bindAsEventListener(this); Event.observe(this.handle, "mousedown", this.eventMouseDown); - + Draggables.register(this); }, - + destroy: function() { Event.stopObserving(this.handle, "mousedown", this.eventMouseDown); Draggables.unregister(this); }, - + currentDelta: function() { return([ parseInt(Element.getStyle(this.element,'left') || '0'), parseInt(Element.getStyle(this.element,'top') || '0')]); }, - + initDrag: function(event) { if(!Object.isUndefined(Draggable._dragging[this.element]) && Draggable._dragging[this.element]) return; - if(Event.isLeftClick(event)) { + if(Event.isLeftClick(event)) { // abort on form elements, fixes a Firefox issue var src = Event.element(event); if((tag_name = src.tagName.toUpperCase()) && ( @@ -309,26 +309,26 @@ var Draggable = Class.create({ tag_name=='OPTION' || tag_name=='BUTTON' || tag_name=='TEXTAREA')) return; - + var pointer = [Event.pointerX(event), Event.pointerY(event)]; var pos = Position.cumulativeOffset(this.element); this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) }); - + Draggables.activate(this); Event.stop(event); } }, - + startDrag: function(event) { this.dragging = true; if(!this.delta) this.delta = this.currentDelta(); - + if(this.options.zindex) { this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0); this.element.style.zIndex = this.options.zindex; } - + if(this.options.ghosting) { this._clone = this.element.cloneNode(true); this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute'); @@ -336,7 +336,7 @@ var Draggable = Class.create({ Position.absolutize(this.element); this.element.parentNode.insertBefore(this._clone, this.element); } - + if(this.options.scroll) { if (this.options.scroll == window) { var where = this._getWindowScroll(this.options.scroll); @@ -347,28 +347,28 @@ var Draggable = Class.create({ this.originalScrollTop = this.options.scroll.scrollTop; } } - + Draggables.notify('onStart', this, event); - + if(this.options.starteffect) this.options.starteffect(this.element); }, - + updateDrag: function(event, pointer) { if(!this.dragging) this.startDrag(event); - + if(!this.options.quiet){ Position.prepare(); Droppables.show(pointer, this.element); } - + Draggables.notify('onDrag', this, event); - + this.draw(pointer); if(this.options.change) this.options.change(this); - + if(this.options.scroll) { this.stopScrolling(); - + var p; if (this.options.scroll == window) { with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; } @@ -386,16 +386,16 @@ var Draggable = Class.create({ if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity); this.startScrolling(speed); } - + // fix AppleWebKit rendering if(Prototype.Browser.WebKit) window.scrollBy(0,0); - + Event.stop(event); }, - + finishDrag: function(event, success) { this.dragging = false; - + if(this.options.quiet){ Position.prepare(); var pointer = [Event.pointerX(event), Event.pointerY(event)]; @@ -410,17 +410,17 @@ var Draggable = Class.create({ this._clone = null; } - var dropped = false; - if(success) { - dropped = Droppables.fire(event, this.element); - if (!dropped) dropped = false; + var dropped = false; + if(success) { + dropped = Droppables.fire(event, this.element); + if (!dropped) dropped = false; } if(dropped && this.options.onDropped) this.options.onDropped(this.element); Draggables.notify('onEnd', this, event); var revert = this.options.revert; if(revert && Object.isFunction(revert)) revert = revert(this.element); - + var d = this.currentDelta(); if(revert && this.options.reverteffect) { if (dropped == 0 || revert != 'failure') @@ -433,45 +433,45 @@ var Draggable = Class.create({ if(this.options.zindex) this.element.style.zIndex = this.originalZ; - if(this.options.endeffect) + if(this.options.endeffect) this.options.endeffect(this.element); - + Draggables.deactivate(this); Droppables.reset(); }, - + keyPress: function(event) { if(event.keyCode!=Event.KEY_ESC) return; this.finishDrag(event, false); Event.stop(event); }, - + endDrag: function(event) { if(!this.dragging) return; this.stopScrolling(); this.finishDrag(event, true); Event.stop(event); }, - + draw: function(point) { var pos = Position.cumulativeOffset(this.element); if(this.options.ghosting) { var r = Position.realOffset(this.element); pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY; } - + var d = this.currentDelta(); pos[0] -= d[0]; pos[1] -= d[1]; - + if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) { pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft; pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop; } - - var p = [0,1].map(function(i){ - return (point[i]-pos[i]-this.offset[i]) + + var p = [0,1].map(function(i){ + return (point[i]-pos[i]-this.offset[i]) }.bind(this)); - + if(this.options.snap) { if(Object.isFunction(this.options.snap)) { p = this.options.snap(p[0],p[1],this); @@ -484,16 +484,16 @@ var Draggable = Class.create({ return (v/this.options.snap).round()*this.options.snap }.bind(this)) } }} - + var style = this.element.style; if((!this.options.constraint) || (this.options.constraint=='horizontal')) style.left = p[0] + "px"; if((!this.options.constraint) || (this.options.constraint=='vertical')) style.top = p[1] + "px"; - + if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering }, - + stopScrolling: function() { if(this.scrollInterval) { clearInterval(this.scrollInterval); @@ -501,14 +501,14 @@ var Draggable = Class.create({ Draggables._lastScrollPointer = null; } }, - + startScrolling: function(speed) { if(!(speed[0] || speed[1])) return; this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed]; this.lastScrolled = new Date(); this.scrollInterval = setInterval(this.scroll.bind(this), 10); }, - + scroll: function() { var current = new Date(); var delta = current - this.lastScrolled; @@ -524,7 +524,7 @@ var Draggable = Class.create({ this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000; this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000; } - + Position.prepare(); Droppables.show(Draggables._lastPointer, this.element); Draggables.notify('onDrag', this); @@ -538,10 +538,10 @@ var Draggable = Class.create({ Draggables._lastScrollPointer[1] = 0; this.draw(Draggables._lastScrollPointer); } - + if(this.options.change) this.options.change(this); }, - + _getWindowScroll: function(w) { var T, L, W, H; with (w.document) { @@ -577,11 +577,11 @@ var SortableObserver = Class.create({ this.observer = observer; this.lastValue = Sortable.serialize(this.element); }, - + onStart: function() { this.lastValue = Sortable.serialize(this.element); }, - + onEnd: function() { Sortable.unmark(); if(this.lastValue != Sortable.serialize(this.element)) @@ -591,11 +591,11 @@ var SortableObserver = Class.create({ var Sortable = { SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/, - + sortables: { }, - + _findRootElement: function(element) { - while (element.tagName.toUpperCase() != "BODY") { + while (element.tagName.toUpperCase() != "BODY") { if(element.id && Sortable.sortables[element.id]) return element; element = element.parentNode; } @@ -606,22 +606,22 @@ var Sortable = { if(!element) return; return Sortable.sortables[element.id]; }, - + destroy: function(element){ var s = Sortable.options(element); - + if(s) { Draggables.removeObserver(s.element); s.droppables.each(function(d){ Droppables.remove(d) }); s.draggables.invoke('destroy'); - + delete Sortable.sortables[s.element.id]; } }, create: function(element) { element = $(element); - var options = Object.extend({ + var options = Object.extend({ element: element, tag: 'li', // assumes li children, override with tag: 'tagname' dropOnEmpty: false, @@ -635,17 +635,17 @@ var Sortable = { delay: 0, hoverclass: null, ghosting: false, - quiet: false, + quiet: false, scroll: false, scrollSensitivity: 20, scrollSpeed: 15, format: this.SERIALIZE_RULE, - - // these take arrays of elements or ids and can be + + // these take arrays of elements or ids and can be // used for better initialization performance elements: false, handles: false, - + onChange: Prototype.emptyFunction, onUpdate: Prototype.emptyFunction }, arguments[1] || { }); @@ -682,7 +682,7 @@ var Sortable = { if(options.zindex) options_for_draggable.zindex = options.zindex; - // build options for the droppables + // build options for the droppables var options_for_droppable = { overlap: options.overlap, containment: options.containment, @@ -690,7 +690,7 @@ var Sortable = { hoverclass: options.hoverclass, onHover: Sortable.onHover } - + var options_for_tree = { onHover: Sortable.onEmptyHover, overlap: options.overlap, @@ -699,7 +699,7 @@ var Sortable = { } // fix for gecko engine - Element.cleanWhitespace(element); + Element.cleanWhitespace(element); options.draggables = []; options.droppables = []; @@ -712,14 +712,14 @@ var Sortable = { (options.elements || this.findElements(element, options) || []).each( function(e,i) { var handle = options.handles ? $(options.handles[i]) : - (options.handle ? $(e).select('.' + options.handle)[0] : e); + (options.handle ? $(e).select('.' + options.handle)[0] : e); options.draggables.push( new Draggable(e, Object.extend(options_for_draggable, { handle: handle }))); Droppables.add(e, options_for_droppable); if(options.tree) e.treeNode = element; - options.droppables.push(e); + options.droppables.push(e); }); - + if(options.tree) { (Sortable.findTreeElements(element, options) || []).each( function(e) { Droppables.add(e, options_for_tree); @@ -741,7 +741,7 @@ var Sortable = { return Element.findChildren( element, options.only, options.tree ? true : false, options.tag); }, - + findTreeElements: function(element, options) { return Element.findChildren( element, options.only, options.tree ? true : false, options.treeTag); @@ -758,7 +758,7 @@ var Sortable = { var oldParentNode = element.parentNode; element.style.visibility = "hidden"; // fix gecko rendering dropon.parentNode.insertBefore(element, dropon); - if(dropon.parentNode!=oldParentNode) + if(dropon.parentNode!=oldParentNode) Sortable.options(oldParentNode).onChange(element); Sortable.options(dropon.parentNode).onChange(element); } @@ -769,26 +769,26 @@ var Sortable = { var oldParentNode = element.parentNode; element.style.visibility = "hidden"; // fix gecko rendering dropon.parentNode.insertBefore(element, nextElement); - if(dropon.parentNode!=oldParentNode) + if(dropon.parentNode!=oldParentNode) Sortable.options(oldParentNode).onChange(element); Sortable.options(dropon.parentNode).onChange(element); } } }, - + onEmptyHover: function(element, dropon, overlap) { var oldParentNode = element.parentNode; var droponOptions = Sortable.options(dropon); - + if(!Element.isParent(dropon, element)) { var index; - + var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only}); var child = null; - + if(children) { var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap); - + for (index = 0; index < children.length; index += 1) { if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) { offset -= Element.offsetSize (children[index], droponOptions.overlap); @@ -801,9 +801,9 @@ var Sortable = { } } } - + dropon.insertBefore(element, child); - + Sortable.options(oldParentNode).onChange(element); droponOptions.onChange(element); } @@ -816,34 +816,34 @@ var Sortable = { mark: function(dropon, position) { // mark on ghosting only var sortable = Sortable.options(dropon.parentNode); - if(sortable && !sortable.ghosting) return; + if(sortable && !sortable.ghosting) return; if(!Sortable._marker) { - Sortable._marker = + Sortable._marker = ($('dropmarker') || Element.extend(document.createElement('DIV'))). hide().addClassName('dropmarker').setStyle({position:'absolute'}); document.getElementsByTagName("body").item(0).appendChild(Sortable._marker); - } + } var offsets = Position.cumulativeOffset(dropon); Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'}); - + if(position=='after') - if(sortable.overlap == 'horizontal') + if(sortable.overlap == 'horizontal') Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'}); else Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'}); - + Sortable._marker.show(); }, - + _tree: function(element, options, parent) { var children = Sortable.findElements(element, options) || []; - + for (var i = 0; i < children.length; ++i) { var match = children[i].id.match(options.format); if (!match) continue; - + var child = { id: encodeURIComponent(match ? match[1] : null), element: element, @@ -852,15 +852,15 @@ var Sortable = { position: parent.children.length, container: $(children[i]).down(options.treeTag) } - + /* Get the element containing the children and recurse over it */ if (child.container) this._tree(child.container, options, child) - + parent.children.push (child); } - return parent; + return parent; }, tree: function(element) { @@ -873,7 +873,7 @@ var Sortable = { name: element.id, format: sortableOptions.format }, arguments[1] || { }); - + var root = { id: null, parent: null, @@ -881,7 +881,7 @@ var Sortable = { container: element, position: 0 } - + return Sortable._tree(element, options, root); }, @@ -897,7 +897,7 @@ var Sortable = { sequence: function(element) { element = $(element); var options = Object.extend(this.options(element), arguments[1] || { }); - + return $(this.findElements(element, options) || []).map( function(item) { return item.id.match(options.format) ? item.id.match(options.format)[1] : ''; }); @@ -906,14 +906,14 @@ var Sortable = { setSequence: function(element, new_sequence) { element = $(element); var options = Object.extend(this.options(element), arguments[2] || { }); - + var nodeMap = { }; this.findElements(element, options).each( function(n) { if (n.id.match(options.format)) nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode]; n.parentNode.removeChild(n); }); - + new_sequence.each(function(ident) { var n = nodeMap[ident]; if (n) { @@ -922,16 +922,16 @@ var Sortable = { } }); }, - + serialize: function(element) { element = $(element); var options = Object.extend(Sortable.options(element), arguments[1] || { }); var name = encodeURIComponent( (arguments[1] && arguments[1].name) ? arguments[1].name : element.id); - + if (options.tree) { return Sortable.tree(element, arguments[1]).children.map( function (item) { - return [name + Sortable._constructIndex(item) + "[id]=" + + return [name + Sortable._constructIndex(item) + "[id]=" + encodeURIComponent(item.id)].concat(item.children.map(arguments.callee)); }).flatten().join('&'); } else { @@ -949,7 +949,7 @@ Element.isParent = function(child, element) { return Element.isParent(child.parentNode, element); } -Element.findChildren = function(element, only, recursive, tagName) { +Element.findChildren = function(element, only, recursive, tagName) { if(!element.hasChildNodes()) return null; tagName = tagName.toUpperCase(); if(only) only = [only].flatten(); diff --git a/test/rails_root/public/javascripts/effects.js b/test/rails_root/public/javascripts/effects.js index 65aed23..4650a34 100644 --- a/test/rails_root/public/javascripts/effects.js +++ b/test/rails_root/public/javascripts/effects.js @@ -3,46 +3,46 @@ // Justin Palmer (http://encytemedia.com/) // Mark Pilgrim (http://diveintomark.org/) // Martin Bialasinki -// +// // script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ +// For details, see the script.aculo.us web site: http://script.aculo.us/ -// converts rgb() and #xxx to #xxxxxx format, -// returns self (or first argument) if not convertable -String.prototype.parseColor = function() { +// converts rgb() and #xxx to #xxxxxx format, +// returns self (or first argument) if not convertable +String.prototype.parseColor = function() { var color = '#'; - if (this.slice(0,4) == 'rgb(') { - var cols = this.slice(4,this.length-1).split(','); - var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); - } else { - if (this.slice(0,1) == '#') { - if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); - if (this.length==7) color = this.toLowerCase(); - } - } - return (color.length==7 ? color : (arguments[0] || this)); + if (this.slice(0,4) == 'rgb(') { + var cols = this.slice(4,this.length-1).split(','); + var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); + } else { + if (this.slice(0,1) == '#') { + if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); + if (this.length==7) color = this.toLowerCase(); + } + } + return (color.length==7 ? color : (arguments[0] || this)); }; /*--------------------------------------------------------------------------*/ -Element.collectTextNodes = function(element) { +Element.collectTextNodes = function(element) { return $A($(element).childNodes).collect( function(node) { - return (node.nodeType==3 ? node.nodeValue : + return (node.nodeType==3 ? node.nodeValue : (node.hasChildNodes() ? Element.collectTextNodes(node) : '')); }).flatten().join(''); }; -Element.collectTextNodesIgnoreClass = function(element, className) { +Element.collectTextNodesIgnoreClass = function(element, className) { return $A($(element).childNodes).collect( function(node) { - return (node.nodeType==3 ? node.nodeValue : - ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? + return (node.nodeType==3 ? node.nodeValue : + ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? Element.collectTextNodesIgnoreClass(node, className) : '')); }).flatten().join(''); }; Element.setContentZoom = function(element, percent) { - element = $(element); - element.setStyle({fontSize: (percent/100) + 'em'}); + element = $(element); + element.setStyle({fontSize: (percent/100) + 'em'}); if (Prototype.Browser.WebKit) window.scrollBy(0,0); return element; }; @@ -82,16 +82,16 @@ var Effect = { wobble: function(pos) { return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5; }, - pulse: function(pos, pulses) { - pulses = pulses || 5; + pulse: function(pos, pulses) { + pulses = pulses || 5; return ( - ((pos % (1/pulses)) * pulses).round() == 0 ? - ((pos * pulses * 2) - (pos * pulses * 2).floor()) : + ((pos % (1/pulses)) * pulses).round() == 0 ? + ((pos * pulses * 2) - (pos * pulses * 2).floor()) : 1 - ((pos * pulses * 2) - (pos * pulses * 2).floor()) ); }, - spring: function(pos) { - return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); + spring: function(pos) { + return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); }, none: function(pos) { return 0; @@ -112,14 +112,14 @@ var Effect = { tagifyText: function(element) { var tagifyStyle = 'position:relative'; if (Prototype.Browser.IE) tagifyStyle += ';zoom:1'; - + element = $(element); $A(element.childNodes).each( function(child) { if (child.nodeType==3) { child.nodeValue.toArray().each( function(character) { element.insertBefore( new Element('span', {style: tagifyStyle}).update( - character == ' ' ? String.fromCharCode(160) : character), + character == ' ' ? String.fromCharCode(160) : character), child); }); Element.remove(child); @@ -128,13 +128,13 @@ var Effect = { }, multiple: function(element, effect) { var elements; - if (((typeof element == 'object') || - Object.isFunction(element)) && + if (((typeof element == 'object') || + Object.isFunction(element)) && (element.length)) elements = element; else elements = $(element).childNodes; - + var options = Object.extend({ speed: 0.1, delay: 0.0 @@ -156,7 +156,7 @@ var Effect = { var options = Object.extend({ queue: { position:'end', scope:(element.id || 'global'), limit: 1 } }, arguments[2] || { }); - Effect[element.visible() ? + Effect[element.visible() ? Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options); } }; @@ -168,20 +168,20 @@ Effect.DefaultOptions.transition = Effect.Transitions.sinoidal; Effect.ScopedQueue = Class.create(Enumerable, { initialize: function() { this.effects = []; - this.interval = null; + this.interval = null; }, _each: function(iterator) { this.effects._each(iterator); }, add: function(effect) { var timestamp = new Date().getTime(); - - var position = Object.isString(effect.options.queue) ? + + var position = Object.isString(effect.options.queue) ? effect.options.queue : effect.options.queue.position; - + switch(position) { case 'front': - // move unstarted effects after this effect + // move unstarted effects after this effect this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) { e.startOn += effect.finishOn; e.finishOn += effect.finishOn; @@ -195,13 +195,13 @@ Effect.ScopedQueue = Class.create(Enumerable, { timestamp = this.effects.pluck('finishOn').max() || timestamp; break; } - + effect.startOn += timestamp; effect.finishOn += timestamp; if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit)) this.effects.push(effect); - + if (!this.interval) this.interval = setInterval(this.loop.bind(this), 15); }, @@ -214,7 +214,7 @@ Effect.ScopedQueue = Class.create(Enumerable, { }, loop: function() { var timePos = new Date().getTime(); - for(var i=0, len=this.effects.length;i0) { @@ -430,9 +430,9 @@ Effect.Scale = Class.create(Effect.Base, { this.fontSizeType = fontSizeType; } }.bind(this)); - + this.factor = (this.options.scaleTo - this.options.scaleFrom)/100; - + this.dims = null; if (this.options.scaleMode=='box') this.dims = [this.element.offsetHeight, this.element.offsetWidth]; @@ -509,7 +509,7 @@ Effect.ScrollTo = function(element) { var options = arguments[1] || { }, scrollOffsets = document.viewport.getScrollOffsets(), elementOffsets = $(element).cumulativeOffset(), - max = (window.height || document.body.scrollHeight) - document.viewport.getHeight(); + max = (window.height || document.body.scrollHeight) - document.viewport.getHeight(); if (options.offset) elementOffsets[1] += options.offset; @@ -529,9 +529,9 @@ Effect.Fade = function(element) { var options = Object.extend({ from: element.getOpacity() || 1.0, to: 0.0, - afterFinishInternal: function(effect) { + afterFinishInternal: function(effect) { if (effect.options.to!=0) return; - effect.element.hide().setStyle({opacity: oldOpacity}); + effect.element.hide().setStyle({opacity: oldOpacity}); } }, arguments[1] || { }); return new Effect.Opacity(element,options); @@ -547,15 +547,15 @@ Effect.Appear = function(element) { effect.element.forceRerendering(); }, beforeSetup: function(effect) { - effect.element.setOpacity(effect.options.from).show(); + effect.element.setOpacity(effect.options.from).show(); }}, arguments[1] || { }); return new Effect.Opacity(element,options); }; Effect.Puff = function(element) { element = $(element); - var oldStyle = { - opacity: element.getInlineOpacity(), + var oldStyle = { + opacity: element.getInlineOpacity(), position: element.getStyle('position'), top: element.style.top, left: element.style.left, @@ -563,10 +563,10 @@ Effect.Puff = function(element) { height: element.style.height }; return new Effect.Parallel( - [ new Effect.Scale(element, 200, - { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), - new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], - Object.extend({ duration: 1.0, + [ new Effect.Scale(element, 200, + { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), + new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], + Object.extend({ duration: 1.0, beforeSetupInternal: function(effect) { Position.absolutize(effect.effects[0].element) }, @@ -580,12 +580,12 @@ Effect.BlindUp = function(element) { element = $(element); element.makeClipping(); return new Effect.Scale(element, 0, - Object.extend({ scaleContent: false, - scaleX: false, + Object.extend({ scaleContent: false, + scaleX: false, restoreAfterFinish: true, afterFinishInternal: function(effect) { effect.element.hide().undoClipping(); - } + } }, arguments[1] || { }) ); }; @@ -593,15 +593,15 @@ Effect.BlindUp = function(element) { Effect.BlindDown = function(element) { element = $(element); var elementDimensions = element.getDimensions(); - return new Effect.Scale(element, 100, Object.extend({ - scaleContent: false, + return new Effect.Scale(element, 100, Object.extend({ + scaleContent: false, scaleX: false, scaleFrom: 0, scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, restoreAfterFinish: true, afterSetup: function(effect) { - effect.element.makeClipping().setStyle({height: '0px'}).show(); - }, + effect.element.makeClipping().setStyle({height: '0px'}).show(); + }, afterFinishInternal: function(effect) { effect.element.undoClipping(); } @@ -616,10 +616,10 @@ Effect.SwitchOff = function(element) { from: 0, transition: Effect.Transitions.flicker, afterFinishInternal: function(effect) { - new Effect.Scale(effect.element, 1, { + new Effect.Scale(effect.element, 1, { duration: 0.3, scaleFromCenter: true, scaleX: false, scaleContent: false, restoreAfterFinish: true, - beforeSetup: function(effect) { + beforeSetup: function(effect) { effect.element.makePositioned().makeClipping(); }, afterFinishInternal: function(effect) { @@ -637,16 +637,16 @@ Effect.DropOut = function(element) { left: element.getStyle('left'), opacity: element.getInlineOpacity() }; return new Effect.Parallel( - [ new Effect.Move(element, {x: 0, y: 100, sync: true }), + [ new Effect.Move(element, {x: 0, y: 100, sync: true }), new Effect.Opacity(element, { sync: true, to: 0.0 }) ], Object.extend( { duration: 0.5, beforeSetup: function(effect) { - effect.effects[0].element.makePositioned(); + effect.effects[0].element.makePositioned(); }, afterFinishInternal: function(effect) { effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle); - } + } }, arguments[1] || { })); }; @@ -682,9 +682,9 @@ Effect.SlideDown = function(element) { // SlideDown need to have the content of the element wrapped in a container element with fixed height! var oldInnerBottom = element.down().getStyle('bottom'); var elementDimensions = element.getDimensions(); - return new Effect.Scale(element, 100, Object.extend({ - scaleContent: false, - scaleX: false, + return new Effect.Scale(element, 100, Object.extend({ + scaleContent: false, + scaleX: false, scaleFrom: window.opera ? 0 : 1, scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, restoreAfterFinish: true, @@ -692,11 +692,11 @@ Effect.SlideDown = function(element) { effect.element.makePositioned(); effect.element.down().makePositioned(); if (window.opera) effect.element.setStyle({top: ''}); - effect.element.makeClipping().setStyle({height: '0px'}).show(); + effect.element.makeClipping().setStyle({height: '0px'}).show(); }, afterUpdateInternal: function(effect) { effect.element.down().setStyle({bottom: - (effect.dims[0] - effect.element.clientHeight) + 'px' }); + (effect.dims[0] - effect.element.clientHeight) + 'px' }); }, afterFinishInternal: function(effect) { effect.element.undoClipping().undoPositioned(); @@ -710,8 +710,8 @@ Effect.SlideUp = function(element) { var oldInnerBottom = element.down().getStyle('bottom'); var elementDimensions = element.getDimensions(); return new Effect.Scale(element, window.opera ? 0 : 1, - Object.extend({ scaleContent: false, - scaleX: false, + Object.extend({ scaleContent: false, + scaleX: false, scaleMode: 'box', scaleFrom: 100, scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, @@ -721,7 +721,7 @@ Effect.SlideUp = function(element) { effect.element.down().makePositioned(); if (window.opera) effect.element.setStyle({top: ''}); effect.element.makeClipping().show(); - }, + }, afterUpdateInternal: function(effect) { effect.element.down().setStyle({bottom: (effect.dims[0] - effect.element.clientHeight) + 'px' }); @@ -734,15 +734,15 @@ Effect.SlideUp = function(element) { ); }; -// Bug in opera makes the TD containing this element expand for a instance after finish +// Bug in opera makes the TD containing this element expand for a instance after finish Effect.Squish = function(element) { - return new Effect.Scale(element, window.opera ? 1 : 0, { + return new Effect.Scale(element, window.opera ? 1 : 0, { restoreAfterFinish: true, beforeSetup: function(effect) { - effect.element.makeClipping(); - }, + effect.element.makeClipping(); + }, afterFinishInternal: function(effect) { - effect.element.hide().undoClipping(); + effect.element.hide().undoClipping(); } }); }; @@ -762,13 +762,13 @@ Effect.Grow = function(element) { width: element.style.width, opacity: element.getInlineOpacity() }; - var dims = element.getDimensions(); + var dims = element.getDimensions(); var initialMoveX, initialMoveY; var moveX, moveY; - + switch (options.direction) { case 'top-left': - initialMoveX = initialMoveY = moveX = moveY = 0; + initialMoveX = initialMoveY = moveX = moveY = 0; break; case 'top-right': initialMoveX = dims.width; @@ -793,11 +793,11 @@ Effect.Grow = function(element) { moveY = -dims.height / 2; break; } - + return new Effect.Move(element, { x: initialMoveX, y: initialMoveY, - duration: 0.01, + duration: 0.01, beforeSetup: function(effect) { effect.element.hide().makeClipping().makePositioned(); }, @@ -806,14 +806,14 @@ Effect.Grow = function(element) { [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }), new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }), new Effect.Scale(effect.element, 100, { - scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, + scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true}) ], Object.extend({ beforeSetup: function(effect) { - effect.effects[0].element.setStyle({height: '0px'}).show(); + effect.effects[0].element.setStyle({height: '0px'}).show(); }, afterFinishInternal: function(effect) { - effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); + effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); } }, options) ) @@ -838,7 +838,7 @@ Effect.Shrink = function(element) { var dims = element.getDimensions(); var moveX, moveY; - + switch (options.direction) { case 'top-left': moveX = moveY = 0; @@ -855,19 +855,19 @@ Effect.Shrink = function(element) { moveX = dims.width; moveY = dims.height; break; - case 'center': + case 'center': moveX = dims.width / 2; moveY = dims.height / 2; break; } - + return new Effect.Parallel( [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }), new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}), new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }) - ], Object.extend({ + ], Object.extend({ beforeStartInternal: function(effect) { - effect.effects[0].element.makePositioned().makeClipping(); + effect.effects[0].element.makePositioned().makeClipping(); }, afterFinishInternal: function(effect) { effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); } @@ -882,7 +882,7 @@ Effect.Pulsate = function(element) { var transition = options.transition || Effect.Transitions.sinoidal; var reverser = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) }; reverser.bind(transition); - return new Effect.Opacity(element, + return new Effect.Opacity(element, Object.extend(Object.extend({ duration: 2.0, from: 0, afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); } }, options), {transition: reverser})); @@ -896,12 +896,12 @@ Effect.Fold = function(element) { width: element.style.width, height: element.style.height }; element.makeClipping(); - return new Effect.Scale(element, 5, Object.extend({ + return new Effect.Scale(element, 5, Object.extend({ scaleContent: false, scaleX: false, afterFinishInternal: function(effect) { - new Effect.Scale(element, 1, { - scaleContent: false, + new Effect.Scale(element, 1, { + scaleContent: false, scaleY: false, afterFinishInternal: function(effect) { effect.element.hide().undoClipping().setStyle(oldStyle); @@ -916,7 +916,7 @@ Effect.Morph = Class.create(Effect.Base, { var options = Object.extend({ style: { } }, arguments[1] || { }); - + if (!Object.isString(options.style)) this.style = $H(options.style); else { if (options.style.include(':')) @@ -939,13 +939,13 @@ Effect.Morph = Class.create(Effect.Base, { } this.start(options); }, - + setup: function(){ function parseColor(color){ if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff'; color = color.parseColor(); return $R(0,2).map(function(i){ - return parseInt( color.slice(i*2+1,i*2+3), 16 ) + return parseInt( color.slice(i*2+1,i*2+3), 16 ) }); } this.transforms = this.style.map(function(pair){ @@ -965,9 +965,9 @@ Effect.Morph = Class.create(Effect.Base, { } var originalValue = this.element.getStyle(property); - return { - style: property.camelize(), - originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), + return { + style: property.camelize(), + originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), targetValue: unit=='color' ? parseColor(value) : value, unit: unit }; @@ -984,7 +984,7 @@ Effect.Morph = Class.create(Effect.Base, { update: function(position) { var style = { }, transform, i = this.transforms.length; while(i--) - style[(transform = this.transforms[i]).style] = + style[(transform = this.transforms[i]).style] = transform.unit=='color' ? '#'+ (Math.round(transform.originalValue[0]+ (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() + @@ -993,7 +993,7 @@ Effect.Morph = Class.create(Effect.Base, { (Math.round(transform.originalValue[2]+ (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() : (transform.originalValue + - (transform.targetValue - transform.originalValue) * position).toFixed(3) + + (transform.targetValue - transform.originalValue) * position).toFixed(3) + (transform.unit === null ? '' : transform.unit); this.element.setStyle(style, true); } @@ -1030,7 +1030,7 @@ Effect.Transform = Class.create({ }); Element.CSS_PROPERTIES = $w( - 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + + 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' + 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' + 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' + @@ -1039,7 +1039,7 @@ Element.CSS_PROPERTIES = $w( 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' + 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' + 'right textIndent top width wordSpacing zIndex'); - + Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/; String.__parseStyleElement = document.createElement('div'); @@ -1051,11 +1051,11 @@ String.prototype.parseStyle = function(){ String.__parseStyleElement.innerHTML = '
      '; style = String.__parseStyleElement.childNodes[0].style; } - + Element.CSS_PROPERTIES.each(function(property){ - if (style[property]) styleRules.set(property, style[property]); + if (style[property]) styleRules.set(property, style[property]); }); - + if (Prototype.Browser.IE && this.include('opacity')) styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]); @@ -1104,7 +1104,7 @@ Effect.Methods = { $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+ 'pulsate shake puff squish switchOff dropOut').each( - function(effect) { + function(effect) { Effect.Methods[effect] = function(element, options){ element = $(element); Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options); @@ -1113,7 +1113,7 @@ $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+ } ); -$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( +$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( function(f) { Effect.Methods[f] = Element[f]; } ); diff --git a/test/test_helper.rb b/test/test_helper.rb index b56c2bf..1c6aed9 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,18 +1,18 @@ # Load the environment ENV['RAILS_ENV'] ||= 'test' require File.dirname(__FILE__) + '/rails_root/config/environment.rb' - + # Load the testing framework require 'test_help' silence_warnings { RAILS_ENV = ENV['RAILS_ENV'] } - + # Run the migrations ActiveRecord::Migrator.migrate("#{RAILS_ROOT}/db/migrate") - + # Setup the fixtures path Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/" $LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path) - + require File.dirname(__FILE__) + '/mock_file' require File.dirname(__FILE__) + '/s3_stubs' require 'open-uri' @@ -31,52 +31,52 @@ def create_fixtures(*table_names) Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) end end - + self.use_transactional_fixtures = true self.use_instantiated_fixtures = false - + def files(name) case name when :photo MockFile.new("#{RAILS_ROOT}/../fixtures/photo.jpg") - + when :not_a_photo MockFile.new("#{RAILS_ROOT}/../fixtures/not_a_photo.xml") - + when :web_photo 'http://www.google.com/intl/en_ALL/images/logo.gif' - + 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 - + def color_at(image, coords) image.load_image.pixel_color(*coords) end - + def to_color(rgb) Magick::Pixel.new(*rgb) end - + def assert_color(expected, coords, image) coords = coords.split('x').collect(&:to_i) expected = to_color(expected) actual = color_at(image, coords) - + assert_equal(expected, actual, "Wrong color at (#{coords.join(',')}). Expected #{expected}, Got #{actual}") end end diff --git a/test/unit/abstract_test.rb b/test/unit/abstract_test.rb index db7a347..ca1732e 100644 --- a/test/unit/abstract_test.rb +++ b/test/unit/abstract_test.rb @@ -1,20 +1,20 @@ require File.dirname(__FILE__) + '/../../test/test_helper' class FleximageAbstractTest < Test::Unit::TestCase - + def test_should_generate_a_default_image p = Abstract.new assert p.save - + assert_equal 320, p.load_image.columns assert_equal 240, p.load_image.rows assert_color [65535, 0, 0], '160x120', p end - + def test_should_delete_an_abstract_model p = Abstract.new assert p.save assert_nothing_raised { p.destroy } end - + end \ No newline at end of file diff --git a/test/unit/basic_model_test.rb b/test/unit/basic_model_test.rb index f2deb20..a839a56 100644 --- a/test/unit/basic_model_test.rb +++ b/test/unit/basic_model_test.rb @@ -2,15 +2,15 @@ class FleximageBasicModelTest < Test::Unit::TestCase def test_should_have_correct_file_path_with_creation_date_based_storage - p = PhotoBare.create(:image_file => files(:photo)) + p = PhotoBare.create(:image_file => files(:photo)) assert_equal "#{RAILS_ROOT}/public/uploads/#{Time.now.year}/#{Time.now.month}/#{Time.now.day}/#{p.id}.png", p.file_path end - + def test_should_have_correct_directory_path_with_creation_date_based_storage p = PhotoBare.create(:image_file => files(:photo)) assert_equal "#{RAILS_ROOT}/public/uploads/#{Time.now.year}/#{Time.now.month}/#{Time.now.day}", p.directory_path end - + def test_should_have_correct_file_path_without_creation_date_based_storage PhotoBare.use_creation_date_based_directories = false p = PhotoBare.create(:image_file => files(:photo)) @@ -18,7 +18,7 @@ def test_should_have_correct_file_path_without_creation_date_based_storage ensure PhotoBare.use_creation_date_based_directories = true end - + def test_should_have_correct_directory_path_without_creation_date_based_storage PhotoBare.use_creation_date_based_directories = false p = PhotoBare.create(:image_file => files(:photo)) @@ -26,7 +26,7 @@ def test_should_have_correct_directory_path_without_creation_date_based_storage ensure PhotoBare.use_creation_date_based_directories = true end - + def test_should_not_prepend_rails_root_to_absolute_path PhotoBare.image_directory = '/tmp' PhotoBare.use_creation_date_based_directories = false diff --git a/test/unit/blank_test.rb b/test/unit/blank_test.rb index 93f6ad8..ed8374c 100644 --- a/test/unit/blank_test.rb +++ b/test/unit/blank_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../../test/test_helper' class FleximageBlankTest < Test::Unit::TestCase - + def test_should_create_blank_image_of_proper_dimensions p = Fleximage::Blank.new('320x480') p.operate do |image| @@ -9,15 +9,15 @@ def test_should_create_blank_image_of_proper_dimensions assert_equal(480, image.height) end end - + def test_should_be_transparent_by_default p = Fleximage::Blank.new('320x480') assert_color([0, 0, 0, 65535], '50x50', p) end - + def test_should_color_image p = Fleximage::Blank.new('320x480', :color => 'red') assert_color([65535, 0, 0, 0], '50x50', p) end - + end \ No newline at end of file diff --git a/test/unit/default_image_path_option_test.rb b/test/unit/default_image_path_option_test.rb index 84153a2..2947685 100644 --- a/test/unit/default_image_path_option_test.rb +++ b/test/unit/default_image_path_option_test.rb @@ -4,7 +4,7 @@ class FleximageDefaultImagePathOptionTest < Test::Unit::TestCase def test_should_use_a_default_image PhotoBare.require_image = false PhotoBare.default_image_path = "../fixtures/photo.jpg" - + p = PhotoBare.new assert p.save assert_equal 1024, p.load_image.rows diff --git a/test/unit/file_upload_from_local_test.rb b/test/unit/file_upload_from_local_test.rb index ff80f1c..a3c2ed5 100644 --- a/test/unit/file_upload_from_local_test.rb +++ b/test/unit/file_upload_from_local_test.rb @@ -5,21 +5,21 @@ def test_should_be_valid_with_image p = PhotoBare.new(:image_file => files(:photo)) assert p.save, 'Record expected to be allowed to save' end - + def test_should_require_an_image p = PhotoBare.new assert !p.save, 'Record expected to not be allowed to save' assert_equal 1, p.errors.size assert_equal 'is required', p.errors.on(:image_file) end - + def test_should_require_an_valid_image p = PhotoBare.new(:image_file => files(:not_a_photo)) assert !p.save, 'Record expected to not be allowed to save' assert_equal 1, p.errors.size assert_equal 'was not a readable image', p.errors.on(:image_file) end - + def test_should_correct_colorspace_and_dpi p = PhotoBare.new(:image_file => files(:cmyk)) image = p.load_image diff --git a/test/unit/file_upload_from_strings_test.rb b/test/unit/file_upload_from_strings_test.rb index 99ff3d2..58a7baf 100644 --- a/test/unit/file_upload_from_strings_test.rb +++ b/test/unit/file_upload_from_strings_test.rb @@ -3,17 +3,17 @@ class FleximageFileUploadFromStringsTest < Test::Unit::TestCase def test_should_accept_file_as_string data = files(:photo).read - + p = PhotoBare.new p.image_file_string = data p.save assert p.save, 'Record expected to be allowed to save' assert p.has_image? end - + def test_should_accept_file_as_base64 data = Base64.encode64(files(:photo).read) - + p = PhotoBare.new p.image_file_base64 = data p.save diff --git a/test/unit/file_upload_from_url_test.rb b/test/unit/file_upload_from_url_test.rb index 691a164..a6c25c3 100644 --- a/test/unit/file_upload_from_url_test.rb +++ b/test/unit/file_upload_from_url_test.rb @@ -7,7 +7,7 @@ def test_should_be_valid_with_image_from_url rescue SocketError print '!' end - + def test_should_be_invalid_with_nonimage_from_url p = PhotoBare.new(:image_file_url => 'http://www.google.com/') assert !p.save, 'Record expected to be invalid after upload via URL' @@ -16,7 +16,7 @@ def test_should_be_invalid_with_nonimage_from_url rescue SocketError print '!' end - + def test_should_be_invalid_with_invalid_url p = PhotoBare.new(:image_file_url => 'foo') assert !p.save, 'Record expected to be invalid after upload via URL' @@ -25,7 +25,7 @@ def test_should_be_invalid_with_invalid_url rescue SocketError print '!' end - + def test_should_have_an_original_filename p = PhotoFile.new(:image_file_url => files(:web_photo)) assert_equal p.image_filename, files(:web_photo) diff --git a/test/unit/file_upload_to_db_test.rb b/test/unit/file_upload_to_db_test.rb index 39b02bb..68f1639 100644 --- a/test/unit/file_upload_to_db_test.rb +++ b/test/unit/file_upload_to_db_test.rb @@ -4,26 +4,26 @@ class FleximageFileUploadToDbTest < Test::Unit::TestCase def test_should_be_valid_with_image p = PhotoDb.new(:image_file => files(:photo)) assert p.save, 'Record expected to be allowed to save' - + p = PhotoDb.find(p.id) assert_kind_of Magick::Image, p.load_image assert p.image_file_data.size > 0 end - + def test_should_require_an_image p = PhotoDb.new assert !p.save, 'Record expected to not be allowed to save' assert_equal 1, p.errors.size assert_equal 'is required', p.errors.on(:image_file) end - + def test_should_require_an_valid_image p = PhotoDb.new(:image_file => files(:not_a_photo)) assert !p.save, 'Record expected to not be allowed to save' assert_equal 1, p.errors.size assert_equal 'was not a readable image', p.errors.on(:image_file) end - + def test_should_retrieve_a_stored_image id = PhotoDb.create(:image_file => files(:photo)).id p = PhotoDb.find(id) @@ -31,7 +31,7 @@ def test_should_retrieve_a_stored_image assert_equal 768, p.load_image.columns assert_equal 1024, p.load_image.rows end - + def test_should_delete_an_image id = PhotoDb.create(:image_file => files(:photo)).id photo = PhotoDb.find(id) diff --git a/test/unit/i18n_messages_test.rb b/test/unit/i18n_messages_test.rb index 0c49e9a..a8c5931 100644 --- a/test/unit/i18n_messages_test.rb +++ b/test/unit/i18n_messages_test.rb @@ -6,42 +6,42 @@ def test_should_have_default_message p = PhotoBare.new p.save assert_equal "is required", p.errors["image_file"] - + p = PhotoBare.new(:image_file => files(:not_a_photo)) p.save assert_equal "was not a readable image", p.errors["image_file"] - + p = PhotoBare.new(:image_file => files(:i1x1)) p.save assert_equal "is too small (Minimum: 2x2)", p.errors["image_file"] end - + def test_should_have_german_message I18n.locale = "de" p = PhotoBare.new p.save assert_equal "ist erforderlich", p.errors["image_file"] - + p = PhotoBare.new(:image_file => files(:not_a_photo)) p.save assert_equal "war nicht lesbar", p.errors["image_file"] - + p = PhotoBare.new(:image_file => files(:i1x1)) p.save assert_equal "ist zu klein (Minimalgröße: 2x2)", p.errors["image_file"] ensure I18n.locale = "en" end - + def test_should_have_model_specific_message p = PhotoCustomError.new assert !p.save assert_equal "needs to be attached", p.errors["image_file"] - + p = PhotoCustomError.new(:image_file => files(:not_a_photo)) p.save assert_equal "seems to be broken", p.errors["image_file"] - + p = PhotoCustomError.new(:image_file => files(:i1x1)) assert !p.save assert_equal "must be bigger (min. size: 2x2)", p.errors["image_file"] diff --git a/test/unit/image_directory_option_test.rb b/test/unit/image_directory_option_test.rb index 4aff131..654c54c 100644 --- a/test/unit/image_directory_option_test.rb +++ b/test/unit/image_directory_option_test.rb @@ -7,7 +7,7 @@ def test_should_store_in_default_image_directory assert_match %r{public/uploads/\d+/\d+/\d+/\d+}, p.file_path assert File.exists?(p.file_path) end - + def test_should_set_image_directory PhotoBare.use_creation_date_based_directories = true PhotoBare.image_directory = 'public/uploads/foo' diff --git a/test/unit/image_proxy_test.rb b/test/unit/image_proxy_test.rb index a3da0a7..c7bce94 100644 --- a/test/unit/image_proxy_test.rb +++ b/test/unit/image_proxy_test.rb @@ -7,7 +7,7 @@ def test_should_have_a_width assert_equal 768, image.width end end - + def test_should_have_a_height p = PhotoBare.create(:image_file => files(:photo)) p.operate do |image| diff --git a/test/unit/image_storage_format_option_test.rb b/test/unit/image_storage_format_option_test.rb index 80594c8..1bb2e69 100644 --- a/test/unit/image_storage_format_option_test.rb +++ b/test/unit/image_storage_format_option_test.rb @@ -6,7 +6,7 @@ def test_should_have_default_storage_format_png assert_match %r{\d+\.png$}, p.file_path assert_equal 'PNG', p.load_image.format end - + def test_should_set_image_storage_format_to_jpg PhotoBare.image_storage_format = :jpg p = PhotoBare.create(:image_file => files(:photo)) @@ -15,12 +15,12 @@ def test_should_set_image_storage_format_to_jpg ensure PhotoBare.image_storage_format = :png end - + def test_should_have_default_storage_format_png_in_db p = PhotoDb.create(:image_file => files(:photo)) assert_equal 'PNG', p.load_image.format end - + def test_should_set_image_storage_format_to_jpg_in_db PhotoDb.image_storage_format = :jpg p = PhotoDb.create(:image_file => files(:photo)) diff --git a/test/unit/magic_columns_test.rb b/test/unit/magic_columns_test.rb index 1f40ef1..5f3f444 100644 --- a/test/unit/magic_columns_test.rb +++ b/test/unit/magic_columns_test.rb @@ -9,7 +9,7 @@ def test_should_save_data_in_magic_columns_from_local assert_equal 'JPEG', p.image_format assert_equal 'jpg', p.extension end - + def test_should_save_data_in_magic_columns_from_url p = PhotoFile.create(:image_file_url => files(:web_photo)) assert_equal files(:web_photo), p.image_filename @@ -20,14 +20,14 @@ def test_should_save_data_in_magic_columns_from_url rescue SocketError print '!' end - + def test_should_delete_magic_columns_when_image_is_deleted p = PhotoFile.new(:image_file => files(:photo)) p.save - + p = PhotoFile.find(p.id) p.delete_image_file.save - + assert_nil p.image_width assert_nil p.image_height end diff --git a/test/unit/minimum_image_size_test.rb b/test/unit/minimum_image_size_test.rb index eefd758..026574d 100644 --- a/test/unit/minimum_image_size_test.rb +++ b/test/unit/minimum_image_size_test.rb @@ -28,26 +28,26 @@ def test_should_not_save_small_image assert !p.save assert p.errors["image_file"].match(/is too small/) end - + def test_should_save_big_image p = BigPhoto.new(:image_file => files(:i100x100)) assert p.save end - + def test_should_only_save_wide p = WidePhoto.new(:image_file => files(:i1x100)) assert !p.save p = WidePhoto.new(:image_file => files(:i100x1)) assert p.save end - + def test_should_only_save_high p = HighPhoto.new(:image_file => files(:i100x1)) assert !p.save p = HighPhoto.new(:image_file => files(:i1x100)) assert p.save end - + def test_should_include_minimum_dimensions_in_message p = BigPhoto.new(:image_file => files(:i1x1)) p.save diff --git a/test/unit/operator_base_test.rb b/test/unit/operator_base_test.rb index 1c52d93..b10c6b6 100644 --- a/test/unit/operator_base_test.rb +++ b/test/unit/operator_base_test.rb @@ -5,39 +5,39 @@ def setup @photo = PhotoBare.create(:image_file => files(:photo)) proxy = Fleximage::ImageProxy.new(@photo.load_image, @photo) @op = Fleximage::Operator::Base.new(proxy, @photo.load_image, @photo) - + @other_img = Magick::Image.read(@photo.file_path).first end - + def test_should_raise_operation_not_implemented_exception assert_raise(Fleximage::Operator::OperationNotImplemented) do @photo.operate { |p| p.base } end end - - + + # size_to_xy - + def test_should_parse_size_string_to_x_and_y assert_equal [1,2], @op.size_to_xy('1x2') assert_equal [640,480], @op.size_to_xy('640x480') end - + def test_should_parse_size_array_to_x_and_y assert_equal [1,2], @op.size_to_xy([1,2]) assert_equal [640,480], @op.size_to_xy([640,480]) end - + def test_should_parse_single_size_array_to_square_x_and_y assert_equal [2,2], @op.size_to_xy(2) assert_equal [2,2], @op.size_to_xy('2') assert_equal [480,480], @op.size_to_xy(480) assert_equal [480,480], @op.size_to_xy('480') end - - + + # scale - + def test_should_scale_the_main_image_and_keep_its_aspect_ratio img = @op.scale(400) assert_equal 400, img.rows @@ -45,7 +45,7 @@ def test_should_scale_the_main_image_and_keep_its_aspect_ratio assert_equal 400, @photo.load_image.rows assert_equal 300, @photo.load_image.columns end - + def test_should_scale_a_different_image_and_keep_its_aspect_ratio @op.scale(400, @other_img) assert_equal 400, @other_img.rows @@ -53,10 +53,10 @@ def test_should_scale_a_different_image_and_keep_its_aspect_ratio assert_equal 1024, @photo.load_image.rows assert_equal 768, @photo.load_image.columns end - - + + # scale and crop - + def test_should_scale_and_crop_the_main_image img = @op.scale_and_crop(400) assert_equal 400, img.rows @@ -64,7 +64,7 @@ def test_should_scale_and_crop_the_main_image assert_equal 400, @photo.load_image.rows assert_equal 400, @photo.load_image.columns end - + def test_should_scale_and_crop_a_different_image @op.scale_and_crop(400, @other_img) assert_equal 400, @other_img.rows @@ -72,10 +72,10 @@ def test_should_scale_and_crop_a_different_image assert_equal 1024, @photo.load_image.rows assert_equal 768, @photo.load_image.columns end - - + + # stretch - + def test_should_stretch_the_main_image img = @op.stretch(400) assert_equal 400, img.rows @@ -83,7 +83,7 @@ def test_should_stretch_the_main_image assert_equal 400, @photo.load_image.rows assert_equal 400, @photo.load_image.columns end - + def test_should_stretch_a_different_image @op.stretch(400, @other_img) assert_equal 400, @other_img.rows @@ -91,34 +91,34 @@ def test_should_stretch_a_different_image assert_equal 1024, @photo.load_image.rows assert_equal 768, @photo.load_image.columns end - - + + def test_should_convert_symbol_to_rmagick_blending_mode assert_equal Magick::MultiplyCompositeOp, @op.symbol_to_blending_mode(:multiply) assert_equal Magick::OverCompositeOp, @op.symbol_to_blending_mode(:over) assert_equal Magick::ScreenCompositeOp, @op.symbol_to_blending_mode(:screen) assert_equal Magick::CopyBlackCompositeOp, @op.symbol_to_blending_mode(:copy_black) end - + def test_should_raise_argument_error_when_no_blend_mode_found assert_raise(ArgumentError) do @op.symbol_to_blending_mode(:foobar) end end - - + + # gravity lookup - + def test_should_lookup_correct_gravity assert_equal Magick::CenterGravity, @op.symbol_to_gravity(:center) assert_equal Magick::NorthGravity, @op.symbol_to_gravity(:top) assert_equal Magick::SouthWestGravity, @op.symbol_to_gravity(:bottom_left) end - + def test_should_raise_error_with_a_bad_gravity assert_raise(ArgumentError) do @op.symbol_to_gravity(:foo) end end - + end diff --git a/test/unit/operator_resize_test.rb b/test/unit/operator_resize_test.rb index d81f979..ed03072 100644 --- a/test/unit/operator_resize_test.rb +++ b/test/unit/operator_resize_test.rb @@ -5,14 +5,14 @@ def setup @photo = PhotoBare.create(:image_file => files(:photo)) proxy = Fleximage::ImageProxy.new(@photo.load_image, @photo) @op = Fleximage::Operator::Base.new(proxy, @photo.load_image, @photo) - + @other_img = Magick::Image.read(@photo.file_path).first end - + def test_should_resize @photo.operate { |p| p.resize '300x400' } assert_equal 400, @photo.load_image.rows assert_equal 300, @photo.load_image.columns end - + end \ No newline at end of file diff --git a/test/unit/preprocess_image_option_test.rb b/test/unit/preprocess_image_option_test.rb index a00c6df..0f86e0e 100644 --- a/test/unit/preprocess_image_option_test.rb +++ b/test/unit/preprocess_image_option_test.rb @@ -5,16 +5,16 @@ def test_should_resize_image_on_upload PhotoDb.preprocess_image do |image| image.resize '50x50', :crop => true end - + p = PhotoDb.new(:image_file => files(:photo)) assert p.save, 'Record expected to be allowed to save' - + assert_equal 50, p.load_image.columns assert_equal 50, p.load_image.rows - + assert_equal 50, p.image_height assert_equal 50, p.image_width - + ensure PhotoDb.preprocess_image_operation = nil end diff --git a/test/unit/require_image_option_test.rb b/test/unit/require_image_option_test.rb index 88b026b..ce58b7a 100644 --- a/test/unit/require_image_option_test.rb +++ b/test/unit/require_image_option_test.rb @@ -3,7 +3,7 @@ class ValidatedPhoto < ActiveRecord::Base set_table_name :photo_dbs acts_as_fleximage - + def validate # overiding the validate method end @@ -14,7 +14,7 @@ def test_should_require_image_by_default p = PhotoBare.new assert !p.save, 'Record expected to not be allowed to save' end - + def test_should_disable_image_requirement PhotoBare.require_image = false p = PhotoBare.new @@ -22,7 +22,7 @@ def test_should_disable_image_requirement ensure PhotoBare.require_image = true end - + def test_should_require_image_when_validate_is_overriden p = ValidatedPhoto.new assert !p.save, 'Record expected to not be allowed to save' diff --git a/test/unit/temp_image_test.rb b/test/unit/temp_image_test.rb index 45dd64a..5f8d2bc 100644 --- a/test/unit/temp_image_test.rb +++ b/test/unit/temp_image_test.rb @@ -7,14 +7,14 @@ def test_should_save_and_use_a_temp_image assert_match /^\d+_\d+$/, a1.image_file_temp assert File.exists?("#{RAILS_ROOT}/tmp/fleximage/#{a1.image_file_temp}") temp_file_path = a1.image_file_temp - + a2 = Avatar.new(:username => 'Alex Wayne', :image_file_temp => temp_file_path) - + assert a2.save assert File.exists?(a2.file_path) assert !File.exists?("#{RAILS_ROOT}/tmp/fleximage/#{temp_file_path}") end - + def test_should_prevent_directory_traversal_attacks a1 = Avatar.new(:image_file_temp => '../fleximage/photo.jpg') assert !a1.save diff --git a/test/unit/use_creation_date_based_directories_option_test.rb b/test/unit/use_creation_date_based_directories_option_test.rb index 96c785e..c1f662c 100644 --- a/test/unit/use_creation_date_based_directories_option_test.rb +++ b/test/unit/use_creation_date_based_directories_option_test.rb @@ -5,7 +5,7 @@ def test_should_store_images_with_creation_date_based_directories p = PhotoBare.create(:image_file => files(:photo)) assert_match %r{public/uploads/\d+/\d+/\d+/\d+}, p.file_path end - + def test_should_store_images_without_creation_date_based_directories PhotoBare.use_creation_date_based_directories = false p = PhotoBare.create(:image_file => files(:photo))