brightcontent-attachments 2.0.33 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31453eae643abc77863b353258667588ca9cbfb8
-  data.tar.gz: 61d12130d8c1db3cec30990c81b5bb784437097e
+  metadata.gz: 9fe1f577211b1bff0afc4b534bcea4542074de68
+  data.tar.gz: 325702f3a132bf2655a27b0bc013699b191e4927
 SHA512:
-  metadata.gz: 011ccfec559cfbf7d72d9f7f61b82ef56cffd5a84d136882a98889538615f37ec3a0ca91aff53b1bb08f3ae95092015400c6b02f8dd322570f41840f4bc0dc2a
-  data.tar.gz: 714478bfc864a6842b5ec97e892cc3596e2697e32cd6ad98eeef9cf999f10f1552ea1b42f5425a0d652e9b14f65564e03266522cd94af79bf3c9f7cd3cbcad66
+  metadata.gz: 66247189162509cd49e45c686ae5ad59a260053110da12da42bb3f5ce975fef2d97918d8f2b1f0079ba8881c06c87676a33944c200d1fced267d188cec991c54
+  data.tar.gz: 83d89ffac4c3f21c62f0818c7d73ad35e3cbe1f32fa0cac70c302e2972ee58b644e80f70594eaad9bb641160b8a7800004dca1ac369ca85e7197e682cf578298

data/.gitignore

