tb_photos 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODllYTM5ODQzZDA3NTJiYThjNjUyYTBkYWJiYjMxNzk5NjhiZjQyZg==
-  data.tar.gz: !binary |-
-    ZWExOWFlOGFkYjg3YTFhMGI4MjUzYzBhMjdmMzVkNGNkYjI0YWNkNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODhmMzcwN2ZiN2U2OGM0NzZhZGJiZjRkZWI4ODI4YWY3ZjA3N2FjODgyM2Fi
-    ODNkY2RmODY3MjU4ZWMyY2I5NjM0ZWEzYWM4YzM2YzJkNWM4ZDY5MzZjZGYw
-    OGEwMWVlOGZkZDMyZTY5YjEyNjc0OGVjM2FhMmMxM2ExNGViYzI=
-  data.tar.gz: !binary |-
-    YzdkODgyOWY4Yzk5ZGI5MjY1MDJlYWYwNGVlODQzMzk2YjZkYTg1OGQyN2Rh
-    N2I4Y2EwMjMwODVkNjRmNDE3MWFjN2IwZjU5N2M2MTMzYzlmMGNlMjMzMTZk
-    MDQ3OGMxN2JhMGQ2ZGNhNjM0NGIzODA3NDk1NTQ4YzkwM2U5NDE=
+SHA1:
+  metadata.gz: ae0e6a31cb45e6caa79125487e2ae8ac6c8ef670
+  data.tar.gz: b28cb9982545758d4450e626bc29db55e0fea247
+SHA512:
+  metadata.gz: 309fdd963c7f4db518ef446f4061366880702c3956377bb30ade294e979030ae4cfe558fcd6cb0ea5d1e6ce7f2871eccb169825c907e68ebb631dcd60258d8a6
+  data.tar.gz: b0ab591e05cd3a54f5bb7318a812909d6298136e33a758e39405358058d6c2f5fa202a01bd99ad859cef60cc5c02fafefd1bf39786b109b84018ca815ee97f21

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

@@ -391,6 +391,9 @@
     var fd = new FormData();
     fd.append('spud_photo[photo]', file);
 
+    var csrf = $('meta[name=csrf-token]').prop('content');
+    fd.append('authenticity_token', csrf);
+
     // create a progress bar
     var progressBar = self.progressBarForUpload(file.name);
     $('#spud_admin_photo_upload_queue_bars').prepend(progressBar);

data/app/assets/stylesheets/admin/photos/application.css.scss

