simple_form_attachments 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75d8e9396efb588b4dffa12c91aeba4416933ea4
-  data.tar.gz: d397b0c78369aafb384aec012b86878c106d2a0e
+  metadata.gz: 7eacf3010000eaf619be4b2df36081e9f9ec843c
+  data.tar.gz: 660027abe7942ff8aecc744911d87af924f96dd8
 SHA512:
-  metadata.gz: 7e25e24f7adb571ffe350168aae72539d2cb2205e021b9cdc2e42d331cb469fd10eab49ace5c85ac91eca5e8ea52b8df6cd9caf08272e8204ed3846edcac6582
-  data.tar.gz: f765ad02d7674232ad72ceded36afabea16a8b0e91376cfdaf18c822653c5b0cb444a0be784b008c32d01a23f488f89592e68114cba31973ff035a89d5fc00f6
+  metadata.gz: 241e0495e78fd53bf8719128ae8ff21d9d7bc46377565ff5c7f37b511e04c2641dc818352f2d6e23bd44cb6a9b4883e92ebf2078e17502fbb39109610429b486
+  data.tar.gz: ad219c71014effa1e50764dc8060af86ebdcb0c2e95b47d89da2f67b235b73626b280d69715ff969148b831b18c5696b6232c80a303eeda9635b96a9e811389f

data/.bundle/config

@@ -0,0 +1 @@
+--- {}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_form_attachments (0.2.3)
+    simple_form_attachments (0.2.4)
       jquery-ui-rails
       rails (>= 4.2)
       rails-assets-blueimp-file-upload (>= 9.6.0)
@@ -53,7 +53,7 @@ GEM
     bson (3.2.6)
     builder (3.2.2)
     coderay (1.1.0)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
     connection_pool (2.2.0)
     coveralls (0.8.10)
       json (~> 1.8)
@@ -100,8 +100,8 @@ GEM
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (2.99)
     mini_portile2 (2.0.0)
@@ -147,15 +147,15 @@ GEM
       railties (= 4.2.5)
       sprockets-rails
     rails-assets-blueimp-canvas-to-blob (3.3.0)
-    rails-assets-blueimp-file-upload (9.12.1)
+    rails-assets-blueimp-file-upload (9.12.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)
       rails-assets-jquery (>= 1.6)
     rails-assets-blueimp-load-image (2.6.1)
-    rails-assets-blueimp-tmpl (3.3.0)
+    rails-assets-blueimp-tmpl (3.4.0)
     rails-assets-handlebars (4.0.5)
-    rails-assets-jquery (2.2.2)
+    rails-assets-jquery (2.2.4)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.7)
@@ -186,23 +186,23 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slim (3.0.6)
-      temple (~> 0.7.3)
+    slim (3.0.7)
+      temple (~> 0.7.6)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    sprockets (3.5.2)
+    sprockets (3.6.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.0.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    temple (0.7.6)
+    temple (0.7.7)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.2)
+    tilt (2.0.5)
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -226,4 +226,4 @@ DEPENDENCIES
   simple_form_attachments!
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

data/app/controllers/simple_form_attachments/upload_controller.rb

@@ -1,33 +1,36 @@
 module SimpleFormAttachments
   class UploadController < ActionController::Base
+    def show
+      @attachment = attachment_class.find(params[:id])
+      render json: { html: attachment_html(@attachment) }, status: :ok
+    end
+
     def create
-      res = attachment.save
-      render json: attachment_json, status: (res ? :ok : :unprocessable_entity)
+      @attachment = new_attachment
+      res = @attachment.save
+      render json: { html: attachment_html(@attachment) }, status: (res ? :ok : :unprocessable_entity)
     end
 
     private # =============================================================
 
-    def attachment
-      @attachment ||= attachment_class.new({ temporary: true }.merge(attachment_params))
-    end
-
-    def attachment_json
-      { html: attachment_html }
+    def new_attachment
+      attachment_class.new(attachment_params).tap do |att|
+        att.temporary = true
+      end
     end
 
