dynamic_image 0.9.5 → 0.9.6

data/config/routes.rb

@@ -1,10 +1,10 @@
 # Rails 3 routes
 Rails.application.routes.draw do
-	match "dynamic_images/:id/:original(/:size(/:filterset))/*filename" => "images#render_dynamic_image", :size => /\d*x\d*/, :original => /original/
-	match "dynamic_images/:id(/:size(/:filterset))/*filename" => "images#render_dynamic_image", :size => /\d*x\d*/
-	# Legacy
-	match "dynamic_image/:id/:original(/:size(/:filterset))/*filename" => "images#render_dynamic_image", :size => /\d*x\d*/, :original => /original/
-	match "dynamic_image/:id(/:size(/:filterset))/*filename" => "images#render_dynamic_image", :size => /\d*x\d*/
+  match "dynamic_images/:id/:original(/:size(/:filterset))/*filename" => "images#render_dynamic_image", :size => /\d*x\d*/, :original => /original/
+  match "dynamic_images/:id(/:size(/:filterset))/*filename" => "images#render_dynamic_image", :size => /\d*x\d*/
+  # Legacy
+  match "dynamic_image/:id/:original(/:size(/:filterset))/*filename" => "images#render_dynamic_image", :size => /\d*x\d*/, :original => /original/
+  match "dynamic_image/:id(/:size(/:filterset))/*filename" => "images#render_dynamic_image", :size => /\d*x\d*/
 end
 
 # Rails 2 routes

data/dynamic_image.gemspec

@@ -1,56 +1,50 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dynamic_image}
-  s.version = "0.9.5"
+  s.name = "dynamic_image"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Inge J\303\270rgensen"]
-  s.date = %q{2011-06-24}
-  s.email = %q{inge@elektronaut.no}
+  s.date = "2012-09-25"
+  s.email = "inge@elektronaut.no"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "app/controllers/images_controller.rb",
-     "app/models/image.rb",
-     "config/routes.rb",
-     "dynamic_image.gemspec",
-     "init.rb",
-     "install.rb",
-     "lib/binary_storage.rb",
-     "lib/binary_storage/active_record_extensions.rb",
-     "lib/binary_storage/blob.rb",
-     "lib/dynamic_image.rb",
-     "lib/dynamic_image/active_record_extensions.rb",
-     "lib/dynamic_image/engine.rb",
-     "lib/dynamic_image/filterset.rb",
-     "lib/dynamic_image/helper.rb",
-     "lib/generators/dynamic_image/USAGE",
-     "lib/generators/dynamic_image/dynamic_image_generator.rb",
-     "lib/generators/dynamic_image/templates/migrations/create_images.rb",
-     "uninstall.rb"
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "app/controllers/images_controller.rb",
+    "app/models/image.rb",
+    "config/routes.rb",
+    "dynamic_image.gemspec",
+    "init.rb",
+    "install.rb",
+    "lib/binary_storage.rb",
+    "lib/binary_storage/active_record_extensions.rb",
+    "lib/binary_storage/blob.rb",
+    "lib/dynamic_image.rb",
+    "lib/dynamic_image/active_record_extensions.rb",
+    "lib/dynamic_image/engine.rb",
+    "lib/dynamic_image/filterset.rb",
+    "lib/dynamic_image/helper.rb",
+    "lib/generators/dynamic_image/USAGE",
+    "lib/generators/dynamic_image/dynamic_image_generator.rb",
+    "lib/generators/dynamic_image/templates/migrations/create_images.rb",
+    "uninstall.rb"
   ]
