attachs 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6376bae7f409923ee076e8f0b4eba342e0b107b4
-  data.tar.gz: c9cf65c444e4e9538ee0d99fdd7a77a5b26a6f04
+  metadata.gz: d4b7e169e9f30ad2bf78cb7f234ff71814200ad6
+  data.tar.gz: b8a1b2b599f222bf759809834c9e492389629ef0
 SHA512:
-  metadata.gz: e34990d1ba9a0f1dbb33300c3bea569d1ecde6645368f7f3f269d2e2742c6d9b0ea2e288910f03d28373cfa86a82705ca6281168b4cf7c311f2290a917f2cbe6
-  data.tar.gz: 57f8213edd2ddbafd31ea2257a7fb9c64ad833a06cdf99259156bc3ed6bd64d8f5a067f339d88c94c6b85da2e090b9b4b53db717a3cb2a4a183afa5ff0af45cd
+  metadata.gz: 2ab3ab663652618fbe9bf500def726a1f101bbb695d7a7bd6ba30b57963fe1b4d2f6b3892d974764b850c53c5f9b0c08b6903acdd782a6e8ad3e258372a27c02
+  data.tar.gz: 45bf708582744d4c012e5b739f921a3c1fc72e4ec2824516dbf9dfa0be08d185956e952f7159f9f25755ca977a343534e3854567be38a598ab8ffaf50e68eb20

data/README.rdoc

@@ -18,7 +18,7 @@ ImageMagick must be install, you can install it with homebrew:
 = Usage
 
 Mount the engine at the end of you routes.rb (only if you are using local storage):
-  mount Attachs:Engine: '/' # Will be use to generate on the fly missing image presets
+  mount Attachs::Engine => '/' # Will be use to generate on the fly missing image presets
 
 Add the column to your table (just a string):
   create_table :models do |t|
@@ -35,6 +35,8 @@ If you need a image:
     has_attached_image :attr, presets: [:small, :big], default: 'assets/image.jpg'
   end
 
