paperclip_private 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66481098f3f82d89f0bfb3e357804c7603159aef
-  data.tar.gz: 791cde5a10795fb9cd4faa0d3b1d16f843740c57
+  metadata.gz: 36298a423bc83490761e76840733815113ca63cf
+  data.tar.gz: a316a0e12a81321eb9f3ce0433e14770470d4011
 SHA512:
-  metadata.gz: 390dfc6fafd5108e6d1e4088fed7db870c1bf44fa482e79d61b4be2f3747270dd1309117860cfd6505411f70e35eeb2d2243a67e2213f220dbb505be42cf7499
-  data.tar.gz: 01c204df3132537a2e1106f14fd6936b43c12b4216ba51c34ab657f567d1a3970a06fc88e95d8529286312ea4bccd2360edafab44376aea97f30e1c8d44b7a99
+  metadata.gz: ce24e9f4ec483e87bdc3ca6c5636179cedb5c8705adcfb479e05cc0ae0942de9525c1b272978875de3863258167c0ee1b0985472f4177c2e9eb9ad238def0c27
+  data.tar.gz: 99d6769fb54991db63cc9aa93e22ba13a4181e4d00d1a9886591cca43d8111e02d460562f57e9218825f3c2bdae2ba13c630899672e6fd96e0ee36e1ef94846c

data/README.md

@@ -10,15 +10,16 @@
 +mount PaperclipPrivate::Engine => 'paperclip/'
 +```
 +
-+In your ApplicationController add the method `paperclip_whitelist` which returns an array of the models with attachments you would like to serve privately. 
-+Ex:
++You have to register class names and their attachments with the whitelist registry. This can happen in the controller or in config/paperclip_private.rb
++The following example would whitelist the class PrivateAttachment's file:
 +```ruby
