brightcontent-attachments 2.0.9 → 2.0.10

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    brightcontent-attachments (2.0.9)
-      brightcontent-core (= 2.0.9)
+    brightcontent-attachments (2.0.10)
+      brightcontent-core (= 2.0.10)
       jquery-fileupload-rails
       paperclip
 
 PATH
   remote: ../core
   specs:
-    brightcontent-core (2.0.9)
+    brightcontent-core (2.0.10)
       bcrypt-ruby
       bootstrap-wysihtml5-rails
       has_scope

data/app/controllers/brightcontent/attachments_controller.rb

@@ -11,11 +11,16 @@ module Brightcontent
     def create
       @attachment = Attachment.new(params.slice(:attachable_id, :attachable_type, :asset))
       if @attachment.save
-        render json: @attachments.to_json, status: :created
+        render json: @attachment.to_json, status: :created
       else
-        render json: @attachments.errors, status: :unprocessable_entity
+        render json: @attachment.errors, status: :unprocessable_entity
       end
     end
 
+    def destroy
+      attachment = Attachment.destroy(params[:id])
+      redirect_to attachment.attachable
+    end
+
   end
 end

data/app/views/brightcontent/attachments/_attachment.html.erb

@@ -0,0 +1,4 @@
+<%= div_for attachment do %>
+  <%= image_tag attachment.url(:brightcontent) %>
+  <%= link_to "Delete", destroy_attachment_path(attachment.id), method: :delete, confirm: "Are you sure?", class: "btn btn-danger btn-mini" %>
+<% end %>

data/app/views/brightcontent/attachments/show.html.erb

@@ -1,3 +1 @@
-<% @attachments.each do |attachment| %>
-  <%= image_tag attachment.url(:brightcontent) %>
-<% end %>
+<%= render @attachments %>

data/app/views/brightcontent/base/_form_field_attachments.html.erb

@@ -2,10 +2,8 @@
   <label class="optional control-label">Attachments</label>
   <div class="controls">
     <% if item.persisted? %>
-      <div id="attachments">
-        <% item.attachments.each do |attachment| %>
-          <%= image_tag attachment.url(:brightcontent) %>
-        <% end %>
+      <div id="attachments" class="clearfix">
+        <%= render item.attachments %>
       </div>
 
       <input id="fileupload" type="file" name="asset" data-url="<%= new_attachment_path %>" multiple>

data/config/routes.rb

@@ -2,4 +2,5 @@ Brightcontent::Engine.routes.draw do
   # TODO: put instead of create
   get 'attachments/:type/:id' => 'attachments#show', as: :attachments
   put 'attachments' => 'attachments#create', as: :new_attachment
+  delete 'attachments/:id' => 'attachments#destroy', as: :destroy_attachment
 end

data/spec/features/attachments_spec.rb

@@ -1,18 +1,41 @@
 require 'spec_helper'
 
 feature "Attachments" do
-  it "show message if item is not saved" do
+  background do
     sign_in
+  end
+
+  scenario "show message if item is not saved" do
     click_link "Blogs"
     click_link "Create new Blog"
     page.should have_content "First save to enable uploads"
   end
 
-  it "show upload form" do
+  scenario "show upload form" do
     create(:blog)
-    sign_in
     click_link "Blogs"
     click_link "Edit"
     page.should have_selector "#attachments"
   end
+
+  context "with image" do
+    background do
+      blog = create(:blog)
+      @attachment = Brightcontent::Attachment.create!(:asset => Rails.root.join("public/rails.png").open)
+      blog.attachments << @attachment
+      click_link "Blogs"
+      click_link "Edit"
+    end
+
+    scenario "shows images" do
+      page.should have_selector "#attachment_#{@attachment.id}"
+    end
+
+    scenario "delete image" do
+      within "#attachment_#{@attachment.id}" do
+        click_link "Delete"
+      end
+      page.should_not have_selector "#attachment_#{@attachment.id}"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-attachments
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +154,7 @@ files:
 - app/controllers/brightcontent/attachments_controller.rb
 - app/helpers/brightcontent/attachments_helper.rb
 - app/models/brightcontent/attachment.rb
+- app/views/brightcontent/attachments/_attachment.html.erb
 - app/views/brightcontent/attachments/show.html.erb
 - app/views/brightcontent/base/_form_field_attachments.html.erb
 - brightcontent-attachments.gemspec
@@ -203,6 +204,7 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/rails.png
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/001/original/icon-socialmedia.png
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/002/original/bg_direction_nav.png
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/003/original/icon-android.png
@@ -236,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2508442452034506775
+      hash: 1632068659845575571
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -245,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2508442452034506775
+      hash: 1632068659845575571
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -291,6 +293,7 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/rails.png
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/001/original/icon-socialmedia.png
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/002/original/bg_direction_nav.png
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/003/original/icon-android.png