fassets_core 0.3.1 → 0.4.0

data/app/assets/javascripts/fassets_core/add_asset_box.js

@@ -53,25 +53,6 @@ $(document).ready(function(){
       $.fancybox.resize();
       $.fancybox.hideActivity();
     });
-    $("#fancybox-content .asset_create_button").click(function(event){
-      event.preventDefault();
-      $.fancybox.showActivity();
-      var action = $("#add_asset_content form").attr("action");
-      $.post(action, $("#add_asset_content form").serialize(), function(data){
-        $("#fancybox-content #add_asset_content").load(data[0].edit_box_url+"?type="+data[0].content_type);
-      });
-      reload_tray();
-      $.fancybox.resize();;
-      $.fancybox.hideActivity();
-    });
-    $("#fancybox-content .asset_submit_button").click(function(event){
-      event.preventDefault();
-      $.fancybox.showActivity();
-      //var token = encodeURIComponent(AUTH_TOKEN)
-      var asset_type = $(event.target).data("asset-type");
-      reload_tray();
-      $.fancybox.hideActivity();
-    });
     $("form.edit_classification input[type=submit][value=Save]").hide();
   };
 
@@ -80,22 +61,4 @@ $(document).ready(function(){
     event.preventDefault();
     show_asset_box();
   });
-  var reload_tray = function() {
-    var user_id = $("#tray").data("user-id");
-    $("#tray").load("/users/"+user_id+"/tray_positions/", function() {
-      $('#tray .drop_button').click(function(event){
-        event.preventDefault();
-        var user_id = $(event.target).data("user-id");
-        var tp_id = $(event.target).data("tp-id");
-        $.ajax({
-          type: 'DELETE',
-          cache	: false,
-          url		: "/users/"+user_id+"/tray_positions/"+tp_id,
-          success: function(data) {
-            $("#tray").load("/users/"+user_id+"/tray_positions/");
-          }
-        });
-      });
-    });
-  };
 });

data/app/assets/javascripts/fassets_core/facets.js.erb

@@ -24,8 +24,3 @@ $(function(){
 
   $('.best_in_place').best_in_place();
 });
-
-/*$.ajax({
-	data:$(this).sortable('serialize') + '&_method=put',
-	type:'post', url:'/users/1/tray'
-})*/

data/app/assets/javascripts/fassets_core/form.js

@@ -0,0 +1,26 @@
+$(document).ready(function(){
+  $(document).bind('ajax:success', function(evt, xhr, status){
+    reload_tray();
+    $('form').find('.errors').empty();
+    $.fancybox.close();
+    $("img[src=\"/assets/fassets_core/collapse.png\"].collapseExpandToggle").click();
+    $("#catalogs_list").load("/catalogs");
+  });
+  $(document).bind('ajax:error', function(evt, xhr, status, error){
+    var responseObject = $.parseJSON(xhr.responseText),
+        errors = new Object();
+
+    $('form').find('.errors').empty();
+    $.each(responseObject.errors, function(key, val){
+      var field = key;
+      errors[field] = $('<ul />');
+      $.each(val, function(){
+        errors[field].append('<li>' + this + '</li>');
+      });
+    });
+
+    $.each(errors, function(key, val){
+      $('form').find('#'+ key.replace('.','_') +'.errors').html(val);
+    });
+  });
+});

data/app/assets/javascripts/fassets_core/index.js

@@ -13,6 +13,7 @@
 //= require ./classification
 //= require ./edit_box
 //= require ./facets