-+def paperclip_whitelist
-+  [PrivateAttachment]
-+end
++require 'paperclip_private'
++PaperclipPrivate::Whitelist.register({PrivateAttachment: :file})
 +```
++You can also pass an array of names like `{PrivateAttachment: [:file, :avatar]}`.
 +
-+Then in your model add `privacy: :private` to the has_attached_file options. Then add the method `can_download_attachment?`. 
++Then in your model add `privacy: :private` to the has_attached_file options. This can also accept a lambda that gets passed the attachment instance and expects back either `:private` or `:public`. 
++Then add the method `can_download_attachment?`. 
 +The method `can_download_attachment?` gets passed the controller instance and the params and is expected to return true, false, or raise Paperclip::Errors::AccessDeniedError.
 +The controller is passed so that methods like current_user can be run on it to get the user instance for validation puprposes. Duplicated params gets passed to do things like allow anyone if the style is :thumb or to only allow :original to paid users.
 +Ex:

data/app/controllers/paperclip_private/attachment_controller.rb

@@ -17,16 +17,17 @@ module PaperclipPrivate
 		protected
 		# Return the private arratcment registry
 		def paperclip_whitelist
-			super if self.class.superclass.instance_methods.include?(:paperclip_whitelist) # Call classes in an array so they appear in the registry.
-			::PaperclipPrivate::AttachmentRegistry.registry 
+			# super if self.class.superclass.instance_methods.include?(:paperclip_whitelist) # Call classes in an array so they appear in the registry.
+			# ::PaperclipPrivate::AttachmentRegistry.registry 
+			::PaperclipPrivate::Whitelist.registry
 		end
 
 		private
 		# Confirm class name is valid and attachment name is valid before calling constantize in set_attachment method.
 		def validate_params!
 			attachments = paperclip_whitelist[params[:class_name]]
-			raise ::PaperclipPrivate::Errors::ControllerValidationError if attachments.nil? || !attachments.keys.map(&:to_s).include?(params[:attachment])
-			@options = attachments[params[:attachment].to_sym]
+			raise ::PaperclipPrivate::Errors::ControllerValidationError if !attachments.include?(params[:attachment])
+			# @options = attachments[params[:attachment].to_sym]
 		end	
 
 		# Sets object, attachment, and styles
@@ -35,6 +36,8 @@ module PaperclipPrivate
 			object_id = params[:id]
 			@object = klass.find(object_id)
 			@attachment = @object.send(params[:attachment])
+			raise ActiveRecord::RecordNotFound if @attachment.nil?
+			@options = @attachment.options
 			@styles = @options[:styles] || {}
 			@styles = @styles.call(@attachment) if @styles.respond_to?(:call)
 		end

data/lib/paperclip_private.rb

@@ -2,10 +2,9 @@ require 'paperclip'
 require 'paperclip_private/interpolations'
 require 'paperclip_private/attachment'
 require 'paperclip_private/errors'
-require 'paperclip_private/has_attached_file'
-require 'paperclip_private/attachment_registry'
+require 'paperclip_private/whitelist'
 require 'paperclip_private/engine'
 
+
 Paperclip::Attachment.include PaperclipPrivate::Attachment
-Paperclip::HasAttachedFile.prepend PaperclipPrivate::HasAttachedFile
 Paperclip::Interpolations.extend PaperclipPrivate::Interpolations

data/lib/paperclip_private/attachment.rb

@@ -17,7 +17,9 @@ module PaperclipPrivate
 		module Initializer
 			def initialize(name, instance, options = {})
 	      defaults = self.class.default_options.dup
-	      if options[:privacy] == :private # change default options if private before merging with options.
+	      privacy = options[:privacy]
+        privacy = privacy.call(instance) if privacy.respond_to?(:call)
+	      if privacy == :private # change default options if private before merging with options.
 	        defaults[:path] = ":rails_root/:privacy#{defaults[:url]}"
 	        defaults[:url] = "#{Rails.application.routes.url_helpers.paperclip_private_engine_path}/private/:klass/:id/:attachment_singular/:style" 
 	      end

data/lib/paperclip_private/interpolations.rb

@@ -7,9 +7,11 @@ module PaperclipPrivate
       end
     end
 
-    # Returns the style, or the default style if nil is supplied.
+    # Returns the privacy
     def privacy(attachment, style_name)
-      attachment.options[:privacy]
+      # attachment.options[:privacy]
+      privacy = attachment.options[:privacy]
+      privacy.respond_to?(:call) ? privacy.call(attachment.instance) : privacy
     end
 
     # Returns the class name without pluarlizing it.

data/lib/paperclip_private/version.rb

@@ -1,3 +1,3 @@
 module PaperclipPrivate
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/paperclip_private/whitelist.rb

@@ -0,0 +1,29 @@
+module PaperclipPrivate
+	module Whitelist
+		def self.registry
+			@registry ||= {}
+		end
+
+		def self.names_for_class(klass)
+			registry[klass] || []
+		end
+
+		def self.register_class(klass, name)
+			return if klass.nil? || name.nil?
+			class_name = klass.to_s
+			registry[class_name] ||= []
+			registry[class_name] << name.to_s
+		end
+
+		def self.register(hash = {})
+			hash.each do |k, v|
+				if v.is_a? Array
+					v.each { |name| register_class(k, name) }
+				else
+					register_class(k, v)
+				end
+			end
+		end
+
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_private
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - jose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,12 +70,11 @@ files:
 - config/routes.rb
 - lib/paperclip_private.rb
 - lib/paperclip_private/attachment.rb
-- lib/paperclip_private/attachment_registry.rb
 - lib/paperclip_private/engine.rb
 - lib/paperclip_private/errors.rb
-- lib/paperclip_private/has_attached_file.rb
 - lib/paperclip_private/interpolations.rb
 - lib/paperclip_private/version.rb
+- lib/paperclip_private/whitelist.rb
 - lib/tasks/paperclip_private_tasks.rake
 - paperclip_private.gemspec
 - test/dummy/Rakefile

data/lib/paperclip_private/attachment_registry.rb

@@ -1,13 +0,0 @@
-module PaperclipPrivate
-	module AttachmentRegistry
-		def self.registry
-			@registry ||= {}
-		end
-
-		def self.register(klass, name, options)
-			class_name = klass.to_s
-			self.registry[class_name] ||= {}
-			self.registry[class_name][name] = options
-		end
-	end
-end

data/lib/paperclip_private/has_attached_file.rb

@@ -1,10 +0,0 @@
-module PaperclipPrivate
-  module HasAttachedFile
-        
-    def register_new_attachment
-      super
-      PaperclipPrivate::AttachmentRegistry.register(@klass, @name, @options) if @options[:privacy] == :private
-    end
-
-  end
-end