-    def attachment_html
-      render_to_string partial: 'simple_form_attachments/attachment_upload_template', locals: partial_locals
+    def attachment_html(attachment)
+      render_to_string(partial: 'simple_form_attachments/attachment_upload_template', locals: partial_locals.merge(attachment: attachment))
     end
 
     def partial_locals
       {
-        parent: parent,
-        parent_name: parent_name,
-        parent_class: parent_class,
+        attachment_relation: attachment_relation,
         child_index: child_index,
-        attachment: attachment,
         multiple: multiple?,
-        attachment_relation: params[:attachment_relation]
+        parent: parent,
+        parent_class: parent_class,
+        parent_name: parent_name
       }
     end
 
@@ -35,40 +38,59 @@ module SimpleFormAttachments
       params.require(:attachment).permit!
     end
 
-    def parent_name
-      params[:attachment_parent][:name]
+    def attachment_class
+      params.fetch(:attachment_type).constantize
     end
 
-    def attachment_class
-      params[:attachment_type].constantize
+    def attachment_relation
+      params.fetch(:attachment_relation, {})
     end
 
-    def parent_class
-      return unless params[:attachment_parent]
-      params[:attachment_parent][:class].constantize
+    def attachment_relation_name
+      return unless attachment_relation.present?
+      attachment_relation.fetch(:name).to_sym
     end
 
-    def parent
-      return unless params[:attachment_relation]
-      if multiple? && attachment.errors.empty?
-        parent_class.new { |o| o.send(params.fetch(:attachment_relation).fetch(:name).to_sym) << attachment }
-      else
-        parent_class.new
-      end
+    def attachment_relation_key
+      return unless attachment_relation.present?
+      attachment_relation.fetch(:key).to_sym
     end
 
     def child_index
       DateTime.now.strftime('%Q').to_i
     end
 
-    # ---------------------------------------------------------------------
+    def multiple_from_params
+      attachment_relation.fetch(:multiple, false)
+    end
 
     def multiple?
-      ['true', true, '1', 1].include? params.fetch(:attachment_relation, {}).fetch(:multiple, false)
+      ['true', true, '1', 1].include?(multiple_from_params)
+    end
+
+    def referenced_from_params
+      attachment_relation.fetch(:referenced, false)
     end
 
     def referenced?
-      ['true', true, '1', 1].include? params.fetch(:attachment_relation, {}).fetch(:referenced, false)
+      ['true', true, '1', 1].include?(referenced_from_params)
+    end
+
+    def parent
+      return unless attachment_relation_name.present?
+      parent_class.new
+    end
+
+    def attachment_parent
+      params.fetch(:attachment_parent, {})
+    end
+
+    def parent_class
+      attachment_parent.fetch(:class, nil).safe_constantize
+    end
+
+    def parent_name
+      attachment_parent.fetch(:name, nil)
     end
   end
 end

data/app/models/concerns/simple_form_attachments/attachment.rb

@@ -5,8 +5,6 @@ module SimpleFormAttachments
     extend ActiveSupport::Concern
 
     included do
-      include Mongoid::Document
-
       field :temporary, type: Boolean, default: false
 
       scope :temporary, -> { where(temporary: true) }

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

@@ -1,5 +1,4 @@
 - 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] }
   - partial_layout = 'layouts/simple_form_attachments/attachment_layout'

data/config/routes.rb

@@ -1,5 +1,6 @@
 SimpleFormAttachments::Engine.routes.draw do
   scope module: :simple_form_attachments do
-    post "/attachments" => "upload#create", as: :attachments
+    get "attachments/:id" => "upload#show", as: :attachment
+    post "attachments" => "upload#create", as: :attachments
   end
 end

data/lib/simple_form_attachments/attachment_input.rb