@@ -8,3 +8,4 @@ spec/dummy/log/*.log
 spec/dummy/tmp/
 spec/dummy/.sass-cache
 vendor/bundle
+bin/

data/app/assets/javascripts/brightcontent/attachments.js.coffee

@@ -0,0 +1,42 @@
+#= require jquery-fileupload/basic
+#= require spin
+
+$ ->
+  request_url = $("#attachable_url").val()
+
+  spinner = new Spinner().spin()
+  $('#fileupload').fileupload
+    method: "PUT"
+    send: ->
+      spinner.spin $("#attachments-controls")[0]
+      $("#attachments *").attr disabled: true
+      $("#fileupload").attr disabled: true
+      $("#attachments-controls").css opacity: 0.5
+
+    done: (e, data) ->
+      $.get request_url, (attachments_view) ->
+        $('#attachments').html attachments_view
+        spinner.stop()
+        $("#fileupload").attr disabled: false
+        $("#attachments-controls").css opacity: 1
+
+
+  $("#attachments").on "click", ".delete", ->
+    el = $(this).parents(".attachment")
+    spinner.spin el[0]
+    el.css opacity: 0.5
+    el.find("*").attr disabled: true
+    $.ajax
+      method: "DELETE"
+      url: $(this).attr "href"
+      success: -> el.remove()
+    false
+
+  $("#attachments").sortable
+    axis: "y"
+    cancel: "input,textarea,button,select,option,a"
+    distance: 5
+    update: ->
+      $.post "#{request_url}/reposition", positions: ($("#attachments > *").map -> $(this).data "attachment-id").toArray()
+
+  $("#attachments").disableSelection()

data/app/assets/stylesheets/brightcontent/attachments.css.scss

@@ -0,0 +1,3 @@
+#attachments .attachment {
+  cursor: move;
+}

data/app/controllers/brightcontent/attachments_controller.rb

@@ -2,9 +2,8 @@ require_dependency "brightcontent/application_controller"
 
 module Brightcontent
   class AttachmentsController < ApplicationController
-
     def show
-      @attachments = Attachment.where(attachable_type: params[:type].classify, attachable_id: params[:id])
+      @attachments = Attachment.for_attachable(params[:type], params[:id])
       render layout: false
     end
 
@@ -18,15 +17,19 @@ module Brightcontent
     end
 
     def destroy
-      attachment = Attachment.destroy(params[:id])
-      redirect_to attachment.attachable
+      Attachment.destroy params[:id]
+      head :no_content
+    end
+
+    def reposition
+      Attachment.for_attachable(params[:type], params[:id]).reposition! params[:positions]
+      head :no_content
     end
 
     private
 
     def attachment_params
-      params.permit(:attachable_id, :attachable_type, :asset)
+      params.require(:attachment).permit(:attachable_id, :attachable_type, :asset)
     end
-
   end
 end

data/app/models/brightcontent/attachment.rb

@@ -3,13 +3,26 @@ module Brightcontent
     belongs_to :attachable, polymorphic: true, :inverse_of => :attachments
     has_attached_file :asset, :styles => lambda {|attachment| attachment.instance.attachment_styles }
     before_post_process :resize_images
+    before_create :set_position
 
-    default_scope order("id")
+    default_scope { order("position, id") }
+    scope :for_attachable, -> type, id { where(attachable_type: type.classify, attachable_id: id) }
 
     delegate :url, to: :asset
 
+    validates_attachment_content_type :asset, content_type: Brightcontent.attachment_content_types
+    validates :attachable, presence: true
     validates :asset, attachment_presence: true
 
+    def self.reposition!(positions)
+      positions.map! &:to_i
+      transaction do
+        all.each do |attachment|
+          attachment.update_column :position, positions.index(attachment.id)
+        end
+      end
+    end
+
     def attachment_styles
       default_attachment_styles.merge(user_defined_styles)
     end
@@ -34,5 +47,8 @@ module Brightcontent
       return false unless image?
     end
 
+    def set_position
+      self.position ||= self.class.for_attachable(attachable_type, attachable_id).maximum(:position).to_i + 1
+    end
   end
 end

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

@@ -1,10 +1,16 @@
-<%= div_for attachment do %>
-  <% if attachment.image? %>
-    <%= image_tag attachment.url(:brightcontent) %>
-    <%= link_to "Insert", nil, class: "insert insert_image btn btn-mini", data: { insert_image: attachment.url(:main) } %>
-  <% else %>
-    <div class="attachment-file"><%= attachment.asset_file_name %></div>
-    <%= link_to "Insert", nil, class: "insert insert_link btn btn-mini", data: { insert_url: attachment.url(:original), insert_name: attachment.asset_file_name } %>
-  <% end %>
-  <%= link_to "Delete", destroy_attachment_path(attachment.id), method: :delete, confirm: "Are you sure?", class: "delete btn btn-danger btn-mini" %>
-<% end %>
+<li class="list-group-item attachment" data-attachment-id="<%= attachment.id %>">
+  <div class="media">
+    <% if attachment.image? %>
+      <%= image_tag attachment.url(:brightcontent), class: "media-object pull-left" %>
+    <% end %>
+    <div class="media-body">
+      <h4 class="attachment-file media-heading"><%= attachment.asset_file_name %></h4>
+      <% if attachment.image? %>
+        <%= link_to "Insert", nil, class: "insert insert_image btn btn-primary btn-xs", data: { insert_image: attachment.url(:main) } %>
+      <% else %>
+        <%= link_to "Insert", nil, class: "insert insert_link btn btn-primary btn-xs", data: { insert_url: attachment.url(:original), insert_name: attachment.asset_file_name } %>
+      <% end %>
+      <%= link_to "Delete", destroy_attachment_path(attachment.id), class: "delete btn btn-danger btn-xs", method: "delete" %>
+    </div>
+  </div>
+</li>

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

@@ -1,18 +1,16 @@
-<div class="control-group optional">
-  <label class="optional control-label">Attachments</label>
-  <div class="controls">
+<div class="control-group">
+  <label class="control-label"><%=Brightcontent::Attachment.model_name.human.pluralize%></label>
+  <div class="controls" id="attachments-controls">
     <% if item.persisted? %>
-      <div id="attachments" class="clearfix">
+      <ul class="media-list" id="attachments">
         <%= render item.attachments %>
-      </div>
-
-      <input id="fileupload" type="file" name="asset" data-url="<%= new_attachment_path %>" multiple>
-      <%= hidden_field_tag "attachable_id", item.id %>
-      <%= hidden_field_tag "attachable_type", item.class.to_s %>
+      </ul>
+      <input id="fileupload" type="file" name="attachment[asset]" data-url="<%= new_attachment_path %>" class="form-control" multiple>
+      <%= hidden_field_tag "attachment[attachable_id]", item.id %>
+      <%= hidden_field_tag "attachment[attachable_type]", item.class.to_s %>
       <%= hidden_field_tag "attachable_url", attachments_path(item.class.to_s, item.id) %>
-
     <% else %>
-      First save to enable uploads
+      <p class="form-control-static"><%= t('brightcontent.save_first')%></p>
     <% end %>
   </div>
 </div>

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

@@ -0,0 +1,4 @@
+<% if item.attachments.any? %>
+  <span class="glyphicon glyphicon-paperclip"></span>
+  <%= item.attachments.count %>
+<% end %>

data/brightcontent-attachments.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "brightcontent-core", version
-  s.add_dependency "paperclip"
+  s.add_dependency "paperclip", ">= 3.0.0"
   s.add_dependency "jquery-fileupload-rails"
 
   s.add_development_dependency "sqlite3"

data/config/locales/brightcontent_attachements.en.yml

@@ -0,0 +1,8 @@
+en:
+  activerecord:
+    models:
+      brightcontent/attachment: Attachment
+
+  brightcontent:
+    save_first: First save to enable uploads
+    insert: Insert

data/config/locales/brightcontent_attachements.nl.yml

@@ -0,0 +1,8 @@
+nl:
+  activerecord:
+    models:
+      brightcontent/attachment: Bijlage
+
+  brightcontent:
+    save_first: Bewaar het item eerst voordat je kunt uploaden.
+    insert: Invoegen

data/config/routes.rb

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

data/db/migrate/20140203140819_add_position_to_attachments.rb

@@ -0,0 +1,5 @@
+class AddPositionToAttachments < ActiveRecord::Migration
+  def change
+    add_column :brightcontent_attachments, :position, :integer
+  end
+end

data/lib/brightcontent/attachments/attachable.rb

@@ -0,0 +1,16 @@
+module Brightcontent
+  module Attachments
+    module Attachable
+      extend ActiveSupport::Concern
+
+      included do
+        add_brightcontent_column :attachments
+        has_many :attachments, as: :attachable, dependent: :destroy, class_name: Brightcontent::Attachment, inverse_of: :attachable
+      end
+
+      def attachment
+        attachments.first
+      end
+    end
+  end
+end

data/lib/brightcontent/attachments/engine.rb

@@ -3,7 +3,7 @@ module Brightcontent
     class Engine < ::Rails::Engine
       initializer "Add attachments class method" do
         ActiveSupport.on_load(:active_record) do
-          include AttachmentModelExtensions
+          include ModelExtensions
         end
       end
     end

data/lib/brightcontent/attachments/model_extensions.rb

@@ -0,0 +1,16 @@
+module Brightcontent
+  module Attachments
+    module ModelExtensions
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        attr_reader :attachment_styles
+
+        def has_attached_files(styles)
+          include ::Brightcontent::Attachments::Attachable
+          @attachment_styles = styles
+        end
+      end
+    end
+  end
+end

data/lib/brightcontent/attachments.rb

@@ -5,9 +5,13 @@ require "jquery-fileupload-rails"
 require "brightcontent/attachments/engine"
 
 module Brightcontent
-  autoload :Attachable, 'brightcontent/attachable'
-  autoload :AttachmentModelExtensions, 'brightcontent/attachment_model_extensions'
+  register_extension 'attachments'
+
+  mattr_reader :attachment_content_types
+  @@attachment_content_types = [/\Aimage/, "application/pdf"]
 
   module Attachments
+    autoload :Attachable, 'brightcontent/attachments/attachable'
+    autoload :ModelExtensions, 'brightcontent/attachments/model_extensions'
   end
 end

data/lib/generators/brightcontent/attachments/install_generator.rb

@@ -2,13 +2,10 @@ module Brightcontent
   module Attachments
     module Generators
       class InstallGenerator < Rails::Generators::Base
-
         desc "Install migrations for Brightcontent Attachments"
-
         def copy_migrations
           rake "brightcontent_attachments_engine:install:migrations"
         end
-
       end
     end
   end

data/script/rails

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/brightcontent/assets/engine', __FILE__)
+ENGINE_ROOT = File.expand_path('../../../core', __FILE__)
+ENGINE_PATH = File.expand_path('../../../core/lib/brightcontent/engine', __FILE__)
 
 require 'rails/all'
 require 'rails/engine/commands'

data/spec/dummy/config/application.rb

@@ -43,15 +43,11 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = false
-
     # Enable the asset pipeline
     config.assets.enabled = true
 
+    # config.i18n.enforce_available_locales = true
+
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
   end

data/spec/dummy/config/environments/development.rb

@@ -1,14 +1,12 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
+  config.eager_load = false
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -22,13 +20,6 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 

data/spec/dummy/config/environments/production.rb

@@ -60,8 +60,4 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/spec/dummy/config/environments/test.rb

@@ -1,5 +1,6 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
+  config.eager_load = false
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -11,9 +12,6 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -29,9 +27,6 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '1582af16879d84e4319aa02ea51964c7c27576e6468838ea1bcadf1286623d44e9117613a747386fde1bc2253a9a49c291a2c100fec64ae5c2cc5c75efa553ef'
+Dummy::Application.config.secret_key_base = '1582af16879d84e4319aa02ea51964c7c27576e6468838ea1bcadf1286623d44e9117613a747386fde1bc2253a9a49c291a2c100fec64ae5c2cc5c75efa553ef'

data/spec/dummy/db/migrate/20121206121725_create_brightcontent_admin_users.rb

@@ -7,6 +7,6 @@ class CreateBrightcontentAdminUsers < ActiveRecord::Migration
       t.timestamps
     end
 
-    Brightcontent::AdminUser.create!(:email => 'admin@example.com', :password => 'password')
+    Brightcontent::AdminUser.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password')
   end
 end

data/spec/dummy/db/schema.rb

@@ -9,36 +9,37 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121222172513) do
+ActiveRecord::Schema.define(version: 20140203140819) do
 
-  create_table "blogs", :force => true do |t|
+  create_table "blogs", force: true do |t|
     t.string   "name"
     t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "brightcontent_admin_users", :force => true do |t|
+  create_table "brightcontent_admin_users", force: true do |t|
     t.string   "email"
     t.string   "password_digest"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
   end
 
-  create_table "brightcontent_attachments", :force => true do |t|
+  create_table "brightcontent_attachments", force: true do |t|
     t.integer  "attachable_id"
     t.string   "attachable_type"
     t.string   "asset_file_name"
     t.string   "asset_content_type"
     t.integer  "asset_file_size"
     t.datetime "asset_updated_at"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
+    t.datetime "created_at",         null: false
+    t.datetime "updated_at",         null: false
+    t.integer  "position"
   end
 
-  add_index "brightcontent_attachments", ["attachable_id"], :name => "index_brightcontent_attachments_on_attachable_id"
-  add_index "brightcontent_attachments", ["attachable_type"], :name => "index_brightcontent_attachments_on_attachable_type"
+  add_index "brightcontent_attachments", ["attachable_id"], name: "index_brightcontent_attachments_on_attachable_id"
+  add_index "brightcontent_attachments", ["attachable_type"], name: "index_brightcontent_attachments_on_attachable_type"
 
 end

data/spec/features/attachments_spec.rb

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

data/spec/models/brightcontent/attachable_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
 module Brightcontent
-  describe Attachable do
-    subject { Blog }
-    its(:brightcontent_columns) { should include "attachments" }
+  module Attachments
+    describe Attachable do
+      subject { Blog }
+      its(:brightcontent_columns) { should include "attachments" }
 
-    it "should have a has_many relation to attachments" do
-      Blog.reflect_on_association(:attachments).macro.should eq :has_many
-    end
+      it "should have a has_many relation to attachments" do
+        Blog.reflect_on_association(:attachments).macro.should eq :has_many
+      end
 
-    it "should have .attachment method" do
-      Blog.new.should respond_to :attachment
+      it "should have .attachment method" do
+        Blog.new.should respond_to :attachment
+      end
     end
   end
 end

data/spec/models/brightcontent/attachment_spec.rb

@@ -15,5 +15,24 @@ module Brightcontent
         its(:attachment_styles) { should == { test: "200x200", brightcontent: "100x100#", main: "200x200#" } }
       end
     end
+
+    describe ".reposition!" do
+      let!(:blog) { build_stubbed(:blog) }
+      let!(:attachment_1) { blog.attachments.create!(:asset => Rails.root.join("public/rails.png").open) }
+      let!(:attachment_2) { blog.attachments.create!(:asset => Rails.root.join("public/rails.png").open) }
+      let!(:attachment_3) { blog.attachments.create!(:asset => Rails.root.join("public/rails.png").open) }
+
+      it "reorders the attachments as specified" do
+        ids = [attachment_2.id, attachment_3.id, attachment_1.id]
+        Attachment.reposition! ids
+        blog.attachments.pluck(:id).should == ids
+      end
+
+      it "sets unspecified attachments' positions to nil" do
+        ids = [attachment_3.id, attachment_2.id]
+        Attachment.reposition! ids
+        attachment_1.reload.position.should be_nil
+      end
+    end
   end
 end

data/vendor/assets/javascripts/spin.js

@@ -0,0 +1,353 @@
+/**
+ * Copyright (c) 2011-2013 Felix Gnass
+ * Licensed under the MIT license
+ */
+(function(root, factory) {
+
+  /* CommonJS */
+  if (typeof exports == 'object')  module.exports = factory()
+
+  /* AMD module */
+  else if (typeof define == 'function' && define.amd) define(factory)
+
+  /* Browser global */
+  else root.Spinner = factory()
+}
+(this, function() {
+  "use strict";
+
+  var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */
+    , animations = {} /* Animation rules keyed by their name */
+    , useCssAnimations /* Whether to use CSS animations or setTimeout */
+
+  /**
+   * Utility function to create elements. If no tag name is given,
+   * a DIV is created. Optionally properties can be passed.
+   */
+  function createEl(tag, prop) {
+    var el = document.createElement(tag || 'div')
+      , n
+
+    for(n in prop) el[n] = prop[n]
+    return el
+  }
+
+  /**
+   * Appends children and returns the parent.
+   */
+  function ins(parent /* child1, child2, ...*/) {
+    for (var i=1, n=arguments.length; i<n; i++)
+      parent.appendChild(arguments[i])
+
+    return parent
+  }
+
+  /**
+   * Insert a new stylesheet to hold the @keyframe or VML rules.
+   */
+  var sheet = (function() {
+    var el = createEl('style', {type : 'text/css'})
+    ins(document.getElementsByTagName('head')[0], el)
+    return el.sheet || el.styleSheet
+  }())
+
+  /**
+   * Creates an opacity keyframe animation rule and returns its name.
+   * Since most mobile Webkits have timing issues with animation-delay,
+   * we create separate rules for each line/segment.
+   */
+  function addAnimation(alpha, trail, i, lines) {
+    var name = ['opacity', trail, ~~(alpha*100), i, lines].join('-')
+      , start = 0.01 + i/lines * 100
+      , z = Math.max(1 - (1-alpha) / trail * (100-start), alpha)
+      , prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase()
+      , pre = prefix && '-' + prefix + '-' || ''
+
+    if (!animations[name]) {
+      sheet.insertRule(
+        '@' + pre + 'keyframes ' + name + '{' +
+        '0%{opacity:' + z + '}' +
+        start + '%{opacity:' + alpha + '}' +
+        (start+0.01) + '%{opacity:1}' +
+        (start+trail) % 100 + '%{opacity:' + alpha + '}' +
+        '100%{opacity:' + z + '}' +
+        '}', sheet.cssRules.length)
+
+      animations[name] = 1
+    }
+
+    return name
+  }
+
+  /**
+   * Tries various vendor prefixes and returns the first supported property.
+   */
+  function vendor(el, prop) {
+    var s = el.style
+      , pp
+      , i
+
+    prop = prop.charAt(0).toUpperCase() + prop.slice(1)
+    for(i=0; i<prefixes.length; i++) {
+      pp = prefixes[i]+prop
+      if(s[pp] !== undefined) return pp
+    }
+    if(s[prop] !== undefined) return prop
+  }
+
+  /**
+   * Sets multiple style properties at once.
+   */
+  function css(el, prop) {
+    for (var n in prop)
+      el.style[vendor(el, n)||n] = prop[n]
+
+    return el
+  }
+
+  /**
+   * Fills in default values.
+   */
+  function merge(obj) {
+    for (var i=1; i < arguments.length; i++) {
+      var def = arguments[i]
+      for (var n in def)
+        if (obj[n] === undefined) obj[n] = def[n]
+    }
+    return obj
+  }
+
+  /**
+   * Returns the absolute page-offset of the given element.
+   */
+  function pos(el) {
+    var o = { x:el.offsetLeft, y:el.offsetTop }
+    while((el = el.offsetParent))
+      o.x+=el.offsetLeft, o.y+=el.offsetTop
+
+    return o
+  }
+
+  /**
+   * Returns the line color from the given string or array.
+   */
+  function getColor(color, idx) {
+    return typeof color == 'string' ? color : color[idx % color.length]
+  }
+
+  // Built-in defaults
+
+  var defaults = {
+    lines: 12,            // The number of lines to draw
+    length: 7,            // The length of each line
+    width: 5,             // The line thickness
+    radius: 10,           // The radius of the inner circle
+    rotate: 0,            // Rotation offset
+    corners: 1,           // Roundness (0..1)
+    color: '#000',        // #rgb or #rrggbb
+    direction: 1,         // 1: clockwise, -1: counterclockwise
+    speed: 1,             // Rounds per second
+    trail: 100,           // Afterglow percentage
+    opacity: 1/4,         // Opacity of the lines
+    fps: 20,              // Frames per second when using setTimeout()
+    zIndex: 2e9,          // Use a high z-index by default
+    className: 'spinner', // CSS class to assign to the element
+    top: 'auto',          // center vertically
+    left: 'auto',         // center horizontally
+    position: 'relative'  // element position
+  }
+
+  /** The constructor */
+  function Spinner(o) {
+    if (typeof this == 'undefined') return new Spinner(o)
+    this.opts = merge(o || {}, Spinner.defaults, defaults)
+  }
+
+  // Global defaults that override the built-ins:
+  Spinner.defaults = {}
+
+  merge(Spinner.prototype, {
+
+    /**
+     * Adds the spinner to the given target element. If this instance is already
+     * spinning, it is automatically removed from its previous target b calling
+     * stop() internally.
+     */
+    spin: function(target) {
+      this.stop()
+
+      var self = this
+        , o = self.opts
+        , el = self.el = css(createEl(0, {className: o.className}), {position: o.position, width: 0, zIndex: o.zIndex})
+        , mid = o.radius+o.length+o.width
+        , ep // element position
+        , tp // target position
+
+      if (target) {
+        target.insertBefore(el, target.firstChild||null)
+        tp = pos(target)
+        ep = pos(el)
+        css(el, {
+          left: (o.left == 'auto' ? tp.x-ep.x + (target.offsetWidth >> 1) : parseInt(o.left, 10) + mid) + 'px',
+          top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : parseInt(o.top, 10) + mid)  + 'px'
+        })
+      }
+
+      el.setAttribute('role', 'progressbar')
+      self.lines(el, self.opts)
+
+      if (!useCssAnimations) {
+        // No CSS animation support, use setTimeout() instead
+        var i = 0
+          , start = (o.lines - 1) * (1 - o.direction) / 2
+          , alpha
+          , fps = o.fps
+          , f = fps/o.speed
+          , ostep = (1-o.opacity) / (f*o.trail / 100)
+          , astep = f/o.lines
+
+        ;(function anim() {
+          i++;
+          for (var j = 0; j < o.lines; j++) {
+            alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity)
+
+            self.opacity(el, j * o.direction + start, alpha, o)
+          }
+          self.timeout = self.el && setTimeout(anim, ~~(1000/fps))
+        })()
+      }
+      return self
+    },
+
+    /**
+     * Stops and removes the Spinner.
+     */
+    stop: function() {
+      var el = this.el
+      if (el) {
+        clearTimeout(this.timeout)
+        if (el.parentNode) el.parentNode.removeChild(el)
+        this.el = undefined
+      }
+      return this
+    },
+
+    /**
+     * Internal method that draws the individual lines. Will be overwritten
+     * in VML fallback mode below.
+     */
+    lines: function(el, o) {
+      var i = 0
+        , start = (o.lines - 1) * (1 - o.direction) / 2
+        , seg
+
+      function fill(color, shadow) {
+        return css(createEl(), {
+          position: 'absolute',
+          width: (o.length+o.width) + 'px',
+          height: o.width + 'px',
+          background: color,
+          boxShadow: shadow,
+          transformOrigin: 'left',
+          transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)',
+          borderRadius: (o.corners * o.width>>1) + 'px'
+        })
+      }
+
+      for (; i < o.lines; i++) {
+        seg = css(createEl(), {
+          position: 'absolute',
+          top: 1+~(o.width/2) + 'px',
+          transform: o.hwaccel ? 'translate3d(0,0,0)' : '',
+          opacity: o.opacity,
+          animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1/o.speed + 's linear infinite'
+        })
+
+        if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}))
+        ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')))
+      }
+      return el
+    },
+
+    /**
+     * Internal method that adjusts the opacity of a single line.
+     * Will be overwritten in VML fallback mode below.
+     */
+    opacity: function(el, i, val) {
+      if (i < el.childNodes.length) el.childNodes[i].style.opacity = val
+    }
+
+  })
+
+
+  function initVML() {
+
+    /* Utility function to create a VML tag */
+    function vml(tag, attr) {
+      return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr)
+    }
+
+    // No CSS transforms but VML support, add a CSS rule for VML elements:
+    sheet.addRule('.spin-vml', 'behavior:url(#default#VML)')
+
+    Spinner.prototype.lines = function(el, o) {
+      var r = o.length+o.width
+        , s = 2*r
+
+      function grp() {
+        return css(
+          vml('group', {
+            coordsize: s + ' ' + s,
+            coordorigin: -r + ' ' + -r
+          }),
+          { width: s, height: s }
+        )
+      }
+
+      var margin = -(o.width+o.length)*2 + 'px'
+        , g = css(grp(), {position: 'absolute', top: margin, left: margin})
+        , i
+
+      function seg(i, dx, filter) {
+        ins(g,
+          ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}),
+            ins(css(vml('roundrect', {arcsize: o.corners}), {
+                width: r,
+                height: o.width,
+                left: o.radius,
+                top: -o.width>>1,
+                filter: filter
+              }),
+              vml('fill', {color: getColor(o.color, i), opacity: o.opacity}),
+              vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
+            )
+          )
+        )
+      }
+
+      if (o.shadow)
+        for (i = 1; i <= o.lines; i++)
+          seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)')
+
+      for (i = 1; i <= o.lines; i++) seg(i)
+      return ins(el, g)
+    }
+
+    Spinner.prototype.opacity = function(el, i, val, o) {
+      var c = el.firstChild
+      o = o.shadow && o.lines || 0
+      if (c && i+o < c.childNodes.length) {
+        c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild
+        if (c) c.opacity = val
+      }
+    }
+  }
+
+  var probe = css(createEl('group'), {behavior: 'url(#default#VML)'})
+
+  if (!vendor(probe, 'transform') && probe.adj) initVML()
+  else useCssAnimations = vendor(probe, 'animation')
+
+  return Spinner
+
+}));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-attachments
 version: !ruby/object:Gem::Version
