attachinary 1.2.6 → 1.3.0

data/README.md

@@ -137,6 +137,14 @@ user.photo_urls = %w[ http://path/to/photo1.jpg http://path/to/photo2.jpg]
 
 # uploading by passing IO object (e.g. direct file upload)
 user.avatar = File.open("/path/to/file", 'r')
+
+# if you want to provide additionals parameters from http://cloudinary.com/documentation/upload_images
+# you need to use diffrent syntax
+user.send(:avatar=, File.open("path/to/file", 'r'), :folder => Rails.env.to_s)
+
+# # uploading photos by passing multiple urls and optional parameters that will be added to every file.
+user.send(:photo_urls=, %w[ http://path/to/photo1.jpg http://path/to/photo2.jpg], folder: Rails.env.to_s, use_filename: true, image_metadata: true)
+
 ```
 
 

data/lib/assets/javascripts/attachinary.js.coffee

@@ -10,9 +10,13 @@
         <ul>
           <% for(var i=0; i<files.length; i++){ %>
             <li>
-              <img
-                src="<%= $.cloudinary.url(files[i].public_id, { "version": files[i].version, "format": 'jpg', "crop": 'fill', "width": 75, "height": 75 }) %>"
-                alt="" width="75" height="75" />
+              <% if(files[i].resource_type == "raw") { %>
+                <div class="raw-file"></div>
+              <% } else { %>
+                <img
+                  src="<%= $.cloudinary.url(files[i].public_id, { "version": files[i].version, "format": 'jpg', "crop": 'fill', "width": 75, "height": 75 }) %>"
+                  alt="" width="75" height="75" />
+              <% } %>
               <a href="#" data-remove="<%= files[i].public_id %>">Remove</a>
             </li>
           <% } %>
@@ -39,7 +43,8 @@
       @files = @options.files
 
       @$form = @$input.closest('form')
-      @$submit = @$form.find('input[type=submit]')
+      @$submit = @$form.find(@options.submit_selector ? 'input[type=submit]')
+      @$wrapper = @$input.closest(@options.wrapper_container_selector) if @options.wrapper_container_selector?
 
       @initFileUpload()
       @addFilesContainer()
@@ -65,13 +70,14 @@
     bindEventHandlers: ->
       @$input.bind 'fileuploadsend', (event, data) =>
         @$input.addClass 'uploading'
+        @$wrapper.addClass 'uploading' if @$wrapper?
         @$form.addClass  'uploading'
 
         @$input.prop 'disabled', true
         if @config.disableWith
           @$submit.each (index,input) =>
             $input = $(input)
-            $input.data 'old-val', $input.val()
+            $input.data 'old-val', $input.val() unless $input.data('old-val')?
           @$submit.val  @config.disableWith
           @$submit.prop 'disabled', true
 
@@ -89,6 +95,7 @@
 
       @$input.bind 'fileuploadalways', (event) =>
         @$input.removeClass 'uploading'
+        @$wrapper.removeClass 'uploading' if @$wrapper?
         @$form.removeClass  'uploading'
 
         @checkMaximum()
@@ -106,7 +113,7 @@
 
 
     addFile: (file) ->
-      if !@options.accept || $.inArray(file.format, @options.accept) != -1
+      if !@options.accept || $.inArray(file.format, @options.accept) != -1  || $.inArray(file.resource_type, @options.accept) != -1
         @files.push file
         @redraw()
         @checkMaximum()
@@ -129,8 +136,10 @@
 
     checkMaximum: ->
       if @maximumReached()
+        @$wrapper.addClass 'disabled' if @$wrapper?
         @$input.prop('disabled', true)
       else
+        @$wrapper.removeClass 'disabled' if @$wrapper?
         @$input.prop('disabled', false)
 
     maximumReached: ->
@@ -139,8 +148,11 @@
 
 
     addFilesContainer: ->
-      @$filesContainer = $('<div class="attachinary_container">')
-      @$input.after @$filesContainer
+      if @options.files_container_selector? and $(@options.files_container_selector).length > 0
+        @$filesContainer = $(@options.files_container_selector)
+      else
+        @$filesContainer = $('<div class="attachinary_container">')
+        @$input.after @$filesContainer
 
     redraw: ->
       @$filesContainer.empty()

data/lib/attachinary/orm/active_record/extension.rb

@@ -9,15 +9,23 @@ module Attachinary
 
       # has_many :photo_files, ...
       # has_many :image_files, ...
-      has_many :"#{relation}",
-        as: :attachinariable,
-        class_name: '::Attachinary::File',
-        conditions: { scope: options[:scope].to_s },
-        dependent: :destroy
+      if Rails::VERSION::MAJOR == 3
+        has_many :"#{relation}",
+          as: :attachinariable,
+          class_name: '::Attachinary::File',
+          conditions: { scope: options[:scope].to_s },
+          dependent: :destroy
+      else
+        has_many :"#{relation}",
+          -> { where scope: options[:scope].to_s }, 
+          as: :attachinariable,
+          class_name: '::Attachinary::File',
+          dependent: :destroy
+      end
 
 
       # def photo=(file)
-      #   input = Attachinary::Utils.process_input(input)
+      #   input = Attachinary::Utils.process_input(input, upload_options)
       #   if input.blank?
       #     photo_files.clear
       #   else
@@ -25,8 +33,8 @@ module Attachinary
       #     self.photo_files = files
       #   end
       # end
-      define_method "#{options[:scope]}=" do |input|
-        input = Attachinary::Utils.process_input(input, options[:scope])
+      define_method "#{options[:scope]}=" do |input, upload_options = {}|
+        input = Attachinary::Utils.process_input(input, upload_options, options[:scope])
         if input.nil?
           send("#{relation}").clear
         else

data/lib/attachinary/orm/base_extension.rb

@@ -20,7 +20,9 @@ module Attachinary
 
         # attr_accessible :photo
         # attr_accessible :images
-        attr_accessible :"#{options[:scope]}" if options[:accessible]
+        if Rails::VERSION::MAJOR == 3
+          attr_accessible :"#{options[:scope]}" if options[:accessible]
+        end
 
         # def photo?
         #   photo.present?
@@ -43,16 +45,18 @@ module Attachinary
           # def photo_url=(url)
           #   ...
           # end
-          define_method :"#{options[:scope]}_url=" do |url|
-            send(:"#{options[:scope]}=", Cloudinary::Uploader.upload(url, resource_type: "auto"))
+          define_method :"#{options[:scope]}_url=" do |url, upload_options = {}|
+            upload_options.merge! resource_type: 'auto'
+            send(:"#{options[:scope]}=", Cloudinary::Uploader.upload(url, upload_options))
           end
 
         else
           # def image_urls=(urls)
           #   ...
           # end
-          define_method :"#{options[:singular]}_urls=" do |urls|
-            send(:"#{options[:scope]}=", urls.map { |url| Cloudinary::Uploader.upload(url, resource_type: "auto") })
+          define_method :"#{options[:singular]}_urls=" do |urls, upload_options = {}|
+            upload_options.merge! resource_type: 'auto'
+            send(:"#{options[:scope]}=", urls.map { |url| Cloudinary::Uploader.upload(url, upload_options) })
           end
         end
 

data/lib/attachinary/orm/file_mixin.rb

@@ -2,7 +2,9 @@ module Attachinary
   module FileMixin
     def self.included(base)
       base.validates :public_id, :version, :resource_type, presence: true
-      base.attr_accessible :public_id, :version, :width, :height, :format, :resource_type
+      if Rails::VERSION::MAJOR == 3
+        base.attr_accessible :public_id, :version, :width, :height, :format, :resource_type
+      end
       base.after_destroy :destroy_file
       base.after_create  :remove_temporary_tag
     end
@@ -22,12 +24,17 @@ module Attachinary
 
     def fullpath(options={})
       format = options.delete(:format)
-      Cloudinary::Utils.cloudinary_url(path(format), options)
+      Cloudinary::Utils.cloudinary_url(path(format), options.reverse_merge(:resource_type => resource_type))
     end
-
+    
+  protected
+    def keep_remote?
+      Cloudinary.config.attachinary_keep_remote == true
+    end
+    
   private
     def destroy_file
-      Cloudinary::Uploader.destroy(public_id) if public_id
+      Cloudinary::Uploader.destroy(public_id) if public_id && !keep_remote?
     end
 
     def remove_temporary_tag

data/lib/attachinary/orm/mongoid/extension.rb

@@ -21,7 +21,7 @@ module Attachinary
 
       # alias_method "orig_photo=", "photo="
       # def photo=(input)
-      #   input = Attachinary::Utils.process_input(input)
+      #   input = Attachinary::Utils.process_input(input, upload_options)
       #   if input.nil?
       #     super(nil)
       #   else
@@ -30,8 +30,8 @@ module Attachinary
       #   end
       # end
       alias_method "orig_#{options[:scope]}=", "#{options[:scope]}="
-      define_method "#{options[:scope]}=" do |input|
-        input = Attachinary::Utils.process_input(input)
+      define_method "#{options[:scope]}=" do |input, upload_options = {}|
+        input = Attachinary::Utils.process_input(input, upload_options)
         if !input.nil?
           input = [input].flatten
           input = (options[:single] ? input[0] : input)

data/lib/attachinary/utils.rb

@@ -11,25 +11,31 @@ module Attachinary
       if hash['id']
         Attachinary::File.find hash['id']
       else
-        file = Attachinary::File.new hash.slice(*Attachinary::File.attr_accessible[:default].to_a)
+        file = if Rails::VERSION::MAJOR == 3
+          Attachinary::File.new hash.slice(*Attachinary::File.attr_accessible[:default].to_a)
+        else
+          permitted_params = ActionController::Parameters.new(hash).permit(:public_id, :version, :width, :height, :format, :resource_type)
+          Attachinary::File.new(permitted_params)
+        end
         file.scope = scope.to_s if scope && file.respond_to?(:scope=)
         file
       end
     end
 
 
-    def self.process_input(input, scope=nil)
+    def self.process_input(input, upload_options, scope=nil)
       case input
       when :blank?.to_proc
         nil
       when lambda { |e| e.respond_to?(:read) }
-        process_hash Cloudinary::Uploader.upload(input, resource_type: 'auto'), scope
+        upload_options.merge! resource_type: 'auto'
+        process_hash Cloudinary::Uploader.upload(input, upload_options), scope
       when String
         process_json(input, scope)
       when Hash
         process_hash(input, scope)
       when Array
-        input = input.map{ |el| process_input(el, scope) }.flatten.compact
+        input = input.map{ |el| process_input(el, upload_options, scope) }.flatten.compact
         input = nil if input.empty?
         input
       else

data/lib/attachinary/version.rb

@@ -1,3 +1,3 @@
 module Attachinary
-  VERSION = "1.2.6"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attachinary
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70169716225900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70169716225900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: cloudinary
-  requirement: &70169716220740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.41
+        version: 1.0.69
   type: :runtime
   prerelease: false
-  version_requirements: *70169716220740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.69
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70169716234040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +53,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169716234040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70169716076720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169716076720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: valid_attribute
-  requirement: &70169716073180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169716073180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70169716070020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169716070020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &70169716084860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,21 +117,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169716084860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70169716081200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169716081200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70169716242740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169716242740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70169716323400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169716323400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70169716357580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +181,15 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70169716357580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70169716354420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +197,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169716354420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Attachments handler for Rails that uses Cloudinary for storage.
 email:
 - milovan.zogovic@gmail.com
@@ -188,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -870591186806322932
+      hash: -869452005892458433
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,11 +257,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -870591186806322932
+      hash: -869452005892458433
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: attachinary-1.2.6
+summary: attachinary-1.3.0
 test_files: []