@@ -3,7 +3,6 @@ require 'i18n'
 
 module SimpleFormAttachments
   class AttachmentInput < SimpleForm::Inputs::Base
-
     class << self
       attr_accessor :configuration
 
@@ -19,7 +18,7 @@ module SimpleFormAttachments
 
     # =====================================================================
 
-    def input wrapper_options
+    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
@@ -102,17 +101,17 @@ module SimpleFormAttachments
 
     def multiple?
       return false unless relation
-      !!(relation.macro =~ /many\z/)
+      !!relation.macro.to_s.end_with?('many')
     end
 
     def referenced?
       return false unless relation
-      !!(relation_class =~ /Referenced\z/)
+      !!relation_class.to_s.end_with?('Referenced')
     end
 
     def embedded?
       return false unless relation
-      !!(relation_class =~ /Embedded\z/)
+      !!relation_class.to_s.end_with?('Embedded')
     end
 
     def sortable?
@@ -123,7 +122,7 @@ module SimpleFormAttachments
 
     def attachments
       return @builder.object.send(attribute_name).to_a unless multiple?
-      @builder.object.send(attribute_name).sort_by{ |a| @builder.object.send(relation_key).index(a.id) }
+      @builder.object.send(attribute_name).sort_by { |a| @builder.object.send(relation_key).index(a.id) }
     end
 
     def accepted_file_types
@@ -141,14 +140,14 @@ module SimpleFormAttachments
       return unless validators
       return unless file_validation_values_for(:ext)
       extensions = file_validation_values_for(:ext)
-      extensions.map{ |e| ".#{e}" }
+      extensions.map { |e| ".#{e}" }
     end
 
     def validated_formats
       return unless validators
       return unless file_validation_values_for(:format)
       formats = file_validation_values_for(:format)
-      formats.map{ |f| ".#{f}" }
+      formats.map { |f| ".#{f}" }
     end
 
     def validated_mime_types
@@ -158,18 +157,18 @@ module SimpleFormAttachments
       mime_types
     end
 
-    def file_validation_values_for property
+    def file_validation_values_for(property)
       return unless file_validation_for(property)
       validation = file_validation_for(property)
-      validation.map{ |v| v.options.values_at(:as, :in) }.flatten.reject(&:blank?).uniq
+      validation.map { |v| v.options.values_at(:as, :in) }.flatten.reject(&:blank?).uniq
     end
 
-    def file_validation_for property
+    def file_validation_for(property)
       return unless validators
-      validators.select{ |v| v.options[:property_name].to_s == property.to_s }
+      validators.select { |v| v.options[:property_name].to_s == property.to_s }
     end
 
-    def validators(field=:file)
+    def validators(field = :file)
       relation_class_name.constantize.validators_on(field)
     end
 
@@ -187,7 +186,7 @@ module SimpleFormAttachments
       input_html_options = {
         multiple: multiple?,
         accept: accepted_file_types,
-        class: 'file',
+        class: 'file'
       }
       template.label_tag('attachment[file]') do
         template.file_field_tag('attachment[file]', input_html_options)
@@ -233,14 +232,16 @@ 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: "simple_form_attachments/#{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,
               multiple: multiple?,
               form: @builder,
-              relation_key: relation_key,
+              relation_key: relation_key
             }
+          )
         end
       end
     end
@@ -252,6 +253,5 @@ module SimpleFormAttachments
         template.render('simple_form_attachments/attachments/attachment.hbs.slim')
       end
     end
-
   end
 end

data/lib/simple_form_attachments/configuration.rb

@@ -1,11 +1,9 @@
 module SimpleFormAttachments
   class Configuration
-
     attr_accessor :route
 
     def route
       @route ||= SimpleFormAttachments::Engine.routes.url_helpers.attachments_path
     end
-
   end
 end

data/lib/simple_form_attachments/engine.rb

@@ -1,9 +1,8 @@
 module SimpleFormAttachments
   class Engine < ::Rails::Engine
