simple_form_attachments 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2258db71defc38e2818791f75ebbb8df6a8b9a7f
-  data.tar.gz: be8694a80360a84c54b3e345073b66fe29eebfd3
+  metadata.gz: ce1bd3097d0aa3aa18e79ba677d6f9058050d972
+  data.tar.gz: 09e01a5273bb2747e5061a74812d6de053da5acc
 SHA512:
-  metadata.gz: 677708881bad666a8c65256c421e7896f516d7dad25a969f96dd1c145d7bc4a1cc8639189a2dcdb05d0b00208189cc93b4ddc96532d630276388cbaeb4246d23
-  data.tar.gz: 9b68dcc3467b94a9c104473d24b71d426e416d2e0ff8263d1d30005694eac958c538146bda49d984e212f31f20b62d2973463ce0f5cacbca271ee03a8109652b
+  metadata.gz: 039f6e3c511157ed6dffce2ca266143272224679d41f1198102923da0f1f97393b6027247d1db8ebe81104e99f4d5cdfd04173d58e59413b5cd6dd4347f14c09
+  data.tar.gz: 55fa16f575026d174766a15512762e3f60b6074a6ef94238a2ae97fabf3da3bfa814b5b8d85f6d79fd5b95a7a452ef57a4f67f288dc430823a76ef6ab6216b57

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_form_attachments (0.1.5)
+    simple_form_attachments (0.2.0)
       jquery-ui-rails
       rails (>= 4.2)
       rails-assets-blueimp-file-upload (>= 9.6.0)
@@ -13,58 +13,60 @@ GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      activesupport (= 4.2.5)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.3)
-      activesupport (= 4.2.3)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
       globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
       arel (~> 6.0)
-    activesupport (4.2.3)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.4.0)
     arel (6.0.3)
-    bson (3.1.2)
+    bson (3.2.6)
     builder (3.2.2)
     coderay (1.1.0)
+    concurrent-ruby (1.0.0)
     connection_pool (2.2.0)
-    coveralls (0.8.2)
+    coveralls (0.8.10)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+      simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-    database_cleaner (1.4.1)
+      tins (~> 1.6.0)
+    database_cleaner (1.5.1)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
-    dragonfly (1.0.10)
+    dragonfly (1.0.12)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3.0)
@@ -73,7 +75,7 @@ GEM
     formatador (0.2.5)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    guard (2.12.8)
+    guard (2.13.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
@@ -92,18 +94,18 @@ GEM
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
-    listen (3.0.2)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    minitest (5.8.3)
     minitest-rails (2.2.0)
       minitest (~> 5.7)
       railties (~> 4.1)
@@ -112,63 +114,63 @@ GEM
       moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.6)
+    moped (2.0.7)
       bson (~> 3.0)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
     multi_json (1.11.2)
     nenv (0.2.0)
-    netrc (0.10.3)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    notiffany (0.0.6)
+    netrc (0.11.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
     optionable (0.2.0)
     origin (2.1.1)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.3)
-      actionmailer (= 4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
-      activemodel (= 4.2.3)
-      activerecord (= 4.2.3)
-      activesupport (= 4.2.3)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
+      railties (= 4.2.5)
       sprockets-rails
-    rails-assets-blueimp-canvas-to-blob (2.2.0)
+    rails-assets-blueimp-canvas-to-blob (2.2.4)
     rails-assets-blueimp-file-upload (9.11.2)
       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 (1.14.0)
-    rails-assets-blueimp-tmpl (2.5.5)
-    rails-assets-handlebars (4.0.3)
+    rails-assets-blueimp-tmpl (2.5.7)
+    rails-assets-handlebars (4.0.5)
     rails-assets-jquery (2.1.4)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.3)
