has_images 0.0.3 → 0.1.0

data/README.md

@@ -32,6 +32,20 @@ add the following to your config/enviroment.rb
     class User < ActiveRecord::Base  
       has_images
     end
+    
+  you can also customize the image-storage with paperclip options
+  
+    class User < ActiveRecord::Base  
+      has_images :styles => {
+       :thumb  => ["150x100", :jpg],
+       :mini   => ["75x50",   :jpg],
+       :medium => ["300x200", :jpg],
+       :large  => ["640x480", :jpg],
+       :huge   => ["800x600", :jpg],
+       :square => ["200x200", :jpg] }, 
+       :path   => ":rails_root/public/images/:attachment/:id_partition/:id_:style.:extension",
+       :url    => "/images/:attachment/:id_partition/:id_:style.:extension"
+    end
   
 ## Examples & usage
 

data/init.rb

@@ -2,15 +2,3 @@
 require 'open-uri'
 require 'has_images'
 ActiveRecord::Base.send(:include, HasImages)
-
-Paperclip.interpolates :short_id_partition do |attachment, style| 
-  ("%08d" % attachment.instance.id).scan(/\d{4}/).join("/")
-end
-
-Paperclip.interpolates :parent do |attachment, style| 
-  attachment.instance.parentmodel.image_folder rescue attachment.instance.parentmodel.class.to_s.underscore.pluralize
-end
-
-Paperclip.interpolates :parent_name do |attachment, style| 
-  attachment.instance.parentmodel.friendly_name rescue attachment.instance.parentmodel.to_s
-end

data/lib/digineo/image.rb

@@ -1,6 +1,7 @@
 class Digineo::Image < ActiveRecord::Base
   
   set_table_name :digineo_images
+  store_full_sti_class = true  
   
   belongs_to :parentmodel, :polymorphic => true
   belongs_to :gallery,    :class_name => "Digineo::ImageGallery"
@@ -13,16 +14,7 @@ class Digineo::Image < ActiveRecord::Base
   named_scope :not_avatar, :conditions => "avatar=0"
   named_scope :without_gallery, :conditions => "gallery_id IS NULL"
   
-  
-  has_attached_file :file, :styles => {
-     :thumb  => ["150x100", :jpg],
-     :mini   => ["75x50",   :jpg],
-     :medium => ["300x200", :jpg],
-     :large  => ["640x480", :jpg],
-     :huge   => ["800x600", :jpg],
-     :square => ["200x200", :jpg] }, 
-     :path   => ":rails_root/public/images/:parent/:short_id_partition/:parent_name_:style.:extension",
-     :url    => "/images/:parent/:short_id_partition/:parent_name_:style.:extension"
+  has_attached_file :file
   
   
   validates_attachment_presence :file, :unless => :file_url_provided?
@@ -32,7 +24,7 @@ class Digineo::Image < ActiveRecord::Base
   validates_presence_of :file_remote_url, :if => :file_url_provided?, :message => 'is invalid or inaccessible'
   
   def set_avatar
-    parentmodel.avatar.unset_avatar if parentmodel.has_avatar?
+    parentmodel.avatar.unset_avatar if parentmodel.avatar
     update_attribute(:avatar, true)
   end
   

data/lib/digineo.rb

@@ -0,0 +1,3 @@
+module Digineo
+  
+end

data/lib/has_images.rb

@@ -1,16 +1,31 @@
 # HasImages
+
 module HasImages
   def self.included(base)
-    base.send :extend, ClassMethods
+    base.send :extend, ClassMethods    
   end
 
   module ClassMethods
     # adds has_images to model
-    def has_images
-      has_many :images, :as => :parentmodel, :dependent => :destroy, :order => 'id ASC', :class_name => "Digineo::Image"
+    def has_images(options={})
+      
+      # eval is not always evil ;)
+      # we generate a Digineo::Model::Image clase to store the given paperclip configuration in it  
+      eval <<-EOF
+        module Digineo::#{self.class_name} 
+          class Digineo::#{self.class_name}::Image < Digineo::Image
+             has_attached_file :file, #{options.inspect}
+          end
+        end
+      EOF
+      
+      has_many :images, :as => :parentmodel, :dependent => :destroy, :order => 'id ASC', :class_name => "Digineo::#{self.class_name}::Image"
       has_one  :avatar, :as => :parentmodel, :order => 'id ASC', :class_name => "Digineo::Image", :conditions => 'avatar=1'      
-      has_many :galleries, :as => :parentmodel, :dependent => :destroy, :class_name => 'Digineo::ImageGallery'
-      send :include, InstanceMethods
+      has_many :galleries, :as => :parentmodel, :dependent => :destroy, :class_name => 'Digineo::ImageGallery'            
+      
+      named_scope :with_avatar, :include => :avatar
+      
+      send :include, InstanceMethods 
     end
   end
 

