brightcontent-assets 2.0.3 → 2.0.5

data/Gemfile.lock

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

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

@@ -1 +1,5 @@
-//= require jquery-fileupload
+//= require jquery-fileupload/basic
+
+$(function () {
+  $('#fileupload').fileupload();
+});

data/app/controllers/brightcontent/assets_controller.rb

@@ -1,16 +1,15 @@
 require_dependency "brightcontent/application_controller"
 
 module Brightcontent
-  class PagesController < BaseController
-    private
-
-    def list_fields
-      default_fields - %w{body depth lft rgt parent_id slug}
-    end
-
-    def form_fields
-      default_fields - %w{slug depth lft rgt}
+  class AssetsController < ApplicationController
+
+    def create
+      @asset = Asset.new(params.slice(:attachable_id, :attachable_type, :asset))
+      if @asset.save
+        render json: @asset.to_json, status: :created
+      else
+        render json: @asset.errors, status: :unprocessable_entity
+      end
     end
-
   end
 end

data/app/models/brightcontent/asset.rb

@@ -1,5 +1,7 @@
 module Brightcontent
   class Asset < ActiveRecord::Base
+    attr_accessible :attachable_id, :attachable_type, :asset
+
     belongs_to :attachable, :polymorphic => true
     has_attached_file :asset
 

data/app/views/brightcontent/assets/_form_field.html.erb

@@ -5,9 +5,9 @@
     <% end %>
   </div>
 
-  <%= form_for item.assets.new, remote: true do |p| %>
-    <%= p.file_field :asset %>
-  <% end %>
+  <input id="fileupload" type="file" name="asset" data-url="<%= brightcontent_assets_path %>" multiple>
+  <%= hidden_field_tag "attachable_id", item.id %>
+  <%= hidden_field_tag "attachable_type", item.class.to_s %>
 <% else %>
   First save to enable uploads
 <% end %>

data/config/routes.rb

@@ -1,3 +1,3 @@
 Brightcontent::Engine.routes.draw do
-  resources :assets, only: [:create, :destroy]
+  put 'brightcontent_assets' => 'assets#create'
 end

data/lib/brightcontent/assets.rb

@@ -1,5 +1,6 @@
 require "brightcontent-core"
 require "paperclip"
+require "jquery-fileupload-rails"
 
 require "brightcontent/assets/engine"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-assets
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brightcontent-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,16 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- 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
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/004/original/icon-calendar.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/005/original/icon-iphone.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/006/original/icon-socialmedia.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/007/original/iphone.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/008/original/logo.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/009/original/menu-button.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/010/original/bestuur.jpg
 - spec/dummy/script/rails
 - spec/factories.rb
 - spec/features/assets_spec.rb
@@ -222,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1664730842358737560
+      hash: 3665897338164839893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1664730842358737560
+      hash: 3665897338164839893
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -277,6 +287,16 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- 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
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/004/original/icon-calendar.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/005/original/icon-iphone.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/006/original/icon-socialmedia.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/007/original/iphone.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/008/original/logo.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/009/original/menu-button.png
+- spec/dummy/public/system/brightcontent/assets/assets/000/000/010/original/bestuur.jpg
 - spec/dummy/script/rails
 - spec/factories.rb
 - spec/features/assets_spec.rb