-  version: 2.0.33
+  version: 2.1.0
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brightcontent-core
@@ -16,110 +16,110 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.33
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.33
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-fileupload-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Separate attachment resource for brightcontent
@@ -128,26 +128,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
 - app/assets/javascripts/brightcontent/.gitkeep
-- app/assets/javascripts/brightcontent/attachments.js
+- app/assets/javascripts/brightcontent/attachments.js.coffee
+- app/assets/stylesheets/brightcontent/attachments.css.scss
 - 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
+- app/views/brightcontent/base/_list_field_attachments.html.erb
 - brightcontent-attachments.gemspec
+- config/locales/brightcontent_attachements.en.yml
+- config/locales/brightcontent_attachements.nl.yml
 - config/routes.rb
 - db/migrate/20121222172513_create_attachments.rb
+- db/migrate/20140203140819_add_position_to_attachments.rb
 - lib/brightcontent-attachments.rb
-- lib/brightcontent/attachable.rb
-- lib/brightcontent/attachment_model_extensions.rb
 - lib/brightcontent/attachments.rb
+- lib/brightcontent/attachments/attachable.rb
 - lib/brightcontent/attachments/engine.rb
+- lib/brightcontent/attachments/model_extensions.rb
 - lib/generators/brightcontent/attachments/install_generator.rb
 - script/rails
 - spec/dummy/README.rdoc