-  s.homepage = %q{http://github.com/elektronaut/dynamic_image}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = "http://github.com/elektronaut/dynamic_image"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{DynamicImage is a rails plugin providing transparent uploading and processing of image files.}
-  s.test_files = [
-    "test/dynamic_image_test.rb",
-     "test/test_helper.rb"
-  ]
+  s.rubygems_version = "1.8.24"
+  s.summary = "DynamicImage is a rails plugin providing transparent uploading and processing of image files."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/init.rb

@@ -1 +1 @@
-require 'dynamic_image'
+require 'dynamic_image'

data/lib/binary_storage.rb

@@ -8,21 +8,21 @@ require File.join(File.dirname(__FILE__), 'binary_storage/active_record_extensio
 require File.join(File.dirname(__FILE__), 'binary_storage/blob')
 
 module BinaryStorage
-	class << self
-		def storage_dir
-			@@storage_dir ||= Rails.root.join('db/binary_storage', Rails.env)
-		end
-		
-		def storage_dir=(new_storage_dir)
-			@@storage_dir = new_storage_dir
-		end
-		
-		def hexdigest_file(path)
-			Digest::SHA1.file(path).hexdigest
-		end
+  class << self
+    def storage_dir
+      @@storage_dir ||= Rails.root.join('db/binary_storage', Rails.env)
+    end
+    
+    def storage_dir=(new_storage_dir)
+      @@storage_dir = new_storage_dir
+    end
+    
+    def hexdigest_file(path)
+      Digest::SHA1.file(path).hexdigest
+    end
 
-		def hexdigest(string)
-			Digest::SHA1.hexdigest(string)
-		end
-	end
+    def hexdigest(string)
+      Digest::SHA1.hexdigest(string)
+    end
+  end
 end

data/lib/binary_storage/active_record_extensions.rb

@@ -1,144 +1,144 @@
 require 'binary_storage'
 
 module BinaryStorage
-	module ActiveRecordExtensions
+  module ActiveRecordExtensions
 
-		def self.included(base)
-			base.send(:extend, BinaryStorage::ActiveRecordExtensions::ClassMethods)
-		end
-		
-		module ClassMethods
-			
-			def register_binary(klass, binary_name, binary_column)
-				@@binary_columns ||= {}
-				@@binary_columns[klass] ||= {}
-				@@binary_columns[klass][binary_name] = binary_column
-			end
-			
-			def binary_column(klass, binary_name)
-				if @@binary_columns && @@binary_columns[klass] && @@binary_columns[klass][binary_name]
-					@@binary_columns[klass][binary_name]
-				else
-					nil
-				end
-			end
-			
-			# Count existing references to a binary
-			def binary_reference_count(hash_string)
-				references = 0
-				if @@binary_columns
-					@@binary_columns.each do |klass, binaries|
-						binaries.each do |binary_name, binary_column|
-							references += klass.count(:all, :conditions => ["`#{binary_column} = ?`", hash_string])
-						end
-					end
-				end
-			end
-			
-			def binary_storage(binary_name, binary_column)
-				binary_name   = binary_name.to_s
-				binary_column = binary_column.to_s
+    def self.included(base)
+      base.send(:extend, BinaryStorage::ActiveRecordExtensions::ClassMethods)
+    end
+    
+    module ClassMethods
+      
+      def register_binary(klass, binary_name, binary_column)
+        @@binary_columns ||= {}
+        @@binary_columns[klass] ||= {}
+        @@binary_columns[klass][binary_name] = binary_column
+      end
+      
+      def binary_column(klass, binary_name)
+        if @@binary_columns && @@binary_columns[klass] && @@binary_columns[klass][binary_name]
+          @@binary_columns[klass][binary_name]
+        else
+          nil
+        end
+      end
+      
+      # Count existing references to a binary
+      def binary_reference_count(hash_string)
+        references = 0
+        if @@binary_columns
+          @@binary_columns.each do |klass, binaries|
+            binaries.each do |binary_name, binary_column|
+              references += klass.count(:all, :conditions => ["`#{binary_column} = ?`", hash_string])
+            end
+          end
+        end
+      end
+      
+      def binary_storage(binary_name, binary_column)
+        binary_name   = binary_name.to_s
+        binary_column = binary_column.to_s
 
-				register_binary(self, binary_name, binary_column)
+        register_binary(self, binary_name, binary_column)
 
-				class_eval <<-end_eval
-					before_save do |binary_model|
-						binary_model.save_binary("#{binary_name}")
-					end
-					
-					after_destroy do |model|
-						binary_model.destroy_binary("#{binary_name}")
-					end
+        class_eval <<-end_eval
+          before_save do |binary_model|
+            binary_model.save_binary("#{binary_name}")
+          end
+          
+          after_destroy do |model|
+            binary_model.destroy_binary("#{binary_name}")
+          end
 
-					def #{binary_name}
-						self.get_binary_data("#{binary_name}")
-					end
+          def #{binary_name}
+            self.get_binary_data("#{binary_name}")
+          end
 
-					def #{binary_name}=(binary_data)
-						self.set_binary_data("#{binary_name}", binary_data)
-					end
+          def #{binary_name}=(binary_data)
+            self.set_binary_data("#{binary_name}", binary_data)
+          end
 
-					def #{binary_name}?
-						self.has_binary_data?("#{binary_name}")
-					end
-				end_eval
+          def #{binary_name}?
+            self.has_binary_data?("#{binary_name}")
+          end
+        end_eval
 
-				send(:include, BinaryStorage::ActiveRecordExtensions::InstanceMethods)
-			end
-		end
-		
-		module InstanceMethods
-			
-			def binaries
-				@binaries ||= {}
-			end
+        send(:include, BinaryStorage::ActiveRecordExtensions::InstanceMethods)
+      end
+    end
+    
+    module InstanceMethods
+      
+      def binaries
+        @binaries ||= {}
+      end
 
-			def binary_column(binary_name)
-				if column_name = self.class.binary_column(self.class, binary_name) 
-					column_name
-				else 
-					raise "Binary column #{binary_name} not defined!"
-				end
-			end
-			
-			def binary_hash_string(binary_name)
-				self.attributes[binary_column(binary_name)]
-			end
+      def binary_column(binary_name)
+        if column_name = self.class.binary_column(self.class, binary_name) 
+          column_name
+        else 
+          raise "Binary column #{binary_name} not defined!"
+        end
+      end
+      
+      def binary_hash_string(binary_name)
+        self.attributes[binary_column(binary_name)]
+      end
 
-			def save_binary(binary_name)
-				if binaries.has_key?(binary_name)
-					if binary = binaries[binary_name]
-						binary.save
-						self.attributes = self.attributes.merge({binary_column(binary_name).to_sym => binary.hash_string})
-					else
-						self.attributes = self.attributes.merge({binary_column(binary_name).to_sym => nil})
-					end
-				end
-			end
+      def save_binary(binary_name)
+        if binaries.has_key?(binary_name)
+          if binary = binaries[binary_name]
+            binary.save
+            self.attributes = self.attributes.merge({binary_column(binary_name).to_sym => binary.hash_string})
+          else
+            self.attributes = self.attributes.merge({binary_column(binary_name).to_sym => nil})
+          end
+        end
+      end
 
-			def destroy_binary(binary_name)
-				if binary = binaries[binary_name]
-					if hash_string = binary.hash_string
-						references = self.class.binary_reference_count
-						if references < 1
-							binary.delete!
-						end
-					end
-				end
-			end
-			
-			def get_binary_data(binary_name)
-				# Set directly?
-				if binary = binaries[binary_name]
-					binary.data
+      def destroy_binary(binary_name)
+        if binary = binaries[binary_name]
+          if hash_string = binary.hash_string
+            references = self.class.binary_reference_count
+            if references < 1
+              binary.delete!
+            end
+          end
+        end
+      end
+      
+      def get_binary_data(binary_name)
+        # Set directly?
+        if binary = binaries[binary_name]
+          binary.data
 
-				# Try loading
-				elsif hash_string = binary_hash_string(binary_name)
-					if binary = BinaryStorage::Blob.find(hash_string)
-						binaries[binary_name] = binary # Cache it
-						binary.data
-					else
-						nil
-					end
-				end
-			end
-			
-			def set_binary_data(binary_name, binary_data)
-				binary = (binary_data) ? BinaryStorage::Blob.new(binary_data) : nil
-				binaries[binary_name] = binary
-			end
-			
-			def has_binary_data?(binary_name)
-				if binaries[binary_name]
-					true
-				else
-					hash_string = binary_hash_string(binary_name)
-					(hash_string && BinaryStorage::Blob.exists?(hash_string)) ? true : false
-				end
-			end
-		end
+        # Try loading
+        elsif hash_string = binary_hash_string(binary_name)
+          if binary = BinaryStorage::Blob.find(hash_string)
+            binaries[binary_name] = binary # Cache it
+            binary.data
+          else
+            nil
+          end
+        end
+      end
+      
+      def set_binary_data(binary_name, binary_data)
+        binary = (binary_data) ? BinaryStorage::Blob.new(binary_data) : nil
+        binaries[binary_name] = binary
+      end
+      
+      def has_binary_data?(binary_name)
+        if binaries[binary_name]
+          true
+        else
+          hash_string = binary_hash_string(binary_name)
+          (hash_string && BinaryStorage::Blob.exists?(hash_string)) ? true : false
+        end
+      end
+    end
 
-	end
+  end
 end
 
-ActiveRecord::Base.send(:include, BinaryStorage::ActiveRecordExtensions)
+ActiveRecord::Base.send(:include, BinaryStorage::ActiveRecordExtensions)

data/lib/binary_storage/blob.rb

@@ -1,105 +1,105 @@
 module BinaryStorage
-	class Blob
-		
-		class << self
-			def find(hash_string)
-				blob = self.new(:hash_string => hash_string)
-				return nil unless blob.exists?
-				blob.load
-				blob
-			end
+  class Blob
+    
+    class << self
+      def find(hash_string)
+        blob = self.new(:hash_string => hash_string)
+        return nil unless blob.exists?
+        blob.load
+        blob
+      end
 
-			def exists?(hash_string)
-				self.new(:hash_string => hash_string).exists?
-			end
+      def exists?(hash_string)
+        self.new(:hash_string => hash_string).exists?
+      end
 
-			def create(data)
-				blob = self.new(data)
-				blob.save
-				blob
-			end
-			
-			def storage_dir(hash_string=nil)
-				root = BinaryStorage.storage_dir
-				(hash_string) ? File.join(root, hash_string.match(/^(..)/)[1]) : root
-			end
-			
-			def storage_path(hash_string)
-				File.join(storage_dir(hash_string), hash_string.gsub(/^(..)/, ''))
-			end
-		end
-		
-		def initialize(*args)
-			args = *args
-			options = {
-				:hash_string => nil,
-				:data        => nil
-			}
-			if args.kind_of?(Hash)
-				options.merge!(args)
-			else
-				options[:data] = args
-			end
-			@hash_string = options[:hash_string]
-			@data        = options[:data]
-		end
-		
-		def data
-			@data
-		end
-		
-		def data=(new_data)
-			@hash_string = nil
-			@data        = new_data
-		end
-		
-		def hash_string
-			unless @hash_string
-				if @data
-					@hash_string = BinaryStorage.hexdigest(data)
-				else
-					raise "Binary has no data!" 
-				end
-			end
-			@hash_string
-		end
-		
-		def storage_dir
-			BinaryStorage::Blob.storage_dir(hash_string)
-		end
+      def create(data)
+        blob = self.new(data)
+        blob.save
+        blob
+      end
+      
+      def storage_dir(hash_string=nil)
+        root = BinaryStorage.storage_dir
+        (hash_string) ? File.join(root, hash_string.match(/^(..)/)[1]) : root
+      end
+      
+      def storage_path(hash_string)
+        File.join(storage_dir(hash_string), hash_string.gsub(/^(..)/, ''))
+      end
+    end
+    
+    def initialize(*args)
+      args = *args
+      options = {
+        :hash_string => nil,
+        :data        => nil
+      }
+      if args.kind_of?(Hash)
+        options.merge!(args)
+      else
+        options[:data] = args
+      end
+      @hash_string = options[:hash_string]
+      @data        = options[:data]
+    end
+    
+    def data
+      @data
+    end
+    
+    def data=(new_data)
+      @hash_string = nil
+      @data        = new_data
+    end
+    
+    def hash_string
+      unless @hash_string
+        if @data
+          @hash_string = BinaryStorage.hexdigest(data)
+        else
+          raise "Binary has no data!" 
+        end
+      end
+      @hash_string
+    end
+    
+    def storage_dir
+      BinaryStorage::Blob.storage_dir(hash_string)
+    end
 
-		def storage_path
-			BinaryStorage::Blob.storage_path(hash_string)
-		end
-		
-		def exists?
-			File.exists?(storage_path)
-		end
-		
-		def empty?
-			(hash_string && !exists?) || !data || data.empty?
-		end
-		
-		def load
-			raise "File not found" unless exists?
-			@data = File.open(storage_path, "rb") {|io| io.read }
-		end
-		
-		def delete
-			if exists?
-				FileUtils.rm(storage_path)
-			end
-		end
+    def storage_path
+      BinaryStorage::Blob.storage_path(hash_string)
+    end
+    
+    def exists?
+      File.exists?(storage_path)
+    end
+    
+    def empty?
+      (hash_string && !exists?) || !data || data.empty?
+    end
+    
+    def load
+      raise "File not found" unless exists?
+      @data = File.open(storage_path, "rb") {|io| io.read }
+    end
+    
+    def delete
+      if exists?
+        FileUtils.rm(storage_path)
+      end
+    end
 
-		def save
-			unless exists?
-				FileUtils.mkdir_p(storage_dir)
-				file = File.new(storage_path, 'wb')
-				file.write(@data)
-				file.close
-			end
-			return true
-		end
-		
-	end
-end
+    def save
+      unless exists?
+        FileUtils.mkdir_p(storage_dir)
+        file = File.new(storage_path, 'wb')
+        file.write(@data)
+        file.close
+      end
+      return true
+    end
+    
+  end
+end