Merge remote-tracking branch 'upstream/master'

app/assets/stylesheets/photographs.css.sass

@@ -60,12 +60,52 @@
           .button
             margin: 0
 
-      &:hover .interactions
+      &:hover .interactions, &:hover .photo-navigation
         opacity: 1
 
       .actual-interactions
         text-align: right
 
+      .photo-navigation
+        opacity: 0
+        transition: opacity .25s ease-in-out
+        -moz-transition: opacity .25s ease-in-out
+        -webkit-transition: opacity .25s ease-in-out
+
+        .previous, .next
+          position: absolute
+          display: block
+          margin: 20px
+
+          a
+            display: block
+            width: 20px
+            height: 20px
+            padding: 40px
+            background:
+              repeat: no-repeat
+              position: 50%
+              color: rgba(0,0,0,.4)
+
+            &:hover
+              background-color: rgba(0,0,0,.6)
+
+        .previous
+          left: 0
+          top: 40%
+          text-align: left
+          text-indent: -99999px
+          a
+            background-image: image-url('glyphicons_inverted/glyphicons_210_left_arrow.png')
+
+        .next
+          right: 0
+          top: 40%
+          text-align: right
+          text-indent: 99999px
+          a
+            background-image: image-url('glyphicons_inverted/glyphicons_211_right_arrow.png')
+
       .stats
         @include stats("glyphicons_halflings")
         text-align: left

app/controllers/application_controller.rb

@@ -4,40 +4,12 @@ class ApplicationController < ActionController::Base
   helper_method :set_title, :hide_filters?, :sharing_mode
 
   attr_accessor :sharing_mode
-
+  
   before_filter :set_locale
-  def set_locale
-    I18n.locale = params[:locale] || (user_signed_in? ? current_user.locale : I18n.default_locale)
-  end
-
   before_filter :fetch_categories
-  def fetch_categories
-    @categories = Rails.cache.fetch([I18n.locale, :categories, :list], expires_in: 5.minutes) do
-      Category.all.sort_by(&:name)
-    end
-
-  # Handle a cache failure here, as it will impact entire site
-  rescue Exception
-    @categories = Category.order("name ASC")
-  end
-
   before_filter :fetch_licenses
-  def fetch_licenses
-    @licenses = Rails.cache.fetch([I18n.locale, :licenses, :list], expires_in: 5.minutes) do
-      License.order("id ASC").load
-    end
-
-  # Handle a cache failure here, as it will impact entire site
-  rescue Exception
-    @licenses = License.order("id ASC")
-  end
-
   before_filter :google_analytics_identification
-  def google_analytics_identification
-    if $gabba.present?
-      $gabba.identify_user(cookies[:__utma], cookies[:__utmz])
-    end
-  end
+  after_filter :track_last_viewed_photographs
 
   rescue_from CanCan::AccessDenied do |exception|
     redirect_to root_url, alert: exception.message
@@ -87,4 +59,47 @@ def hide_filters!
   def enable_sharing_mode
     self.sharing_mode = true
   end
+
+  def set_locale
+    I18n.locale = params[:locale] || (user_signed_in? ? current_user.locale : I18n.default_locale)
+  end
+
+  def fetch_categories
+    @categories = Rails.cache.fetch([I18n.locale, :categories, :list], expires_in: 5.minutes) do
+      Category.all.sort_by(&:name)
+    end
+
+  # Handle a cache failure here, as it will impact entire site
+  rescue Exception
+    @categories = Category.order("name ASC")
+  end
+
+  def fetch_licenses
+    @licenses = Rails.cache.fetch([I18n.locale, :licenses, :list], expires_in: 5.minutes) do
+      License.order("id ASC").load
+    end
+
+  # Handle a cache failure here, as it will impact entire site
+  rescue Exception
+    @licenses = License.order("id ASC")
+  end
+
+  def google_analytics_identification
+    if $gabba.present?
+      $gabba.identify_user(cookies[:__utma], cookies[:__utmz])
+    end
+  end
+
+  def track_last_viewed_photographs
+    case
+    # When a collection is being viewed, store its photo ids
+    when @collection.present?
+      flash[:last_viewed_photograph_ids] = @collection.photographs.visible.pluck(:id).uniq
+    # If viewing a photo and previously viewed a set of photos, keep the photo ids
+    when flash[:last_viewed_photograph_ids].present? && @photograph.present?
+      if flash[:last_viewed_photograph_ids].include?(@photograph.id)
+        flash.keep
+      end
+    end
+  end
 end

app/helpers/photographs_helper.rb

@@ -158,4 +158,32 @@ def metadata_typeahead_values(attr = nil)
       end
     end
   end
+
+  def last_viewed_photograph_ids
+    flash[:last_viewed_photograph_ids]
+  end
+
+  def last_viewed_photographs
+    if last_viewed_photograph_ids.present?
+      Photograph.view_for(current_user).where(id: flash[:last_viewed_photograph_ids])
+    end
+  end
+
+  def next_photo_id(photograph, photograph_ids)
+    if photograph_ids.present? && photograph_ids.size > 0
+      index = photograph_ids.index(photograph.id)
+      photograph_ids[(index || 0) + 1]
+    end
+  end
+
+  def previous_photo_id(photograph, photograph_ids)
+    if photograph_ids.present? && photograph_ids.size > 0
+      index = photograph_ids.index(photograph.id)
+      if index == 0
+        nil
+      else
+        photograph_ids[(index || 0) - 1]
+      end
+    end
+  end
 end

app/views/photographs/_interactions.html.slim

@@ -32,3 +32,14 @@ div class="interactions"
                 = link_to photograph_favourites_path(photograph), method: :post, class: "button small favourite secondary", "data-remote" => true do
                   |  
 
+div class="photo-navigation"
+  div class="inner"
+    - previous_id = previous_photo_id(photograph, last_viewed_photograph_ids)
+    - if previous_id.present?
+      span class="previous"
+        = link_to t("previous"), photograph_path(id: previous_id)
+
+    - next_id = next_photo_id(photograph, last_viewed_photograph_ids)
+    - if next_id.present?
+      span class="next"
+        = link_to t("next"), photograph_path(id: next_id)

config/locales/en.yml

@@ -29,6 +29,8 @@ en:
     twitter_account: "@photographer_io"
     github: "GitHub"
   privacy_policy: "https://www.iubenda.com/privacy-policy/288645"
+  previous: "Previous"
+  next: "Next"
 
   locales:
     en: "English"

spec/controllers/application_controller_spec.rb

@@ -8,7 +8,7 @@
     before { Category.stub(:where) { [] } }
 
     it "cache failure shouldn't break the site" do
-      instance.fetch_categories.should eq([])
+      instance.send(:fetch_categories).should eq([])
     end
   end
 

spec/controllers/collections_controller_spec.rb

@@ -9,6 +9,7 @@
     let(:photographs) { [Photograph.make] }
 
     before do
+      controller.stub(:track_last_viewed_photographs) { nil }
       collection.stub(:id) { 1 }
       collection.stub_chain(:photographs, :visible, :page) { photographs }
       Collection.stub(:find) { collection }