@@ -1,3 +1,5 @@
+//= require_self
+
 // Thumbnails
 //////////////
 .spud_admin_photo_ui_thumbs{

data/app/controllers/admin/photo_albums_controller.rb

@@ -3,7 +3,6 @@ class Admin::PhotoAlbumsController < Admin::ApplicationController
   before_filter :get_album, :only => [:show, :edit, :update, :destroy, :library]
   add_breadcrumb 'Photo Albums', :admin_photo_albums_path
   layout 'admin/spud_photos'
-  cache_sweeper :spud_photo_sweeper, :only => [:create, :update, :destroy]
 
   def index
     @photo_albums = SpudPhotoAlbum.all
@@ -20,7 +19,7 @@ class Admin::PhotoAlbumsController < Admin::ApplicationController
   end
 
   def create
-    @photo_album = SpudPhotoAlbum.new(params[:spud_photo_album])
+    @photo_album = SpudPhotoAlbum.new(photo_album_params)
     if @photo_album.save
       set_photo_order
     end
@@ -32,7 +31,7 @@ class Admin::PhotoAlbumsController < Admin::ApplicationController
   end
 
   def update
-    @photo_album.update_attributes(params[:spud_photo_album])
+    @photo_album.update_attributes(photo_album_params)
     if @photo_album.save
       set_photo_order
       flash[:notice] = 'SpudPhotoAlbum updated successfully' 
@@ -49,15 +48,19 @@ class Admin::PhotoAlbumsController < Admin::ApplicationController
     @photo_album = SpudPhotoAlbum.find(params[:id])
   end
 
-  private
+private
 
   def set_photo_order
     order_ids = params[:spud_photo_album][:photo_ids] || []
     @photo_album.spud_photo_albums_photos.each do |obj|
-      logger.debug "##### ID: #{obj.spud_photo_id.to_s}"
+      #logger.debug "##### ID: #{obj.spud_photo_id.to_s}"
       index = order_ids.index(obj.spud_photo_id.to_s)
       obj.update_attribute(:sort_order, index)
     end
   end
 
-end
+  def photo_album_params
+    params.require(:spud_photo_album).permit(:title, :url_name, :photo_ids => [])
+  end
+
+end

data/app/controllers/admin/photo_galleries_controller.rb

@@ -4,7 +4,6 @@ class Admin::PhotoGalleriesController < Admin::ApplicationController
   before_filter :get_albums, :only => [:new, :create, :edit, :update]
   add_breadcrumb 'Photo Galleries', :admin_photo_galleries_path
   layout 'admin/spud_photos'
-  cache_sweeper :spud_photo_sweeper, :only => [:create, :update, :destroy]
 
   def index
     @photo_galleries = SpudPhotoGallery.all
@@ -21,7 +20,7 @@ class Admin::PhotoGalleriesController < Admin::ApplicationController
   end
   
   def create
-    @photo_gallery = SpudPhotoGallery.new(params[:spud_photo_gallery])
+    @photo_gallery = SpudPhotoGallery.new(photo_gallery_params)
     flash[:notice] = 'SpudPhotoGallery created successfully' if @photo_gallery.save
     respond_with @photo_gallery, :location => admin_photo_galleries_path
   end
@@ -31,7 +30,7 @@ class Admin::PhotoGalleriesController < Admin::ApplicationController
   end
   
   def update
-    @photo_gallery.update_attributes(params[:spud_photo_gallery])
+    @photo_gallery.update_attributes(photo_gallery_params)
     flash[:notice] = 'SpudPhotoGallery updated successfully' if @photo_gallery.save
     respond_with @photo_gallery, :location => admin_photo_galleries_path
   end
@@ -41,6 +40,8 @@ class Admin::PhotoGalleriesController < Admin::ApplicationController
     respond_with @photo_gallery, :location => admin_photo_galleries_path
   end
 
+private
+
   def get_gallery
     @photo_gallery = SpudPhotoGallery.find(params[:id])
   end
@@ -49,4 +50,8 @@ class Admin::PhotoGalleriesController < Admin::ApplicationController
     @photo_albums = SpudPhotoAlbum.all
   end
 
-end
+  def photo_gallery_params
+    params.require(:spud_photo_gallery).permit(:title, :url_name, :album_ids => [])
+  end
+
+end

data/app/controllers/admin/photos_controller.rb

@@ -4,7 +4,6 @@ class Admin::PhotosController < Admin::ApplicationController
 
   before_filter :get_photo, :only => [:show, :edit, :update, :destroy]
   layout false
-  cache_sweeper :spud_photo_sweeper, :only => [:create, :update, :destroy]
 
   def index
     @photos = SpudPhoto.all
@@ -23,7 +22,7 @@ class Admin::PhotosController < Admin::ApplicationController
   end
 
   def create
-    @photo = SpudPhoto.new(params[:spud_photo])
+    @photo = SpudPhoto.new(photo_params)
     if @photo.save
       success = true
       flash[:notice] = 'SpudPhoto created successfully' 
@@ -44,7 +43,7 @@ class Admin::PhotosController < Admin::ApplicationController
   end
   
   def update
-    @photo.update_attributes(params[:spud_photo])
+    @photo.update_attributes(photo_params)
     if @photo.save
       success = true
       flash[:notice] = 'SpudPhoto updated successfully' 
@@ -69,7 +68,7 @@ class Admin::PhotosController < Admin::ApplicationController
     respond_with @photos, :location => admin_photos_path
   end
 
-  private
+private
 
   def get_photo
     @photo = SpudPhoto.find(params[:id])
@@ -89,4 +88,8 @@ class Admin::PhotosController < Admin::ApplicationController
     end
   end
 
-end
+  def photo_params
+    params.require(:spud_photo).permit(:title, :caption, :photo)
+  end
+
+end

data/app/controllers/photo_albums_controller.rb

@@ -7,12 +7,6 @@ class PhotoAlbumsController < ApplicationController
     before_filter :get_gallery
   end
 
-  after_filter :only => [:show, :index] do |c|
-    if Spud::Photos.enable_full_page_caching
-      c.cache_page(nil, nil, false)
-    end
-  end
-
   def index
     if @photo_gallery
       @photo_albums = @photo_gallery.albums.order('created_at desc')

data/app/controllers/photo_galleries_controller.rb

@@ -3,14 +3,8 @@ class PhotoGalleriesController < ApplicationController
   respond_to :html, :json, :xml
   layout Spud::Photos.base_layout
 
-  after_filter :only => [:index] do |c|
-    if Spud::Photos.enable_full_page_caching
-      c.cache_page(nil, nil, false)
-    end
-  end
-
   def index
-    @photo_galleries = SpudPhotoGallery.order('created_at desc').includes(:albums)
+    @photo_galleries = SpudPhotoGallery.order('created_at desc')
     respond_with @photo_galleries
   end
 

data/app/models/spud_photo.rb

@@ -2,8 +2,6 @@ class SpudPhoto < ActiveRecord::Base
 
   extend ActionView::Helpers::NumberHelper
 
-  attr_accessible :title, :caption, :photo
-
   has_many :spud_photo_albums_photos, :dependent => :destroy
   has_many :albums,
     :through => :spud_photo_albums_photos,

data/app/models/spud_photo_album.rb

@@ -1,12 +1,10 @@
 class SpudPhotoAlbum < ActiveRecord::Base
 
-  attr_accessible :title, :url_name, :photos, :photo_ids
-
   has_many :spud_photo_albums_photos, :dependent => :destroy
-  has_many :photos,
+  has_many :photos, 
+    ->{ order('spud_photo_albums_photos.sort_order asc') },
     :through => :spud_photo_albums_photos,
-    :source => :spud_photo,
-    :order => 'spud_photo_albums_photos.sort_order asc'
+    :source => :spud_photo
 
   has_many :spud_photo_galleries_albums
   has_many :galleries,
@@ -32,7 +30,7 @@ class SpudPhotoAlbum < ActiveRecord::Base
     end
   end
 
-  private
+private
 
   def set_url_name
     self.url_name = self.title.parameterize

data/app/models/spud_photo_albums_photo.rb

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

data/app/models/spud_photo_galleries_album.rb

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

data/app/models/spud_photo_gallery.rb

@@ -1,7 +1,5 @@
 class SpudPhotoGallery < ActiveRecord::Base
 
-  attr_accessible :title, :url_name, :albums, :album_ids
-
   has_many :spud_photo_galleries_albums, :dependent => :destroy
   has_many :albums,
     :through => :spud_photo_galleries_albums,
@@ -33,4 +31,4 @@ class SpudPhotoGallery < ActiveRecord::Base
     end
   end
 
-end
+end

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

@@ -5,6 +5,6 @@
   </div>
   <div class="spud_admin_photo_ui_thumb_controls">
     <%= 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?' %>
+    <%= link_to 'Delete', admin_photo_album_path(album), :method => :delete, :class => 'spud_admin_photos_btn_delete', :remote => true, :data => {:confirm => 'Are you sure?'} %>
   </div>
 </div>

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

@@ -1,6 +1,4 @@
-<% content_for :title do %>
-  <%= (@photo_gallery ? @photo_gallery.title : 'Photo Albums') %> | <%= Spud::Core.site_name %>
-<% end %>
+<% @page_title = @photo_gallery ? @photo_gallery.title : 'Photo Albums' %>
 
 <% content_for :head do %>
   
@@ -12,13 +10,15 @@
   <p><%= link_to 'Back to Galleries', photo_galleries_path %></p>
 <% end %>
 
-<div id="spud_photo_albums">
-  <% @photo_albums.each do |album| %>
-    <div class="spud_photo_album_thumbnail">
-      <h3>
-        <%= link_to album.title, (@photo_gallery ? photo_gallery_photo_album_path(@photo_gallery.url_name, album.url_name) : photo_album_path(album.url_name)) %>
-      </h3>
-      <%= image_tag album.top_photo_url(:medium), :title => album.title %>
-    </div>
-  <% end %>
-</div>
+<% cache([@photo_gallery, @photo_albums]) do %>
+  <div id="spud_photo_albums">
+    <% @photo_albums.each do |album| %>
+      <div class="spud_photo_album_thumbnail">
+        <h3>
+          <%= link_to album.title, (@photo_gallery ? photo_gallery_photo_album_path(@photo_gallery.url_name, album.url_name) : photo_album_path(album.url_name)) %>
+        </h3>
+        <%= image_tag album.top_photo_url(:medium), :title => album.title %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -1,6 +1,4 @@
-<% content_for :title do %>
-  <%= @photo_album.title %> | <%= Spud::Core.site_name %>
-<% end %>
+<% @page_title = @photo_album.title %>
 
 <% content_for :head do %>
 
@@ -8,20 +6,18 @@
 
 <h2>Photo Album: <%= @photo_album.title %></h2>
 
-<% if @photo_gallery %>
-  <% if @photo_gallery.albums.length == 1 %>
-    <p><%= link_to 'Back to Galleries', photo_galleries_path %>
+<% cache(@photo_album) do %>
+  <% if @photo_gallery %>
+    <p><%= link_to 'Back to Albums', photo_gallery_photo_albums_path(@photo_gallery.url_name) %>
   <% else %>
-    <p><%= link_to 'Back to Gallery', photo_gallery_photo_albums_path(@photo_gallery.url_name) %>
+    <p><%= link_to 'Back to Albums', photo_albums_path %>
   <% end %>
-<% else %>
-  <p><%= link_to 'Back to Albums', photo_albums_path %>
-<% end %>
 
-<div id="spud_photo_galleries">
-  <% @photo_album.photos.each do |photo| %>
-    <div class="spud_photo_album_thumbnail">
-      <%= link_to image_tag(photo.photo.url(:small), :alt => photo.caption, :title => photo.title), photo.photo.url(:large) %>
-    </div>
-  <% end %>
-</div>
+  <div id="spud_photo_galleries">
+    <% @photo_album.photos.each do |photo| %>
+      <div class="spud_photo_album_thumbnail">
+        <%= link_to image_tag(photo.photo.url(:small), :alt => photo.caption, :title => photo.title), photo.photo.url(:large) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -1,6 +1,4 @@
-<% content_for :title do %>
-  Photo Galleries | <%= Spud::Core.site_name %>
-<% end %>
+<% @page_title = 'Photo Galleries' %>
 
 <% content_for :head do %>
   
@@ -8,11 +6,15 @@
 
 <h2>Photo Galleries</h2>
 
-<div id="spud_photo_galleries">
-  <% @photo_galleries.each do |gallery| %>
-    <div class="spud_photo_gallery_thumbnail">
-      <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>
+<% cache(@photo_galleries) do %>
+  <div id="spud_photo_galleries">
+    <% @photo_galleries.each do |gallery| %>
+      <% cache(gallery) do %>
+        <div class="spud_photo_gallery_thumbnail">
+          <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 %>
+    <% end %>
+  </div>
+<% end %>

data/config/routes.rb

@@ -19,4 +19,4 @@ Rails.application.routes.draw do
     end
   end
 
-end
+end

data/lib/spud_photos/configuration.rb

@@ -23,6 +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
+    self.max_image_upload_size = 5.megabytes
   end
 end

data/lib/spud_photos/engine.rb

@@ -6,7 +6,6 @@ module Spud
     class Engine < Rails::Engine
       engine_name :tb_photos
       initializer :assets_photos do |config| 
-        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

data/lib/spud_photos/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Photos
-	  VERSION = "1.0.3"
+	  VERSION = "1.0.4"
 	end
 end