spud_photos 0.0.2 → 0.0.3

data/README.markdown

@@ -6,14 +6,12 @@ Spud Photos is an engine for creating and managing photo galleries, designed for
 
 1. In your Gemfile add the following
 
-		gem 'spud_core', :git => "git://github.com/davydotcom/spud_core_admin.git"
-		gem 'spud_photos', :git => "git://github.com/gregawoods/spud_photos.git"
+		gem 'spud_photos'
 
 2. Run bundle install
 3. Copy in database migrations to your new rails project
 
-		bundle exec rake spud_core:install:migrations
-		bundle exec rake spud_photos:install:migrations
+		bundle exec rake railties:install:migrations
 		rake db:migrate
 
 4. Run a rails server instance and point your browser to /spud/admin
@@ -23,7 +21,7 @@ Spud Photos is an engine for creating and managing photo galleries, designed for
 Spud Photos accepts the following configuration options:
 
 	Spud::Photos.configure do |config|
-	  self.base_layout = 'application'
+	  config.base_layout = 'application'
 	  config.galleries_enabled = false
 	  config.base_path = 'photos'
 	  config.photo_styles = {
@@ -32,6 +30,10 @@ Spud Photos accepts the following configuration options:
 	    :large => '400x400#',
 	    :huge => '600x600'
 	  }
+	  self.paperclip_storage = :filesystem #use :s3 to use s3 storage (aws gem required)
+    	  config.s3_credentials = "#{Rails.root}/config/s3.yml"
+    	  config.storage_path = ":rails_root/public/system/spud_photos/:id/:style/:basename.:extension"
+    	  config.storage_url = "/system/spud_photos/:id/:style/:basename.:extension"
 	end
 
 The `photo_styles` option will be passed to [Paperclip][2], so any valid paperclip styles can be added here.

data/app/assets/javascripts/spud/admin/photos.js