-      actionpack (= 4.2.3)
-      activesupport (= 4.2.3)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rest-client (1.8.0)
@@ -179,7 +181,7 @@ GEM
     simple_form (3.2.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    simplecov (0.10.0)
+    simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
@@ -188,19 +190,20 @@ GEM
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    sprockets (3.4.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.0.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     temple (0.7.6)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
-    tins (1.5.4)
+    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
@@ -221,3 +224,6 @@ DEPENDENCIES
   mongoid (~> 4.0)
   rake
   simple_form_attachments!
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -38,7 +38,7 @@ class AttachmentImage
 end
 ```
 
-This adds a `:temporary` Boolean field and two scopes: `temporary` and `permanent` to the model.
+This adds a `:temporary` Boolean field (set to `false` by default) and two scopes: `temporary` and `permanent` to the model.
 
 Note that the concern does not include any specific accessors (ie Dragonfly). You need to define those yourself in your model.
 
@@ -66,7 +66,7 @@ You could use for example the `before_save` callback to embed the attachments yo
 
 #### Callbacks
 
-Since attachments can be added/removed dynamically in the form, we need to indicate which ones are actually submitted in the end, so that we can – immediately or later – delete the temporary ones.
+Since attachments can be added/removed dynamically in the form, we need to indicate which ones are actually submitted in the end, so that we can – immediately or later (left up to you) – delete the temporary ones.
 
 For that each relation defines a method named after the relation name, which can be called for example via a callback:
 
@@ -77,7 +77,7 @@ after_save :mark_attachment_images_permanent
 
 These methods (atomically) set the attachment's `:temporary` attribute to `false`.
 
-Alternatively the `mark_all_attachments_permanent` method can be used to loop through all attachment relations, triggering individual abovementioned methods. This means the two `after_save` callbacks above can be replaced with:
+Alternatively the `mark_all_attachments_permanent` method can be used to loop through all attachment relations, triggering individual above-mentioned methods. This means the two `after_save` callbacks above can be replaced with:
 
 ```ruby
 after_save :mark_all_attachments_permanent
@@ -91,6 +91,12 @@ If you want to validate the number of attachments allowed on the owner, you can
 validates :attachment_pdfs, length: { maximum: 2 }
 ```
 
+### Controller
+
+The default `UploadController` receives the uploaded attachment, sets its `temporary` to `true` and creates corresponding record in the database.
+
+Remember, you need to mark attachments as permanent (ie `temporary` to `false`) yourself. See Callbacks above.
+
 ### Routes
 
 Mount the engine in your routes:

data/app/controllers/simple_form_attachments/upload_controller.rb

@@ -1,6 +1,5 @@
 module SimpleFormAttachments
   class UploadController < ActionController::Base
-
     def create
       res = attachment.save
       render json: attachment_json, status: (res ? :ok : :unprocessable_entity)
@@ -9,7 +8,7 @@ module SimpleFormAttachments
     private # =============================================================
 
     def attachment
-      @attachment ||= attachment_class.new attachment_params
+      @attachment ||= attachment_class.new({ temporary: true }.merge(attachment_params))
     end
 
     def attachment_json
@@ -52,7 +51,7 @@ module SimpleFormAttachments
     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 }
+        parent_class.new { |o| o.send(params.fetch(:attachment_relation).fetch(:name).to_sym) << attachment }
       else
         parent_class.new
       end
@@ -71,6 +70,5 @@ module SimpleFormAttachments
     def referenced?
       ['true', true, '1', 1].include? params.fetch(:attachment_relation, {}).fetch(:referenced, false)
     end
-
   end
 end

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

@@ -7,14 +7,14 @@ module SimpleFormAttachments
     included do
       include Mongoid::Document
 
-      field :temporary, type: Boolean, default: true
+      field :temporary, type: Boolean, default: false
 
       scope :temporary, -> { where(temporary: true) }
       scope :permanent, -> { where(temporary: false) }
+    end
 
-      def to_simple_form_partial_path
-        ['simple_form_attachments', to_partial_path].join('/')
-      end
+    def to_simple_form_partial_path
+      ['simple_form_attachments', to_partial_path].join('/')
     end
   end
 end

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

@@ -45,7 +45,6 @@
       @init_fileupload()
 
     init_sortable: () ->
-      @get_attachment_list().add( @get_attachment_list().find('th, td') ).each -> $(this).outerWidth $(this).outerWidth()
       @get_attachment_list().find('tbody').sortable(@options.sortable_options).disableSelection()
 
     init_fileupload: () ->

data/lib/simple_form_attachments/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormAttachments
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/test/controllers/simple_form_attachments/upload_controller_test.rb

@@ -11,7 +11,7 @@ module SimpleFormAttachments
 
     let(:params) {
       {
-        attachment: { temporary: true },
+        attachment: { body: 'foo' },
         attachment_parent: { class: 'Parent' },
         attachment_relation: { name: 'attachments', multiple: true },
         attachment_type: "Attachment"
@@ -23,7 +23,6 @@ module SimpleFormAttachments
     # ---------------------------------------------------------------------
 
     describe '#create' do
-
       it 'should succeed' do
         action
         must_respond_with :success
@@ -35,6 +34,13 @@ module SimpleFormAttachments
         end
       end
 
+      it 'must mark the newly upladed attachment as temporary' do
+        action
+        assigns(:attachment).must_be :present?
+        assigns(:attachment).body.must_equal 'foo'
+        assigns(:attachment).temporary.must_equal true
+      end
+
       describe 'returned JSON' do
         it 'should contain template with correct locals' do
           action

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

@@ -2,8 +2,8 @@ require 'test_helper'
 require_relative '../../../../app/models/concerns/simple_form_attachments/attachment'
 
 describe Attachment do
-  let(:temporary_attachment) { Attachment.new }
-  let(:permanent_attachment) { Attachment.new(temporary: false) }
+  let(:temporary_attachment) { Attachment.new(temporary: true) }
+  let(:permanent_attachment) { Attachment.new }
 
   before do
     temporary_attachment.save

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

@@ -2,15 +2,14 @@ require 'test_helper'
 require_relative '../../../../app/models/concerns/simple_form_attachments/has_attachments'
 
 describe Parent do
-
   let(:parent) { Parent.new }
 
   let(:attachment_reflection) { parent.reflect_on_association(:attachment) }
   let(:attachments_reflection) { parent.reflect_on_association(:attachments) }
 
-  let(:related_attachment_one) { Attachment.create }
-  let(:related_attachment_two) { Attachment.create }
-  let(:unrelated_attachment) { Attachment.create }
+  let(:related_attachment_one) { Attachment.create(temporary: true) }
+  let(:related_attachment_two) { Attachment.create(temporary: true) }
+  let(:unrelated_attachment) { Attachment.create(temporary: true) }
 
   # ---------------------------------------------------------------------
 
@@ -26,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 'Attachment'
     end
 
     it 'passes the :dependent option to the relation' do
@@ -34,12 +33,12 @@ describe Parent do
     end
 
     it 'returns attachments in same order as in which its ids have been stored' do
-      parent.attachments.sorted.must_equal parent.attachments.sort_by{ |a| parent.attachment_ids.index(a.id) }
+      parent.attachments.sorted.must_equal parent.attachments.sort_by { |a| parent.attachment_ids.index(a.id) }
     end
 
     it 'returns attachments in the same order as attachment_ids' do
       parent.attachment_ids = [related_attachment_one.id, related_attachment_two.id]
-      parent.attachments.sorted.must_equal parent.attachments.sort_by{ |a| parent.attachment_ids.index(a.id) }
+      parent.attachments.sorted.must_equal parent.attachments.sort_by { |a| parent.attachment_ids.index(a.id) }
     end
   end
 
@@ -50,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 'Attachment'
     end
     it 'passes the :dependent option to the relation' do
       attachments_reflection.dependent.must_equal :destroy
@@ -111,5 +110,4 @@ describe Parent do
   end
 
   # ---------------------------------------------------------------------
-
 end

data/test/test_helper.rb

@@ -54,6 +54,7 @@ end
 
 class Attachment
   include SimpleFormAttachments::Attachment
+  field :body, type: String
 end
 
 class Parent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_attachments
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomas Celizna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails