attachinary 1.0.1 → 1.1.0

data/README.md

@@ -63,8 +63,8 @@ Lets say that we want all of our **users** to have single **avatar** and many **
 
 In our `_form.html.erb` template, we need to add only this:
 
-	<%= attachinary_file_field_tag 'user[avatar]', user, :avatar %>
-	<%= attachinary_file_field_tag 'user[photos]', user, :photos %>
+	<%= f.attachinary_file_field :avatar %>
+	<%= f.attachinary_file_field :photos %>
 
 If you're using [SimpleForm](https://github.com/plataformatec/simple_form), you can even shorten this to:
 

data/{vendor → lib}/assets/javascripts/attachinary.js.coffee

@@ -4,9 +4,6 @@
     index: 0
     config:
       disableWith: 'Uploading...'
-      filesClass: 'attachinary_files'
-      removeLabel: 'remove'
-      removeClass: ''
       invalidFormatMessage: 'Invalid file format'
       template: """
         <ul>
@@ -47,9 +44,12 @@
       @checkMaximum()
 
     initFileUpload: ->
+      @options.field_name = @$input.attr('name')
+
       options =
         maxFileSize: 10000000
         dataType: 'json'
+        paramName: 'file'
         headers: {"X-Requested-With": "XMLHttpRequest"}
 
       if @$input.attr('accept')
@@ -74,6 +74,7 @@
         if @config.disableWith
           $submit.data 'old-val', $submit.val()
           $submit.val  @config.disableWith
+          $submit.prop 'disabled', true
 
       @$input.bind 'fileuploadalways', (event) =>
         $form = @$input.closest('form')
@@ -85,6 +86,7 @@
         @$input.prop 'disabled', false
         if @config.disableWith
           $submit.val  $submit.data('old-val')
+          $submit.prop 'disabled', false
 
     addFile: (file) ->
       if !@options.accept || $.inArray(file.format, @options.accept) != -1

data/lib/attachinary/engine.rb

@@ -1,4 +1,5 @@
 require 'attachinary/view_helpers'
+require 'attachinary/form_builder'
 
 module Attachinary
   class Engine < ::Rails::Engine
@@ -10,6 +11,12 @@ module Attachinary
       end
     end
 
+    initializer "attachinary.include_view_helpers" do |app|
+      ActiveSupport.on_load :action_view do
+        ActionView::Helpers::FormBuilder.send(:include, Attachinary::FormBuilder)
+      end
+    end
+
     initializer "attachinary.enable_simple_form" do |app|
       require "attachinary/simple_form" if defined?(::SimpleForm::Inputs::Base)
     end

data/lib/attachinary/form_builder.rb

@@ -0,0 +1,7 @@
+module Attachinary
+  module FormBuilder
+    def attachinary_file_field(method, options={})
+      @template.builder_attachinary_file_field_tag method, self, options
+    end
+  end
+end

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

@@ -26,10 +26,16 @@ module Attachinary
 
       if options[:single]
         # embeds_on :photo, ...
-        embeds_one :"#{scope}", as: :attachinariable, class_name: '::Attachinary::File'
+        embeds_one :"#{scope}",
+          as: :attachinariable,
+          class_name: '::Attachinary::File',
+          cascade_callbacks: true
       else
         # embeds_many :images, ...
-        embeds_many :"#{scope}", as: :attachinariable, class_name: '::Attachinary::File'
+        embeds_many :"#{scope}",
+          as: :attachinariable,
+          class_name: '::Attachinary::File',
+          cascade_callbacks: true
       end
 
 

data/lib/attachinary/simple_form.rb

@@ -2,10 +2,6 @@ class AttachinaryInput < SimpleForm::Inputs::Base
   attr_reader :attachinary_options
 
   def input
-    name = "#{@builder.object_name}[#{attribute_name}]"
-    input_html_options[:id] ||= "#{@builder.object_name}_#{attribute_name}"
-
-    template.attachinary_file_field_tag name, @builder.object, attribute_name,
-     { html: input_html_options }
+    template.builder_attachinary_file_field_tag attribute_name, @builder, { html: input_html_options }
   end
 end

data/lib/attachinary/version.rb

@@ -1,3 +1,3 @@
 module Attachinary
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/attachinary/view_helpers.rb

@@ -3,7 +3,17 @@ require 'mime/types'
 module Attachinary
   module ViewHelpers
 
+    def builder_attachinary_file_field_tag(attr_name, builder, options={})
+      options = attachinary_file_field_options(builder.object, attr_name, options)
+      builder.file_field(attr_name, options[:html])
+    end
+
     def attachinary_file_field_tag(field_name, model, relation, options={})
+      options = attachinary_file_field_options(model, relation, options)
+      file_field_tag(field_name, options[:html])
+    end
+
+    def attachinary_file_field_options(model, relation, options={})
       options[:attachinary] = model.send("#{relation}_metadata")
 
       options[:cloudinary] ||= {}
@@ -35,12 +45,11 @@ module Attachinary
       options[:html][:data] ||= {}
       options[:html][:data][:attachinary] = options[:attachinary] || {}
       options[:html][:data][:attachinary][:files] = [model.send(relation)].compact.flatten
-      options[:html][:data][:attachinary][:field_name] = field_name
 
       options[:html][:data][:form_data] = cloudinary_params.reject{ |k, v| v.blank? }
       options[:html][:data][:url] = cloudinary_upload_url
 
-      file_field_tag('file', options[:html])
+      options
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attachinary
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70198166992480 !ruby/object:Gem::Requirement
+  requirement: &70157177562020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70198166992480
+  version_requirements: *70157177562020
 - !ruby/object:Gem::Dependency
   name: cloudinary
-  requirement: &70198167000640 !ruby/object:Gem::Requirement
+  requirement: &70157177561080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.30
+        version: 1.0.40
   type: :runtime
   prerelease: false
-  version_requirements: *70198167000640
+  version_requirements: *70157177561080
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70198167040760 !ruby/object:Gem::Requirement
+  requirement: &70157177560440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198167040760
+  version_requirements: *70157177560440
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70198167038660 !ruby/object:Gem::Requirement
+  requirement: &70157177559380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70198167038660
+  version_requirements: *70157177559380
 - !ruby/object:Gem::Dependency
   name: valid_attribute
-  requirement: &70198167037580 !ruby/object:Gem::Requirement
+  requirement: &70157177558600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198167037580
+  version_requirements: *70157177558600
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70198167055900 !ruby/object:Gem::Requirement
+  requirement: &70157177557880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198167055900
+  version_requirements: *70157177557880
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70198167053580 !ruby/object:Gem::Requirement
+  requirement: &70157177557120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,21 +87,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70198167053580
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &70198167052440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70198167052440
+  version_requirements: *70157177557120
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70198167050240 !ruby/object:Gem::Requirement
+  requirement: &70157177556460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198167050240
+  version_requirements: *70157177556460
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70198167062200 !ruby/object:Gem::Requirement
+  requirement: &70157177555700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198167062200
+  version_requirements: *70157177555700
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70198167059120 !ruby/object:Gem::Requirement
+  requirement: &70157177555260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198167059120
+  version_requirements: *70157177555260
 description: Attachments handler for Rails that uses Cloudinary for storage.
 email:
 - milovan.zogovic@gmail.com
@@ -144,7 +133,9 @@ files:
 - app/controllers/attachinary/files_controller.rb
 - config/routes.rb
 - db/migrate/20120612112526_create_attachinary_tables.rb
+- lib/assets/javascripts/attachinary.js.coffee
 - lib/attachinary/engine.rb
+- lib/attachinary/form_builder.rb
 - lib/attachinary/orm/active_record/extension.rb
 - lib/attachinary/orm/active_record/file.rb
 - lib/attachinary/orm/active_record.rb
@@ -156,7 +147,6 @@ files:
 - lib/attachinary/version.rb
 - lib/attachinary/view_helpers.rb
 - lib/attachinary.rb
-- vendor/assets/javascripts/attachinary.js.coffee
 - MIT-LICENSE
 - Rakefile
 - README.md
@@ -174,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -42460769790723876
+      hash: -1210217158710923500
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -183,11 +173,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -42460769790723876
+      hash: -1210217158710923500
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: attachinary-1.0.1
+summary: attachinary-1.1.0
 test_files: []