dynamic_image 0.9.0 → 0.9.3

data/README.rdoc

@@ -1,13 +1,14 @@
 = DynamicImage
 
-DynamicImage is a Rails plugin providing transparent uploading 
-and processing of image files.
+DynamicImage is a Rails plugin that simplifies image uploading and processing.
+No configuration is necessary, as resizing and processing is done on demand and 
+cached rather than on upload. 
 
-Images are processed and cached on demand without need for any 
-configuration.
+Note: This version is currently Rails 3 specific, although the final 1.0 
+version will also be compatible with 2.x. 
 
 
-== Installation:
+== Installation
 
 Install the gem:
 
@@ -23,37 +24,86 @@ Do the migrations:
  rake db:migrate
 
 
-== Getting started:
+== Getting started
 
-Use belongs_to_image in your models:
+Let's create a model with an image:
 
  class User
-   belongs_to_image :profile_picture
+   belongs_to_image :mugshot
  end
 
-Create a form:
+Uploading files is pretty straightforward, just add a <tt>file_field</tt>
+to your form and update your record as usual: 
 
  <%= form_for @user, :html => {:multipart => true} do |f| %>
-   Name: <%= f.text_field :name %>
-   Profile picture: <%= f.file_field :profile_picture %>
-   <%= submit_tag "Save" %>
+     Name:    <%= f.text_field :name %>
+     Mugshot: <%= f.file_field :mugshot %>
+     <%= submit_tag "Save" %>
  <% end %>
 
-Use the dynamic_image_tag helper to show images:
+You can now use the <tt>dynamic_image_tag</tt> helper to show off your
+new image:
 
- <%= dynamic_image_tag @user.profile_picture, :size => '64x64' %>
- <%= dynamic_image_tag @user.profile_picture, :size => '150x' %>
+ <% if @user.mugshot? %>
+     <%= dynamic_image_tag @user.profile_picture, :size => '64x64' %>
+ <% end %>
+
+
+== Filters
 
+I'm cleaning up the filters syntax, watch this space.
 
-== Caching
+
+== Technical
+
+The original master files are stored in the file system and identified a 
+SHA-1 hash of the contents. If you're familiar with the internal workings
+of git, this should seem familiar. 
 
 Processing images on the fly is expensive. Therefore, page caching is enabled
 by default, even in development mode. To disable page caching, add the following
-line in your initializers or environment.rb:
+line in your initializers:
 
  DynamicImage.page_caching = false
 
+
+== History
+
+DynamicImage was originally created in early 2006 to handle images
+for the Pages CMS. It was later extracted as a Rails Engine for Rails
+1.2 in 2007, which also marked the first public release as 
+dynamic_image_engine. 
+
+The API has remained more or less unchanged, but the internal workings
+have been refactored a few times over the years, most notably dropping
+the Engines dependency and transitioning from database storage to file
+system. 
+
+The current version is based on an internal branch targeting Rails 
+2.3, and modified to work as a Rails 3 plugin. It's not directly
+compatible with earlier versions, but upgrading shouldn't be more 
+trouble than migrating the files out of the database.
+
+
 == Copyright
 
-Copyright © 2006-2010 Inge Jørgensen. See LICENSE for details.
+Copyright © 2006-2010 Inge Jørgensen.
 	
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.3

data/app/models/image.rb

@@ -21,10 +21,15 @@ class Image < ActiveRecord::Base
 			image.crop_start = "0x0"
 		end
 	end
-
+	
 	# Create the binary from an image file.
 	def imagefile=(image_file)
-		self.filename     = image_file.original_filename rescue File.basename( image_file.path )
+		if image_file.kind_of?(String) && image_file =~ /^(ht|f)tps?:\/\//
+			self.filename = File.basename(image_file)
+			image_file    = open(image_file)
+		else
+			self.filename = image_file.original_filename rescue File.basename(image_file.path)
+		end
 		self.content_type = image_file.content_type.chomp rescue "image/"+image_file.path.split(/\./).last.downcase.gsub(/jpg/,"jpeg") # ugly hack
 		set_image_data(image_file.read)
 	end