@@ -208,6 +212,7 @@ files:
 - spec/models/brightcontent/attachment_spec.rb
 - spec/spec_helper.rb
 - spec/support/acceptance_helper.rb
+- vendor/assets/javascripts/spin.js
 homepage: http://brightin.nl
 licenses: []
 metadata: {}
@@ -217,17 +222,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Assets resource for brightcontent

data/app/assets/javascripts/brightcontent/attachments.js

@@ -1,14 +0,0 @@
-//= require jquery-fileupload/basic
-
-$(function () {
-
-  var request_url = $("#attachable_url").val();
-
-  $('#fileupload').fileupload({
-    done: function (e, data) {
-      $.get(request_url, function(data) {
-        $('#attachments').html(data);
-      });
-    }
-  });
-});

data/app/helpers/brightcontent/attachments_helper.rb

@@ -1,4 +0,0 @@
-module Brightcontent
-  module AttachmentsHelper
-  end
-end

data/lib/brightcontent/attachable.rb

@@ -1,15 +0,0 @@
-module Brightcontent
-  module Attachable
-    extend ActiveSupport::Concern
-
-    included do
-      add_brightcontent_column :attachments
-      has_many :attachments, as: :attachable, dependent: :destroy, class_name: Brightcontent::Attachment, :inverse_of => :attachable
-    end
-
-    def attachment
-      attachments.first
-    end
-
-  end
-end

data/lib/brightcontent/attachment_model_extensions.rb

@@ -1,13 +0,0 @@
-module Brightcontent
-  module AttachmentModelExtensions
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      attr_reader :attachment_styles
-      def has_attached_files(styles)
-        include Brightcontent::Attachable
-        @attachment_styles = styles
-      end
-    end
-  end
-end