tb_photos 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 256c658c315de9252e9aa9922e2cad47e8435d41
-  data.tar.gz: 48757bc8b3566d90f8c7960fb90c01a02b2872c9
+SHA256:
+  metadata.gz: 6312c612b6dea2c5a897ea003594296012b7068b4e988c60e01222f1677884c7
+  data.tar.gz: acefd2270d72b9f3973367277b05f065cea62aec278ad4f54a09755234957938
 SHA512:
-  metadata.gz: c11a5993256f1237a3691ec014cb39859128c701ea7cb8e84930c0991b4cd86c701bf2cb24912c4041eed2f6314d3537642742602045d6d095bdaa64c40f9bda
-  data.tar.gz: d47a82058c4653a40ba4799e082043ddaa23daac179f08fb095d4531c79cfbb20e0ceba3965335709030141c13f55eb6e7bd081b8a792aad1970ed6312a3dbd4
+  metadata.gz: b2494ec2f3d04bf6fd51c28fca5e396bac7f0a40b85c023b02464406cb05be5119dda330f40bd3d4aa31a953d8d012ef2aa45396f66eecad8e6305b321499b0f
+  data.tar.gz: 3a0852322e35fc2cd01ca74dc0d6882d4e57cdfed47a1bee26e66f96f59b0abf9bd41db090a2b815628256e074ab9486a951d78e2ac46d92c92d484b6cfc311b

data/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks

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

@@ -2,12 +2,10 @@
 
 var html5upload = false;
 
-var self = spud.admin.photos = {
+var self = tb.photos = {
   init: function(){
     // event handlers
-    $('.admin-photo-ui-thumbs-sortable').sortable({
-      connectWith:'.admin-photo-ui-thumbs-sortable'
-    });
+    Sortable.create(document.querySelector('#admin-photos-selected'));
     $('body').on('submit', '#admin-photo-album-form', submittedPhotoAlbumForm);
     $('body').on('submit', '#admin-photo-gallery-form', submittedPhotoGalleryForm);
     $('body').on('submit', '#admin-photo-form', submittedPhotoForm);
@@ -84,7 +82,7 @@ var self = spud.admin.photos = {
       var target = $('#admin-photos-selected, #admin-photos');
       target.prepend(html);
     }
-    spud.admin.modal.hide();
+    tb.modal.hide();
   }
 };
 
@@ -117,14 +115,14 @@ var validatePhoto = function(file) {
     if(allowedTypes.indexOf(file.type) < 0) {
       errors.push("Unsupported file format");
     }
-    var maxAllowedSize = spud.admin.photos.max_image_upload_size_bytes;
+    var maxAllowedSize = tb.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);
+      errors.push("Your file size of " + self.getFileSizeHumanized(file.size) + " exceeded the maximum limit of " + tb.photos.max_image_upload_size_humanized);
     }
   }
   else{
     if($('.admin-photo-form-current-photo').length === 0){
-      errors.push("No file found");  
+      errors.push("No file found");
     }
   }
   return errors;