+//= require ./form
 //= require ./tray
 
 $.ajaxSetup({ 'beforeSend': function(xhr) {

data/app/assets/javascripts/fassets_core/tray.js

@@ -1,3 +1,22 @@
+function reload_tray() {
+  var user_id = $("#tray").data("user-id");
+  $("#tray").load("/users/"+user_id+"/tray_positions/", function() {
+    $('#tray .drop_button').click(function(event){
+      event.preventDefault();
+      var user_id = $(event.target).data("user-id");
+      var tp_id = $(event.target).data("tp-id");
+      $.ajax({
+        type: 'DELETE',
+        cache : false,
+        url           : "/users/"+user_id+"/tray_positions/"+tp_id,
+        success: function(data) {
+          $("#tray").load("/users/"+user_id+"/tray_positions/");
+        }
+      });
+    });
+  });
+};
+
 $(document).ready(function(){
   $('#tray ol').sortable({
     items: 'li',

data/app/assets/stylesheets/fassets_core/add_asset_box.css.scss

@@ -50,28 +50,9 @@
   top: 5px;
   width: 20%;
 }
-.wiki_results {
-  display: inline;
-}
-.wiki_img {
-  background: silver;
-  float: left;
-  margin: 5px;
-}
-#file_asset_form{
-  width: 90%;
-  height: 50%;
-  padding-right: 10px;
-  float: left;
-}
 #edit_asset_content{
   width: 98%;
   height: 48%;
   //float: left;
 }
-.wiki_image{
-  float:left;
-}
-.wiki_actions{
-  padding-left: 5px;
-}
+

data/app/assets/stylesheets/fassets_core/forms.css.scss

@@ -7,6 +7,19 @@
     .submit {
       margin-top: 1em;
     }
+
+    span.errors {
+      ul {
+        display: inline;
+
+        li {
+          display: inline;
+          color: red;
+        }
+        li:after { content: ", "; }
+        li:last-child:after { content: ""; }
+      }
+    }
   }
 }
 

data/app/controllers/assets_controller.rb

@@ -27,11 +27,11 @@ class AssetsController < FassetsCore::ApplicationController
         @classification = Classification.new(:catalog_id => params["classification"]["catalog_id"],:asset_id => @content.asset.id)
         @classification.save
         flash[:notice] = "Created new asset!"
-        format.js { render :json => @content.to_jq_upload.merge({:status => :ok}).to_json }
+        format.js { render :nothing => true }
         format.html { redirect_to edit_asset_content_path(@content) }
       else
         flash[:error] = "Could not create asset!"
-        format.js { render :json => {:errors => @content.errors.messages}.to_json }
+        format.js { render :json => {:errors => @content.errors.messages}.to_json, :status => :unprocessable_entity }
         format.html do
           render :template => 'assets/new'
         end
@@ -45,18 +45,30 @@ class AssetsController < FassetsCore::ApplicationController
     render :template => 'assets/edit', :layout => !(params["content_only"])
   end
   def update
-    if @content.update_attributes(content_params) and @content.asset.update_attributes(params["asset"])
+    @content.update_attributes(content_params)
+    @content.asset.update_attributes(params["asset"])
+    if @content.save
       flash[:notice] = "Succesfully updated asset!"
       render :nothing => true
     else
-      flash[:error] = "Could not update asset!"
-      render :template => 'assets/edit'
+      respond_to do |format|
+        format.js { render :json => {:errors => @content.errors.messages}.to_json, :status => :unprocessable_entity }
+        format.html do
+          flash[:error] = "Could not update asset!"
+          render :template => 'assets/edit'
+        end
+      end
     end
   end
   def destroy
-    flash[:notice] = "Asset has been deleted!"
     @content.destroy
-    redirect_to main_app.root_url
+    respond_to do |format|
+      format.js { render :nothing => true }
+      format.html do
+        flash[:notice] = "Asset has been deleted!"
+        redirect_to main_app.root_url
+      end
+    end
   end
   def preview
     render :partial => content_model.to_s.underscore.pluralize + "/" + @content.media_type.to_s.underscore + "_preview"

data/app/controllers/catalogs_controller.rb

@@ -18,15 +18,25 @@ class CatalogsController < FassetsCore::ApplicationController
     @catalog = Catalog.new(params[:catalog])
     if @catalog.save
       create_type_facet()
-      flash[:notice] = "Catalog was successfully created."
-      redirect_to catalogs_path
+      respond_to do |format|
+        format.html do
+          flash[:notice] = "Catalog was successfully created."
+          redirect_to catalogs_path
+        end
+        format.js { render :nothing => true }
+      end
     else
-      if params[:catalog][:title].blank?
-        flash[:error] = "Catalog could not be created! Title cannot be empty!"
-      else
-        flash[:error] = "Catalog could not be created!"
+      respond_to do |format|
+        format.html do
+          if params[:catalog][:title].blank?
+            flash[:error] = "Catalog could not be created! Title cannot be empty!"
+          else
+            flash[:error] = "Catalog could not be created!"
+          end
+          render :template => 'catalogs/index'
+        end
+        format.js { render :json => {:errors => @catalog.errors.messages}.to_json, :status => :unprocessable_entity }
       end
-      render :template => 'catalogs/index'
     end
   end
   def edit

data/app/views/assets/_form.html.haml

@@ -8,21 +8,22 @@
         %span.action
           =button_to "Delete", asset_content_path(@content),
             :method => :delete,
-            :onclick => "return confirm('Are you sure?')",
-            :class => "delete_asset_button"
+            :confirm => "Are you sure?",
+            :class => "delete_asset_button",
+            :remote => true
           =render :partial => "assets/put_on_tray"
           =render :partial => "#{@content.class.to_s.underscore.pluralize}/actions" rescue nil
   #asset_preview
-    =render content_partial(@content, :preview)
+    =render :partial => content_partial(@content, :preview), :locals => {:content => @content}
 
 #asset_form
-  =form_for @content, :url => asset_content_path(@content), :html => {:class => "fassets_core asset_form", :multipart => true} do |f|
+  =form_for @content, :url => asset_content_path(@content), :html => {:class => "fassets_core asset_form"}, :remote => true do |f|
     =render :partial => "shared/error", :locals => {:target => @content}
     =fields_for "asset", @content.asset do |asset|
       %p
         %label{:for => 'name'} Name:
         =asset.text_field :name
-        #name_warning
+        %span#asset_name.errors
     =render :partial => "#{@content.class.to_s.underscore.pluralize}/form", :locals => {:new => new}, :object => f
     =submit_tag @content.new_record? ? "Create" : "Save",
       :class => "asset_submit_button",

data/app/views/assets/edit.html.haml

@@ -1,13 +1,3 @@
-=content_for :h1 do
-  #type
-    =@content.media_type.capitalize
-  #title
-    =link_to @content.asset.name, asset_content_path(@content)
-  #action
-    %span.action
-      =button_to "Delete", asset_content_path(@content), :method => :delete, :onclick => "return confirm('Are you sure?')"
-      =render :partial => "assets/put_on_tray"
-
 #sidebar.fassets_core
   =render :partial => "assets/classification", :locals => {:asset => @content.asset}
   =render :partial => "#{@content.class.to_s.underscore.pluralize}/sidebar"

data/app/views/assets/new.html.haml

@@ -12,13 +12,12 @@
   -unless @content.nil?
     #add_asset_content
       #main.fassets_core
-        =form_for @content, :url => asset_content_path(@content),:html => {:multipart => true} do |f|
-          =render :partial => "shared/error", :locals => {:target => @content}
+        =form_for @content, :url => asset_content_path(@content), :remote => true do |f|
           =fields_for "asset" do |asset|
             %p
               %label{:for => 'name'} Name:
               =asset.text_field :name
-              #name_warning
+              %span#asset_name.errors
           %p
             %label{:for => 'catalog_id'} Catalog:
             =select("classification", "catalog_id", Catalog.all.inject([]){|m,c| m << [c.title, c.id]})

data/app/views/assets/show.html.haml

@@ -1,5 +1,5 @@
 #asset_preview
-  =render content_partial(@content, :preview)
+  =render :partial => content_partial(@content, :preview), :locals{content => @content}
 
 =content_for :h1 do
   #type

data/app/views/catalogs/_form.html.haml

@@ -1,6 +1,7 @@
 %p
   %label{:for => 'title'} Title:
   =text_field :catalog, :title
+  %span#title.errors
 %p
   %label{:for => 'info'} Info:
   =text_area :catalog, :info, :rows => 4

data/app/views/catalogs/index.html.haml

@@ -1,17 +1,16 @@
-=content_for :h1 do
-  Fassets Development
 #sidebar.fassets_core
   -if user_signed_in?
     .collapsible
       %h2.title New Catalog
-      =form_for Catalog.new, :url => catalogs_path do |f|
+      =form_for Catalog.new, :url => catalogs_path, :remote => true do |f|
         =render :partial => "form", :object => f
         =submit_tag "Create"
-  %ul.collection
-    -Catalog.all.each do |catalog|
-      %li
-        =link_to(catalog.title, catalog_path(catalog))
-        .content=catalog.info
+  #catalogs_list
+    %ul.collection
+      -Catalog.all.each do |catalog|
+        %li
+          =link_to(catalog.title, catalog_path(catalog))
+          .content=catalog.info
 
 #main
 

data/app/views/catalogs/index.js.haml

@@ -0,0 +1,5 @@
+%ul.collection
+  -Catalog.all.each do |catalog|
+    %li
+      =link_to(catalog.title, catalog_path(catalog))
+      .content=catalog.info

data/lib/fassets_core/test_helper/every_assets_controller.rb

@@ -47,11 +47,23 @@ shared_examples_for "Every AssetsController" do
     end
 
     describe "DELETE asset" do
-      it "should delete the asset and show a notice" do
-        delete "destroy", additional_request_params.merge({ :id => asset.id })
-        assigns(:content).should respond_to(:destroy).with(0).arguments
-        response.should redirect_to root_path
-        request.flash[:notice].should =~ /^Asset has been deleted!$/
+      context "HTML request" do
+        it "should delete the asset and show a notice" do
+          delete "destroy", additional_request_params.merge({ :id => asset.id })
+          assigns(:content).should respond_to(:destroy).with(0).arguments
+          response.should redirect_to root_path
+          request.flash[:notice].should =~ /^Asset has been deleted!$/
+        end
+      end
+
+      context "JS request" do
+        it "should delete the asset" do
+          delete "destroy", additional_request_params.merge({ :id => asset.id, :format => :js })
+          assigns(:content).should respond_to(:destroy).with(0).arguments
+          response.should be_success
+          response.body.strip.should be_empty
+          request.flash.should be_empty
+        end
       end
     end
 
@@ -66,12 +78,29 @@ shared_examples_for "Every AssetsController" do
       end
 
       it "should throw an error when update fails" do
-        controller.instance_eval { @content.stub!(:update_attributes) { false } }
-        post 'update', additional_request_params.merge({ :id => asset.id })
+        controller.instance_eval { @content.stub!(:save) { false } }
+        post 'update', additional_request_params.merge({ :id => asset.id, :asset => { :name => "" } })
         assigns(:content).should respond_to(:update_attributes).with(1).argument
         request.flash[:error].should =~ /^Could not update asset!$/
         response.should render_template 'assets/edit'
       end
+
+      context "JS request" do
+        it "should fail with empty name for asset" do
+          controller.instance_eval do
+            @content.stub!(:save) { false }
+            @content.stub!(:errors) { Asset.create(:content_type => "Test").errors }
+          end
+          post 'update', additional_request_params.merge({ :id => asset.id, :format => :js, :asset => { :name => "" } })
+          response.status.should == 422
+          json = JSON.parse(response.body)
+          #HACK: in fact this should be 'asset.name'
+          #but errors needed to be stubbed and I’m not sure how exactly I can do this
+          json["errors"].should have_key("name")
+          json["errors"]["name"].first.should == "can't be blank"
+        end
+
+      end
     end
   end
 
@@ -123,14 +152,15 @@ shared_examples_for "Every AssetsController" do
           post 'create', additional_request_params.merge(p)
           content = assigns(:content)
           content.errors.messages.should == {}
-          JSON.parse(response.body).class.should == Hash
-          JSON.parse(response.body)["status"].should == "ok"
+          response.should be_success
+          response.body.strip.should be_empty
         end
 
         it "should fail when asset cannot be saved" do
           p = meta_data
           post 'create', additional_request_params.merge(p).merge({:format => :js})
           JSON.parse(response.body)["errors"].should_not be_nil
+          response.status.should == 422
         end
       end
     end
@@ -142,6 +172,7 @@ module FassetsCore::TestHelpers
     my_a = asset
     my_a.stub!(:destroy)
     my_a.stub!(:update_attributes) { true }
+    my_a.stub!(:save) { true }
     my_a.stub!(:asset) { double(Asset, :update_attributes => true, :name => "Example Asset") }
     controller.stub!(:find_content) { }
     controller.instance_eval { @content = my_a }

data/lib/fassets_core/version.rb

@@ -1,3 +1,3 @@
 module FassetsCore
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fassets_core
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70371960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,15 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70371960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70370570 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70370570
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70368760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70368760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70366260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70364470 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364470
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fancybox-rails
-  requirement: &70308590 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308590
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: best_in_place
-  requirement: &70306510 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306510
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70305300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70304440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +150,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70303720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +166,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70318590 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +182,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318590
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70315710 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +198,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315710
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A facetted classification framework for digital assets.
 email:
 - julian@svg4all.de
@@ -152,178 +212,180 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/helpers/fassets_core/application_helper.rb
+- app/helpers/catalogs_helper.rb
 - app/helpers/classifications_helper.rb
 - app/helpers/tray_positions_helper.rb
-- app/helpers/labels_helper.rb
-- app/helpers/catalogs_helper.rb
 - app/helpers/assets_helper.rb
-- app/helpers/fassets_core/application_helper.rb
-- app/controllers/tray_positions_controller.rb
-- app/controllers/labels_controller.rb
-- app/controllers/facets_controller.rb
-- app/controllers/catalogs_controller.rb
-- app/controllers/fassets_core/application_controller.rb
-- app/controllers/assets_controller.rb
-- app/controllers/classifications_controller.rb
-- app/models/asset.rb
-- app/models/classification.rb
-- app/models/label_filter.rb
-- app/models/tray_position.rb
-- app/models/facet.rb
-- app/models/catalog.rb
-- app/models/label.rb
-- app/models/labeling.rb
+- app/helpers/labels_helper.rb
+- app/views/labels/_form.haml
+- app/views/labels/destroy.js.erb
+- app/views/labels/_sidebar.html.haml
+- app/views/tray_positions/destroy.js.rjs
+- app/views/tray_positions/create.js.rjs
+- app/views/tray_positions/sort.js.rjs
 - app/views/layouts/fassets_core/application.html.haml
+- app/views/catalogs/index.js.haml
 - app/views/catalogs/show.html.haml
-- app/views/catalogs/_form.html.haml
-- app/views/catalogs/_box_content.html.haml
 - app/views/catalogs/index.html.haml
-- app/views/catalogs/box.html.haml
+- app/views/catalogs/new.html.haml
 - app/views/catalogs/_facet.html.haml
 - app/views/catalogs/edit.html.haml
+- app/views/catalogs/_box_content.html.haml
+- app/views/catalogs/_box_catalog_list.html.haml
+- app/views/catalogs/_form.html.haml
+- app/views/catalogs/box.html.haml
 - app/views/catalogs/_filter_item.html.haml
-- app/views/catalogs/new.html.haml
 - app/views/catalogs/_catalog.html.haml
-- app/views/catalogs/_box_catalog_list.html.haml
-- app/views/labels/_form.haml
-- app/views/labels/_sidebar.html.haml
-- app/views/labels/destroy.js.erb
 - app/views/classifications/update.js.erb
-- app/views/shared/_error.html.haml
-- app/views/shared/_clipboard.html.haml
-- app/views/shared/_asset_form.html.haml
-- app/views/shared/_tray.html.haml
-- app/views/shared/_classification.html.haml
-- app/views/shared/_tray_position.html.haml
-- app/views/shared/_asset.html.haml
-- app/views/shared/_flash_messages.html.haml
-- app/views/facets/_form.html.haml
-- app/views/facets/edit.html.haml
 - app/views/assets/show.html.haml
-- app/views/assets/_form.html.haml
 - app/views/assets/_add_asset_sidebar.html.haml
+- app/views/assets/_classification.html.haml
+- app/views/assets/new.html.haml
 - app/views/assets/edit.html.haml
+- app/views/assets/_form.html.haml
 - app/views/assets/_put_on_tray.html.haml
-- app/views/assets/new.html.haml
-- app/views/assets/_classification.html.haml
-- app/views/tray_positions/sort.js.rjs
-- app/views/tray_positions/destroy.js.rjs
-- app/views/tray_positions/create.js.rjs
-- app/assets/javascripts/fassets_core/assets.js
-- app/assets/javascripts/fassets_core/classification.js
-- app/assets/javascripts/fassets_core/edit_box.js
-- app/assets/javascripts/fassets_core/add_asset_box.js
-- app/assets/javascripts/fassets_core/facets.js.erb
-- app/assets/javascripts/fassets_core/catalogs.js
-- app/assets/javascripts/fassets_core/index.js
-- app/assets/javascripts/fassets_core/catalog_box.js
-- app/assets/javascripts/fassets_core/tray.js
-- app/assets/stylesheets/fassets_core/add_asset_box.css.scss
-- app/assets/stylesheets/fassets_core/forms.css.scss
-- app/assets/stylesheets/fassets_core/index.css
-- app/assets/stylesheets/fassets_core/master.css.scss
-- app/assets/stylesheets/fassets_core/sidebar.css.scss
-- app/assets/stylesheets/fassets_core/assets.css.scss
-- app/assets/stylesheets/fassets_core/edit_box.css.scss
-- app/assets/stylesheets/fassets_core/tray.css.scss
-- app/assets/stylesheets/fassets_core/catalog_box.css.scss
-- app/assets/stylesheets/fassets_core/filter.css.scss
-- app/assets/stylesheets/fassets_core/labels.css.scss
-- app/assets/stylesheets/fassets_core/facet.css.scss
-- app/assets/stylesheets/fassets_core/collapsible.css.scss
+- app/views/facets/edit.html.haml
+- app/views/facets/_form.html.haml
+- app/views/shared/_asset_form.html.haml
+- app/views/shared/_flash_messages.html.haml
+- app/views/shared/_clipboard.html.haml
+- app/views/shared/_classification.html.haml
+- app/views/shared/_error.html.haml
+- app/views/shared/_asset.html.haml
+- app/views/shared/_tray_position.html.haml
+- app/views/shared/_tray.html.haml
+- app/controllers/fassets_core/application_controller.rb
+- app/controllers/assets_controller.rb
+- app/controllers/classifications_controller.rb
+- app/controllers/labels_controller.rb
+- app/controllers/tray_positions_controller.rb
+- app/controllers/facets_controller.rb
+- app/controllers/catalogs_controller.rb
 - app/assets/images/fassets_core/delete.png
+- app/assets/images/fassets_core/markup_preview.png
+- app/assets/images/fassets_core/drag.png
 - app/assets/images/fassets_core/archive.png
 - app/assets/images/fassets_core/clipboard.png
-- app/assets/images/fassets_core/remove.png
-- app/assets/images/fassets_core/collapsed.png
 - app/assets/images/fassets_core/add.png
-- app/assets/images/fassets_core/edit.png
-- app/assets/images/fassets_core/collapse.png
 - app/assets/images/fassets_core/link.png
-- app/assets/images/fassets_core/markup_preview.png
+- app/assets/images/fassets_core/sort.png
+- app/assets/images/fassets_core/remove.png
 - app/assets/images/fassets_core/warning.png
-- app/assets/images/fassets_core/drag.png
+- app/assets/images/fassets_core/collapsed.png
+- app/assets/images/fassets_core/collapse.png
+- app/assets/images/fassets_core/edit.png
 - app/assets/images/fassets_core/classify.png
-- app/assets/images/fassets_core/sort.png
-- config/initializers/users.rb
+- app/assets/stylesheets/fassets_core/facet.css.scss
+- app/assets/stylesheets/fassets_core/forms.css.scss
+- app/assets/stylesheets/fassets_core/index.css
+- app/assets/stylesheets/fassets_core/add_asset_box.css.scss
+- app/assets/stylesheets/fassets_core/tray.css.scss
+- app/assets/stylesheets/fassets_core/edit_box.css.scss
+- app/assets/stylesheets/fassets_core/assets.css.scss
+- app/assets/stylesheets/fassets_core/collapsible.css.scss
+- app/assets/stylesheets/fassets_core/filter.css.scss
+- app/assets/stylesheets/fassets_core/master.css.scss
+- app/assets/stylesheets/fassets_core/catalog_box.css.scss
+- app/assets/stylesheets/fassets_core/labels.css.scss
+- app/assets/stylesheets/fassets_core/sidebar.css.scss
+- app/assets/javascripts/fassets_core/form.js
+- app/assets/javascripts/fassets_core/assets.js
+- app/assets/javascripts/fassets_core/tray.js
+- app/assets/javascripts/fassets_core/index.js
+- app/assets/javascripts/fassets_core/catalog_box.js
+- app/assets/javascripts/fassets_core/add_asset_box.js
+- app/assets/javascripts/fassets_core/facets.js.erb
+- app/assets/javascripts/fassets_core/classification.js
+- app/assets/javascripts/fassets_core/edit_box.js
+- app/assets/javascripts/fassets_core/catalogs.js
+- app/models/asset.rb
+- app/models/labeling.rb
+- app/models/tray_position.rb
+- app/models/facet.rb
+- app/models/label_filter.rb
+- app/models/catalog.rb
+- app/models/classification.rb
+- app/models/label.rb
+- config/routes.rb
 - config/initializers/uploader.rb
+- config/initializers/users.rb
 - config/initializers/mime_types.rb
-- config/routes.rb
-- db/migrate/007_create_tray_positions.rb
-- db/migrate/017_add_clipboard.rb
-- db/migrate/001_create_catalogs.rb
-- db/migrate/006_create_labelings.rb
-- db/migrate/20120803150826_add_position_to_facet.rb
-- db/migrate/008_create_assets.rb
 - db/migrate/002_create_facets.rb
-- db/migrate/005_create_classifications.rb
+- db/migrate/006_create_labelings.rb
 - db/migrate/003_create_labels.rb
+- db/migrate/005_create_classifications.rb
 - db/migrate/010_add_label_ordering.rb
+- db/migrate/20120803150826_add_position_to_facet.rb
+- db/migrate/007_create_tray_positions.rb
+- db/migrate/008_create_assets.rb
+- db/migrate/001_create_catalogs.rb
+- db/migrate/017_add_clipboard.rb
 - db/schema.rb
 - db/seeds.rb
 - lib/acts_as_asset.rb
-- lib/fassets_core.rb
-- lib/tasks/cucumber.rake
-- lib/tasks/fassets-core_tasks.rake
+- lib/fassets_core/version.rb
+- lib/fassets_core/engine.rb
+- lib/fassets_core/plugins.rb
 - lib/fassets_core/test_helper/acts_as_asset.rb
-- lib/fassets_core/test_helper/every_authenticated_controller.rb
 - lib/fassets_core/test_helper/every_assets_controller.rb
+- lib/fassets_core/test_helper/every_authenticated_controller.rb
 - lib/fassets_core/test_helper.rb
-- lib/fassets_core/engine.rb
-- lib/fassets_core/version.rb
-- lib/fassets_core/plugins.rb
+- lib/fassets_core.rb
+- lib/tasks/cucumber.rake
+- lib/tasks/fassets-core_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.md
-- test/integration/navigation_test.rb
 - test/fassets-core_test.rb
-- test/unit/image_asset_test.rb
-- test/unit/tray_position_test.rb
-- test/unit/catalog_test.rb
-- test/unit/labelling_test.rb
-- test/unit/slide_test.rb
-- test/unit/asset_content_test.rb
-- test/unit/topic_test.rb
-- test/unit/user_test.rb
-- test/unit/frame_test.rb
-- test/unit/asset_test.rb
-- test/unit/facet_test.rb
-- test/unit/label_test.rb
-- test/unit/classification_test.rb
-- test/unit/slot_test.rb
-- test/unit/presentation_test.rb
-- test/test_helper.rb
-- test/fixtures/labels.yml
-- test/fixtures/catalogs.yml
-- test/fixtures/labellings.yml
-- test/fixtures/tray_positions.yml
-- test/fixtures/slides.yml
-- test/fixtures/assets.yml
-- test/fixtures/topics.yml
-- test/fixtures/frames.yml
-- test/fixtures/facets.yml
-- test/fixtures/image_assets.yml
-- test/fixtures/classifications.yml
-- test/fixtures/users.yml
-- test/fixtures/slots.yml
-- test/fixtures/asset_contents.yml
-- test/fixtures/presentations.yml
-- test/functional/users_controller_test.rb
-- test/functional/tray_positions_controller_test.rb
-- test/functional/classifications_controller_test.rb
 - test/functional/slots_controller_test.rb
-- test/functional/labellings_controller_test.rb
-- test/functional/catalogs_controller_test.rb
 - test/functional/files_controller_test.rb
+- test/functional/catalogs_controller_test.rb
+- test/functional/labellings_controller_test.rb
+- test/functional/tray_positions_controller_test.rb
+- test/functional/assets_controller_test.rb
 - test/functional/presentations_controller_test.rb
+- test/functional/classifications_controller_test.rb
+- test/functional/users_controller_test.rb
 - test/functional/sessions_controller_test.rb
-- test/functional/facets_controller_test.rb
-- test/functional/urls_controller_test.rb
-- test/functional/assets_controller_test.rb
 - test/functional/labels_controller_test.rb
-- test/functional/slides_controller_test.rb
 - test/functional/file_assets_controller_test.rb
+- test/functional/urls_controller_test.rb
+- test/functional/facets_controller_test.rb
+- test/functional/slides_controller_test.rb
 - test/functional/content_controller_test.rb
+- test/fixtures/catalogs.yml
+- test/fixtures/slides.yml
+- test/fixtures/topics.yml
+- test/fixtures/classifications.yml
+- test/fixtures/labellings.yml
+- test/fixtures/presentations.yml
+- test/fixtures/facets.yml
+- test/fixtures/slots.yml
+- test/fixtures/frames.yml
+- test/fixtures/users.yml
+- test/fixtures/asset_contents.yml
+- test/fixtures/labels.yml
+- test/fixtures/assets.yml
+- test/fixtures/image_assets.yml
+- test/fixtures/tray_positions.yml
+- test/test_helper.rb
+- test/unit/tray_position_test.rb
+- test/unit/catalog_test.rb
+- test/unit/frame_test.rb
+- test/unit/asset_test.rb
+- test/unit/presentation_test.rb
+- test/unit/topic_test.rb
+- test/unit/user_test.rb
+- test/unit/labelling_test.rb
+- test/unit/slot_test.rb
+- test/unit/facet_test.rb
+- test/unit/slide_test.rb
+- test/unit/image_asset_test.rb
+- test/unit/classification_test.rb
+- test/unit/label_test.rb
+- test/unit/asset_content_test.rb
+- test/integration/navigation_test.rb
 - test/performance/browsing_test.rb
 homepage: https://github.com/fassets/
 licenses: []
@@ -339,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 520050769
+      hash: 2183292788371298868
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -348,61 +410,61 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 520050769
+      hash: 2183292788371298868
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A facetted classification framework for digital assets.
 test_files:
-- test/integration/navigation_test.rb
 - test/fassets-core_test.rb
-- test/unit/image_asset_test.rb
-- test/unit/tray_position_test.rb
-- test/unit/catalog_test.rb
-- test/unit/labelling_test.rb
-- test/unit/slide_test.rb
-- test/unit/asset_content_test.rb
-- test/unit/topic_test.rb
-- test/unit/user_test.rb
-- test/unit/frame_test.rb
-- test/unit/asset_test.rb
-- test/unit/facet_test.rb
-- test/unit/label_test.rb
-- test/unit/classification_test.rb
-- test/unit/slot_test.rb
-- test/unit/presentation_test.rb
-- test/test_helper.rb
-- test/fixtures/labels.yml
-- test/fixtures/catalogs.yml
-- test/fixtures/labellings.yml
-- test/fixtures/tray_positions.yml
-- test/fixtures/slides.yml
-- test/fixtures/assets.yml
-- test/fixtures/topics.yml
-- test/fixtures/frames.yml
-- test/fixtures/facets.yml
-- test/fixtures/image_assets.yml
-- test/fixtures/classifications.yml
-- test/fixtures/users.yml
-- test/fixtures/slots.yml
-- test/fixtures/asset_contents.yml
-- test/fixtures/presentations.yml
-- test/functional/users_controller_test.rb
-- test/functional/tray_positions_controller_test.rb
-- test/functional/classifications_controller_test.rb
 - test/functional/slots_controller_test.rb
-- test/functional/labellings_controller_test.rb
-- test/functional/catalogs_controller_test.rb
 - test/functional/files_controller_test.rb
+- test/functional/catalogs_controller_test.rb
+- test/functional/labellings_controller_test.rb
+- test/functional/tray_positions_controller_test.rb
+- test/functional/assets_controller_test.rb
 - test/functional/presentations_controller_test.rb
+- test/functional/classifications_controller_test.rb
+- test/functional/users_controller_test.rb
 - test/functional/sessions_controller_test.rb
-- test/functional/facets_controller_test.rb
-- test/functional/urls_controller_test.rb
-- test/functional/assets_controller_test.rb
 - test/functional/labels_controller_test.rb
-- test/functional/slides_controller_test.rb
 - test/functional/file_assets_controller_test.rb
+- test/functional/urls_controller_test.rb
+- test/functional/facets_controller_test.rb
+- test/functional/slides_controller_test.rb
 - test/functional/content_controller_test.rb
+- test/fixtures/catalogs.yml
+- test/fixtures/slides.yml
+- test/fixtures/topics.yml
+- test/fixtures/classifications.yml
+- test/fixtures/labellings.yml
+- test/fixtures/presentations.yml
+- test/fixtures/facets.yml
+- test/fixtures/slots.yml
+- test/fixtures/frames.yml
+- test/fixtures/users.yml
+- test/fixtures/asset_contents.yml
+- test/fixtures/labels.yml
+- test/fixtures/assets.yml
+- test/fixtures/image_assets.yml
+- test/fixtures/tray_positions.yml
+- test/test_helper.rb
+- test/unit/tray_position_test.rb
+- test/unit/catalog_test.rb
+- test/unit/frame_test.rb
+- test/unit/asset_test.rb
+- test/unit/presentation_test.rb
+- test/unit/topic_test.rb
+- test/unit/user_test.rb
+- test/unit/labelling_test.rb
+- test/unit/slot_test.rb
+- test/unit/facet_test.rb
+- test/unit/slide_test.rb
+- test/unit/image_asset_test.rb
+- test/unit/classification_test.rb
+- test/unit/label_test.rb
+- test/unit/asset_content_test.rb
+- test/integration/navigation_test.rb
 - test/performance/browsing_test.rb