data/dynamic_image.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynamic_image}
-  s.version = "0.9.0"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Inge J\303\270rgensen"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-20}
   s.email = %q{inge@elektronaut.no}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/dynamic_image/active_record_extensions.rb

@@ -43,6 +43,9 @@ module DynamicImage
 							self.associated_#{association_id} = img_obj
 						end
 					end
+					def #{association_id}?
+						(self.#{association_id} && self.#{association_id}.data?) ? true : false
+					end
 				end_eval
 
 				send :include, DynamicImage::ActiveRecordExtensions::InstanceMethods

data/lib/dynamic_image/helper.rb

@@ -74,36 +74,22 @@ module DynamicImage
 		end
 	
 		# Returns an image tag for the provided image model, works similar to the rails <tt>image_tag</tt> helper. 
-		# The <tt>alt</tt> tag is set to the image title unless explicitly provided.
 		#
 		# The following options are supported (the rest will be forwarded to <tt>image_tag</tt>):
 		#
-		#   :size         - Resize the image to fit these proportions. Size is given as a string with the format
+		# * :size         - Resize the image to fit these proportions. Size is given as a string with the format
 		#                   '100x100'. Either dimension can be omitted, for example: '100x'
-		#   :crop         - Boolean, default: false. Crop the image to the size given.
-		#   :no_size_attr - Boolean, default: false. Do not include width and height attributes in the image tag.
-		#   :filterset    - Apply the given filterset to the image
+		# * :crop         - Crop the image to the size given. (Boolean, default: <tt>false</tt>)
+		# * :no_size_attr - Do not include width and height attributes in the image tag. (Boolean, default: false)
+		# * :filterset    - Apply the given filterset to the image
 		#
-		# == Examples
+		# ==== Examples
 		#
-		# Tag for original image, without rescaling:
-		#   <%= dynamic_image_tag(@image) %>
+		#  dynamic_image_tag(@image)                                    # Original image
+		#  dynamic_image_tag(@image, :size => "100x")                   # Will be 100px wide
+		#  dynamic_image_tag(@image, :size => "100x100")                # Will fit within 100x100
+		#  dynamic_image_tag(@image, :size => "100x100", :crop => true) # Will be cropped to 100x100
 		#
-		# Tag for image, rescaled to fit within 100x100 (size will be 100x100 or smaller):
-		#   <%= dynamic_image_tag(@image, :size => "100x100") %>
-		#
-		# Tag for image, cropped and rescaled to 100x100 (size will be 100x100 in all cases):
-		#   <%= dynamic_image_tag(@image, :size => "100x100", :crop => true) %>
-		#
-		# Tag for image with a filter set applied:
-		#   <%= dynamic_image_tag(@image, :size => "100x100", :filterset => @filterset) %>
-		#
-		# Tag for image with a named filter set applied:
-		#   <%= dynamic_image_tag(@image, :size => "100x100", :filterset => "thumbnails") %>
-		#
-		# Tag for image without the width/height attributes, and with a custom alt attribute
-		#   <%= dynamic_image_tag(@image, :size => "100x100", :no_size_attr => true, :alt => "Thumbnail for post" %>
-	
 		def dynamic_image_tag(image, options = {})
 			parsed_options = dynamic_image_options(image, options)
 			image_tag(parsed_options[:url], parsed_options[:options] ).gsub(/\?[\d]+/,'')

data/lib/dynamic_image.rb

@@ -1,5 +1,6 @@
 require 'tempfile'
 require 'digest/sha1'
+require 'open-uri'
 
 # Gem dependencies
 require 'rmagick'

data/lib/generators/dynamic_image/templates/migrations/create_images.rb

@@ -12,7 +12,6 @@ class CreateImages < ActiveRecord::Migration
       t.column :crop_size,     :string
       t.column :created_at,    :datetime
       t.column :updated_at,    :datetime
-      t.column :filters,       :text
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - "Inge J\xC3\xB8rgensen"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +02:00
+date: 2010-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency