tb_photos 1.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmE0OWRiMGJhZjFhYzljNGVkZjQxMGFhMzY2N2I4ZTZiMTNjYzFjYw==
+    ZjFmN2JiMjcyNjEwN2ViZTk2MmEwMjZiZTNiYWI1NjNhYjk4ZjQzZQ==
   data.tar.gz: !binary |-
-    YzlkMWY1OTAzNmFkZDI4OWQ1NzMwM2ViNDA1NTYxOGNkMTVkOGJjYw==
+    N2EyNjE5N2FiZGNlZTdlYjBkMGQ3NGQ1MTQ4NDFlOGUxOTQ2OGNhZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGI5YzQ2YmRiMzI0YmU3YTgyYzBmMDBhN2Y1NGMwM2U5YzIzODNiNWVjZjYx
-    ZTUxMTRhOGZlMTI3YjJjNDg1NWE2Nzc5NGRkZjRiMjc3MzEwMDZmODAwMzBi
-    ODgxYTU1NjgwMDg5ZjZkYmY1MjMxNWI3Y2FhYjM2ZDA1MzI3OGQ=
+    ZTE1ZDhkODYxYTU4ODg1YmYyYTQ3ZjA1ZDUxZDA4OWFiZWEzNmE0ZmZhM2U0
+    M2Y4NDExYTBkZTkxMjMzNjJiOTkyNjBiNmVhYWFjN2NiYjQzZjQyMjE4MGEz
+    YjZkMzMwMDYwNDQ4OTcwNmRmMDZlYjdmZTU1NTNiYzkzZDEwMGM=
   data.tar.gz: !binary |-
-    MmFhZmU3NGRmYTdkODJiNGMxMWJiMjgyNTJlNWE1ZWVjMGZiMjg0OTdhYzhi
-    M2RiNDM2YWIzMDcyMDQwMzZkY2Q5OWIwNGQ2YTBjOGZkYWJlNDE3YjY4NmU2
-    MDk1NTMxMjZiYzIzOWZmZmNjNWU1ZWJjODdjMTdkNzYzZWY3MWI=
+    ZjE0ZTllMzIwMGIwYmU3Y2IxNGZhM2RmMWEzZDBlYTYxZjJiYjY5ODA5OTc2
+    ZTU3MzkyMjlmZjAwMDMwZDk3NDdlYmU2NmVjOWY3ZmY1OWQ0YzA4ZDg3YmJh
+    YjJhNDNhNDIwZTEyYjljN2I1YzUwYjdjMDI2ZmNmYWRhMmFjMjc=

data/README.markdown

@@ -1,12 +1,12 @@
-# Spud Photos
+# Twice Baked Photos
 
-Spud Photos is an engine for creating and managing photo galleries, designed for use with [Spud][1].
+TB Photos is an engine for creating and managing photo galleries, designed for use with [Twice Baked][1].
 
 ## Installation/Usage
 
 1. In your Gemfile add the following
 
-		gem 'spud_photos'
+		gem 'tb_photos'
 
 2. Run bundle install
 3. Copy in database migrations to your new rails project
@@ -14,11 +14,11 @@ Spud Photos is an engine for creating and managing photo galleries, designed for
 		bundle exec rake railties:install:migrations
 		rake db:migrate
 
-4. Run a rails server instance and point your browser to /spud/admin
+4. Run a rails server instance and point your browser to `/admin`
 
 ## Configuration
 
-Spud Photos accepts the following configuration options:
+TB Photos accepts the following configuration options:
 
 	Spud::Photos.configure do |config|
 	  config.base_layout = 'application'
@@ -30,12 +30,15 @@ Spud Photos accepts the following configuration options:
 	    :large => '400x400#',
 	    :huge => '600x600'
 	  }
+	  config.max_image_upload_size = 2.megabytes
 	  config.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 `max_image_upload_size` should match with the apache/nginx max upload size for the public directory. Set the config to 0 for no size limit.
+
 The `photo_styles` option will be passed to [Paperclip][2], so any valid paperclip styles can be added here.
 
 ## Galleries
@@ -48,16 +51,12 @@ A number of built-in views have been provided to help you get started with the f
 
 	rails generate spud:photos:views
 
-__NOTE:__ The built-in views are likely to undergo changes as features are added to the photos engine. If a new version of Spud Photos does not play nicely with your customized views, try backing up your views to an alternate location and running the views generator again to see what has changed. 
-
-
-[1]:https://github.com/davydotcom/spud_core_admin
-[2]:https://github.com/thoughtbot/paperclip
+__NOTE:__ The built-in views are likely to undergo changes as features are added to the photos engine. If a new version of TB Photos does not play nicely with your customized views, try backing up your views to an alternate location and running the views generator again to see what has changed. 
 
 Testing
 -----------------
 
-Spud uses RSpec for testing. Get the tests running with a few short commands:
+Twice Baked uses RSpec for testing. Get the tests running with a few short commands:
 
 1. Create and migrate the databases:
    
@@ -72,4 +71,8 @@ Spud uses RSpec for testing. Get the tests running with a few short commands:
 
         rspec spec
 
-After the tests have completed the current code coverage stats is available by opening ```/coverage/index.html``` in a browser.
+After the tests have completed the current code coverage stats is available by opening ```/coverage/index.html``` in a browser.
+
+
+[1]:https://bitbucket.org/westlakedesign/tb_core
+[2]:https://github.com/thoughtbot/paperclip

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SpudPhotos'
+  rdoc.title    = 'TbPhotos'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')

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

@@ -0,0 +1 @@
+//= require ./photos

data/app/assets/javascripts/{spud/admin → admin/photos}/photos.js