+(If you want your attachment to be private add private: true to the parameters)
+
 Define presets in your application.rb
   config.attachs.presets = {
     big: { method: :fit, width: 1024, height: 768 }, # Fit will scale the image until it fit in the space without cropping
@@ -73,6 +75,10 @@ If your file it's optional:
 
 = FAQ
 
+== Where my private files are stored?
+
+In a folder named "private" in the root directory of your app.
+
 == How can I use a cdn with this plugin?
 
 Define a base url in your application.rb:

data/lib/attachs/active_record/base.rb

@@ -3,20 +3,6 @@ module Attachs
     module Base
       extend ActiveSupport::Concern
 
-      included do
-        singleton_class.class_eval do
-          [:file, :image].each do |type|
-            name = :"has_attached_#{type}"
-            define_method name do |*args|
-              options = args.extract_options!
-              options[:type] = type
-              define_attachment *args.append(options)
-            end
-            alias_method :"attached_#{type}", name
-          end
-        end
-      end
-
       protected
 
       attr_reader :stored_attachments, :deleted_attachments
@@ -24,6 +10,22 @@ module Attachs
       def attachments
         @attachments ||= {}
       end
+      
+      def add_attachment(attr, value, options)
+        attachment = build_attachment_instance(value, options)
+        attachments[attr] = attachment
+        write_attribute attr, attachment.filename 
+      end
+
+      def get_attachment(attr, options)
+        return attachments[attr] if attachments.has_key? attr
+        return nil unless read_attribute(attr) or options.has_key? :default
+        attachments[attr] = build_attachment_instance(read_attribute(attr), options)
+      end
+
+      def remove_attachment(attr)
+        write_attribute attr, nil
+      end
 
       def build_attachment_instance(source, options)
         klass = options.has_key?(:type) ? options[:type].to_s.classify : 'File'
@@ -59,7 +61,7 @@ module Attachs
       end
 
       def delete_attachments
-        iterate_attachments { |a| a.delete }  
+        iterate_attachments { |a| a.delete }
       end
       
       def remove_stored_attachments
@@ -72,6 +74,16 @@ module Attachs
 
       module ClassMethods
 
+        [:file, :image].each do |type|
+          name = :"has_attached_#{type}"
+          define_method name do |*args|
+            options = args.extract_options!
+            options[:type] = type
+            define_attachment *args.map(&:to_sym).append(options)
+          end
+          alias_method :"attached_#{type}", name
+        end
+
         attr_reader :attachments
     
         def inherited(subclass)
@@ -89,9 +101,9 @@ module Attachs
           options = args.extract_options!
           make_attachable unless attachable?
           args.each do |attr|
-            define_attachable_attribute_methods attr.to_sym, options
-            define_default_validations attr.to_sym, options
-            attachments[attr.to_sym] = options
+            define_attachment_attribute_methods attr, options
+            define_attachment_default_validations attr, options
+            attachments[attr] = options
           end
         end
 
@@ -103,41 +115,24 @@ module Attachs
           @attachments = {}
         end
 
-        def define_default_validations(attr, options)
-          default_validations = Rails.application.config.attachs.default_validations[options[:type]]
-          validates attr, default_validations.dup if default_validations.present?
-        end
-
-        def define_attachable_attribute_methods(attr, options)
-          ['set','get'].each { |method| send "define_attachable_attribute_method_#{method}", attr, options }
-        end
-        
-        def define_attachable_attribute_method_set(attr, options)
+        def define_attachment_attribute_methods(attr, options)
           define_method "#{attr}=" do |value|
-            if value.is_a? ActionDispatch::Http::UploadedFile or value.is_a? Rack::Test::UploadedFile or (value.is_a? String and value =~ /^[a-zA-Z0-9_-]+\.[a-zA-z]+$/)
-              attachment = build_attachment_instance(value, options)
-              attachments[attr] = attachment
-              write_attribute attr, attachment.filename 
-            end
+            add_attachment attr, value, options if value.is_a? ActionDispatch::Http::UploadedFile or value.is_a? Rack::Test::UploadedFile
           end
+          define_method attr do
+            get_attachment attr, options
+          end 
           define_method "delete_#{attr}=" do |value|
-            if attribute_present? attr and value == '1'
-              send "#{attr}_will_change!"
-              attachments[attr] = nil
-              attributes[attr.to_s] = nil
-            end
+            remove_attachment attr if value == '1'
             instance_variable_set :"@delete_#{attr}", value
           end
-        end
-
-        def define_attachable_attribute_method_get(attr, options)
-          define_method attr do
-            return attachments[attr] if attachments.has_key? attr
-            return nil unless super() or options.has_key? :default
-            attachments[attr] = build_attachment_instance(super(), options)
-          end 
           attr_reader :"delete_#{attr}"
         end
+        
+        def define_attachment_default_validations(attr, options)
+          default_validations = Rails.application.config.attachs.default_validations[options[:type]]
+          validates attr, default_validations.dup if default_validations.present?
+        end
 
       end    
     end

data/lib/attachs/storages/local.rb

@@ -2,8 +2,9 @@ module Attachs
   module Storages
     class Local
 
-      def initialize(default)
+      def initialize(default, private)
         @tmp = (Rails.env.test? and !default)
+        @private = private
       end
 
       def exists?(path)
@@ -19,7 +20,7 @@ module Attachs
       end
 
       def url(path)
-        ::File.join Rails.application.config.attachs.base_url, path
+        ::File.join Rails.application.config.attachs.base_url, path unless private?
       end
 
       def store(upload, path)
@@ -47,8 +48,12 @@ module Attachs
         @tmp == true
       end
 
+      def private?
+        @private == true
+      end
+
       def base_path
-        Rails.root.join tmp? ? 'tmp' : 'public'
+        Rails.root.join tmp? ? 'tmp' : private? ? 'private' : 'public'
       end
 
       def create_dir(path)

data/lib/attachs/storages/s3.rb

@@ -4,7 +4,7 @@ module Attachs
       
       cattr_accessor :config
 
-      def initialize(default)
+      def initialize(default, private)
         if (Rails.env.test? and !default)
           env = 'test'
         elsif default
@@ -12,9 +12,9 @@ module Attachs
         else
           env = Rails.env
         end
-        config = self.class.config[env]
-        AWS.config access_key_id: config['access_key_id'], secret_access_key: config['secret_access_key']
-        @bucket = AWS::S3.new.buckets[config['bucket']]
+        AWS.config access_key_id: config[env]['access_key_id'], secret_access_key: config[env]['secret_access_key']
+        @bucket = AWS::S3.new.buckets[config[env]['bucket']]
+        @private = private
       end
 
       def exists?(path)
@@ -26,12 +26,11 @@ module Attachs
       end
 
       def url(path)
-        base_url = Rails.application.config.attachs.base_url
         base_url.present? ? ::File.join(base_url, path) : object(path).public_url(secure: false)
       end
 
       def store(upload, path)
-        bucket.objects.create(path, Pathname.new(upload.path)).acl = :public_read
+        bucket.objects.create(path, Pathname.new(upload.path)).acl = private? ? :private : :public_read
       end
       
       def delete(path)
@@ -43,7 +42,7 @@ module Attachs
           if upload.present?
             cache[source] = upload.path
           else
-            remote = create_tmp_file
+            remote = create_tmp
             remote.binmode
             object(source).read { |chunk| remote.write(chunk) }
             remote.close
@@ -51,7 +50,7 @@ module Attachs
             cache[source] = remote.path
           end
         end
-        tmp = create_tmp_file
+        tmp = create_tmp
         yield Attachs::Magick::Image.new(cache[source], tmp.path)
         store tmp, output
       end
@@ -59,9 +58,21 @@ module Attachs
       protected
 
       attr_reader :bucket
+
+      def config
+        self.class.config
+      end
+
+      def base_url
+        Rails.application.config.attachs.base_url
+      end
+
+      def private?
+        @private
+      end
       
-      def create_tmp_file
-        Tempfile.new('s3')
+      def create_tmp
+        Tempfile.new 's3'
       end
 
       def cache

data/lib/attachs/types/file.rb

@@ -3,6 +3,8 @@ module Attachs
     class File
       
       def initialize(source, options={})
+        @options = options
+        @deleted = false        
         if source.is_a? ActionDispatch::Http::UploadedFile or source.is_a? Rack::Test::UploadedFile
           @upload = source          
           @stored = false
@@ -21,8 +23,10 @@ module Attachs
           @default = true
           @storage = build_storage
         end
-        @deleted = false        
-        @options = options
+      end
+      
+      def private?
+        @options and @options[:private] == true
       end
 
       def default?
@@ -68,17 +72,17 @@ module Attachs
       end
 
       def realpath(*args)
-        return nil if deleted? or Rails.application.config.attachs.storage == :s3
+        return nil if deleted? or storage_type == :s3
         (stored? ? storage.realpath(path(*args)) : upload.path).to_s
       end
 
       def url(*args)
-        return nil if deleted? or not stored?
+        return nil if deleted? or !stored?
         storage.url(path(*args)).to_s
       end
 
       def store
-        if not stored? and upload?
+        if !stored? and upload?
           @storage = build_storage
           storage.store upload, destination_path
           yield if block_given?
@@ -88,7 +92,7 @@ module Attachs
       end
       
       def delete
-        if not default? and stored? and exists?
+        if !default? and stored? and exists?
           storage.delete path
           yield if block_given?
           @storage = build_storage(:local) if upload?
@@ -101,9 +105,13 @@ module Attachs
 
       attr_reader :upload, :storage, :options
 
+      def storage_type
+        Rails.application.config.attachs.storage
+      end
+
       def build_storage(type=nil)
-        type ||= Rails.application.config.attachs.storage
-        Attachs::Storages.const_get(type.to_s.classify).new default?
+        klass = (type || storage_type).to_s.classify 
+        Attachs::Storages.const_get(klass).new default?, private?
       end
 
       def upload?

data/lib/attachs/types/image.rb

@@ -3,7 +3,7 @@ module Attachs
     class Image < File
 
       def presets
-        Rails.application.config.attachs.default_presets | (options[:presets] || [])
+        default_presets | parse_array_setting(options[:presets])
       end
       
       def store
@@ -11,26 +11,44 @@ module Attachs
       end
 
       def delete
-        super { presets.each { |name| storage.delete path(name) if exists?(name) } if presets.any? }
+        super { presets.each { |name| delete_preset name } if presets.any? }
       end
 
       def generate_preset(name)
-        storage.magick destination_path, destination_path(name), upload do |image|
-          settings = Rails.application.config.attachs.presets[name]
-          if settings.respond_to? :call
-            settings.call image
-          else
-            image.send "resize_to_#{settings[:method] || 'fill'}", settings[:width], settings[:height]
+        if settings = Rails.application.config.attachs.presets[name]
+          storage.magick destination_path, destination_path(name), upload do |image|
+            if settings.respond_to? :call
+              settings.call image
+            else
+              image.send "resize_to_#{settings[:method] || 'fill'}", settings[:width], settings[:height]
+            end
           end
         end
       end
 
       def delete_preset(name)
-        storage.delete path(name)
+        storage.delete path(name) if exists?(name)
       end
 
       protected
 
+      def parse_array_setting(value)
+        case value
+        when Symbol
+          [value]
+        when String
+          [value.to_sym]
+        when Array
+          value
+        else
+          []
+        end
+      end
+
+      def default_presets
+        parse_array_setting Rails.application.config.attachs.default_presets
+      end
+
       def store_path(*args)
         ::File.join 'images', (args[0] ? args[0].to_s.gsub('_', '-') : 'original')
       end

data/lib/attachs/validators/attachment_content_type_validator.rb

@@ -1,9 +1,9 @@
 class AttachmentContentTypeValidator < Attachs::Validators::Base
   
   def validate_each(record, attribute, value)
-    if value.present? and not value.default?
-      unless options[:in].include? value.extname.from(1)
-        add_error record, attribute, 'errors.messages.attachment_content_type', types: options[:in].to_sentence
+    if value.present? and !value.default?
+      if options[:in].exclude? value.extname.from(1)
+        add_error record, attribute, 'attachment_content_type', types: options[:in].to_sentence
       end
     end
   end        

data/lib/attachs/validators/attachment_presence_validator.rb

@@ -1,8 +1,8 @@
 class AttachmentPresenceValidator < Attachs::Validators::Base
   
   def validate_each(record, attribute, value)
-    unless value.present? and value.exists? and not value.default?
-      add_error record, attribute, 'errors.messages.attachment_presence'
+    unless value.present? and value.exists? and !value.default?
+      add_error record, attribute, 'attachment_presence'
     end
   end  
 

data/lib/attachs/validators/attachment_size_validator.rb

@@ -2,9 +2,9 @@ class AttachmentSizeValidator < Attachs::Validators::Base
   include ActionView::Helpers::NumberHelper
     
   def validate_each(record, attribute, value)
-    if value.present? and not value.default?
+    if value.present? and !value.default?
       if options.has_key? :in
-        unless options[:in].include? value.size
+        if options[:in].exclude? value.size
           add_error record, attribute, 'attachment_size_in', min: number_to_human_size(options[:in].begin), max: number_to_human_size(options[:in].end)
         end          
       else    
@@ -18,10 +18,4 @@ class AttachmentSizeValidator < Attachs::Validators::Base
     end
   end
 
-  protected
-
-  def add_error(record, attribute, type, options)
-    super(record, attribute, "errors.messages.#{type}", options)
-  end
-
 end