fassets_core 0.2.0 → 0.3.0

data/README.md

@@ -7,8 +7,7 @@ This project rocks and uses MIT-LICENSE.
 To use this plugin in your rails project, you need to add the gem to your applications `Gemfile`:
 
 ```
-# for now the git version of fassets core should be used, since it’s under heavy development
-gem 'fassets_core', :git => "git://github.com/fassets/fassets_core.git"
+gem 'fassets_core'
 ```
 
 After that, run the `bundle` command to install all new dependencies.
@@ -20,3 +19,19 @@ bundle exec rake fassets_core_engine:install:migrations
 bundle exec rake db:migrate
 ```
 
+# Run tests
+
+In order to run the tests for the first time, you need to do the following in a clean repository:
+
+```
+bundle
+RAILS_ENV=test rake db:migrate
+bundle exec guard
+```
+
+After the initial setup, it is okay to just start guard:
+
+```
+bundle exec guard
+```
+

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

@@ -11,8 +11,6 @@ $(document).ready(function(){
     $.fancybox.showActivity();
     var f_width = $(window).width()*0.8;
     var f_height = $(window).height()*0.8;
-    $("#add_asset_content").css("left",$("#catalog_list").width()+10);
-    $("#add_asset_content").css("width",$("#fancybox-content").width()-$("#catalog_list").width()-30-$("#facets").width());
     $.ajaxSetup({cache: false});
     $.get('/assets/new', { content_only: true }, function(data) {
       $.fancybox({
@@ -23,7 +21,6 @@ $(document).ready(function(){
         height: f_height,
         onComplete: function(){
           $("#fancybox-content").data("box-type","add_asset");
-          adjust_links();
           $.fancybox.resize();
         }
       });
@@ -43,40 +40,42 @@ $(document).ready(function(){
       }
       break;
     }
-   });
-    var adjust_links = function(){
-      $("#fancybox-content li.asset_type").click(function(event){
-        event.preventDefault();
-        $.fancybox.showActivity();
-        asset_type = $(event.target).data("asset-type");
-        $("#fancybox-content").load("/assets/new", {type: asset_type, content_only: true }, function() {
-          adjust_links();
-        });
-        $.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();
+  });
+  $(document).ajaxComplete(function() {
+    adjust_links();
+  });
+  var adjust_links = function() {
+    $("#add_asset_sidebar li.asset_type").click(function(event){
+      event.preventDefault();
+      $.fancybox.showActivity();
+      asset_type = $(event.target).data("asset-type");
+      $("div.fassets_core.new").load("/assets/new", {type: asset_type, content_only: true });
+      $.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);
       });
-      $("form.edit_classification input[type=submit][value=Save]").hide();
-    };
+      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();
+  };
 
+  adjust_links();
   $("#new_asset_link").click(function(event){
     event.preventDefault();
     show_asset_box();

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

@@ -6,6 +6,8 @@
 //= require jquery.iframe-transport
 //= require jquery.collapsiblePanel-0.2.0
 //= require fancybox
+//= require jquery.purr
+//= require best_in_place
 //= require_tree .
 //= require_self
 

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

@@ -4,24 +4,23 @@ $(document).ready(function(){
       $.fancybox.showActivity();
       var f_width = $(window).width()*0.8;
       var f_height = $(window).height()*0.8;
-	    $.ajax({
-		    type		: "GET",
-		    cache	: false,
-		    url		: "/asset/"+asset_id+"/edit",
-		    success: function(data) {
-			    $.fancybox({
-            content: data,
-            padding: 0,
-            autoDimensions: false,
-            width: f_width,
-            height: f_height,
-            onComplete: function(){$("#fancybox-content").data("box-type","edit_asset");}
-          });
-          adjust_links();
-          $.fancybox.resize();
-		    }
-	    });
+      $.ajaxSetup({cache: false});
+      $.get('/assets/'+asset_id+'/edit', { content_only: true }, function(data) {
+        $.fancybox({
+          content: data,
+          padding: 0,
+          autoDimensions: false,
+          width: f_width,
+          height: f_height,
+          onComplete: function(){
+            $("#fancybox-content").data("box-type","edit_asset");
+            adjust_links();
+            $.fancybox.resize();
+          }
+        });
+      });
     };
+
     $("body .edit_button").live("click",function(event){
       event.preventDefault();
       show_edit_box(event);

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

@@ -2,13 +2,10 @@ $(function(){
   //Sortable Labels
   $('#labels').sortable({
     axis: 'y',
-    start: function() {
-      $('#labels .handle').bind('click',noEventPropagation);
-    },
-    stop:function() {
-      $('#labels .handle').unbind('click', noEventPropagation);
-    },
-    update:function(){
+    handle: ".handle",
+    update: function(e, ui){
+      url = $("ol#labels").data('update_url')
+      $.post(url, $(this).sortable('serialize'))
     }
   });
 
@@ -24,6 +21,8 @@ $(function(){
   });
   // hide the submit button if JS is enabled (form can be submited by checking the boxes)
   $("form.edit_classification input[type=submit][value=Save]").hide();
+
+  $('.best_in_place').best_in_place();
 });
 
 /*$.ajax({

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

@@ -0,0 +1,20 @@
+//= require jquery
+//= require jquery_ujs
+//= require jquery-ui
+//= require jquery.collapsiblePanel-0.2.0
+//= require fancybox
+//= require jquery.purr
+//= require best_in_place
+//= require_self
+//= require ./add_asset_box
+//= require ./assets
+//= require ./catalog_box
+//= require ./catalogs
+//= require ./classification
+//= require ./edit_box
+//= require ./facets
+//= require ./tray
+
+$.ajaxSetup({ 'beforeSend': function(xhr) {
+  xhr.setRequestHeader("Accept", "text/javascript,text/html");
+}});

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

@@ -1,12 +1,15 @@
 #add_asset_sidebar {
   position: absolute;
-  left: 0;
-  top: 0px;
+  width: 200px;
   height: 100%;
-  min-width: 150px;
   font-size: 1em;
-  padding-right: 0;
+  margin-right: 1em;
   background: silver;
+
+  ul {
+    list-style: none;
+  }
+
   .asset_type {
     margin-top: .5em;
     padding: .5em .0em .5em .5em;
@@ -28,20 +31,17 @@
     }
   }
 }
-#content {
-  position: absolute;
-  height: 100%;
-}
+
 #fancybox-content h1 {
   border-top: none;
   background-color: white;
 }
 #add_asset_content {
   position: relative;
-  top: 5px;
-  height: 98%;
-  left: 150px;
-  width: 88%;
+  height: 100%;
+  margin-left: 200px;
+  padding-left: 1em;
+  overflow-y: auto;
 }
 #sidebar.box{
   float: right;

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

@@ -1,6 +1,5 @@
 #fancybox-content #main {
   margin-top: 10px;
-  margin-left: 10px;
   height: 95%;
 }
 #fancybox-content #sidebar{
@@ -21,7 +20,7 @@
       color: white;
       text-shadow: 1px 1px #777777;
       padding: .5em;
-      float: left; 
+      float: left;
     }
     #action {
       float: left;

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

@@ -10,3 +10,8 @@
   }
 }
 
+.fassets_core.new {
+  position: absolute;
+  height: 100%;
+  width: 100%;
+}

data/app/assets/stylesheets/fassets_core/index.css

@@ -0,0 +1,15 @@
+/*
+ *= require fancybox
+ *= require ./add_asset_box
+ *= require ./assets
+ *= require ./catalog_box
+ *= require ./collapsible
+ *= require ./edit_box
+ *= require ./facet
+ *= require ./filter
+ *= require ./forms
+ *= require ./labels
+ *= require ./master
+ *= require ./sidebar
+ *= require ./tray
+ */

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

@@ -1,4 +1,4 @@
-.fassets_core {
+.fassets_core .labels {
   .collapsible {
     text-align: left;
   }
@@ -10,4 +10,19 @@
   ul {
     margin: 0;
   }
+
+  span.best_in_place {
+    display: inline;
+  }
+  form {
+    display: inline;
+
+    div {
+      display: inline;
+    }
+
+    input {
+      display: inline;
+    }
+  }
 }

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

@@ -1,3 +1,7 @@
+body {
+  overflow: hidden;
+}
+
 .fassets_core {
   text-align: left;
 

data/app/controllers/assets_controller.rb

@@ -26,7 +26,6 @@ class AssetsController < FassetsCore::ApplicationController
       if @content.save
         @classification = Classification.new(:catalog_id => params["classification"]["catalog_id"],:asset_id => @content.asset.id)
         @classification.save
-        create_content_labeling(@content.asset.id, params["classification"]["catalog_id"])
         flash[:notice] = "Created new asset!"
         format.js { render :json => @content.to_jq_upload.merge({:status => :ok}).to_json }
         format.html { redirect_to edit_asset_content_path(@content) }
@@ -43,7 +42,7 @@ class AssetsController < FassetsCore::ApplicationController
     render :template => 'assets/show'
   end
   def edit
-    render :template => 'assets/edit', :locals => {:in_fancybox => false}, :layout => false
+    render :template => 'assets/edit', :layout => !(params["content_only"])
   end
   def update
     if @content.update_attributes(content_params) and @content.asset.update_attributes(params["asset"])
@@ -73,43 +72,14 @@ class AssetsController < FassetsCore::ApplicationController
     params[field_name]
   end
   def find_content
-    if params[:asset_id]
-      content_id = Asset.find(params[:id]).content_id
-    else
-      content_id = params[:id]
+    if self.respond_to?(:content_model)
+      @content = content_model.find(params[:id])
+    elsif !params[:asset_id].nil?
+      asset = Asset.find(params[:asset_id])
+      @content = asset.content
     end
-    content_id = Asset.find(params[:id]).content_id
-    @content = self.content_model.find(content_id)
   rescue ActiveRecord::RecordNotFound => e
-    flash[:error] = "#{self.content_model.to_s} with id #{params[:id]} not found"
+    flash[:error] = e.message
     redirect_to main_app.root_url
   end
-  def create_content_labeling(asset_id,catalog_id)
-    asset = Asset.find(asset_id)
-    content_facet = Facet.where(:catalog_id => catalog_id, :caption => "Content Type").first
-    return if content_facet.nil?
-    content_facet.labels.each do |label|
-      if asset.content_type == "FileAsset"
-        if label.caption.downcase == asset.content.media_type
-          labeling = Labeling.new(:classification_id => @classification.id, :label_id => label.id)
-          labeling.save
-        end
-      elsif asset.content_type == "Url"
-        if label.caption == "Url"
-          labeling = Labeling.new(:classification_id => @classification.id, :label_id => label.id)
-          labeling.save
-        end
-      elsif asset.content_type == "Code"
-        if label.caption == "Code"
-          labeling = Labeling.new(:classification_id => @classification.id, :label_id => label.id)
-          labeling.save
-        end
-      elsif asset.content_type == "FassetsPresentations::Presentation"
-        if label.caption == "Presentation"
-          labeling = Labeling.new(:classification_id => @classification.id, :label_id => label.id)
-          labeling.save
-        end
-      end
-    end
-  end
 end

data/app/controllers/labels_controller.rb

@@ -1,6 +1,7 @@
 class LabelsController < FassetsCore::ApplicationController
   before_filter :authenticate_user!
   before_filter :find_label, :except => [:create, :sort]
+  respond_to :html, :json
   def create
     @label = Label.new(params[:label])
     @label.facet_id = params[:facet_id]
@@ -12,19 +13,27 @@ class LabelsController < FassetsCore::ApplicationController
         flash[:error] = "Label could not be created! Caption cannot be empty!"
       else
         flash[:error] = "Label could not be created!"
-      end      
+      end
       redirect_to :back
     end
   end
   def update
-    if params[:label][:caption].blank?
-      flash[:error] = "Label could not be updated! Caption cannot be empty!"
-      redirect_to :back
-      return
-    end            
     @label.update_attributes(params[:label])
-    flash[:notice] = "Label was successfully updated."
-    redirect_to edit_catalog_facet_path(params[:catalog_id], params[:facet_id])    
+    respond_to do |format|
+      if @label.save
+        format.html do
+          flash[:notice] = "Label was successfully updated."
+          redirect_to edit_catalog_facet_path(params[:catalog_id], params[:facet_id])
+        end
+        format.json { respond_with_bip(@label) }
+      else
+        format.html do
+          flash[:error] = "Label could not be updated! Caption cannot be empty!"
+          redirect_to :back
+        end
+        format.json { respond_with_bip(@label) }
+      end
+    end
   end
   def sort
     params[:label].each_with_index do |id, position|

data/app/models/asset.rb

@@ -10,13 +10,6 @@ class Asset < ActiveRecord::Base
 
   after_create :put_on_tray
 
-  def publish=(test)
-  end
-  def published=(test)
-  end
-  def published
-    1
-  end
   def self.filter(filter)
     options = {:select => "assets.*", :order => "name"}
     unless filter.empty?
@@ -27,18 +20,19 @@ class Asset < ActiveRecord::Base
     all options
   end
 
+  # FIXME: is this used somewhere? should be removed right after the release of 0.3.0 to test if something breaks
   def self.count_for_labels(filter)
     options = {:include => [:labelings], :group => "label_id"}
     unless filter.empty?
       options[:conditions] = "assets.id IN(
-          SELECT DISTINCT assets.id 
-            FROM assets 
-              LEFT OUTER JOIN classifications ON (assets.id = classifications.asset_id) 
-              LEFT OUTER JOIN labelings ON (labelings.classification_id=classifications.id) 
-            WHERE (#{filter.to_condition}) 
-            GROUP BY assets.id 
+          SELECT DISTINCT assets.id
+            FROM assets
+              LEFT OUTER JOIN classifications ON (assets.id = classifications.asset_id)
+              LEFT OUTER JOIN labelings ON (labelings.classification_id=classifications.id)
+            WHERE (#{filter.to_condition})
+            GROUP BY assets.id
           HAVING COUNT(label_id)=#{filter.size})"
-          filter.to_condition
+      filter.to_condition
     end
     count options
   end
@@ -46,7 +40,8 @@ class Asset < ActiveRecord::Base
   def put_on_tray
     return if user.nil?
 
-    tray_positions.create(:user_id => user.id, :asset_id => id, :position => user.tray_positions.maximum(:position) ? user.tray_positions.maximum(:position)+1 : 1)
+    p = user.tray_positions.maximum(:position) || 0
+    tray_positions.create(:user_id => user.id, :asset_id => id, :position => p + 1)
   end
 end
 

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

@@ -4,22 +4,23 @@
   #name
     New
 
--unless @asset_types.nil?
-  #add_asset_sidebar
-    =render :partial => "add_asset_sidebar"
+.fassets_core.new
+  -unless @asset_types.nil?
+    #add_asset_sidebar
+      =render :partial => "add_asset_sidebar"
 
--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}
-        =fields_for "asset" do |asset|
+  -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}
+          =fields_for "asset" do |asset|
+            %p
+              %label{:for => 'name'} Name:
+              =asset.text_field :name
+              #name_warning
           %p
-            %label{:for => 'name'} Name:
-            =asset.text_field :name
-            #name_warning
-        %p
-          %label{:for => 'catalog_id'} Catalog:
-          =select("classification", "catalog_id", Catalog.all.inject([]){|m,c| m << [c.title, c.id]})
-        =render :partial => @content.class.to_s.underscore.pluralize + "/form", :locals => {:new => true}, :object => f
-        =submit_tag "Create", :class => "asset_create_button"
+            %label{:for => 'catalog_id'} Catalog:
+            =select("classification", "catalog_id", Catalog.all.inject([]){|m,c| m << [c.title, c.id]})
+          =render :partial => @content.class.to_s.underscore.pluralize + "/form", :locals => {:new => true}, :object => f
+          =submit_tag "Create", :class => "asset_create_button"

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

@@ -5,7 +5,7 @@
       =link_to image_tag("fassets_core/edit.png"), edit_catalog_facet_path(@catalog, facet)
       %span.handle=image_tag("fassets_core/drag.png")
   %ul{:class => "#{facet.color}_lite"}
-    -facet.labels.each do |label|
+    -facet.ordered_labels.each do |label|
       -if @counts[label.id] && !@filter.include?(label.id)
         %li.label
           =link_to label.caption, catalog_path(@catalog, :filter => @filter.to_query_include(label.id))

data/app/views/labels/_sidebar.html.haml

@@ -1,22 +1,22 @@
-.collapsible
-  %h2.title New Label
-  =form_for [@catalog, @facet, Label.new], :url => catalog_facet_labels_path(@catalog,@facet) do |f|
-    =render :partial => "labels/form", :object => f
-    =submit_tag "Create"
-
-.collapsible
+.labels
   %h2.title Labels
-  %ol.collection{:class => @facet.label_order == 'position' ? "sortable" : nil, :id => "catalogs.#{@catalog.id}.facets.#{@facet.id}.labels.sort"}
+  .collapsible
+    %h2.title New Label
+    =form_for [@catalog, @facet, Label.new] do |f|
+      =render :partial => "labels/form", :object => f
+      =submit_tag "Create"
+
+  %ol.collection{:class => @facet.label_order == 'position' ? "sortable" : nil,
+    :id => "labels",
+    :data => {:update_url => sort_catalog_facet_labels_path(@catalog, @facet)}}
     -@facet.ordered_labels.each do |label|
       %li{:id => "label_#{label.id}"}
-        =label.caption
-        .content
-          =form_for [@catalog, @facet, label], :url => catalog_facet_label_path(@catalog, @facet, label) do |f|
-            =render :partial => "labels/form", :object => f
-            =submit_tag "Save"
-          =button_to "Drop", catalog_facet_label_path(@catalog, @facet, label),
+        %span.content
+          =best_in_place label, :caption, :path => catalog_facet_label_path(@catalog, @facet, label)
+          =button_to "Delete", catalog_facet_label_path(@catalog, @facet, label),
             :confirm => 'Are you sure?',
             :method => "delete",
             :remote => true,
             :disable_with => 'loading...'
-
+        - if @facet.label_order == 'position'
+          %span.handle= image_tag "fassets_core/drag.png"

data/app/views/layouts/fassets_core/application.html.haml

@@ -4,11 +4,13 @@
   =yield :core_head
 
 - content_for :catalogs_selector do
-  =collection_select :catalog,
-    :id, Catalog.all,
-    :id, :title,
-    options ={:prompt => "Catalogs ..."},
-    :onchange => "javascript:window.location= '/catalogs/' + this.value"
+  %select{ :onchange => "javascript:window.location= this.value"}
+    %option{ :value => "/" }= "Catalogs..."
+    =Catalog.all.each do |c|
+      - if params[:id].to_i == c.id
+        %option{ :value => '/catalogs/' + c.id.to_s, :selected => 'selected'}= c.title
+      - else 
+        %option{ :value => '/catalogs/' + c.id.to_s}= c.title   
 
 - content_for :tray do
   =render :partial => "shared/tray"

data/app/views/shared/_flash_messages.html.haml

@@ -0,0 +1,6 @@
+-if flash[:notice]
+  #message=flash[:notice]
+-if flash[:error]
+  #error_message=flash[:error]
+-if flash[:alert]
+  #error_message=flash[:alert]

data/config/routes.rb

@@ -3,10 +3,10 @@ Rails.application.routes.draw do
     resources :facets do
       collection do
         post :sort
-      end  
+      end
       resources :labels do
         collection do
-          put :sort
+          post :sort
         end
       end
     end
@@ -24,11 +24,10 @@ Rails.application.routes.draw do
   end
 
   match 'asset/:id/preview' => 'Assets#preview'
-  match 'asset/:id/edit' => 'Assets#edit'
   match 'asset/:id/classifications' => 'Assets#classifications'
   match 'catalog_box' => 'Catalogs#catalog_box'
   match 'box_content' => 'Catalogs#box_content'
   match 'box_facet' => 'Catalogs#box_facet'
-  match 'edit_box/:id' => 'Assets#edit_box'
+  match 'assets/:asset_id/edit' => 'assets#edit'
   match 'assets/new' => 'assets#new'
 end

data/lib/acts_as_asset.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module Acts
     module Asset
       def self.included(base)
-        base.extend(ClassMethods)  
+        base.extend(ClassMethods)
       end
       module ClassMethods
         def acts_as_asset
@@ -15,19 +15,12 @@ module ActiveRecord
         def name
           asset.name
         end
-        def class_underscore
-          self.class.to_s.underscore
-        end
         def media_type
           "generic"
         end
         def icon
           "/images/#{media_type}.png"
         end
-        protected
-          def put_on_tray
-            tray_positions.create(:user_id => self.user_id)
-          end
       end
     end
   end

data/lib/fassets_core/test_helper/acts_as_asset.rb

@@ -0,0 +1,46 @@
+require "rspec"
+
+shared_examples_for "ActsAsAsset" do
+  before(:each) do
+    begin
+      @the_asset = Asset.create!(:name => "Test Asset", :content => asset)
+    rescue NameError
+      raise "May be you need to define an asset! Use \"let(:asset){ #your code here }\" in your specs."
+    end
+  end
+
+  context "associations for the model" do
+    it "should have an asset object" do
+      asset.asset.should == @the_asset
+    end
+
+    it "should destroy the asset model when deleted" do
+      asset.destroy
+      begin
+        @the_asset.reload
+        raise "RecordNotFound exception should have been raised!"
+      rescue ActiveRecord::RecordNotFound
+      end
+    end
+
+    it "should be possible to set the name for an asset through the object itself" do
+      asset.asset.name="New name"
+      asset.save!
+      @the_asset.reload.name.should == "New name"
+    end
+  end
+
+  context "instance methods for the model" do
+    it "should provide a name method" do
+      asset.name.should == "Test Asset"
+    end
+
+    it "should provide a media type" do
+      asset.media_type.should_not be_nil
+    end
+
+    it "should provide an icon" do
+      asset.icon.should_not be_nil
+    end
+  end
+end

data/lib/fassets_core/test_helper/every_assets_controller.rb

@@ -79,13 +79,13 @@ shared_examples_for "Every AssetsController" do
     it "should redirect to root with error message on error" do
       get 'show', additional_request_params.merge({ :id => asset.id })
       response.should redirect_to(root_path)
-      request.flash[:error].should =~ /not found$/
+      request.flash[:error].should =~ /^Couldn't find/
     end
 
     it "should delete the asset and show a notice" do
       delete "destroy", additional_request_params.merge({ :id => asset.id })
       response.should redirect_to(root_path)
-      request.flash[:error].should =~ /not found$/
+      request.flash[:error].should =~ /^Couldn't find/
     end
 
     describe "create asset" do

data/lib/fassets_core/test_helper.rb

@@ -1,3 +1,3 @@
 require "fassets_core/test_helper/every_assets_controller.rb"
 require "fassets_core/test_helper/every_authenticated_controller.rb"
-
+require "fassets_core/test_helper/acts_as_asset.rb"

data/lib/fassets_core/version.rb

@@ -1,3 +1,3 @@
 module FassetsCore
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/fassets_core.rb

@@ -1,6 +1,7 @@
 require "fassets_core/engine"
 require "fassets_core/plugins"
 require "fancybox-rails"
+require "best_in_place"
 
 module FassetsCore
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fassets_core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: best_in_place
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +247,7 @@ files:
 - 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
@@ -261,6 +278,7 @@ files:
 - app/assets/stylesheets/fassets_core/facet.css.scss
 - app/assets/stylesheets/fassets_core/forms.css.scss
 - app/assets/stylesheets/fassets_core/application.css
+- 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
@@ -273,6 +291,7 @@ files:
 - app/assets/stylesheets/fassets_core/sidebar.css.scss
 - 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/application.js.erb
@@ -308,13 +327,11 @@ files:
 - 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_assets_controller.rb
 - lib/fassets_core/test_helper/every_authenticated_controller.rb
 - lib/fassets_core/test_helper.rb
-- lib/authenticated_system.rb
 - lib/fassets_core.rb
-- lib/authenticated_test_helper.rb
-- lib/template_manager.rb
 - lib/tasks/cucumber.rake
 - lib/tasks/fassets-core_tasks.rake
 - MIT-LICENSE
@@ -384,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4486109871585801178
+      hash: -1017598728477094860
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -393,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4486109871585801178
+      hash: -1017598728477094860
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/authenticated_system.rb

@@ -1,187 +0,0 @@
-module AuthenticatedSystem
-  protected
-    # Returns true or false if the user is logged in.
-    # Preloads @current_user with the user model if they're logged in.
-    def logged_in?
-      !!current_user
-    end
-
-    # Accesses the current user from the session.
-    # Future calls avoid the database because nil is not equal to false.
-    def current_user
-      @current_user ||= (login_from_session || login_from_basic_auth || login_from_cookie) unless @current_user == false
-    end
-
-    # Store the given user id in the session.
-    def current_user=(new_user)
-      session[:user_id] = new_user ? new_user.id : nil
-      @current_user = new_user || false
-    end
-
-    # Check if the user is authorized
-    #
-    # Override this method in your controllers if you want to restrict access
-    # to only a few actions or if you want to check if the user
-    # has the correct rights.
-    #
-    # Example:
-    #
-    #  # only allow nonbobs
-    #  def authorized?
-    #    current_user.login != "bob"
-    #  end
-    #
-    def authorized?(action=nil, resource=nil, *args)
-      user_signed_in??
-    end
-
-    # Filter method to enforce a login requirement.
-    #
-    # To require logins for all actions, use this in your controllers:
-    #
-    #   before_filter :login_required
-    #
-    # To require logins for specific actions, use this in your controllers:
-    #
-    #   before_filter :login_required, :only => [ :edit, :update ]
-    #
-    # To skip this in a subclassed controller:
-    #
-    #   skip_before_filter :login_required
-    #
-    def login_required
-      authorized? || access_denied
-    end
-
-    # Redirect as appropriate when an access request fails.
-    #
-    # The default action is to redirect to the login screen.
-    #
-    # Override this method in your controllers if you want to have special
-    # behavior in case the user is not authorized
-    # to access the requested action.  For example, a popup window might
-    # simply close itself.
-    def access_denied
-      respond_to do |format|
-        format.html do
-          store_location
-          redirect_to new_session_path
-        end
-        # format.any doesn't work in rails version < http://dev.rubyonrails.org/changeset/8987
-        # you may want to change format.any to e.g. format.any(:js, :xml)
-        format.any do
-          request_http_basic_authentication 'Web Password'
-        end
-      end
-    end
-
-    # Store the URI of the current request in the session.
-    #
-    # We can return to this location by calling #redirect_back_or_default.
-    def store_location
-      session[:return_to] = request.request_uri
-    end
-
-    # Redirect to the URI stored by the most recent store_location call or
-    # to the passed default.  Set an appropriately modified
-    #   after_filter :store_location, :only => [:index, :new, :show, :edit]
-    # for any controller you want to be bounce-backable.
-    def redirect_back_or_default(default)
-      redirect_to(session[:return_to] || default)
-      session[:return_to] = nil
-    end
-
-    # Inclusion hook to make #current_user and #logged_in?
-    # available as ActionView helper methods.
-    def self.included(base)
-      base.send :helper_method, :current_user, :user_signed_in?, :authorized? if base.respond_to? :helper_method
-    end
-
-    #
-    # Login
-    #
-
-    # Called from #current_user.  First attempt to login by the user id stored in the session.
-    def login_from_session
-      self.current_user = User.find_by_id(session[:user_id]) if session[:user_id]
-    end
-
-    # Called from #current_user.  Now, attempt to login by basic authentication information.
-    def login_from_basic_auth
-      authenticate_with_http_basic do |login, password|
-        self.current_user = User.authenticate(login, password)
-      end
-    end
-
-    #
-    # Logout
-    #
-
-    # Called from #current_user.  Finaly, attempt to login by an expiring token in the cookie.
-    # for the paranoid: we _should_ be storing user_token = hash(cookie_token, request IP)
-    def login_from_cookie
-      user = cookies[:auth_token] && User.find_by_remember_token(cookies[:auth_token])
-      if user && user.remember_token?
-        self.current_user = user
-        handle_remember_cookie! false # freshen cookie token (keeping date)
-        self.current_user
-      end
-    end
-
-    # This is ususally what you want; resetting the session willy-nilly wreaks
-    # havoc with forgery protection, and is only strictly necessary on login.
-    # However, **all session state variables should be unset here**.
-    def logout_keeping_session!
-      # Kill server-side auth cookie
-      @current_user.forget_me if @current_user.is_a? User
-      @current_user = false     # not logged in, and don't do it for me
-      kill_remember_cookie!     # Kill client-side auth cookie
-      session[:user_id] = nil   # keeps the session but kill our variable
-      # explicitly kill any other session variables you set
-    end
-
-    # The session should only be reset at the tail end of a form POST --
-    # otherwise the request forgery protection fails. It's only really necessary
-    # when you cross quarantine (logged-out to logged-in).
-    def logout_killing_session!
-      logout_keeping_session!
-      reset_session
-    end
-
-    #
-    # Remember_me Tokens
-    #
-    # Cookies shouldn't be allowed to persist past their freshness date,
-    # and they should be changed at each login
-
-    # Cookies shouldn't be allowed to persist past their freshness date,
-    # and they should be changed at each login
-
-    def valid_remember_cookie?
-      return nil unless @current_user
-      (@current_user.remember_token?) &&
-        (cookies[:auth_token] == @current_user.remember_token)
-    end
-
-    # Refresh the cookie auth token if it exists, create it otherwise
-    def handle_remember_cookie! new_cookie_flag
-      return unless @current_user
-      case
-      when valid_remember_cookie? then @current_user.refresh_token # keeping same expiry date
-      when new_cookie_flag        then @current_user.remember_me
-      else                             @current_user.forget_me
-      end
-      send_remember_cookie!
-    end
-
-    def kill_remember_cookie!
-      cookies.delete :auth_token
-    end
-
-    def send_remember_cookie!
-      cookies[:auth_token] = {
-        :value   => @current_user.remember_token,
-        :expires => @current_user.remember_token_expires_at }
-    end
-
-end

data/lib/authenticated_test_helper.rb

@@ -1,20 +0,0 @@
-module AuthenticatedTestHelper
-  # Sets the current user in the session from the user fixtures.
-  def login_as(user)
-    @request.session[:user_id] = user ? users(user).id : nil
-  end
-
-  def authorize_as(user)
-    @request.env["HTTP_AUTHORIZATION"] = user ? ActionController::HttpAuthentication::Basic.encode_credentials(users(user).login, 'monkey') : nil
-  end
-
-  # rspec
-  def mock_user
-    user = mock_model(User, :id => 1,
-      :login  => 'user_name',
-      :name   => 'U. Surname',
-      :to_xml => "User-in-XML", :to_json => "User-in-JSON",
-      :errors => [])
-    user
-  end
-end

data/lib/template_manager.rb

@@ -1,27 +0,0 @@
-module TemplateManager
-  extend self
-
-  def outer_templates
-    templates.keys
-  end
-  def inner_templates(outer)
-    templates[outer].keys
-  end
-  def inner_template(outer, name)
-    templates[outer][name]
-  end
-private
-  def templates
-    Dir.chdir(TEMPLATE_PATH) do
-      @templates ||= Dir.entries(".").inject({}) do |templates, entry|
-        yml_path = File.join(entry, "template.yml")
-        if entry != '.' && 
-           entry != '..' && 
-           File.exists?(yml_path)
-          templates[entry] = YAML.load_file(yml_path)
-        end
-        templates
-      end
-    end
-  end
-end