@@ -1,12 +1,11 @@
-Spud = (typeof(Spud) == 'undefined') ? {} : Spud;
-Spud.Admin = (typeof(Spud.Admin) == 'undefined') ? {} : Spud.Admin;
+(function(){
 
-Spud.Admin.Photos = new function(){
+  spud.admin.photos = {};
+  var self = spud.admin.photos;
 
-  var self = this;
-  var html5upload = false;
+  self.html5upload = false;
 
-  this.init = function(){
+  self.init = function(){
     // event handlers
     $('.spud_admin_photo_ui_thumbs_sortable').sortable({
       connectWith:'.spud_admin_photo_ui_thumbs_sortable'
@@ -23,7 +22,7 @@ Spud.Admin.Photos = new function(){
 
     // html5 drag and drop file
     if(typeof(FormData) != 'undefined' && typeof(XMLHttpRequest) != 'undefined' && (droparea = document.getElementById('spud_admin_photo_upload_queue'))){
-      html5upload = true;
+      self.html5upload = true;
       $('#spud_admin_photo_upload_queue').show();
       droparea.addEventListener('dragenter', self.stopDndPropagation, false);
       droparea.addEventListener('dragexit', self.stopDndPropagation, false);
@@ -39,29 +38,48 @@ Spud.Admin.Photos = new function(){
     }
   };
 
-  this.submittedPhotoAlbumForm = function(e){
+  self.submittedPhotoAlbumForm = function(e){
 
   };
 
-  this.submittedPhotoGalleryForm = function(e){
+  self.submittedPhotoGalleryForm = function(e){
     $('#spud_admin_photo_albums_available .spud_admin_photo_ui_thumb').remove();
   };
 
-  this.clickedPhotoRemoveFromAlbum = function(e){
+  self.clickedPhotoRemoveFromAlbum = function(e){
     $(this).parents('.spud_admin_photo_ui_thumb').fadeOut(200, function(){
       $(this).remove();
     });
     return false;
   };
 
+  self.validatePhoto = function(file) {
+    var errors = [];
+
+    if(file) {
+      var allowedTypes = ["image/jpeg", "image/png", "image/gif", "image/bmp"];
+      if(allowedTypes.indexOf(file.type) < 0) {
+        errors.push("Unsupported file format");
+      }
+      var maxAllowedSize = spud.admin.photos.max_image_upload_size_bytes;
+      if(maxAllowedSize && file.size > maxAllowedSize) {
+        errors.push("Your file size of " + self.getFileSizeHumanized(file.size) + " exceeded the maximum limit of " + spud.admin.photos.max_image_upload_size_humanized);
+      }
+    }
+    else {
+      errors.push("No file found");
+    }
+    return errors;
+  };
+
   /* Handle file uploads passed via iframe (legacy support)
   * -------------------------------------------------------- */
 
-  this.photoLegacyUploadErrors = function(html){
+  self.photoLegacyUploadErrors = function(html){
     $('#spud_admin_photo_form').replaceWith(html);
   };
 
-  this.photoLegacyUploadComplete = function(id, html){
+  self.photoLegacyUploadComplete = function(id, html){
     var element = $('#spud_admin_photo_' + id);
     if(element.length > 0){
       element.replaceWith(html);
@@ -73,7 +91,7 @@ Spud.Admin.Photos = new function(){
     hideModalDialog();
   };
 
-  this.selectedPhotoUiThumb = function(e){
+  self.selectedPhotoUiThumb = function(e){
     var thumb = $(this);
     if(thumb.hasClass('spud_admin_photo_ui_thumb_selected')){
       $(this).removeClass('spud_admin_photo_ui_thumb_selected');
@@ -83,21 +101,21 @@ Spud.Admin.Photos = new function(){
     }
   };
 
-  this.markPhotoAsDeleted = function(photo_id){
+  self.markPhotoAsDeleted = function(photo_id){
     var photo = $('#spud_admin_photo_' + photo_id);
     photo.fadeOut(200, function(){
       photo.remove();
     });
   };
 
-  this.markPhotoAlbumAsDeleted = function(photo_album_id){
+  self.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){
+  self.markPhotoGalleryAsDeleted = function(photo_gallery_id){
     var photo_gallery = $('#spud_admin_photo_gallery_' + photo_gallery_id);
     photo_gallery.fadeOut(200, function(){
       photo_gallery.remove();
@@ -108,13 +126,47 @@ Spud.Admin.Photos = new function(){
   * Single-Photo Form Upload
   -------------------------------- */
 
-  this.submittedPhotoForm = function(e){
+  self.generateFileUploadErrors = function(errors, opts) {
+
+    if(typeof errors == "string") {
+      errors = [errors];
+    }
+    var totalErrors = errors.length;
+    var errorMsg = totalErrors + " errors prohibited you from saving:";
+    if(totalErrors == 1) {
+      errorMsg = "1 error prohibited you from saving:";
+    }
+    if(opts && opts.showAsDialog) {
+      alert(errorMsg + '\n\t' + errors.join('\n\t'));
+      return false;
+    }
+
+    $(".spud_admin_form_error_list").remove();
+    $("#spud_admin_photo_form").find("[for=spud_photo_photo]").css("color","black");
+    $("#spud_admin_photo_form").before('<div class="spud_admin_form_error_list"><ul><h4>' + errorMsg +'</h4></ul></div>');
+    $("#spud_admin_photo_form").find("[for=spud_photo_photo]").css("color","red");
+    for(var i = 0; i < errors.length; i++) {
+      $(".spud_admin_form_error_list > ul").append("<li>"+ errors[i] + "</li>");
+    }
+    return false;
+  };
+
+  self.getFileSizeHumanized = function(bytes) {
+    var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+    if(bytes === 0){
+      return 'n/a';
+    }
+    var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)), 10);
+    return (bytes / Math.pow(1024, i)).toFixed(1) + ' ' + sizes[i];
+  };
+
+  self.submittedPhotoForm = function(e){
     // disable submit button
     // not working in updated bootstrap!
     // var submit = $(this).find('input[type=submit]');
     // submit.attr('disabled', 'disabled').val(submit.attr('data-loading-text'));
 
-    if(html5upload){
+    if(self.html5upload){
       // create a FormData object and attach form values
       var fd = new FormData();
       var form = $(this);
@@ -126,14 +178,14 @@ Spud.Admin.Photos = new function(){
       // progress bar to send events to
       var progressBar;
       var file = form.find('#spud_photo_photo')[0].files[0];
-      if(file){
-        progressBar = self.progressBarForUpload(file.name);
-        fd.append('spud_photo[photo]', file);
-        form.append(progressBar);
-      }
-      else{
-        progressBar = self.progressBarForUpload('');
+      var photoValidationErrors = self.validatePhoto(file);
+      if(photoValidationErrors.length) {
+        return self.generateFileUploadErrors(photoValidationErrors);
       }
+      
+      progressBar = self.progressBarForUpload(file.name);
+      fd.append('spud_photo[photo]', file);
+      form.append(progressBar);
 
       // send FormData object as ajax request
       var xhr = new XMLHttpRequest();
@@ -152,7 +204,7 @@ Spud.Admin.Photos = new function(){
   * Upload Progress Monitoring
   -------------------------------- */
 
-  this.progressBarForUpload = function(fileName){
+  self.progressBarForUpload = function(fileName){
     var html = [
       '<div class="spud_admin_photo_progress">',
         '<h6>',
@@ -167,7 +219,7 @@ Spud.Admin.Photos = new function(){
     return $(html);
   };
 
-  this.onPhotoUploadProgress = function(e, progressBar){
+  self.onPhotoUploadProgress = function(e, progressBar){
     var percent = Math.round(e.loaded * 100 / e.total);
     progressBar.find('.bar').css({width: percent + '%'});
     if(percent == 100){
@@ -176,7 +228,7 @@ Spud.Admin.Photos = new function(){
     }
   };
 
-  this.onPhotoUploadComplete = function(e, progressBar){
+  self.onPhotoUploadComplete = function(e, progressBar){
     // success
     var photo = $.parseJSON(e.target.response);
     if(e.target.status == 200){
@@ -198,7 +250,7 @@ Spud.Admin.Photos = new function(){
     }
   };
 
-  this.onPhotoUploadCancel = function(e, progressBar){
+  self.onPhotoUploadCancel = function(e, progressBar){
     progressBar.find('.spud_admin_photo_progress_status').text('Done!');
     progressBar.find('.progress').addClass('progress-danger');
   };
@@ -206,7 +258,7 @@ Spud.Admin.Photos = new function(){
   /*
   * Photo Upload/Edit Form
   ------------------------------- */
-  this.clickedPhotoAddOrEdit = function(e){
+  self.clickedPhotoAddOrEdit = function(e){
     var url = this.href;
     $.ajax({
       url:url,
@@ -215,18 +267,19 @@ Spud.Admin.Photos = new function(){
     return false;
   };
 
-  this.photoUploadFormLoaded = function(html){
+  self.photoUploadFormLoaded = function(html){
     displayModalDialogWithOptions({
       title: 'Upload Photo',
       html: html
     });
+    $("#fileUploadSizeLegend").html('File Upload <span class="split-pane-item-meta">max allowed size : '+ spud.admin.photos.max_image_upload_size_humanized +'</span>');
   };
 
   /*
   * Add From Photo Library
   ------------------------------- */
 
-  this.clickedPhotoLibrary = function(e){
+  self.clickedPhotoLibrary = function(e){
     var url = this.href;
     $.ajax({
       url:url,
@@ -235,7 +288,7 @@ Spud.Admin.Photos = new function(){
     return false;
   };
 
-  this.photoLibraryLoaded = function(html){
+  self.photoLibraryLoaded = function(html){
     var dialog = $('#modal_window');
     $('#spud_admin_photos_selected .spud_admin_photo_ui_thumb').each(function(){
       var id = $(this).attr('id');
@@ -254,7 +307,7 @@ Spud.Admin.Photos = new function(){
     });
   };
 
-  this.addSelectedPhotosFromLibrary = function(e){
+  self.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')
@@ -263,13 +316,13 @@ Spud.Admin.Photos = new function(){
     hideModalDialog();
   };
 
-  this.deleteSelectedPhotosFromLibrary = function(e){
+  self.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',
+      url: '/admin/photos/mass_destroy',
       data: {spud_photo_ids:ids},
       success: function(data, textStatus, jqXHR){
         $('.spud_admin_photo_ui_thumb_selected').fadeOut(200, function(){
@@ -288,24 +341,29 @@ Spud.Admin.Photos = new function(){
   * Drag & Drop File Upload Queue
   -------------------------------- */
 
-  this.fileQueue = [];
-  this.fileQueueStarted = false;
+  self.fileQueue = [];
+  self.fileQueueStarted = false;
 
   // prevent default browser behavior of opening the dropped file
-  this.stopDndPropagation = function(e){
+  self.stopDndPropagation = function(e){
     e.stopPropagation();
     e.preventDefault();
   };
 
   // add files to queue. starts queue if not started already
-  this.droppedFile = function(e){
+  self.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]);
+      var file = files[i];
+      var photoValidationErrors = self.validatePhoto(file);
+      if(photoValidationErrors.length) {
+        return self.generateFileUploadErrors(photoValidationErrors, {showAsDialog: true});
+      }
+      self.fileQueue.push(file);
       i++;
     }
     self.updateQueueCountLabel();
@@ -317,11 +375,11 @@ Spud.Admin.Photos = new function(){
     }
   };
 
-  this.updateQueueCountLabel = function(){
+  self.updateQueueCountLabel = function(){
     $('#spud_admin_photo_upload_queue_label span').text(self.fileQueue.length);
   };
 
-  this.uploadNextPhoto = function(){
+  self.uploadNextPhoto = function(){
     if(self.fileQueue.length === 0){
       self.fileQueueStarted = false;
       return;
@@ -343,14 +401,15 @@ Spud.Admin.Photos = new function(){
     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.open('POST', '/admin/photos');
     xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
     xhr.send(fd);
   };
 
-  this.onQueuedPhotoUploadComplete = function(e, progressBar){
+  self.onQueuedPhotoUploadComplete = function(e, progressBar){
     self.onPhotoUploadComplete(e, progressBar);
     self.updateQueueCountLabel();
     self.uploadNextPhoto();
   };
-};
+
+})();

data/app/assets/stylesheets/{spud/admin/photos.css → admin/photos/application.css.scss}

@@ -1,5 +1,5 @@
-/* Thumbnails
----------------------------- */
+// Thumbnails
+//////////////
 .spud_admin_photo_ui_thumbs{
   height: 300px;
   padding: 0;
@@ -75,7 +75,7 @@
   border-bottom-right-radius: 15px;
 }
 .spud_admin_photos_btn_remove, .spud_admin_photos_btn_delete{
-  background: url('/assets/spud/photos/buttons/x_16x16.png');
+  background: image-url('admin/photos/buttons/x_16x16.png');
   height: 16px;
   width: 16px;
   text-indent: -7777px;
@@ -83,7 +83,7 @@
   margin: 0 4px;
 }
 .spud_admin_photos_btn_edit{
-  background: url('/assets/spud/photos/buttons/cog_16x16.png');
+  background: image-url('admin/photos/buttons/cog_16x16.png');
   height: 16px;
   width: 16px;
   text-indent: -7777px;
@@ -91,8 +91,8 @@
   margin: 0 4px;
 }
 
-/* Upload Queue
----------------------------- */
+// Upload Queue
+//////////////
 .spud_admin_photo_progress{
   margin: 10px 0;
 }
@@ -108,8 +108,8 @@
   overflow-y: scroll;
 }
  
-/* Gallery Form
----------------------------- */
+// Gallery Form
+//////////////
 .spud_admin_photos_selection_left{
   width: 520px;
   margin-right: 18px;

data/app/controllers/{spud/admin → admin}/photo_albums_controller.rb

@@ -1,9 +1,8 @@
-class Spud::Admin::PhotoAlbumsController < Spud::Admin::ApplicationController
+class Admin::PhotoAlbumsController < Admin::ApplicationController
 
   before_filter :get_album, :only => [:show, :edit, :update, :destroy, :library]
-  add_breadcrumb 'Photo Albums', :spud_admin_photo_albums_path
-  respond_to :html, :json, :xml
-  layout 'spud/admin/spud_photos'
+  add_breadcrumb 'Photo Albums', :admin_photo_albums_path
+  layout 'admin/spud_photos'
   cache_sweeper :spud_photo_sweeper, :only => [:create, :update, :destroy]
 
   def index
@@ -25,7 +24,7 @@ class Spud::Admin::PhotoAlbumsController < Spud::Admin::ApplicationController
     if @photo_album.save
       set_photo_order
     end
-    respond_with @photo_album, :location => spud_admin_photo_albums_path
+    respond_with @photo_album, :location => admin_photo_albums_path
   end
 
   def edit
@@ -38,12 +37,12 @@ class Spud::Admin::PhotoAlbumsController < Spud::Admin::ApplicationController
       set_photo_order
       flash[:notice] = 'SpudPhotoAlbum updated successfully' 
     end
-    respond_with @photo_album, :location => spud_admin_photo_albums_path
+    respond_with @photo_album, :location => admin_photo_albums_path
   end
 
   def destroy
     flash[:notice] = 'SpudPhotoAlbum deleted successfully' if @photo_album.destroy
-    respond_with @photo_album, :location => spud_admin_photo_albums_path
+    respond_with @photo_album, :location => admin_photo_albums_path
   end
 
   def get_album

data/app/controllers/{spud/admin → admin}/photo_galleries_controller.rb

@@ -1,10 +1,9 @@
-class Spud::Admin::PhotoGalleriesController < Spud::Admin::ApplicationController
+class Admin::PhotoGalleriesController < Admin::ApplicationController
 
   before_filter :get_gallery, :only => [:show, :edit, :update, :destroy]
   before_filter :get_albums, :only => [:new, :create, :edit, :update]
-  add_breadcrumb 'Photo Galleries', :spud_admin_photo_galleries_path
-  respond_to :html, :json, :xml
-  layout 'spud/admin/spud_photos'
+  add_breadcrumb 'Photo Galleries', :admin_photo_galleries_path
+  layout 'admin/spud_photos'
   cache_sweeper :spud_photo_sweeper, :only => [:create, :update, :destroy]
 
   def index
@@ -24,7 +23,7 @@ class Spud::Admin::PhotoGalleriesController < Spud::Admin::ApplicationController
   def create
     @photo_gallery = SpudPhotoGallery.new(params[:spud_photo_gallery])
     flash[:notice] = 'SpudPhotoGallery created successfully' if @photo_gallery.save
-    respond_with @photo_gallery, :location => spud_admin_photo_galleries_path
+    respond_with @photo_gallery, :location => admin_photo_galleries_path
   end
   
   def edit
@@ -34,12 +33,12 @@ class Spud::Admin::PhotoGalleriesController < Spud::Admin::ApplicationController
   def update
     @photo_gallery.update_attributes(params[:spud_photo_gallery])
     flash[:notice] = 'SpudPhotoGallery updated successfully' if @photo_gallery.save
-    respond_with @photo_gallery, :location => spud_admin_photo_galleries_path
+    respond_with @photo_gallery, :location => admin_photo_galleries_path
   end
   
   def destroy
     flash[:notice] = 'SpudPhotoGallery deleted successfully' if @photo_gallery.destroy
-    respond_with @photo_gallery, :location => spud_admin_photo_galleries_path
+    respond_with @photo_gallery, :location => admin_photo_galleries_path
   end
 
   def get_gallery

data/app/controllers/{spud/admin → admin}/photos_controller.rb

@@ -1,9 +1,8 @@
-class Spud::Admin::PhotosController < Spud::Admin::ApplicationController
+class Admin::PhotosController < Admin::ApplicationController
 
   include RespondsToParent
 
   before_filter :get_photo, :only => [:show, :edit, :update, :destroy]
-  respond_to :html, :json, :xml, :js
   layout false
   cache_sweeper :spud_photo_sweeper, :only => [:create, :update, :destroy]
 
@@ -61,13 +60,13 @@ class Spud::Admin::PhotosController < Spud::Admin::ApplicationController
 
   def destroy
     flash[:notice] = 'SpudPhoto deleted successfully' if @photo.destroy
-    respond_with @photo, :location => spud_admin_photos_path
+    respond_with @photo, :location => admin_photos_path
   end
 
   def mass_destroy
     @photos = SpudPhoto.where(:id => params[:spud_photo_ids])
     flash[:notice] = 'Photos deleted successfully' if @photos.destroy_all
-    respond_with @photos, :location => spud_admin_photos_path
+    respond_with @photos, :location => admin_photos_path
   end
 
   private

data/app/controllers/photo_albums_controller.rb

@@ -23,14 +23,9 @@ class PhotoAlbumsController < ApplicationController
   end
 
   def show
-    @photo_album = SpudPhotoAlbum.find_by_url_name(params[:id])
+    @photo_album = SpudPhotoAlbum.where(:url_name => params[:id]).first
     if @photo_album.blank?
-      flash[:error] = "Could not find the requested Photo Album"
-      if params[:photo_gallery_id]
-        redirect_to photo_gallery_photo_albums_path(params[:photo_gallery_id])
-      else
-        redirect_to photo_albums_path
-      end
+      raise Spud::NotFoundError.new(:item => 'photo album')
     else
       respond_with @photo_album
     end
@@ -39,16 +34,10 @@ class PhotoAlbumsController < ApplicationController
 private
 
   def get_gallery
-    @photo_gallery = SpudPhotoGallery.find_by_url_name(params[:photo_gallery_id])
+    @photo_gallery = SpudPhotoGallery.where(:url_name => params[:photo_gallery_id]).first
     if @photo_gallery.blank?
-      flash[:error] = "Could not find the requested Photo Gallery"
-      if request.xhr?
-        render :nothing => true, :status => 404
-      else
-        redirect_to photo_galleries_path
-      end
-      return false
+      raise Spud::NotFoundError.new(:item => 'photo gallery')
     end
   end
 
-end
+end

data/app/controllers/photo_galleries_controller.rb

@@ -14,4 +14,4 @@ class PhotoGalleriesController < ApplicationController
     respond_with @photo_galleries
   end
 
-end
+end

data/app/helpers/admin/photo_albums_helper.rb

@@ -0,0 +1,2 @@
+module Admin::PhotoAlbumsHelper
+end

data/app/helpers/admin/photo_galleries_helper.rb

@@ -0,0 +1,2 @@
+module Admin::PhotoGalleriesHelper
+end

data/app/helpers/{spud/admin → admin}/photos_helper.rb

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

data/app/models/spud_photo.rb

@@ -1,5 +1,7 @@
 class SpudPhoto < ActiveRecord::Base
 
+  extend ActionView::Helpers::NumberHelper
+
   attr_accessible :title, :caption, :photo
 
   has_many :spud_photo_albums_photos, :dependent => :destroy
@@ -9,21 +11,23 @@ class SpudPhoto < ActiveRecord::Base
 
   has_attached_file :photo, 
     :styles => lambda { |attachment| attachment.instance.dynamic_styles },
-    :convert_options => Spud::Photos.config.convert_options,
+    :convert_options => Spud::Photos.convert_options,
+    :source_file_options => Spud::Photos.source_file_options,
     :storage => Spud::Photos.paperclip_storage,
     :s3_credentials => Spud::Photos.s3_credentials,
     :url => Spud::Photos.storage_url,
     :path => Spud::Photos.storage_path
 
-  validates_attachment_presence :photo
+  validates_attachment :photo,
+    :presence => true,
+    :size => {:less_than => Spud::Photos.max_image_upload_size, :message => "size cannot exceed " + number_to_human_size(Spud::Photos.max_image_upload_size), :if => Proc.new{|p| Spud::Photos.max_image_upload_size > 0}}
 
   def dynamic_styles
-    compress = '-strip -density 72x72'
     admin_styles = {
-      :spud_admin_small => {:geometry => '125x125#', :convert_options => compress},
-      :spud_admin_medium => {:geometry => '300x200', :convert_options => compress}
+      :spud_admin_small => {:geometry => '125x125#', :format => :jpg, :source_file_options => '-density 72', :convert_options => '-strip -quality 85'},
+      :spud_admin_medium => {:geometry => '300x200', :format => :jpg, :source_file_options => '-density 72', :convert_options => '-strip -quality 85'}
     }
     return admin_styles.merge(Spud::Photos.config.photo_styles)
   end
 
-end
+end

data/app/models/spud_photo_album.rb

@@ -19,7 +19,7 @@ class SpudPhotoAlbum < ActiveRecord::Base
   after_save :update_photo_order
 
   def top_photo_url(style)
-    unless photos.empty?
+    if photos.length > 0
       return photos.first.photo.url(style)
     end
   end

data/app/views/{spud/admin → admin}/photo_albums/_album.html.erb

@@ -4,7 +4,7 @@
     <%= hidden_field_tag 'spud_photo_gallery[album_ids][]', album.id %>
   </div>
   <div class="spud_admin_photo_ui_thumb_controls">
-    <%= link_to 'Edit', edit_spud_admin_photo_album_path(album), :class => 'spud_admin_photos_btn_edit' %>
-    <%= link_to 'Delete', spud_admin_photo_album_path(album), :method => :delete, :class => 'spud_admin_photos_btn_delete', :remote => true, :confirm => 'Are you sure?' %>
+    <%= link_to 'Edit', edit_admin_photo_album_path(album), :class => 'spud_admin_photos_btn_edit' %>
+    <%= link_to 'Delete', admin_photo_album_path(album), :method => :delete, :class => 'spud_admin_photos_btn_delete', :remote => true, :confirm => 'Are you sure?' %>
   </div>
 </div>

data/app/views/{spud/admin → admin}/photo_albums/_form.html.erb

@@ -15,8 +15,8 @@
   <fieldset class="spud_admin_photos_album_fieldset">
     <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 => "btn btn-success", :id => 'spud_admin_photo_album_action_upload' %>
+      <%= link_to "Photo Library", admin_photos_path, :class => "btn btn-primary", :id => 'spud_admin_photo_album_action_library' %>
+      <%= link_to "Upload Photo", new_admin_photo_path, :class => "btn btn-success", :id => 'spud_admin_photo_album_action_upload' %>
     </div>
     <div id="spud_admin_photo_upload_queue">
       <p>Drag and drop photos here to upload</p>
@@ -24,7 +24,7 @@
       <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 %>
+      <%= render :partial => '/admin/photos/photo', :collection => @photo_album.photos %>
     </div>
   </fieldset>
 

data/app/views/admin/photo_albums/edit.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'form', :locals => {:path => admin_photo_album_path(@photo_album)} %>

data/app/views/{spud/admin → admin}/photo_albums/index.html.erb

@@ -1,5 +1,5 @@
 <%= content_for :data_controls do %>
-  <%= link_to "New Photo Album", new_spud_admin_photo_album_path, :class => "btn btn-primary", :title => "New Photo Album" %>
+  <%= link_to "New Photo Album", new_admin_photo_album_path, :class => "btn btn-primary", :title => "New Photo Album" %>
 <% end %>
 
 <%= content_for :detail do %>

data/app/views/admin/photo_albums/new.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'form', :locals => {:path => admin_photo_albums_path} %>

data/app/views/{spud/admin → admin}/photo_galleries/_form.html.erb

@@ -20,13 +20,13 @@
     <div id="spud_admin_photo_albums_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/photo_albums/album', :collection => @photo_gallery.albums %>
+        <%= render :partial => '/admin/photo_albums/album', :collection => @photo_gallery.albums %>
       </div>
     </div>
     <div id="spud_admin_photo_albums_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/photo_albums/album', :collection => @photo_gallery.albums_available %>
+        <%= render :partial => '/admin/photo_albums/album', :collection => @photo_gallery.albums_available %>
       </div>
     </div>
   </fieldset>

data/app/views/admin/photo_galleries/destroy.js.erb

@@ -0,0 +1 @@
+spud.admin.photos.markPhotoGalleryAsDeleted(<%= @photo_gallery.id %>);

data/app/views/admin/photo_galleries/edit.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'form', :locals => {:path => admin_photo_gallery_path(@photo_gallery)} %>

data/app/views/{spud/admin → admin}/photo_galleries/index.html.erb

@@ -1,5 +1,5 @@
 <%= content_for :data_controls do %>
-  <%= link_to "New Photo Gallery", new_spud_admin_photo_gallery_path, :class => "btn btn-primary", :title => "New Photo Gallery" %>
+  <%= link_to "New Photo Gallery", new_admin_photo_gallery_path, :class => "btn btn-primary", :title => "New Photo Gallery" %>
 <% end %>
 
 <%= content_for :detail do %>
@@ -8,8 +8,8 @@
       <div id="spud_admin_photo_gallery_<%= gallery.id %>" class="spud_admin_photo_ui_thumb" style="background-image:url('<%= gallery.top_photo_url(:spud_admin_small) %>')">
         <h5><%= gallery.title %></h5>
         <div class="spud_admin_photo_ui_thumb_controls">
-          <%= link_to 'Edit', edit_spud_admin_photo_gallery_path(gallery), :class => 'spud_admin_photos_btn_edit' %>
-          <%= link_to 'Delete', spud_admin_photo_gallery_path(gallery), :method => :delete, :class => 'spud_admin_photos_btn_delete', :remote => true, :confirm => 'Are you sure?' %>
+          <%= link_to 'Edit', edit_admin_photo_gallery_path(gallery), :class => 'spud_admin_photos_btn_edit' %>
+          <%= link_to 'Delete', admin_photo_gallery_path(gallery), :method => :delete, :class => 'spud_admin_photos_btn_delete', :remote => true, :confirm => 'Are you sure?' %>
         </div>
       </div>
     <% end %>

data/app/views/admin/photo_galleries/new.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'form', :locals => {:path => admin_photo_galleries_path} %>

data/app/views/{spud/admin → 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', :target => 'spud_admin_photo_form_target', :class => 'form-horizontal'} do |f| %> 
+<%= form_for @photo, :url => (@photo.new_record? ? admin_photos_path : 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)%>
   
@@ -19,7 +19,7 @@
   </fieldset>
 
   <fieldset>
-    <legend>File Upload</legend>
+    <legend id="fileUploadSizeLegend">File Upload</span></legend>
       <div class="control-group">
         <%= f.label :photo, :class => "control-label" %>
         <div class="controls">

data/app/views/{spud/admin → admin}/photos/_photo.html.erb

@@ -7,7 +7,7 @@
     <%= 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 => 'spud_admin_photos_btn_edit' %>
+    <%= link_to 'Edit', edit_admin_photo_path(photo), :class => 'spud_admin_photos_btn_edit' %>
     <%= link_to 'Delete', '#', :class => 'spud_admin_photos_btn_remove' %>
   </div>
 <% end %>

data/app/views/admin/photos/destroy.js.erb

@@ -0,0 +1 @@
+spud.admin.photos.markPhotoAsDeleted(<%= @photo.id %>);

data/app/views/{spud/admin → admin}/photos/show.js.erb

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

data/app/views/layouts/admin/spud_photos.html.erb

@@ -0,0 +1,8 @@
+<%= content_for :head do %>
+  <script type="text/javascript">
+    $(document).ready(spud.admin.photos.init);
+    spud.admin.photos.max_image_upload_size_humanized = spud.admin.photos.getFileSizeHumanized(<%= Spud::Photos.max_image_upload_size %>);
+    spud.admin.photos.max_image_upload_size_bytes = <%= Spud::Photos.max_image_upload_size %>;
+  </script>
+<% end %>
+<%= render :template => 'layouts/admin/detail' %>

data/app/views/photo_albums/show.html.erb

@@ -9,7 +9,7 @@
 <h2>Photo Album: <%= @photo_album.title %></h2>
 
 <% if @photo_gallery %>
-  <% if @photo_gallery.albums.count == 1 %>
+  <% if @photo_gallery.albums.length == 1 %>
     <p><%= link_to 'Back to Galleries', photo_galleries_path %>
   <% else %>
     <p><%= link_to 'Back to Gallery', photo_gallery_photo_albums_path(@photo_gallery.url_name) %>
@@ -24,4 +24,4 @@
       <%= link_to image_tag(photo.photo.url(:small), :alt => photo.caption, :title => photo.title), photo.photo.url(:large) %>
     </div>
   <% end %>
-</div>
+</div>

data/app/views/photo_galleries/index.html.erb

@@ -11,8 +11,8 @@
 <div id="spud_photo_galleries">
   <% @photo_galleries.each do |gallery| %>
     <div class="spud_photo_gallery_thumbnail">
-      <h3><%= link_to gallery.title, (gallery.albums.length == 1 ? photo_gallery_photo_album_path(gallery.url_name, gallery.albums.first.url_name) : photo_gallery_photo_albums_path(gallery.url_name)) %></h3>
+      <h3><%= link_to gallery.title, photo_gallery_photo_albums_path(gallery.url_name) %></h3>
       <%= image_tag gallery.top_photo_url(:medium), :title => gallery.title %>
     </div>
   <% end %>
-</div>
+</div>

data/config/routes.rb

@@ -1,14 +1,12 @@
 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
-      resources :photo_galleries
+  namespace :admin do
+    resources :photos do
+      get 'library', :on => :collection
+      post 'mass_destroy', :on => :collection
     end
+    resources :photo_albums
+    resources :photo_galleries
   end
 
   scope Spud::Photos.config.base_path do

data/lib/spud_photos/configuration.rb

@@ -1,13 +1,19 @@
 module Spud
   module Photos
     include ActiveSupport::Configurable
-    config_accessor :photo_styles, :convert_options, :galleries_enabled, :base_layout, :base_path,:s3_credentials,:storage_path,:storage_url,:paperclip_storage, :enable_full_page_caching, :page_caches_to_sweep
+    require 'active_support/core_ext/numeric/bytes'
+    config_accessor :photo_styles, :convert_options, :source_file_options, :galleries_enabled, :base_layout, :base_path,:s3_credentials,:storage_path,:storage_url,:paperclip_storage, :enable_full_page_caching, :page_caches_to_sweep, :max_image_upload_size
     self.photo_styles = {
       :small => '50x50#',
       :medium => '200x200#',
       :large => '400x400#'
     }
-    self.convert_options = {}
+    self.convert_options = {
+      :all => '-strip'
+    }
+    self.source_file_options = {
+      :all => '-density 72'
+    }
     self.galleries_enabled = false
     self.base_layout = 'application'
     self.base_path = 'photos'
@@ -17,5 +23,6 @@ module Spud
     self.storage_url = "/system/spud_photos/:id/:style/:basename.:extension"
     self.enable_full_page_caching = false
     self.page_caches_to_sweep = []
+    self.max_image_upload_size = 2.megabytes
   end
 end

data/lib/spud_photos/engine.rb

@@ -6,13 +6,15 @@ module Spud
     class Engine < Rails::Engine
       engine_name :tb_photos
       initializer :assets_photos do |config| 
-        Rails.application.config.assets.precompile += ["spud/admin/photos*"]
+        Rails.application.config.assets.precompile += ["admin/photos/application*"]
+        Spud::Core.append_admin_javascripts("admin/photos/application")
+        Spud::Core.append_admin_stylesheets("admin/photos/application")
       end
       initializer :admin_photos do
         Spud::Core.config.admin_applications += [{
           :name => 'Photo Albums',
-          :thumbnail => 'spud/photos/photo_albums_thumb.png',
-          :url => '/spud/admin/photo_albums',
+          :thumbnail => 'admin/photos/photo_albums_thumb.png',
+          :url => '/admin/photo_albums',
           :retina => true,
           :order => 82
         # },{
@@ -25,8 +27,8 @@ module Spud
         if Spud::Photos.config.galleries_enabled
           Spud::Core.config.admin_applications += [{
             :name => 'Photo Galleries',
-            :thumbnail => 'spud/photos/photo_albums_thumb.png',
-            :url => '/spud/admin/photo_galleries',
+            :thumbnail => 'admin/photos/photo_albums_thumb.png',
+            :url => '/admin/photo_galleries',
             :retina => true,
             :order => 81
           }]
@@ -34,4 +36,4 @@ module Spud
       end
     end
   end
-end
+end

data/lib/spud_photos/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Photos
-	  VERSION = "1.0"
+	  VERSION = "1.0.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_photos
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -173,50 +173,51 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/images/spud/photos/buttons/cog_16x16.png
-- app/assets/images/spud/photos/buttons/x_16x16.png
-- app/assets/images/spud/photos/photo_albums_thumb.png
-- app/assets/images/spud/photos/photo_albums_thumb@2x.png
-- app/assets/javascripts/spud/admin/photos.js
-- app/assets/stylesheets/spud/admin/photos.css
+- app/assets/images/admin/photos/buttons/cog_16x16.png
+- app/assets/images/admin/photos/buttons/x_16x16.png
+- app/assets/images/admin/photos/photo_albums_thumb.png
+- app/assets/images/admin/photos/photo_albums_thumb@2x.png
+- app/assets/javascripts/admin/photos/application.js
+- app/assets/javascripts/admin/photos/photos.js
+- app/assets/stylesheets/admin/photos/application.css.scss
+- app/controllers/admin/photo_albums_controller.rb
+- app/controllers/admin/photo_galleries_controller.rb
+- app/controllers/admin/photos_controller.rb
 - app/controllers/photo_albums_controller.rb
 - app/controllers/photo_galleries_controller.rb
-- app/controllers/spud/admin/photo_albums_controller.rb
-- app/controllers/spud/admin/photo_galleries_controller.rb
-- app/controllers/spud/admin/photos_controller.rb
+- app/helpers/admin/photo_albums_helper.rb
+- app/helpers/admin/photo_galleries_helper.rb
+- app/helpers/admin/photos_helper.rb
 - app/helpers/photo_albums_helper.rb
 - app/helpers/photo_galleries_helper.rb
-- app/helpers/spud/admin/photo_albums_helper.rb
-- app/helpers/spud/admin/photo_galleries_helper.rb
-- 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/models/spud_photo_sweeper.rb
-- app/views/layouts/spud/admin/spud_photos.html.erb
+- app/views/admin/photo_albums/_album.html.erb
+- app/views/admin/photo_albums/_form.html.erb
+- app/views/admin/photo_albums/destroy.js.erb
+- app/views/admin/photo_albums/edit.html.erb
+- app/views/admin/photo_albums/index.html.erb
+- app/views/admin/photo_albums/new.html.erb
+- app/views/admin/photo_galleries/_form.html.erb
+- app/views/admin/photo_galleries/destroy.js.erb
+- app/views/admin/photo_galleries/edit.html.erb
+- app/views/admin/photo_galleries/index.html.erb
+- app/views/admin/photo_galleries/new.html.erb
+- app/views/admin/photos/_form.html.erb
+- app/views/admin/photos/_photo.html.erb
+- app/views/admin/photos/destroy.js.erb
+- app/views/admin/photos/edit.html.erb
+- app/views/admin/photos/index.html.erb
+- app/views/admin/photos/new.html.erb
+- app/views/admin/photos/show.js.erb
+- app/views/layouts/admin/spud_photos.html.erb
 - app/views/photo_albums/index.html.erb
 - app/views/photo_albums/show.html.erb
 - app/views/photo_galleries/index.html.erb
-- app/views/spud/admin/photo_albums/_album.html.erb
-- app/views/spud/admin/photo_albums/_form.html.erb
-- app/views/spud/admin/photo_albums/destroy.js.erb
-- app/views/spud/admin/photo_albums/edit.html.erb
-- app/views/spud/admin/photo_albums/index.html.erb
-- app/views/spud/admin/photo_albums/new.html.erb
-- app/views/spud/admin/photo_galleries/_form.html.erb
-- app/views/spud/admin/photo_galleries/destroy.js.erb
-- app/views/spud/admin/photo_galleries/edit.html.erb
-- app/views/spud/admin/photo_galleries/index.html.erb
-- app/views/spud/admin/photo_galleries/new.html.erb
-- app/views/spud/admin/photos/_form.html.erb
-- app/views/spud/admin/photos/_photo.html.erb
-- app/views/spud/admin/photos/destroy.js.erb
-- 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
@@ -232,7 +233,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.markdown
-homepage: http://www.github.com/gregawoods/spud_photos
+homepage: http://bitbucket.org/westlakedesign/tb_photos
 licenses: []
 metadata: {}
 post_install_message: 
@@ -251,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Twice Baked Engine

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

@@ -1,2 +0,0 @@
-module Spud::Admin::PhotoAlbumsHelper
-end

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

@@ -1,2 +0,0 @@
-module Spud::Admin::PhotoGalleriesHelper
-end

data/app/views/layouts/spud/admin/spud_photos.html.erb

@@ -1,8 +0,0 @@
-<%= content_for :head do %>
-  <%= javascript_include_tag "spud/admin/photos" %>
-  <%= stylesheet_link_tag 'spud/admin/photos' %>
-  <script type="text/javascript">
-    $(document).ready(Spud.Admin.Photos.init);
-  </script>
-<% end %>
-<%= render :template => 'layouts/spud/admin/detail' %>

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

@@ -1 +0,0 @@
-<%= render :partial => 'form', :locals => {:path => spud_admin_photo_album_path(@photo_album)} %>

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

@@ -1 +0,0 @@
-<%= render :partial => 'form', :locals => {:path => spud_admin_photo_albums_path} %>

data/app/views/spud/admin/photo_galleries/destroy.js.erb

@@ -1 +0,0 @@
-Spud.Admin.Photos.markPhotoGalleryAsDeleted(<%= @photo_gallery.id %>);

data/app/views/spud/admin/photo_galleries/edit.html.erb

@@ -1 +0,0 @@
-<%= render :partial => 'form', :locals => {:path => spud_admin_photo_gallery_path(@photo_gallery)} %>

data/app/views/spud/admin/photo_galleries/new.html.erb

@@ -1 +0,0 @@
-<%= render :partial => 'form', :locals => {:path => spud_admin_photo_galleries_path} %>

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

@@ -1 +0,0 @@
-Spud.Admin.Photos.markPhotoAsDeleted(<%= @photo.id %>);