simple_form_attachments 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1540e6d1e827ffdfacb5bf1fabb16add5326a15a
-  data.tar.gz: be5daa41dee23d745418119e798407f4e88e7c5c
+  metadata.gz: a12fab48309e9d05e47affed9ba0634611420bbf
+  data.tar.gz: 05e4628edee4e1ba554512ea9b57f6a7d5ad4f44
 SHA512:
-  metadata.gz: 3e57492026a7dc0e6bb79051ea58d642f77a4be62c5e5fb14477b812f05c3cb7d09b0f3e2961664008b6cf26eac1df906bed84b38516d9e716c6aafc032575b8
-  data.tar.gz: d7081f1fb537c5be4c22165dd5671478d5e7b24617f7c200e71bed50aa1eee7dc36052c404d214ef720cf20e8172e5b775e338ec784222623aa71acd3a0df238
+  metadata.gz: d80eb51c12da9c051bec72e632189ff403cf7725081c1819d0292b744c69d7a3750067fd245321602f9c352bd38736cd8aa566374a32765db4ed8c65e5bf1302
+  data.tar.gz: 9648f1b70f24048f549088341aef1e437b130f5931ff9e275c2c0952fea8a7dddc95917dc6bdcb55629008383b695c303acceaea6c60e7379b3c0bcacd28f440

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_form_attachments (0.0.4)
+    simple_form_attachments (0.0.5)
       jquery-ui-rails
       rails (>= 4.2)
       rails-assets-blueimp-file-upload (>= 9.6.0)
@@ -50,7 +50,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     arel (6.0.0)
-    bson (3.1.1)
+    bson (3.1.2)
     builder (3.2.2)
     coderay (1.1.0)
     connection_pool (2.2.0)
@@ -69,11 +69,11 @@ GEM
       multi_json (~> 1.0)
       rack (>= 1.3.0)
     erubis (2.7.0)
-    ffi (1.9.9)
+    ffi (1.9.10)
     formatador (0.2.5)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
-    guard (2.12.7)
+    guard (2.12.8)
       formatador (>= 0.2.4)
       listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