-
     engine_name = :simple_form_attachments
 
     # Add yml files to I18n
-    I18n.load_path += Dir[ SimpleFormAttachments::Engine.root.join('config', 'locales', '**', '*.{rb,yml}') ]
+    I18n.load_path += Dir[SimpleFormAttachments::Engine.root.join('config', 'locales', '**', '*.{rb,yml}')]
   end
 end

data/lib/simple_form_attachments/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormAttachments
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/test/controllers/simple_form_attachments/upload_controller_test.rb

@@ -4,34 +4,32 @@ require_relative '../../../app/controllers/simple_form_attachments/upload_contro
 
 module SimpleFormAttachments
   describe UploadController do
-
     setup do
       @routes = SimpleFormAttachments::Engine.routes
     end
 
-    let(:params) {
-      {
-        attachment: { body: 'foo' },
-        attachment_parent: { class: 'Parent' },
-        attachment_relation: { name: 'attachments', multiple: true },
-        attachment_type: "Attachment"
-      }
-    }
-    let(:count) { Attachment.count }
-    let(:action) { post :create, params }
+    let(:count) { AttachmentTest.count }
 
     # ---------------------------------------------------------------------
 
     describe '#create' do
+      let(:params) do
+        {
+          attachment: { body: 'foo' },
+          attachment_parent: { class: 'Parent' },
+          attachment_relation: { name: 'attachments', multiple: true },
+          attachment_type: 'AttachmentTest'
+        }
+      end
+      let(:action) { post :create, params }
+
       it 'should succeed' do
         action
         must_respond_with :success
       end
 
       it 'should create attachment of specified model' do
-        assert_difference '::Attachment.count' do
-          action
-        end
+        assert_difference('AttachmentTest.count') { action }
       end
 
       it 'must mark the newly upladed attachment as temporary' do
@@ -48,5 +46,32 @@ module SimpleFormAttachments
         end
       end
     end
+
+    # ---------------------------------------------------------------------
+
+    describe '#show' do
+      let(:attachment) { AttachmentTest.create! }
+      let(:params) do
+        {
+          id: attachment.id.to_s,
+          attachment_parent: { class: 'Parent' },
+          attachment_relation: { name: 'attachments', multiple: true },
+          attachment_type: 'AttachmentTest'
+        }
+      end
+      let(:action) { get :show, params }
+
+      it 'should succeed' do
+        action
+        must_respond_with :success
+      end
+
+      describe 'returned JSON' do
+        it 'should contain template with correct locals' do
+          action
+          assert_template 'simple_form_attachments/_attachment_upload_template', locals: { multiple: true, parent_class: params[:attachment_parent][:class].constantize }
+        end
+      end
+    end
   end
 end

data/test/models/concerns/simple_form_attachments/attachment_test.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
 require_relative '../../../../app/models/concerns/simple_form_attachments/attachment'
 
-describe Attachment do
-  let(:temporary_attachment) { Attachment.new(temporary: true) }
-  let(:permanent_attachment) { Attachment.new }
+describe AttachmentTest do
+  let(:temporary_attachment) { AttachmentTest.new(temporary: true) }
+  let(:permanent_attachment) { AttachmentTest.new }
 
   before do
     temporary_attachment.save
@@ -13,29 +13,29 @@ describe Attachment do
   describe 'scopes' do
     describe ':temporary' do
       it 'has :temporary scope' do
-        Attachment.must_respond_to :temporary
+        AttachmentTest.must_respond_to :temporary
       end
 
       it 'returns the temporary attachments' do
-        Attachment.temporary.to_a.must_include temporary_attachment
+        AttachmentTest.temporary.to_a.must_include temporary_attachment
       end
 
       it 'does not return the temporary attachments for' do
-        Attachment.temporary.to_a.wont_include permanent_attachment
+        AttachmentTest.temporary.to_a.wont_include permanent_attachment
       end
     end
 
     describe ':permanent' do
       it 'has :permanent scope' do