@@ -6,64 +6,111 @@ Spud.Admin.Photos = new function(){
   var self = this;
 
   this.init = function(){
+    // event handlers
     $('.spud_admin_photo_ui_thumbs_sortable').sortable({
       connectWith:'.spud_admin_photo_ui_thumbs_sortable'
     });
-    $('#spud_admin_photo_album_form, #spud_admin_photo_gallery_form').live('submit', self.submittedPhotoAlbumOrGalleryForm)
-    $('.spud_admin_photo_mass_destroy').live('click', self.massDestroySelected);
-    $('#spud_admin_photo_form').live('submit', self.submittedPhotoForm);
-    $('.spud_admin_photo_ui_thumb_selectable input[type=checkbox]').live('click', self.invertPhotoUiThumbCheckbox);
-    $('.spud_admin_photo_ui_thumb_selectable').live('click', self.selectedPhotoUiThumb);
-    self.markSelectedPhotoUiThumbs();
-  };
-
-  this.submittedPhotoAlbumOrGalleryForm = function(e){
-    // update photo checkboxes
-    $('.spud_admin_photo_ui_thumb').each(function(){
-      var item = $(this);
-      var checkbox = item.find('input[type=checkbox]');
-      checkbox.attr('checked', (item.parents('.spud_admin_photos_selection_left').length>0));
+    $('body').on('submit', '#spud_admin_photo_album_form', self.submittedPhotoAlbumForm)
+    $('body').on('submit', '#spud_admin_photo_form', self.submittedPhotoForm);
+    $('body').on('click', '.spud_admin_photos_btn_remove', self.clickedPhotoRemoveFromLibrary)
+    $('body').on('click', '.spud_admin_photo_ui_thumbs_selectable .spud_admin_photo_ui_thumb', self.selectedPhotoUiThumb);
+    $('body').on('click', '#spud_admin_photo_album_action_library', self.clickedPhotoLibrary);
+
+    // html5 drag and drop file 
+    var droparea = document.getElementById('spud_admin_photos_selected');
+    droparea.addEventListener('dragenter', self.stopDndPropagation, false);
+    droparea.addEventListener('dragexit', self.stopDndPropagation, false);
+    droparea.addEventListener('dragover', self.stopDndPropagation, false);
+    droparea.addEventListener('drop', self.droppedFile, false);
+  };
+
+  this.submittedPhotoAlbumForm = function(){
+    var ids = $('#spud_admin_photos_selected .spud_admin_photo_ui_thumb').map(function(i, el){ return $(el).attr('rel') } );
+    $('#spud_photo_album_order').val(ids.toArray().join());
+  };
+
+  this.clickedPhotoRemoveFromLibrary = function(e){
+    $(this).parents('.spud_admin_photo_ui_thumb').fadeOut(200, function(){
+      $(this).remove();
     });
-  }
+  };
 
-  this.massDestroySelected = function(e){
-    e.preventDefault();
-    var ids = $.map($('.spud_admin_photo_ui_thumb_selected'), function(val, i){ 
-      return $(val).find('input[type=checkbox]').val() 
+  /* Handle file uploads passed via iframe (legacy support)
+  * -------------------------------------------------------- */
+
+  this.photoLegacyUploadErrors = function(html){
+    $('#spud_admin_photo_form').replaceWith(html);
+  };
+
+  this.photoLegacyUploadComplete = function(id, html){
+    var element = $('#spud_admin_photo_' + id);
+    if(element.length > 0){
+      element.replaceWith(htmlhtml);
+    }
+    else{
+      var target = $('#spud_admin_photos_selected .spud_admin_photo_ui_thumbs, #spud_admin_photos');
+      target.prepend(html).fadeIn(200);
+    }
+    $('#dialog').dialog('close');
+  };
+
+  this.selectedPhotoUiThumb = function(e){
+    var thumb = $(this);
+    if(thumb.hasClass('spud_admin_photo_ui_thumb_selected')){
+      $(this).removeClass('spud_admin_photo_ui_thumb_selected');
+    }
+    else{
+      $(this).addClass('spud_admin_photo_ui_thumb_selected');
+    }
+  };
+
+  this.markPhotoAsDeleted = function(photo_id){
+    var photo = $('#spud_admin_photo_' + photo_id);
+    photo.fadeOut(200, function(){
+      photo.remove();
+    });
+  };
+
+  this.markPhotoAlbumAsDeleted = function(photo_album_id){
+    var photo_album = $('#spud_admin_photo_album_' + photo_album_id);
+    photo_album.fadeOut(200, function(){
+      photo_album.remove();
+    });
+  };
+
+  this.markPhotoGalleryAsDeleted = function(photo_gallery_id){
+    var photo_gallery = $('#spud_admin_photo_gallery_' + photo_gallery_id);
+    photo_gallery.fadeOut(200, function(){
+      photo_gallery.remove();
     });
-    $.ajax({
-      type: 'POST',
-      url: $(this).attr('href'),
-      data: {spud_photo_ids:ids},
-      success: function(data, textStatus, jqXHR){
-        $('.spud_admin_photo_ui_thumb_selected').fadeOut(200, function(){
-          $(this).remove();
-        });
-      },
-      error: function(jqXHR, textStatus, errorThrown){
-        console.log('An error occurred:')
-        console.log(arguments);
-      }
-    })
   };
 
+  /* 
+  * Single-Photo Form Upload
+  -------------------------------- */
+
   this.submittedPhotoForm = function(e){
     if(FormData && XMLHttpRequest){
       // create a FormData object and attach form values
       var fd = new FormData();
       var form = $(this);
+      var file = form.find('#spud_photo_photo')[0].files[0];
       fd.append('_method', form.find('[name=_method]').val());
       fd.append('authenticity_token', form.find('[name=authenticity_token]').val());
-      fd.append('spud_photo[photo]', form.find('#spud_photo_photo')[0].files[0]);
+      fd.append('spud_photo[photo]', file);
       fd.append('spud_photo[title]', form.find('#spud_photo_title').val());
       fd.append('spud_photo[caption]', form.find('#spud_photo_caption').val());
 
+      // progress bar to send events to 
+      var progressBar = self.progressBarForUpload(file.fileName);
+      form.find('.form-actions').before(progressBar);
+
       // send FormData object as ajax request
       var xhr = new XMLHttpRequest();
-      xhr.upload.addEventListener('progress', self.photoUploadProgress, false);
-      xhr.addEventListener('load', self.photoUploadComplete, false);
-      xhr.addEventListener('error', self.photoUploadFailed, false);
-      xhr.addEventListener('abort', self.photoUploadCanceled, false);
+      xhr.upload.addEventListener('progress', function(e){ self.onPhotoUploadProgress(e, progressBar) }, false);
+      xhr.addEventListener('load', function(e){ self.onPhotoUploadComplete(e, progressBar); }, false);
+      xhr.addEventListener('error', function(e){ self.onPhotoUploadFailure(e, progressBar); }, false);
+      xhr.addEventListener('abort', function(e){ self.onPhotoUploadCancel(e, progressBar); }, false);
       xhr.open('POST', form.attr('action'));
       xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
       xhr.send(fd);
@@ -71,23 +118,44 @@ Spud.Admin.Photos = new function(){
     }
   };
 
-  this.photoUploadProgress = function(e){
+  /* 
+  * Upload Progress Monitoring
+  -------------------------------- */
+
+  this.progressBarForUpload = function(fileName){
+    return $('\
+      <div class="spud_admin_photo_progress" \
+        <h6> \
+          <span class="spud_admin_photo_progress_filename">'+fileName+'</span>: \
+          <span class="spud_admin_photo_progress_status">Uploading</span> \
+        </h6> \
+        <div class="progress progress-striped active"> \
+          <div class="bar" style="width: 0;"></div> \
+        </div> \
+      </div>');
+  };
+
+  this.onPhotoUploadProgress = function(e, progressBar){
     var percent = Math.round(e.loaded * 100 / e.total);
-    console.log('progress: ' + percent + '%');
-    $('.progress').show();
-    $('.progress .bar').css({width: percent + '%'});
+    progressBar.find('.bar').css({width: percent + '%'});
+    if(percent == 100){
+      progressBar.find('.progress').addClass('progress-success');
+      progressBar.find('.spud_admin_photo_progress_status').text('Processing');
+    }
   };
 
-  this.photoUploadComplete = function(e){
+  this.onPhotoUploadComplete = function(e, progressBar){
     // success
     var photo = $.parseJSON(e.target.response);
     if(e.target.status == 200){
+      progressBar.find('.spud_admin_photo_progress_status').text('Done!');
+      progressBar.find('.progress').removeClass('progress-striped active');
       var element = $('#spud_admin_photo_' + photo.id);
       if(element.length > 0){
         element.replaceWith(photo.html);
       }
       else{
-        var target = $('#spud_admin_photos_selected .spud_admin_photo_ui_thumbs, #spud_admin_photos');
+        var target = $('#spud_admin_photos_selected, #spud_admin_photos');
         target.prepend(photo.html).fadeIn(200);
       }
       $('#dialog').dialog('close');
@@ -98,61 +166,150 @@ Spud.Admin.Photos = new function(){
     }
   };
 
-  this.photoUploadFailed = function(e){
-    console.log('fail!');
-    console.log(e);
-  }
+  this.onPhotoUploadCancel = function(e, progressBar){
 
-  this.photoUploadCanceled = function(e){
-    console.log('cancel');
-  };  
+  };
 
-  // need to invert the checkbox state so that it gets properly checked/uncheckd when `selectedPhotoUiThumb` fires
-  this.invertPhotoUiThumbCheckbox = function(e){
-    $(this).attr('checked', !$(this).attr('checked'));
+  this.onPhotoUploadCancel = function(e, progressBar){
+    progressBar.find('.spud_admin_photo_progress_status').text('Done!');
+    progressBar.find('.progress').addClass('progress-danger');
   };
 
-  this.selectedPhotoUiThumb = function(e){
-    var checkbox = $(this).find('input[type=checkbox]');
-    if(checkbox){
-      if(checkbox.attr('checked')){
-        $(this).removeClass('spud_admin_photo_ui_thumb_selected');
-        checkbox.attr('checked', false);
-      }
-      else{
-        $(this).addClass('spud_admin_photo_ui_thumb_selected');
-        checkbox.attr('checked', true);
-      }
-    }
+  /*
+  * Add From Photo Library
+  ------------------------------- */
+
+  this.clickedPhotoLibrary = function(e){
+    var url = this.href;
+    $.ajax({
+      url:url,
+      success:self.photoLibraryLoaded
+    });
+    return false;
   };
 
-  this.markSelectedPhotoUiThumbs = function(){
-    $('.spud_admin_photo_ui_thumb_selectable').each(function(){
-      var checkbox = $(this).find('input[type=checkbox]');
-      if(checkbox && checkbox.attr('checked')){
-        $(this).addClass('spud_admin_photo_ui_thumb_selected');
+  this.photoLibraryLoaded = function(html){
+    var dialog = $("#dialog");
+    if(dialog.length == 0){
+      dialog = $('<div id="dialog" style="display:hidden;"></div>').appendTo('body');
+    }
+    dialog.html(html);
+    $('#spud_admin_photos_selected .spud_admin_photo_ui_thumb').each(function(){
+      var id = $(this).attr('id');
+      var dupe = dialog.find('#'+id);
+      if(dupe){
+        dupe.remove();
+      }
+    });
+    dialog.dialog({
+      width: 660,
+      modal: true,
+      height: 450,
+      title: 'My Photo Library',
+      buttons: {
+        'Add Selected': self.addSelectedPhotosFromLibrary,
+        'Delete Selected': self.deleteSelectedPhotosFromLibrary
       }
     });
   };
 
-  this.markPhotoAsDeleted = function(photo_id){
-    var photo = $('#spud_admin_photo_' + photo_id);
-    photo.fadeOut(200, function(){
-      photo.remove();
-    });
+  this.addSelectedPhotosFromLibrary = function(e){
+    $('#spud_admin_photo_library .spud_admin_photo_ui_thumb_selected')
+      .removeClass('spud_admin_photo_ui_thumb_selected')
+      .prependTo('#spud_admin_photos_selected')
+      .hide()
+      .fadeIn(200);
+    $(this).dialog('close');
   };
 
-  this.markPhotoAlbumAsDeleted = function(photo_album_id){
-    var photo_album = $('#spud_admin_photo_album_' + photo_album_id);
-    photo_album.fadeOut(200, function(){
-      photo_album.remove();
+  this.deleteSelectedPhotosFromLibrary = function(e){
+    var ids = $.map($('.spud_admin_photo_ui_thumb_selected'), function(val, i){ 
+      return $(val).attr('rel');
     });
+    $.ajax({
+      type: 'POST',
+      url: '/spud/admin/photos/mass_destroy',
+      data: {spud_photo_ids:ids},
+      success: function(data, textStatus, jqXHR){
+        $('.spud_admin_photo_ui_thumb_selected').fadeOut(200, function(){
+          $(this).remove();
+        });
+      },
+      error: function(jqXHR, textStatus, errorThrown){
+        console.log('An error occurred:')
+        console.log(arguments);
+      }
+    })
+
   };
 
-  this.markPhotoGalleryAsDeleted = function(photo_gallery_id){
-    var photo_gallery = $('#spud_admin_photo_gallery_' + photo_gallery_id);
-    photo_gallery.fadeOut(200, function(){
-      photo_gallery.remove();
-    });
+  /*
+  * Drag & Drop File Upload Queue
+  -------------------------------- */
+
+  this.fileQueue = [];
+  this.fileQueueStarted = false;
+
+  // prevent default browser behavior of opening the dropped file
+  this.stopDndPropagation = function(e){
+    e.stopPropagation();
+    e.preventDefault();
+  }
+
+  // add files to queue. starts queue if not started already
+  this.droppedFile = function(e){
+    e.stopPropagation();
+    e.preventDefault();
+    $('#spud_admin_photo_upload_queue').show();
+    var files = e.dataTransfer.files;
+    var i = 0;
+    while(i < files.length){
+      self.fileQueue.push(files[i]);
+      i++;
+    }
+    self.updateQueueCountLabel();
+    if(!this.fileQueueStarted){
+      self.uploadNextPhoto();
+      if(self.fileQueue.length > 0){
+        self.uploadNextPhoto();  
+      }
+    }
+  };
+
+  this.updateQueueCountLabel = function(){
+    $('#spud_admin_photo_upload_queue_label span').text(self.fileQueue.length);
+  };
+
+  this.uploadNextPhoto = function(){
+    if(self.fileQueue.length == 0){
+      self.fileQueueStarted = false;
+      return;
+    }
+
+    // formdata object
+    self.fileQueueStarted = true;
+    var file = self.fileQueue.pop();
+    var fd = new FormData();
+    fd.append('spud_photo[photo]', file);
+
+    // create a progress bar
+    var progressBar = self.progressBarForUpload(file.fileName);
+    $('#spud_admin_photo_upload_queue_bars').prepend(progressBar);
+
+    // send formdata as xhr
+    var xhr = new XMLHttpRequest();
+    xhr.upload.addEventListener('progress', function(e){ self.onPhotoUploadProgress(e, progressBar); }, false);
+    xhr.addEventListener('load', function(e){ self.onQueuedPhotoUploadComplete(e, progressBar) }, false);
+    xhr.addEventListener('error', function(e){ self.onPhotoUploadFailure(e, progressBar); }, false);
+    xhr.addEventListener('abort', function(e){ self.onPhotoUploadCancel(e, progressBar); }, false);
+    xhr.open('POST', '/spud/admin/photos');
+    xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+    xhr.send(fd);
+  };
+
+  this.onQueuedPhotoUploadComplete = function(e, progressBar){
+    self.onPhotoUploadComplete(e, progressBar);
+    self.updateQueueCountLabel();
+    self.uploadNextPhoto();
   };
 };

data/app/assets/stylesheets/spud/admin/photos.css

@@ -12,7 +12,7 @@
   margin: 15px 0;
 }
 .spud_admin_photo_ui_thumbs{
-  height: 350px;
+  height: 300px;
   padding: 0;
   border: 1px solid #cacaca;
   margin: 15px 0;
@@ -50,16 +50,19 @@
 .spud_admin_photo_ui_thumbs_selectable .spud_admin_photo_ui_thumb{
   cursor: pointer;
 }
+.spud_admin_photo_ui_thumbs_selectable .spud_admin_photo_ui_thumb_controls{
+  display: none;
+}
 .spud_admin_photo_ui_thumb_selected{
   border: 3px solid #006CCC;
-  margin: -3px 30px 30px -3px;
+  margin: 13px;
+}
+.spud_admin_photo_ui_thumb_small.spud_admin_photo_ui_thumb_selected{
+  margin: 9px;
 }
 .spud_admin_photo_ui_thumbs_sortable .spud_admin_photo_ui_thumb{
   cursor: move;
 }
-.spud_admin_photo_ui_thumb_selected:nth-child(6n){
-  margin-right: -3px;
-}
 .spud_admin_photo_ui_thumb h5{
   font-size: 12px;
   color: white;
@@ -86,7 +89,7 @@
   background: rgba(0,0,0,0.5);
   border-bottom-right-radius: 15px;
 }
-.spud_admin_photos_btn_delete{
+.spud_admin_photos_btn_remove, .spud_admin_photos_btn_delete{
   background: url('/assets/spud/photos/buttons/x_16x16.png');
   height: 16px;
   width: 16px;
@@ -109,4 +112,28 @@
   position: absolute;
   top: 0;
   right: 0;
+}
+
+#spud_admin_photo_album_actions{
+
+}
+
+/* Upload Queue
+---------------------------- */
+#spud_admin_photo_album_form{
+
+}
+.spud_admin_photo_progress{
+  margin: 10px 0;
+}
+#spud_admin_photo_upload_queue{
+  display: none;
+  background: white;
+  padding: 15px;
+  margin: 0 0 0 10px;
+  width: 250px;
+  height: 270px;
+  float: right;
+  border: 1px solid #cacaca;
+  overflow-y: scroll;
 }

data/app/controllers/photo_albums_controller.rb

@@ -6,10 +6,11 @@ class PhotoAlbumsController < ApplicationController
   def index
     if params[:photo_gallery_id]
       @photo_gallery = SpudPhotoGallery.find_by_url_name(params[:photo_gallery_id])
-      if @photo_gallery
-        @photo_albums = @photo_gallery.albums.order('created_at desc')
+      if @photo_gallery.blank?
+        flash[:error] = 'Photo gallery could not be found!'
+        redirect_to photo_galleries_path and return false
       else
-        @photo_albums = []
+        @photo_albums = @photo_gallery.albums.order('created_at desc')
       end
     else
       @photo_albums = SpudPhotoAlbum.order('created_at desc')
@@ -19,7 +20,16 @@ class PhotoAlbumsController < ApplicationController
 
   def show
     @photo_album = SpudPhotoAlbum.find_by_url_name(params[:id])
-    respond_with @photo_album
+    if @photo_album.blank?
+      flash[:error] = "Post not found!"
+      if params[:photo_gallery_id]
+        redirect_to photo_gallery_photo_albums_path(params[:photo_gallery_id])
+      else
+        redirect_to photo_albums_path
+      end
+    else
+      respond_with @photo_album
+    end
   end
 
 end

data/app/controllers/spud/admin/photo_albums_controller.rb

@@ -1,6 +1,6 @@
 class Spud::Admin::PhotoAlbumsController < Spud::Admin::ApplicationController
 
-  before_filter :get_album, :only => [:show, :edit, :update, :destroy]
+  before_filter :get_album, :only => [:show, :edit, :update, :destroy, :library]
   respond_to :html, :json, :xml
   layout 'spud/admin/spud_photos'
 
@@ -20,7 +20,10 @@ class Spud::Admin::PhotoAlbumsController < Spud::Admin::ApplicationController
 
   def create
     @photo_album = SpudPhotoAlbum.new(params[:spud_photo_album])
-    flash[:notice] = 'SpudPhotoAlbum created successfully' if @photo_album.save
+    if @photo_album.save
+      set_photo_order
+      @photo_album.spud_photo_albums_photos = photo_albums_photos
+    end
     respond_with @photo_album, :location => spud_admin_photo_albums_path
   end
 
@@ -30,7 +33,10 @@ class Spud::Admin::PhotoAlbumsController < Spud::Admin::ApplicationController
 
   def update
     @photo_album.update_attributes(params[:spud_photo_album])
-    flash[:notice] = 'SpudPhotoAlbum updated successfully' if @photo_album.save
+    if @photo_album.save
+      set_photo_order
+      flash[:notice] = 'SpudPhotoAlbum updated successfully' 
+    end
     respond_with @photo_album, :location => spud_admin_photo_albums_path
   end
 
@@ -43,4 +49,15 @@ class Spud::Admin::PhotoAlbumsController < Spud::Admin::ApplicationController
     @photo_album = SpudPhotoAlbum.find(params[:id])
   end
 
+  private
+
+  def set_photo_order
+    order_ids = params[:spud_photo_album_order].split(',')
+    @photo_album.spud_photo_albums_photos.each do |obj|
+      logger.debug "##### ID: #{obj.spud_photo_id.to_s}"
+      index = order_ids.index(obj.spud_photo_id.to_s)
+      obj.update_attribute(:order, index)
+    end
+  end
+
 end

data/app/controllers/spud/admin/photos_controller.rb

@@ -1,11 +1,10 @@
 class Spud::Admin::PhotosController < Spud::Admin::ApplicationController
 
+  include RespondsToParent
+
   before_filter :get_photo, :only => [:show, :edit, :update, :destroy]
   respond_to :html, :json, :xml, :js
-  layout 'spud/admin/spud_photos'
-
-  add_breadcrumb 'Photos', :spud_admin_photos_path
-  belongs_to_spud_app :photos
+  layout false
 
   def index
     @photos = SpudPhoto.all
@@ -32,7 +31,9 @@ class Spud::Admin::PhotosController < Spud::Admin::ApplicationController
     if request.xhr?
       render json_for_photo(success)
     else
-      respond_with @photo, :location => spud_admin_photos_path
+      respond_to_parent do
+        render 'show.js'
+      end
     end
   end
 
@@ -51,10 +52,12 @@ class Spud::Admin::PhotosController < Spud::Admin::ApplicationController
     if request.xhr?
       render json_for_photo(success)
     else
-      respond_with @photo, :location => spud_admin_photos_path
+      respond_to_parent do
+        render 'show.js'
+      end
     end
   end
-  
+
   def destroy
     flash[:notice] = 'SpudPhoto deleted successfully' if @photo.destroy
     respond_with @photo, :location => spud_admin_photos_path

data/app/helpers/spud/admin/photos_helper.rb

@@ -1,2 +1,7 @@
 module Spud::Admin::PhotosHelper
-end
+
+  def photo_is_selected
+    return (@photo_album && @photo_album.photo_ids.include?(photo.id))
+  end
+
+end

data/app/models/spud_photo.rb

@@ -1,7 +1,11 @@
 class SpudPhoto < ActiveRecord::Base
-  has_and_belongs_to_many :albums,
-    :class_name => 'SpudPhotoAlbum',
-    :join_table => 'spud_photo_albums_photos'
+
+  attr_accessible :title, :caption, :photo
+
+  has_many :spud_photo_albums_photos
+  has_many :albums,
+    :through => :spud_photo_albums_photos,
+    :source => :spud_photo_album
 
   has_attached_file :photo, 
     :styles => lambda { |attachment| attachment.instance.dynamic_styles },

data/app/models/spud_photo_album.rb

@@ -1,15 +1,22 @@
 class SpudPhotoAlbum < ActiveRecord::Base
-  has_and_belongs_to_many :galleries,
-    :class_name => 'SpudPhotoGallery',
-    :join_table => 'spud_photo_galleries_albums'
-  has_and_belongs_to_many :photos,
-    :class_name => 'SpudPhoto',
-    :join_table => 'spud_photo_albums_photos',
-    :order => 'created_at'
+
+  attr_accessible :title, :url_name, :photos, :photo_ids
+
+  has_many :spud_photo_albums_photos
+  has_many :photos,
+    :through => :spud_photo_albums_photos,
+    :source => :spud_photo,
+    :order => 'spud_photo_albums_photos.order asc'
+
+  has_many :spud_photo_galleries_albums
+  has_many :galleries,
+    :through => :spud_photo_galleries_albums,
+    :source => :spud_photo_gallery
+
   validates_presence_of :title, :url_name
   validates_uniqueness_of :title, :url_name
   before_validation :set_url_name
-
+  after_save :update_photo_order
 
   def top_photo_url(style)
     unless photos.empty?
@@ -31,4 +38,12 @@ class SpudPhotoAlbum < ActiveRecord::Base
     self.url_name = self.title.parameterize
   end
 
+  def update_photo_order
+    # order = 0
+    # self.photos.each do |p|
+    #   p.update_attribute(:order, order)
+    #   order += 1
+    # end
+  end
+
 end

data/app/models/spud_photo_albums_photo.rb

@@ -0,0 +1,5 @@
+class SpudPhotoAlbumsPhoto < ActiveRecord::Base
+  attr_accessible :spud_photo_id, :spud_photo_album_id, :order
+  belongs_to :spud_photo
+  belongs_to :spud_photo_album
+end

data/app/models/spud_photo_galleries_album.rb

@@ -0,0 +1,5 @@
+class SpudPhotoGalleriesAlbum < ActiveRecord::Base
+  attr_accessible :spud_photo_album_id, :spud_photo_gallery_id, :order
+  belongs_to :spud_photo_album
+  belongs_to :spud_photo_gallery
+end

data/app/models/spud_photo_gallery.rb

@@ -1,7 +1,12 @@
 class SpudPhotoGallery < ActiveRecord::Base
-  has_and_belongs_to_many :albums,
-    :class_name => 'SpudPhotoAlbum',
-    :join_table => 'spud_photo_galleries_albums'
+
+  attr_accessible :title, :url_name, :albums, :album_ids
+
+  has_many :spud_photo_galleries_albums
+  has_many :albums,
+    :through => :spud_photo_galleries_albums,
+    :source => :spud_photo_album
+
   validates_presence_of :title, :url_name
   validates_uniqueness_of :title, :url_name
   before_validation :set_url_name
@@ -23,7 +28,9 @@ class SpudPhotoGallery < ActiveRecord::Base
   private
 
   def set_url_name
-    self.url_name = self.title.parameterize
+    if self.title
+      self.url_name = self.title.parameterize
+    end
   end
 
 end

data/app/views/spud/admin/photo_albums/_form.html.erb

@@ -2,30 +2,30 @@
   
   <%= error_messages_for(f.object) %>
   
+  <%= hidden_field_tag :spud_photo_album_order %>
+
   <fieldset>
     <legend>Photo Album Info</legend>  
-      <div class="control-group">
-        <%= f.label :title, :class => "control-label" %>
-        <div class="controls">
-          <%= f.text_field :title %>
-        </div>
+    <div class="control-group">
+      <%= f.label :title, :class => "control-label" %>
+      <div class="controls">
+        <%= f.text_field :title %>
       </div>
+    </div>
   </fieldset>
 
   <fieldset class="spud_admin_photos_album_fieldset">
-    <%= link_to "New Photo", new_spud_admin_photo_path, :class => "spud_admin_photo_create ajax btn btn-primary", :title => "New Photo" %>
-    <legend>Select Photos</legend>
-    <div id="spud_admin_photos_selected" class="spud_admin_photos_selection_left">
-      <h4>Selected:</h4>
-      <div class="spud_admin_photo_ui_thumbs spud_admin_photo_ui_thumbs_sortable">
-        <%= render :partial => '/spud/admin/photos/photo', :collection => @photo_album.photos %>
-      </div>
+    <legend>Selected Photos</legend>
+    <div id="spud_admin_photo_album_actions" class="control-group">
+      <%= link_to "Photo Library", spud_admin_photos_path, :class => "btn btn-primary", :id => 'spud_admin_photo_album_action_library' %>
+      <%= link_to "Upload Photo", new_spud_admin_photo_path, :class => "ajax btn btn-primary", :title => "New Photo" %>
     </div>
-    <div id="spud_admin_photos_available" class="spud_admin_photos_selection_right">
-      <h4>Available:</h4>
-      <div class="spud_admin_photo_ui_thumbs spud_admin_photo_ui_thumbs_sortable">
-        <%= render :partial => '/spud/admin/photos/photo', :collection => @photo_album.photos_available %>
-      </div>
+    <div id="spud_admin_photo_upload_queue">
+      <h5 id="spud_admin_photo_upload_queue_label">Queued Uploads: <span>0</span></h5>
+      <div id="spud_admin_photo_upload_queue_bars"></div>
+    </div>
+    <div id="spud_admin_photos_selected" class="control-group spud_admin_photo_ui_thumbs spud_admin_photo_ui_thumbs_sortable">
+      <%= render :partial => '/spud/admin/photos/photo', :collection => @photo_album.photos %>
     </div>
   </fieldset>
 

data/app/views/spud/admin/photos/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for @photo, :url => (@photo.new_record? ? spud_admin_photos_path : spud_admin_photo_path(@photo)), :html => {:id => 'spud_admin_photo_form', :class => 'form-horizontal'} do |f| %> 
+<%= form_for @photo, :url => (@photo.new_record? ? spud_admin_photos_path : spud_admin_photo_path(@photo)), :html => {:id => 'spud_admin_photo_form', :target => 'spud_admin_photo_form_target', :class => 'form-horizontal'} do |f| %> 
   
   <%=error_messages_for(f.object)%>
   
@@ -36,13 +36,11 @@
       <% end %>
   </fieldset>
 
-  <div class="progress progress-striped active" style="display:none;">
-    <div class="bar" style="width: 0;"></div>
-  </div>
-
   <div class="form-actions">
     <%= f.submit "Save Photo", :class=>"btn btn-primary form-btn", "data-loading-text" => "Saving..." %> 
     <!--or <%=link_to "cancel", request.referer, :class => "btn" %> -->
   </div>
 
+  <iframe id="spud_admin_photo_form_target" name="spud_admin_photo_form_target" style="display:none;"></iframe>
+
 <% end %>

data/app/views/spud/admin/photos/_photo.html.erb

@@ -1,9 +1,13 @@
-<div id="spud_admin_photo_<%= photo.id %>" class="spud_admin_photo_ui_thumb spud_admin_photo_ui_thumb_small" style="background-image:url('<%= photo.photo.url(:spud_admin_small) %>')">
+<%= content_tag :div, 
+  :rel => photo.id,
+  :id => "spud_admin_photo_#{photo.id}", 
+  :style => "background-image:url('#{photo.photo.url(:spud_admin_small)}')",
+  :class => "spud_admin_photo_ui_thumb spud_admin_photo_ui_thumb_small" do %>
   <div style="display:none;">
-    <%= check_box_tag 'spud_photo_album[photo_ids][]', photo.id, (@photo_album && @photo_album.photo_ids.include?(photo.id)) %>
+    <%= hidden_field_tag 'spud_photo_album[photo_ids][]', photo.id %>
   </div>
   <div class="spud_admin_photo_ui_thumb_controls">
     <%= link_to 'Edit', edit_spud_admin_photo_path(photo), :class => 'ajax spud_admin_photos_btn_edit' %>
-    <%= link_to 'Delete', spud_admin_photo_path(photo), :method => :delete, :remote => true, :class => 'spud_admin_photos_btn_delete', :confirm => 'Are you sure? This will permanently delete the photo from all albums it currently belongs to.' %>
+    <%= link_to 'Delete', '#', :class => 'spud_admin_photos_btn_remove' %>
   </div>
-</div>
+<% end %>

data/app/views/spud/admin/photos/index.html.erb

@@ -1,12 +1,3 @@
-<%= content_for :data_controls do %>
-  <!--
-  <%= link_to 'Delete Selected', mass_destroy_spud_admin_photos_path, :class => 'spud_admin_photo_mass_destroy btn btn-danger', :confirm => 'Are you sure?' %>
-  -->
-  <%= link_to "New Photo", new_spud_admin_photo_path, :class => "spud_admin_photo_create ajax btn btn-primary", :title => "New Photo" %>
-<% end %>
-
-<%= content_for :detail do %>
-  <div id="spud_admin_photos" class="spud_admin_photo_ui_thumbs">
-    <%= render :partial => 'photo', :collection => @photos %>
-  <div>
-<% end %>
+<div id="spud_admin_photo_library" class="spud_admin_photo_ui_thumbs spud_admin_photo_ui_thumbs_selectable">
+  <%= render :partial => 'photo', :collection => @photos %>
+<div>

data/app/views/spud/admin/photos/show.js.erb

@@ -0,0 +1,5 @@
+<% if @photo.errors.any? %>
+  Spud.Admin.Photos.photoLegacyUploadErrors("<%= escape_javascript(render 'form') %>");
+<% else %>
+  Spud.Admin.Photos.photoLegacyUploadComplete(<%= @photo.id %>, "<%= escape_javascript(render :partial => 'photo', :locals => {:photo => @photo}) %>");
+<% end %>

data/config/routes.rb

@@ -3,6 +3,7 @@ Rails.application.routes.draw do
   namespace :spud do
     namespace :admin do
       resources :photos do
+        get 'library', :on => :collection
         post 'mass_destroy', :on => :collection
       end
       resources :photo_albums

data/db/migrate/20120405042046_upgrade_photo_relationships.rb

@@ -0,0 +1,8 @@
+class UpgradePhotoRelationships < ActiveRecord::Migration
+  def change
+    add_column :spud_photo_albums_photos, :id, :primary_key
+    add_column :spud_photo_albums_photos, :order, :integer, :default => 0
+    add_column :spud_photo_galleries_albums, :id, :primary_key
+    add_column :spud_photo_galleries_albums, :order, :integer, :default => 0
+  end
+end

data/lib/responds_to_parent.rb

@@ -0,0 +1,69 @@
+#  Copyright (c) 2006 Sean Treadway
+#
+#  Permission is hereby granted, free of charge, to any person obtaining
+#  a copy of this software and associated documentation files (the
+#  "Software"), to deal in the Software without restriction, including
+#  without limitation the rights to use, copy, modify, merge, publish,
+#  distribute, sublicense, and/or sell copies of the Software, and to
+#  permit persons to whom the Software is furnished to do so, subject to
+#  the following conditions:
+#
+#  The above copyright notice and this permission notice shall be
+#  included in all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+#  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+#  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+#  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+# Module containing the methods useful for child IFRAME to parent window communication
+module RespondsToParent
+
+  # Executes the response body as JavaScript in the context of the parent window.
+  # Use this method of you are posting a form to a hidden IFRAME or if you would like
+  # to use IFRAME base RPC.
+  def responds_to_parent(&block)
+    yield
+
+    if performed?
+      # We're returning HTML instead of JS or XML now
+      response.headers['Content-Type'] = 'text/html; charset=UTF-8'
+
+      # Either pull out a redirect or the request body
+      script =  if response.headers['Location']
+                  #TODO: erase_redirect_results is missing in rails 3.0 has to be implemented
+#                  erase redirect
+                  "document.location.href = #{location.to_s.inspect}"
+                else
+                  response.body
+                end
+
+      # Escape quotes, linebreaks and slashes, maintaining previously escaped slashes
+      # Suggestions for improvement?
+      script = (script || '').
+        gsub('\\', '\\\\\\').
+        gsub(/\r\n|\r|\n/, '\\n').
+        gsub(/['"]/, '\\\\\&').
+        gsub('</script>','</scr"+"ipt>')
+
+      # Clear out the previous render to prevent double render
+      response.request.env['action_controller.instance'].instance_variable_set(:@_response_body, nil)
+
+      # Eval in parent scope and replace document location of this frame
+      # so back button doesn't replay action on targeted forms
+      # loc = document.location to be set after parent is updated for IE
+      # with(window.parent) - pull in variables from parent window
+      # setTimeout - scope the execution in the windows parent for safari
+      # window.eval - legal eval for Opera
+      render :text => "<html><body><script type='text/javascript' charset='utf-8'>
+        var loc = document.location;
+        with(window.parent) { setTimeout(function() { window.eval('#{script}'); if (typeof(loc) !== 'undefined') loc.replace('about:blank'); }, 1) };
+        </script></body></html>".html_safe
+    end
+  end
+  alias respond_to_parent responds_to_parent
+end

data/lib/spud_photos.rb

@@ -1,5 +1,6 @@
 module Spud
   module Photos
+    require 'responds_to_parent.rb'
  		require 'spud_photos/configuration'
 		require 'spud_photos/engine' if defined?(Rails)
   end

data/lib/spud_photos/engine.rb

@@ -15,12 +15,12 @@ module Spud
           :url => '/spud/admin/photo_albums',
           :retina => true,
           :order => 82
-        },{
-          :name => 'Photos',
-          :thumbnail => 'spud/photos/photo_albums_thumb.png',
-          :url => '/spud/admin/photos',
-          :retina => true,
-          :order => 83
+        # },{
+        #   :name => 'Photos',
+        #   :thumbnail => 'spud/photos/photo_albums_thumb.png',
+        #   :url => '/spud/admin/photos',
+        #   :retina => true,
+        #   :order => 83
         }]
         if Spud::Photos.config.galleries_enabled
           Spud::Core.config.admin_applications += [{

data/lib/spud_photos/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Photos
-	  VERSION = "0.0.2"
+	  VERSION = "0.0.3"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_photos
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-31 00:00:00.000000000 Z
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70105838190880 !ruby/object:Gem::Requirement
+  requirement: &70189045047420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70105838190880
+  version_requirements: *70189045047420
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70105838188820 !ruby/object:Gem::Requirement
+  requirement: &70189045046840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70105838188820
+  version_requirements: *70189045046840
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70105838186920 !ruby/object:Gem::Requirement
+  requirement: &70189045045960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105838186920
+  version_requirements: *70189045045960
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70105838200760 !ruby/object:Gem::Requirement
+  requirement: &70189045045160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,7 +57,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105838200760
+  version_requirements: *70189045045160
 description: Spud Photos is a feature complete photo management/gallery for the spud
   engine. Manage multiple galleries, albums, and photos. Use HTML 5 to drag and drop
   many images at once.
@@ -89,6 +89,8 @@ files:
 - app/helpers/spud/admin/photos_helper.rb
 - app/models/spud_photo.rb
 - app/models/spud_photo_album.rb
+- app/models/spud_photo_albums_photo.rb
+- app/models/spud_photo_galleries_album.rb
 - app/models/spud_photo_gallery.rb
 - app/views/layouts/spud/admin/spud_photos.html.erb
 - app/views/photo_albums/index.html.erb
@@ -111,11 +113,14 @@ files:
 - app/views/spud/admin/photos/edit.html.erb
 - app/views/spud/admin/photos/index.html.erb
 - app/views/spud/admin/photos/new.html.erb
+- app/views/spud/admin/photos/show.js.erb
 - config/routes.rb
 - db/migrate/20120228232120_create_spud_photos.rb
 - db/migrate/20120228232329_create_spud_photo_albums.rb
 - db/migrate/20120228232344_create_spud_photo_galleries.rb
+- db/migrate/20120405042046_upgrade_photo_relationships.rb
 - lib/generators/spud/photos/views_generator.rb
+- lib/responds_to_parent.rb
 - lib/spud_photos/configuration.rb
 - lib/spud_photos/engine.rb
 - lib/spud_photos/version.rb
@@ -166,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2069257905353995615
+      hash: 4384740055791320075
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,10 +180,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2069257905353995615
+      hash: 4384740055791320075
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Spud Photos Engine