data/test/has_images_test.rb

@@ -1,4 +1,34 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/test_helper'
+
+class User < ActiveRecord::Base
+  has_images :styles => {
+     :thumb  => ["150x100", :jpg],
+     :mini   => ["75x50",   :jpg],
+     :medium => ["300x200", :jpg],
+     :large  => ["640x480", :jpg],
+     :huge   => ["800x600", :jpg],
+     :square => ["200x200", :jpg] }, 
+     :path   => ":rails_root/public/images/:parent/:short_id_partition/:parent_name_:style.:extension",
+     :url    => "/images/:parent/:short_id_partition/:parent_name_:style.:extension"
+end
+
+class UserTest < ActiveSupport::TestCase
+  context "user model" do
+    should_have_many :images, :galleries
+    should_have_named_scope :with_avatar
+    
+    
+    context "image configuration" do
+      should "exist class Digineo::User::Image" do
+        user = User.new
+        
+        assert Digineo::User::Image
+        
+        
+      end      
+    end
+  end  
+end
 
 class HasImagesTest < ActiveSupport::TestCase
   # Replace this with your real tests.

data/test/test_helper.rb

@@ -1,3 +1,52 @@
 require 'rubygems'
-require 'active_support'
-require 'active_support/test_case'
+require 'active_record'
+require 'shoulda/rails'
+require 'active_support/test_case'
+require 'paperclip'
+
+require File.expand_path(File.dirname(__FILE__)+"/../lib/digineo")
+require File.expand_path(File.dirname(__FILE__)+"/../lib/digineo/image")
+require File.expand_path(File.dirname(__FILE__)+"/../lib/digineo/image_gallery")
+require File.expand_path(File.dirname(__FILE__)+"/../lib/digineo/image_type")
+require File.expand_path(File.dirname(__FILE__)+"/../lib/has_images")
+ActiveRecord::Base.send(:include, HasImages)
+
+config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.establish_connection(config['test'])
+
+ActiveRecord::Schema.define do
+  create_table "users", :force => true do |t|
+    t.column "name",  :text
+    t.column "email", :text
+  end
+  
+  create_table :digineo_image_types do |t|
+    t.string  :name      
+  end
+  
+  create_table :digineo_image_galleries do |t|
+    t.string :name
+    t.integer :parentmodel_id, :references => nil
+    t.string  :parentmodel_type
+    t.timestamps
+  end  
+  
+  create_table :digineo_images do |t|
+    t.string :name
+    t.text   :text
+    t.integer :gallery_id, :on_delete => :set_null, :references => :digineo_image_galleries
+    t.integer :image_type_id, :on_delete => :set_null, :references => :digineo_image_types
+    t.integer :parentmodel_id, :references => nil
+    t.string  :parentmodel_type
+    t.string :file_file_name
+    t.string :file_content_type
+    t.string :file_remote_url
+    t.integer :file_file_size
+    t.datetime :file_updated_at
+    t.string :type
+    t.boolean :avatar, :default => false, :null => false
+    t.timestamps
+  end
+end
+

data/test/{digineo → unit/digineo}/image_gallery_test.rb

@@ -1,8 +1,7 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class Digineo::ImageGalleryTest < ActiveSupport::TestCase
   should_validate_presence_of :name
   should_belong_to :parentmodel
   should_have_many :images
-  should_validate_uniqueness_of :name, :scoped_to => [:parentmodel_id, :parentmodel_type]
 end

data/test/{digineo → unit/digineo}/image_test.rb

@@ -1,4 +1,5 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
+
 
 class Digineo::ImageTest < ActiveSupport::TestCase
   

data/test/{digineo → unit/digineo}/image_type_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class Digineo::ImageTypeTest < ActiveSupport::TestCase
   should_validate_presence_of :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: has_images
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Dennis Meise
@@ -38,6 +38,7 @@ files:
 - Rakefile
 - README.md
 - lib/has_images.rb
+- lib/digineo.rb
 - lib/digineo/image_gallery.rb
 - lib/digineo/image_type.rb
 - lib/digineo/image.rb
@@ -72,8 +73,8 @@ signing_key:
 specification_version: 3
 summary: HasImages adds images and galleries to your ActiveRecord models.
 test_files: 
-- test/digineo/image_gallery_test.rb
-- test/digineo/image_type_test.rb
-- test/digineo/image_test.rb
+- test/unit/digineo/image_gallery_test.rb
+- test/unit/digineo/image_type_test.rb
+- test/unit/digineo/image_test.rb
 - test/has_images_test.rb
 - test/test_helper.rb