-        Attachment.must_respond_to :permanent
+        AttachmentTest.must_respond_to :permanent
       end
 
       it 'returns the permanent attachments' do
-        Attachment.permanent.to_a.must_include permanent_attachment
+        AttachmentTest.permanent.to_a.must_include permanent_attachment
       end
 
       it 'does not return the temporary attachments for' do
-        Attachment.permanent.to_a.wont_include temporary_attachment
+        AttachmentTest.permanent.to_a.wont_include temporary_attachment
       end
     end
   end

data/test/models/concerns/simple_form_attachments/has_attachments_test.rb

@@ -7,9 +7,9 @@ describe Parent do
   let(:attachment_reflection) { parent.reflect_on_association(:attachment) }
   let(:attachments_reflection) { parent.reflect_on_association(:attachments) }
 
-  let(:related_attachment_one) { Attachment.create(temporary: true) }
-  let(:related_attachment_two) { Attachment.create(temporary: true) }
-  let(:unrelated_attachment) { Attachment.create(temporary: true) }
+  let(:related_attachment_one) { AttachmentTest.create(temporary: true) }
+  let(:related_attachment_two) { AttachmentTest.create(temporary: true) }
+  let(:unrelated_attachment) { AttachmentTest.create(temporary: true) }
 
   # ---------------------------------------------------------------------
 
@@ -25,7 +25,7 @@ describe Parent do
     end
 
     it 'respects definition of :class_name' do
-      attachments_reflection.class_name.must_equal 'Attachment'
+      attachments_reflection.class_name.must_equal 'AttachmentTest'
     end
 
     it 'passes the :dependent option to the relation' do
@@ -49,7 +49,7 @@ describe Parent do
       parent.must_respond_to :attachment
     end
     it 'respects definition of :class_name' do
-      attachment_reflection.class_name.must_equal 'Attachment'
+      attachment_reflection.class_name.must_equal 'AttachmentTest'
     end
     it 'passes the :dependent option to the relation' do
       attachments_reflection.dependent.must_equal :destroy
@@ -85,11 +85,13 @@ describe Parent do
     before do
       parent.attachments << related_attachment_one
     end
+    
     it 'marks has_many attachments as permanent' do
       related_attachment_one.reload.temporary.must_equal true
       parent.send(:mark_attachments_permanent)
       related_attachment_one.reload.temporary.must_equal false
     end
+
     it 'does not mark other attachments as permanent' do
       unrelated_attachment.temporary.must_equal true
     end
@@ -99,15 +101,15 @@ describe Parent do
     before do
       parent.attachment = related_attachment_two
     end
+
     it 'marks has_many attachments as permanent' do
       related_attachment_two.reload.temporary.must_equal true
       parent.send(:mark_attachment_permanent)
       related_attachment_two.reload.temporary.must_equal false
     end
+
     it 'does not mark other attachments as permanent' do
       unrelated_attachment.temporary.must_equal true
     end
   end
-
-  # ---------------------------------------------------------------------
 end

data/test/test_helper.rb

@@ -52,7 +52,8 @@ end
 
 # ---------------------------------------------------------------------
 
-class Attachment
+class AttachmentTest
+  include Mongoid::Document
   include SimpleFormAttachments::Attachment
   field :body, type: String
 end
@@ -61,6 +62,6 @@ class Parent
   include Mongoid::Document
   include SimpleFormAttachments::HasAttachments
 
-  has_one_attachment :attachment, class_name: 'Attachment', dependent: :destroy
-  has_many_attachments :attachments, class_name: 'Attachment', dependent: :destroy
+  has_one_attachment :attachment, class_name: 'AttachmentTest', dependent: :destroy
+  has_many_attachments :attachments, class_name: 'AttachmentTest', dependent: :destroy
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_attachments
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tomas Celizna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -230,6 +230,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
 - ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"