spud_photos 0.9.0.2 → 0.9.1

data/app/controllers/photo_albums_controller.rb

@@ -3,6 +3,10 @@ class PhotoAlbumsController < ApplicationController
   respond_to :html, :json, :xml
   layout Spud::Photos.base_layout
 
+  if Spud::Photos.galleries_enabled
+    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)
@@ -10,14 +14,8 @@ class PhotoAlbumsController < ApplicationController
   end
 
   def index
-    if params[:photo_gallery_id]
-      @photo_gallery = SpudPhotoGallery.find_by_url_name(params[:photo_gallery_id])
-      if @photo_gallery.blank?
-        flash[:error] = 'Photo gallery could not be found!'
-        redirect_to photo_galleries_path and return false
-      else
-        @photo_albums = @photo_gallery.albums.order('created_at desc')
-      end
+    if @photo_gallery
+      @photo_albums = @photo_gallery.albums.order('created_at desc')
     else
       @photo_albums = SpudPhotoAlbum.order('created_at desc')
     end
@@ -27,7 +25,7 @@ class PhotoAlbumsController < ApplicationController
   def show
     @photo_album = SpudPhotoAlbum.find_by_url_name(params[:id])
     if @photo_album.blank?
-      flash[:error] = "Post not found!"
+      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
@@ -38,4 +36,19 @@ class PhotoAlbumsController < ApplicationController
     end
   end
 
+private
+
+  def get_gallery
+    @photo_gallery = SpudPhotoGallery.find_by_url_name(params[:photo_gallery_id])
+    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
+    end
+  end
+
 end

data/app/controllers/photo_galleries_controller.rb

@@ -10,7 +10,7 @@ class PhotoGalleriesController < ApplicationController
   end
 
   def index
-    @photo_galleries = SpudPhotoGallery.order('created_at desc')
+    @photo_galleries = SpudPhotoGallery.order('created_at desc').includes(:albums)
     respond_with @photo_galleries
   end
 

data/app/models/spud_photo_sweeper.rb

@@ -22,6 +22,12 @@ private
       if File.directory?(cache_path)
         FileUtils.rm_rf(cache_path)
       end
+      if Spud::Photos.config.galleries_enabled
+        expire_page photo_galleries_path
+      else
+        expire_page photo_albums_path
+      end
+
       if !Spud::Photos.config.page_caches_to_sweep.blank?
         Spud::Photos.config.page_caches_to_sweep.each do |route|
           expire_page(route)
@@ -30,4 +36,4 @@ private
     end
   end
 
-end
+end

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

@@ -6,12 +6,18 @@
   
 <% end %>
 
-<h2><%= (@photo_gallery ? @photo_gallery.title : 'Photo Albums') %></h2>
+<h2><%= (@photo_gallery ? "Photo Gallery: #{@photo_gallery.title}" : 'Photo Albums') %></h2>
+
+<% if Spud::Photos.galleries_enabled %>
+  <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>
+      <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 %>

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

@@ -6,7 +6,17 @@
 
 <% end %>
 
-<h2>Photo Album: <% @photo_album.title %></h2>
+<h2>Photo Album: <%= @photo_album.title %></h2>
+
+<% if @photo_gallery %>
+  <% if @photo_gallery.albums.count == 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) %>
+  <% end %>
+<% else %>
+  <p><%= link_to 'Back to Albums', photo_albums_path %>
+<% end %>
 
 <div id="spud_photo_galleries">
   <% @photo_album.photos.each do |photo| %>

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

@@ -11,7 +11,7 @@
 <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>
+      <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>
       <%= image_tag gallery.top_photo_url(:medium), :title => gallery.title %>
     </div>
   <% end %>

data/db/migrate/20120228232329_create_spud_photo_albums.rb

@@ -9,7 +9,7 @@ class CreateSpudPhotoAlbums < ActiveRecord::Migration
       t.integer :spud_photo_album_id
       t.integer :spud_photo_id
     end
-    add_index :spud_photo_albums, :url_name
-    add_index :spud_photo_albums_photos, :spud_photo_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
+end

data/db/migrate/20120228232344_create_spud_photo_galleries.rb

@@ -9,7 +9,7 @@ class CreateSpudPhotoGalleries < ActiveRecord::Migration
       t.integer :spud_photo_gallery_id
       t.integer :spud_photo_album_id
     end
-    add_index :spud_photo_galleries, :url_name
-    add_index :spud_photo_galleries_albums, :spud_photo_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
+end

data/lib/spud_photos/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Photos
-	  VERSION = "0.9.0.2"
+	  VERSION = "0.9.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_photos
 version: !ruby/object:Gem::Version
-  version: 0.9.0.2
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -276,7 +276,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1193722346749498297
+      hash: -1716932056523986828
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1193722346749498297
+      hash: -1716932056523986828
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24