@@ -186,11 +184,11 @@ var submittedPhotoForm = function(e){
     if(photoValidationErrors.length) {
       return generateFileUploadErrors(photoValidationErrors);
     }
-    
+
     if(file){
       progressBar = progressBarForUpload(file.name);
       fd.append('spud_photo[photo]', file);
-      form.append(progressBar);  
+      form.append(progressBar);
     }
     else{
       progressBar = progressBarForUpload('');
@@ -250,7 +248,7 @@ var onPhotoUploadComplete = function(e, progressBar){
       var target = $('#admin-photos-selected, #admin-photos');
       target.prepend(photo.html).fadeIn(200);
     }
-    spud.admin.modal.hide();
+    tb.modal.hide();
   }
   // validation error
   else{
@@ -282,11 +280,11 @@ var clickedPhotoAddOrEdit = function(e){
 };
 
 var photoUploadFormLoaded = function(html){
-  spud.admin.modal.displayWithOptions({
+  tb.modal.displayWithOptions({
     title: 'Upload Photo',
     html: html
   });
-  $(".admin-photo-form-max-size").text('Maximum upload size: '+ spud.admin.photos.max_image_upload_size_humanized);
+  $(".admin-photo-form-max-size").text('Maximum upload size: '+ tb.photos.max_image_upload_size_humanized);
 };
 
 /*
@@ -311,7 +309,7 @@ var photoLibraryLoaded = function(html){
       dupe.remove();
     }
   });
-  spud.admin.modal.displayWithOptions({
+  tb.modal.displayWithOptions({
     title: 'My Photo Library',
     html: html,
     buttons:{
@@ -327,7 +325,7 @@ var addSelectedPhotosFromLibrary = function(e){
     .prependTo('#admin-photos-selected')
     .hide()
     .fadeIn(200);
-  spud.admin.modal.hide();
+  tb.modal.hide();
 };
 
 var deleteSelectedPhotosFromLibrary = function(e){
@@ -343,7 +341,7 @@ var deleteSelectedPhotosFromLibrary = function(e){
         $(this).remove();
       });
       for(var i=0; i<ids.length; i++){
-        spud.admin.photos.markPhotoAsDeleted(ids[i]);
+        tb.photos.markPhotoAsDeleted(ids[i]);
       }
     },
     error: function(jqXHR, textStatus, errorThrown){

data/app/controllers/admin/photo_albums_controller.rb

@@ -1,6 +1,5 @@
 class Admin::PhotoAlbumsController < Admin::ApplicationController
-
-  before_filter :get_album, :only => [:show, :edit, :update, :destroy, :library]
+  before_action :album, only: [:show, :edit, :update, :destroy, :library]
   add_breadcrumb 'Photo Albums', :admin_photo_albums_path
   layout 'admin/spud_photos'
   belongs_to_spud_app :photo_albums
@@ -21,10 +20,8 @@ class Admin::PhotoAlbumsController < Admin::ApplicationController
 
   def create
     @photo_album = SpudPhotoAlbum.new(photo_album_params)
-    if @photo_album.save
-      set_photo_order
-    end
-    respond_with @photo_album, :location => admin_photo_albums_path
+    write_photo_order if @photo_album.save
+    respond_with @photo_album, location: admin_photo_albums_path
   end
 
   def edit
@@ -34,24 +31,24 @@ class Admin::PhotoAlbumsController < Admin::ApplicationController
   def update
     @photo_album.update_attributes(photo_album_params)
     if @photo_album.save
-      set_photo_order
-      flash[:notice] = 'Album updated successfully' 
+      write_photo_order
+      flash[:notice] = 'Album updated successfully'
     end
-    respond_with @photo_album, :location => admin_photo_albums_path
+    respond_with @photo_album, location: admin_photo_albums_path
   end
 
   def destroy
     flash.now[:notice] = 'Album deleted successfully' if @photo_album.destroy
-    respond_with @photo_album, :location => admin_photo_albums_path
+    respond_with @photo_album, location: admin_photo_albums_path
   end
 
-  def get_album
+  def album
     @photo_album = SpudPhotoAlbum.find(params[:id])
   end
 
-private
+  private
 
-  def set_photo_order
+  def write_photo_order
     order_ids = params[:spud_photo_album][:photo_ids] || []
     @photo_album.spud_photo_albums_photos.each do |obj|
       index = order_ids.index(obj.spud_photo_id.to_s)
@@ -60,7 +57,6 @@ private
   end
 
   def photo_album_params
-    params.require(:spud_photo_album).permit(:title, :url_name, :photo_ids => [])
+    params.require(:spud_photo_album).permit(:title, :url_name, photo_ids: [])
   end
-
 end

data/app/controllers/admin/photo_galleries_controller.rb

@@ -1,7 +1,6 @@
 class Admin::PhotoGalleriesController < Admin::ApplicationController
-
-  before_filter :get_gallery, :only => [:show, :edit, :update, :destroy]
-  before_filter :get_albums, :only => [:new, :create, :edit, :update]
+  before_action :gallery, only: [:show, :edit, :update, :destroy]
+  before_action :albums, only: [:new, :create, :edit, :update]
   add_breadcrumb 'Photo Galleries', :admin_photo_galleries_path
   layout 'admin/spud_photos'
   belongs_to_spud_app :photo_galleries
@@ -10,49 +9,48 @@ class Admin::PhotoGalleriesController < Admin::ApplicationController
     @photo_galleries = SpudPhotoGallery.all
     respond_with @photo_galleries
   end
-  
+
   def show
     respond_with @photo_gallery
   end
-  
+
   def new
     @photo_gallery = SpudPhotoGallery.new
     respond_with @photo_gallery
   end
-  
+
   def create
     @photo_gallery = SpudPhotoGallery.new(photo_gallery_params)
     flash[:notice] = 'Gallery created successfully' if @photo_gallery.save
-    respond_with @photo_gallery, :location => admin_photo_galleries_path
+    respond_with @photo_gallery, location: admin_photo_galleries_path
   end
-  
+
   def edit
     respond_with @photo_gallery
   end
-  
+
   def update
     @photo_gallery.update_attributes(photo_gallery_params)
     flash[:notice] = 'Gallery updated successfully' if @photo_gallery.save
-    respond_with @photo_gallery, :location => admin_photo_galleries_path
+    respond_with @photo_gallery, location: admin_photo_galleries_path
   end
-  
+
   def destroy
     flash.now[:notice] = 'Gallery deleted successfully' if @photo_gallery.destroy
-    respond_with @photo_gallery, :location => admin_photo_galleries_path
+    respond_with @photo_gallery, location: admin_photo_galleries_path
   end
 
-private
+  private
 
-  def get_gallery
+  def gallery
     @photo_gallery = SpudPhotoGallery.find(params[:id])
   end
 
-  def get_albums
+  def albums
     @photo_albums = SpudPhotoAlbum.all
   end
 
   def photo_gallery_params
-    params.require(:spud_photo_gallery).permit(:title, :url_name, :album_ids => [])
+    params.require(:spud_photo_gallery).permit(:title, :url_name, album_ids: [])
   end
-
 end

data/app/controllers/admin/photos_controller.rb

@@ -1,9 +1,7 @@
 class Admin::PhotosController < Admin::ApplicationController
-
-  include RespondsToParent
   belongs_to_spud_app :photo_albums
 
-  before_filter :get_photo, :only => [:show, :edit, :update, :destroy]
+  before_action :photo, only: [:show, :edit, :update, :destroy]
   layout false
 
   def index
@@ -18,7 +16,7 @@ class Admin::PhotosController < Admin::ApplicationController
   def new
     @photo = SpudPhoto.new
     respond_with @photo do |format|
-      format.js { render 'new', :layout => false }
+      format.js { render 'new', layout: false }
     end
   end
 
@@ -27,16 +25,14 @@ class Admin::PhotosController < Admin::ApplicationController
     if photo_file.present?
       fingerprint = Digest::MD5.hexdigest(photo_file.read)
       photo_file.rewind
-      @photo = SpudPhoto.where(:photo_fingerprint => fingerprint).first
-    end
-    
-    if @photo.blank?
-      @photo = SpudPhoto.new(photo_params)
+      @photo = SpudPhoto.where(photo_fingerprint: fingerprint).first
     end
 
+    @photo = SpudPhoto.new(photo_params) if @photo.blank?
+
     if @photo.save
       success = true
-      flash[:notice] = 'SpudPhoto created successfully' 
+      flash[:notice] = 'SpudPhoto created successfully'
     end
     if request.xhr?
       render json_for_photo(success)
@@ -49,15 +45,15 @@ class Admin::PhotosController < Admin::ApplicationController
 
   def edit
     respond_with @photo do |format|
-      format.js { render 'edit', :layout => false }
+      format.js { render 'edit', layout: false }
     end
   end
-  
+
   def update
     @photo.update_attributes(photo_params)
     if @photo.save
       success = true
-      flash[:notice] = 'SpudPhoto updated successfully' 
+      flash[:notice] = 'SpudPhoto updated successfully'
     end
     if request.xhr?
       render json_for_photo(success)
@@ -70,37 +66,36 @@ class Admin::PhotosController < Admin::ApplicationController
 
   def destroy
     flash[:notice] = 'SpudPhoto deleted successfully' if @photo.destroy
-    respond_with @photo, :location => admin_photos_path
+    respond_with @photo, location: admin_photos_path
   end
 
   def mass_destroy
-    @photos = SpudPhoto.where(:id => params[:spud_photo_ids])
+    @photos = SpudPhoto.where(id: params[:spud_photo_ids])
     flash[:notice] = 'Photos deleted successfully' if @photos.destroy_all
-    respond_with @photos, :location => admin_photos_path
+    respond_with @photos, location: admin_photos_path
   end
 
-private
+  private
 
-  def get_photo
+  def photo
     @photo = SpudPhoto.find(params[:id])
   end
-  
+
   def json_for_photo(success)
     if success
-      return {:status => 200, :json => { 
-        :id => @photo.id, 
-        :html => render_to_string(:partial => 'photo', :locals => {:photo => @photo}, :layout => nil)
-      }}
+      { status: 200, json: {
+        id: @photo.id,
+        html: render_to_string(partial: 'photo', locals: { photo: @photo }, layout: nil)
+      } }
     else
-      return {:status => 422, :json => {
-        :id => 0,
-        :html => render_to_string(:partial => 'form', :layout => nil)
-      }}
+      { status: 422, json: {
+        id: 0,
+        html: render_to_string(partial: 'form', layout: nil)
+      } }
     end
   end
 
   def photo_params
     params.require(:spud_photo).permit(:title, :caption, :photo)
   end
-
 end

data/app/controllers/photo_albums_controller.rb

@@ -1,37 +1,31 @@
 class PhotoAlbumsController < ApplicationController
-
   respond_to :html, :json, :xml
   layout Spud::Photos.base_layout
 
-  if Spud::Photos.galleries_enabled
-    before_filter :get_gallery
-  end
+  before_action :gallery if Spud::Photos.galleries_enabled
 
   def index
-    if @photo_gallery
-      @photo_albums = @photo_gallery.albums.ordered
-    else
-      @photo_albums = SpudPhotoAlbum.ordered
-    end
+    @photo_albums = if @photo_gallery
+                      @photo_gallery.albums.ordered
+                    else
+                      SpudPhotoAlbum.ordered
+                    end
     respond_with @photo_albums
   end
 
   def show
-    @photo_album = SpudPhotoAlbum.find_by(:url_name => params[:id])
+    @photo_album = SpudPhotoAlbum.find_by(url_name: params[:id])
     if @photo_album.blank?
-      raise Spud::NotFoundError.new(:item => 'photo album')
+      raise Spud::NotFoundError, item: 'photo album'
     else
       respond_with @photo_album
     end
   end
 
-private
+  private
 
-  def get_gallery
-    @photo_gallery = SpudPhotoGallery.find_by(:url_name => params[:photo_gallery_id])
-    if @photo_gallery.blank?
-      raise Spud::NotFoundError.new(:item => 'photo gallery')
-    end
+  def gallery
+    @photo_gallery = SpudPhotoGallery.find_by(url_name: params[:photo_gallery_id])
+    raise Spud::NotFoundError, item: 'photo gallery' if @photo_gallery.blank?
   end
-
 end

data/app/controllers/photo_galleries_controller.rb

@@ -1,5 +1,4 @@
 class PhotoGalleriesController < ApplicationController
-
   respond_to :html, :json, :xml
   layout Spud::Photos.base_layout
 
@@ -7,5 +6,4 @@ class PhotoGalleriesController < ApplicationController
     @photo_galleries = SpudPhotoGallery.ordered
     respond_with @photo_galleries
   end
-
 end

data/app/helpers/admin/photos_helper.rb

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

data/app/models/spud_photo.rb

@@ -1,36 +1,34 @@
 class SpudPhoto < ActiveRecord::Base
-
   extend ActionView::Helpers::NumberHelper
 
-  has_many :spud_photo_albums_photos, :dependent => :destroy
+  has_many :spud_photo_albums_photos, dependent: :destroy
   has_many :albums,
-    :through => :spud_photo_albums_photos,
-    :source => :spud_photo_album
+           through: :spud_photo_albums_photos,
+           source: :spud_photo_album
 
-  has_attached_file :photo, 
-    :styles => lambda { |attachment| attachment.instance.dynamic_styles },
-    :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
+  has_attached_file :photo,
+                    styles: ->(attachment) { attachment.instance.dynamic_styles },
+                    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 :photo,
-    :presence => true,
-    :content_type => {:content_type => ['image/jpg', 'image/jpeg', 'image/png']},
-    :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}
-    }
+                       presence: true,
+                       content_type: { content_type: ['image/jpg', 'image/jpeg', 'image/png'] },
+                       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 { |_p| Spud::Photos.max_image_upload_size > 0 }
+                       }
 
   def dynamic_styles
     admin_styles = {
-      :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'}
+      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)
+    admin_styles.merge(Spud::Photos.config.photo_styles)
   end
-
 end

data/app/models/spud_photo_album.rb

@@ -1,41 +1,38 @@
 class SpudPhotoAlbum < ActiveRecord::Base
-
-  has_many :spud_photo_albums_photos, :dependent => :destroy
-  has_many :photos, 
-    ->{ order('spud_photo_albums_photos.sort_order asc') },
-    :through => :spud_photo_albums_photos,
-    :source => :spud_photo
+  has_many :spud_photo_albums_photos, dependent: :destroy
+  has_many :photos,
+           -> { order('spud_photo_albums_photos.sort_order asc') },
+           through: :spud_photo_albums_photos,
+           source: :spud_photo
 
   has_many :spud_photo_galleries_albums
   has_many :galleries,
-    :through => :spud_photo_galleries_albums,
-    :source => :spud_photo_gallery
+           through: :spud_photo_galleries_albums,
+           source: :spud_photo_gallery
 
-  validates_presence_of :title, :url_name
-  validates_uniqueness_of :title, :url_name
+  validates :title, :url_name, presence: true
+  validates :title, :url_name, uniqueness: true
   before_validation :set_url_name
   after_save :update_photo_order
 
-  scope :ordered, ->{ order('created_at desc') }
+  scope :ordered, -> { order('created_at desc') }
 
   def top_photo_url(style)
-    if photos.length > 0
-      return photos.first.photo.url(style)
-    end
+    return photos.first.photo.url(style) unless photos.empty?
   end
 
   def photos_available
     if photo_ids.any?
-      return SpudPhoto.where('id not in (?)', photo_ids)
+      SpudPhoto.where('id not in (?)', photo_ids)
     else
-      return SpudPhoto.all
+      SpudPhoto.all
     end
   end
 
-private
+  private
 
   def set_url_name
-    self.url_name = self.title.parameterize
+    self.url_name = title.parameterize
   end
 
   def update_photo_order
@@ -45,5 +42,4 @@ private
     #   order += 1
     # end
   end
-
 end

data/app/models/spud_photo_albums_photo.rb

@@ -1,4 +1,4 @@
 class SpudPhotoAlbumsPhoto < ActiveRecord::Base
   belongs_to :spud_photo
-  belongs_to :spud_photo_album, :touch => true
+  belongs_to :spud_photo_album, touch: true
 end

data/app/models/spud_photo_galleries_album.rb

@@ -1,4 +1,4 @@
 class SpudPhotoGalleriesAlbum < ActiveRecord::Base
   belongs_to :spud_photo_album
-  belongs_to :spud_photo_gallery, :touch => true
+  belongs_to :spud_photo_gallery, touch: true
 end

data/app/models/spud_photo_gallery.rb

@@ -1,36 +1,30 @@
 class SpudPhotoGallery < ActiveRecord::Base
-
-  has_many :spud_photo_galleries_albums, :dependent => :destroy
+  has_many :spud_photo_galleries_albums, dependent: :destroy
   has_many :albums,
-    :through => :spud_photo_galleries_albums,
-    :source => :spud_photo_album
+           through: :spud_photo_galleries_albums,
+           source: :spud_photo_album
 
-  validates_presence_of :title, :url_name
-  validates_uniqueness_of :title, :url_name
+  validates :title, :url_name, presence: true
+  validates :title, :url_name, uniqueness: true
   before_validation :set_url_name
 
-  scope :ordered, ->{ order('created_at desc') }
+  scope :ordered, -> { order('created_at desc') }
 
   def top_photo_url(style)
-    unless albums.empty?
-      return albums.first.top_photo_url(style)
-    end
+    return albums.first.top_photo_url(style) unless albums.empty?
   end
 
   def albums_available
     if album_ids.any?
-      return SpudPhotoAlbum.where('id not in (?)', album_ids)
+      SpudPhotoAlbum.where('id not in (?)', album_ids)
     else
-      return SpudPhotoAlbum.all
+      SpudPhotoAlbum.all
     end
   end
 
   private
 
   def set_url_name
-    if self.title
-      self.url_name = self.title.parameterize
-    end
+    self.url_name = title.parameterize if title
   end
-
 end

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

@@ -5,6 +5,6 @@
   </div>
   <div class="admin-photo-ui-thumb-controls">
     <%= link_to '', edit_admin_photo_album_path(album), :class => 'admin-photos-btn-edit' %>
-    <%= link_to '', admin_photo_album_path(album), :method => :delete, :class => 'admin-photos-btn-delete', :remote => true, :data => {:confirm => 'Are you sure?'} %>
+    <%= link_to '', admin_photo_album_path(album), method: :delete, :class => 'admin-photos-btn-delete', :data => {:confirm => 'Are you sure?'} %>
   </div>
 </div>

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

@@ -9,7 +9,7 @@
         <h5><%= gallery.title %></h5>
         <div class="admin-photo-ui-thumb-controls">
           <%= link_to '', edit_admin_photo_gallery_path(gallery), :class => 'admin-photos-btn-edit' %>
-          <%= link_to '', admin_photo_gallery_path(gallery), :method => :delete, :class => 'admin-photos-btn-delete', :remote => true, :data => {:confirm => 'Are you sure?'} %>
+          <%= link_to '', admin_photo_gallery_path(gallery), :method => :delete, :class => 'admin-photos-btn-delete', :data => {:confirm => 'Are you sure?'} %>
         </div>
       </div>
     <% end %>

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

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

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

@@ -1,8 +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 %>;
+    $(document).ready(tb.photos.init);
+    tb.photos.max_image_upload_size_humanized = tb.photos.getFileSizeHumanized(<%= Spud::Photos.max_image_upload_size %>);
+    tb.photos.max_image_upload_size_bytes = <%= Spud::Photos.max_image_upload_size %>;
   </script>
 <% end %>
 <%= render :template => 'layouts/admin/detail' %>

data/config/routes.rb

@@ -1,9 +1,8 @@
 Rails.application.routes.draw do
-
   namespace :admin do
     resources :photos do
-      get 'library', :on => :collection
-      post 'mass_destroy', :on => :collection
+      get 'library', on: :collection
+      post 'mass_destroy', on: :collection
     end
     resources :photo_albums
     resources :photo_galleries
@@ -11,12 +10,11 @@ Rails.application.routes.draw do
 
   scope Spud::Photos.config.base_path do
     if Spud::Photos.config.galleries_enabled
-      resources :photo_galleries, :only => :index, :path => '/' do
-        resources :photo_albums, :only => [:index, :show], :path => '/'
+      resources :photo_galleries, only: :index, path: '/' do
+        resources :photo_albums, only: [:index, :show], path: '/'
       end
     else
-      resources :photo_albums, :only => [:index, :show], :path => '/'
+      resources :photo_albums, only: [:index, :show], path: '/'
     end
   end
-
 end

data/db/migrate/20120228232120_create_spud_photos.rb

@@ -1,4 +1,4 @@
-class CreateSpudPhotos < ActiveRecord::Migration
+class CreateSpudPhotos < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_photos do |t|
       t.string :title
@@ -10,4 +10,4 @@ class CreateSpudPhotos < ActiveRecord::Migration
       t.timestamps
     end
   end
-end
+end

data/db/migrate/20120228232329_create_spud_photo_albums.rb

@@ -1,15 +1,15 @@
-class CreateSpudPhotoAlbums < ActiveRecord::Migration
+class CreateSpudPhotoAlbums < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_photo_albums do |t|
       t.string :title
       t.string :url_name
       t.timestamps
     end
-    create_table :spud_photo_albums_photos, :id => false do |t|
+    create_table :spud_photo_albums_photos, id: false do |t|
       t.integer :spud_photo_album_id
       t.integer :spud_photo_id
     end
-    add_index :spud_photo_albums, :url_name, :name => "idx_album_url_name"
-    add_index :spud_photo_albums_photos, :spud_photo_album_id, :name => "idx_album_id"
+    add_index :spud_photo_albums, :url_name, name: 'idx_album_url_name'
+    add_index :spud_photo_albums_photos, :spud_photo_album_id, name: 'idx_album_id'
   end
 end

data/db/migrate/20120228232344_create_spud_photo_galleries.rb

@@ -1,15 +1,15 @@
-class CreateSpudPhotoGalleries < ActiveRecord::Migration
+class CreateSpudPhotoGalleries < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_photo_galleries do |t|
       t.string :title
       t.string :url_name
       t.timestamps
     end
-    create_table :spud_photo_galleries_albums, :id => false do |t|
+    create_table :spud_photo_galleries_albums, id: false do |t|
       t.integer :spud_photo_gallery_id
       t.integer :spud_photo_album_id
     end
-    add_index :spud_photo_galleries, :url_name, :name => "idx_gallery_url_name"
-    add_index :spud_photo_galleries_albums, :spud_photo_gallery_id, :name => "idx_gallery_id"
+    add_index :spud_photo_galleries, :url_name, name: 'idx_gallery_url_name'
+    add_index :spud_photo_galleries_albums, :spud_photo_gallery_id, name: 'idx_gallery_id'
   end
 end

data/db/migrate/20120405042046_upgrade_photo_relationships.rb

@@ -1,8 +1,8 @@
-class UpgradePhotoRelationships < ActiveRecord::Migration
+class UpgradePhotoRelationships < ActiveRecord::Migration[4.2]
   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_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
+    add_column :spud_photo_galleries_albums, :order, :integer, default: 0
   end
-end
+end

data/db/migrate/20121127210314_rename_order_to_sort_order.rb

@@ -1,4 +1,4 @@
-class RenameOrderToSortOrder < ActiveRecord::Migration
+class RenameOrderToSortOrder < ActiveRecord::Migration[4.2]
   def change
     rename_column :spud_photo_albums_photos, :order, :sort_order
     rename_column :spud_photo_galleries_albums, :order, :sort_order

data/db/migrate/20140730201754_add_fingerprint_to_spud_photos.rb

@@ -1,4 +1,4 @@
-class AddFingerprintToSpudPhotos < ActiveRecord::Migration
+class AddFingerprintToSpudPhotos < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_photos, :photo_fingerprint, :string
     add_index :spud_photos, :photo_fingerprint

data/lib/generators/spud/photos/views_generator.rb

@@ -1,7 +1,6 @@
 require 'rails/generators/migration'
 
 class Spud::Photos::ViewsGenerator < ::Rails::Generators::Base
-  
   source_root File.expand_path('../../../../../app/views', __FILE__)
 
   def install
@@ -11,4 +10,4 @@ class Spud::Photos::ViewsGenerator < ::Rails::Generators::Base
     copy_file 'photo_albums/index.html.erb', 'app/views/photo_albums/index.html.erb'
     copy_file 'photo_albums/show.html.erb', 'app/views/photo_albums/show.html.erb'
   end
-end
+end

data/lib/spud_photos/configuration.rb

@@ -2,25 +2,25 @@ module Spud
   module Photos
     include ActiveSupport::Configurable
     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
+    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#'
+      small: '50x50#',
+      medium: '200x200#',
+      large: '400x400#'
     }
     self.convert_options = {
-      :all => '-strip'
+      all: '-strip'
     }
     self.source_file_options = {
-      :all => '-density 72'
+      all: '-density 72'
     }
     self.galleries_enabled = false
     self.base_layout = 'application'
     self.base_path = 'photos'
     self.paperclip_storage = :filesystem
     self.s3_credentials = "#{Rails.root}/config/s3.yml"
-    self.storage_path = ":rails_root/public/system/spud_photos/:id/:style/:basename.:extension"
-    self.storage_url = "/system/spud_photos/:id/:style/:basename.:extension"
+    self.storage_path = ':rails_root/public/system/spud_photos/:id/:style/:basename.:extension'
+    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 = 5.megabytes

data/lib/spud_photos/engine.rb

@@ -5,31 +5,26 @@ module Spud
   module Photos
     class Engine < Rails::Engine
       engine_name :tb_photos
-      initializer :assets_photos do |config| 
-        Spud::Core.append_admin_javascripts("admin/photos/application")
-        Spud::Core.append_admin_stylesheets("admin/photos/application")
+      initializer :assets_photos do |_config|
+        TbCore.append_admin_javascripts('admin/photos/application')
+        TbCore.append_admin_stylesheets('admin/photos/application')
       end
       initializer :admin do
-        Spud::Core.config.admin_applications += [{
-          :name => 'Photo Albums',
-          :thumbnail => 'admin/photos/photo_albums_thumb.png',
-          :url => '/admin/photo_albums',
-          :retina => true,
-          :order => 82
-        # },{
-        #   :name => 'Photos',
-        #   :thumbnail => 'spud/photos/photo_albums_thumb.png',
-        #   :url => '/spud/admin/photos',
-        #   :retina => true,
-        #   :order => 83
+        Rails.application.config.assets.precompile += %w( admin/photos/photo_albums_thumb.png )
+        TbCore.config.admin_applications += [{
+          name: 'Photo Albums',
+          thumbnail: 'admin/photos/photo_albums_thumb.png',
+          url: '/admin/photo_albums',
+          retina: true,
+          order: 82
         }]
         if Spud::Photos.config.galleries_enabled
           Spud::Core.config.admin_applications += [{
-            :name => 'Photo Galleries',
-            :thumbnail => 'admin/photos/photo_albums_thumb.png',
-            :url => '/admin/photo_galleries',
-            :retina => true,
-            :order => 81
+            name: 'Photo Galleries',
+            thumbnail: 'admin/photos/photo_albums_thumb.png',
+            url: '/admin/photo_galleries',
+            retina: true,
+            order: 81
           }]
         end
       end

data/lib/spud_photos/version.rb

@@ -1,5 +1,5 @@
 module Spud
-	module Photos
-	  VERSION = "1.1.0"
-	end
+  module Photos
+    VERSION = '1.2.0'.freeze
+  end
 end

data/lib/tb_photos.rb

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

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Dummy::Application

data/spec/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
-require "tb_photos"
+require 'tb_photos'
 
 module Dummy
   class Application < Rails::Application
@@ -31,7 +31,7 @@ module Dummy
     config.i18n.enforce_available_locales = true
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
@@ -54,4 +54,3 @@ module Dummy
     config.assets.version = '1.0'
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environments/test.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
@@ -24,7 +24,7 @@ Dummy::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the

data/spec/dummy/config/routes.rb

@@ -1,4 +1,3 @@
 Rails.application.routes.draw do
-
-  mount SpudPhotos::Engine => "/spud_photos"
+  mount SpudPhotos::Engine => '/spud_photos'
 end

data/spec/dummy/script/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require File.expand_path('../../config/boot', __FILE__)
 require 'rails/commands'

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
 # Track code coverage
 require 'simplecov'
- SimpleCov.start 'rails' do
+SimpleCov.start 'rails' do
   # root "dummy/"
-  add_filter "/factories/"
+  add_filter '/factories/'
 end
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] = 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
+ENV['RAILS_ENV'] = 'test'
+require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'database_cleaner'
@@ -17,8 +17,8 @@ require 'mocha'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
-Dir[File.join(ENGINE_RAILS_ROOT,"spec/support/**/*.rb"), File.join(ENGINE_RAILS_ROOT,"factories/*")].each {|f| require f}
+ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
+Dir[File.join(ENGINE_RAILS_ROOT, 'spec/support/**/*.rb'), File.join(ENGINE_RAILS_ROOT, 'factories/*')].each { |f| require f }
 
 RSpec.configure do |config|
   config.mock_with :mocha

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tb_photos
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Greg Woods
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
   name: tb_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -126,13 +140,13 @@ description: Twice Baked is a feature complete photo management/gallery for the
   engine. Manage multiple galleries, albums, and photos. Use HTML 5 to drag and drop
   many images at once.
 email:
-- greg@westlakedesign.com
+- greg.woods@moserit.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.markdown
+- README.md
 - Rakefile
 - app/assets/images/admin/photos/photo_albums_thumb.png
 - app/assets/javascripts/admin/photos/application.js
@@ -155,19 +169,16 @@ files:
 - app/models/spud_photo_gallery.rb
 - 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/_album.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
@@ -218,10 +229,10 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/spec_helper.rb
-homepage: http://bitbucket.org/westlakedesign/tb_photos
+homepage: http://bitbucket.org/moser-inc/tb_photos
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -236,38 +247,37 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.1
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Twice Baked Engine
 test_files:
+- spec/spec_helper.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
-- spec/dummy/public/404.html
+- spec/dummy/script/rails
+- spec/dummy/Rakefile
+- spec/dummy/public/favicon.ico
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
+- spec/dummy/public/404.html
 - spec/dummy/README.rdoc
-- spec/dummy/script/rails
-- spec/spec_helper.rb

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

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

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

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

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

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