@@ -92,7 +92,7 @@ GEM
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
-    listen (3.0.0)
+    listen (3.0.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     loofah (2.0.2)
@@ -116,7 +116,7 @@ GEM
       bson (~> 3.0)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     nenv (0.2.0)
     netrc (0.10.3)
     nokogiri (1.6.6.2)
@@ -145,7 +145,7 @@ GEM
       railties (= 4.2.3)
       sprockets-rails
     rails-assets-blueimp-canvas-to-blob (2.1.1)
-    rails-assets-blueimp-file-upload (9.10.1)
+    rails-assets-blueimp-file-upload (9.10.3)
       rails-assets-blueimp-canvas-to-blob (>= 2.1.1)
       rails-assets-blueimp-load-image (>= 1.13.0)
       rails-assets-blueimp-tmpl (>= 2.5.4)

data/README.md

@@ -96,7 +96,7 @@ validates :attachment_pdfs, length: { maximum: 2 }
 Mount the engine in your routes:
 
 ```ruby
-  mount SimpleFormAttachments::Engine => "/"
+mount SimpleFormAttachments::Engine => "/"
 ```
 
 This will include a default `/attachments` route.
@@ -145,7 +145,6 @@ td.file_info
     = fields.input :caption
 ```
 
-
 #### Validation errors
 
 If you want to show validation errors in your partial, simply include the `simple_form_attachments/errors` partial as shown above.

data/app/controllers/simple_form_attachments/upload_controller.rb

@@ -23,6 +23,7 @@ module SimpleFormAttachments
     def partial_locals
       {
         parent: parent,
+        parent_name: parent_name,
         parent_class: parent_class,
         child_index: child_index,
         attachment: attachment,
@@ -35,6 +36,10 @@ module SimpleFormAttachments
       params.require(:attachment).permit!
     end
 
+    def parent_name
+      params[:attachment_parent][:name]
+    end
+
     def attachment_class
       params[:attachment_type].constantize
     end

data/app/views/simple_form_attachments/_attachment_upload_template.html.slim

@@ -1,4 +1,4 @@
-- form = ActionView::Helpers::FormBuilder.new(parent_class.model_name.param_key, parent, self, {})
+- form = ActionView::Helpers::FormBuilder.new(parent_name, parent, self, {})
 
 = form.simple_fields_for attachment_relation[:name].to_sym, attachment, { child_index: child_index } do |fields|
   - partial_locals = { attachment: attachment, form: form, fields: fields, multiple: multiple, relation_key: attachment_relation[:key] }

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

@@ -43,6 +43,7 @@
         dropZone: @$element
         formData: {
           'attachment_type]': @get_attachment_type_input().val(),
+          'attachment_parent[name]': @get_attachment_parent_name_input().val(),
           'attachment_parent[class]': @get_attachment_parent_class_input().val(),
           'attachment_relation[type]': @get_attachment_relation_type_input().val(),
           'attachment_relation[key]': @get_attachment_relation_key_input().val(),
@@ -147,6 +148,8 @@
       @$element.find('input[name="attachment[multiple]"]')
     get_attachment_parent_class_input: ->
       @$element.find('input[name="attachment_parent[class]"]')
+    get_attachment_parent_name_input: ->
+      @$element.find('input[name="attachment_parent[name]"]')
     get_attachment_relation_key_input: ->
       @$element.find('input[name="attachment_relation[key]"]')
     get_attachment_relation_name_input: ->

data/lib/simple_form_attachments/attachment_input.rb

@@ -21,10 +21,12 @@ module SimpleFormAttachments
 
     def input wrapper_options
       template.content_tag :div, merge_wrapper_options(input_html_options, wrapper_options) do
+        template.concat attachment_blank_field
         template.concat attachment_file_field
         template.concat attachment_type_field
         template.concat attachment_multiple_field
         template.concat attachment_parent_class_field
+        template.concat attachment_parent_name_field
         template.concat attachment_relation_key_field
         template.concat attachment_relation_name_field
         template.concat attachment_relation_class_field
@@ -81,6 +83,10 @@ module SimpleFormAttachments
       @builder.object.class.name
     end
 
+    def parent_name
+      @builder.object_name
+    end
+
     def relation_class
       relation.relation.to_s
     end
@@ -162,6 +168,10 @@ module SimpleFormAttachments
 
     # ---------------------------------------------------------------------
 
+    def attachment_blank_field
+      template.hidden_field_tag("#{parent_name}[#{relation_key}][]", nil)
+    end
+
     def attachment_file_field
       input_html_options = {
         multiple: multiple?,
@@ -185,6 +195,10 @@ module SimpleFormAttachments
       template.hidden_field_tag('attachment_parent[class]', parent_class)
     end
 
+    def attachment_parent_name_field
+      template.hidden_field_tag('attachment_parent[name]', parent_name)
+    end
+
     def attachment_relation_name_field
       template.hidden_field_tag('attachment_relation[name]', @attribute_name)
     end
@@ -208,7 +222,7 @@ module SimpleFormAttachments
       table_classes << 'sortable' if sortable?
       template.content_tag :table, class: table_classes do
         @builder.simple_fields_for attribute_name do |attachment_fields|
-          template.render partial: attachment_fields.object.to_partial_path, format: :html, layout: 'layouts/simple_form_attachments/attachment_layout',
+          template.render partial: "simple_form_attachments/#{attachment_fields.object.to_partial_path}", format: :html, layout: 'layouts/simple_form_attachments/attachment_layout',
             locals: {
               attachment: attachment_fields.object,
               fields: attachment_fields,

data/lib/simple_form_attachments/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormAttachments
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_attachments
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tomas Celizna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -280,7 +280,6 @@ files:
 - test/dummy/app/models/attachment_image.rb
 - test/dummy/app/models/concerns/.keep
 - test/dummy/app/models/test.rb
-- test/dummy/app/views/attachment_images/_attachment_image.html.slim
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/simple_form_attachments/attachment_images/_attachment_image.html.slim
 - test/dummy/app/views/tests/_form.html.slim
@@ -418,7 +417,6 @@ test_files:
 - test/dummy/app/models/attachment_image.rb
 - test/dummy/app/models/concerns/.keep
 - test/dummy/app/models/test.rb
-- test/dummy/app/views/attachment_images/_attachment_image.html.slim
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/simple_form_attachments/attachment_images/_attachment_image.html.slim
 - test/dummy/app/views/tests/_form.html.slim

data/test/dummy/app/views/attachment_images/_attachment_image.html.slim

@@ -1,15 +0,0 @@
-td.thumb
-  div.thumb
-    = image_tag attachment.thumb_url, alt: attachment.file_name
-
-td.file_info
-  = link_to attachment.file_name, attachment.file.url
-  span.mime_type = attachment.file_mime_type
-  span.size = attachment.file_size
-
-- if attachment.errors.to_a.any?
-  td.errors = render 'simple_form_attachments/errors', errors: attachment.errors.to_a
-
-- else
-  td.fields
-    = fields.input :caption