sufia 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d9ca86c363c0d4e38d76b587a487b97f675c016
-  data.tar.gz: d1a9151de4fa4bb651ddee3b1aabf246c167cc56
+  metadata.gz: b1c4c30d06096c8bf96dd31815ac959204aa7ba0
+  data.tar.gz: a5f92e07ff3b432ab8b0fcd9c257b86e7c9b76c0
 SHA512:
-  metadata.gz: 0f444ca293e68574e34d8defb7b82d9d57d360d3a3526f58e7b42ab86da48f66551e7b1769ce778e573f83b5efcda300e1e1325e0bf0968eaf991c33a7416f91
-  data.tar.gz: d6ad98fbb7809d6e828c740de33085e486016716a4329439300d29441a0bbea3969f7de606eca80cba9307ae083ca85281bc32538f821854e72873a355ed9d2f
+  metadata.gz: d09bc93fc96305ffb8f2406611419e9979ba1bc28e7096ca9d04370132d91396b820d44b03d23f09d30153b2b3c5d5792b4cc150e5ea45bd0724e8d96a3fdae5
+  data.tar.gz: 6150293ef7e9b349b62deab24475e3b370af265e2116c065c904943880506d3000a13d0878e746fd47b5fe693c78cd88d96f7d64e1df19da812f87e3a4dcb9b5

data/SUFIA_VERSION

@@ -1 +1 @@
-3.7.1
+3.7.2

data/app/assets/javascripts/sufia.js

@@ -49,6 +49,9 @@ limitations under the License.
 //= require hydra/batch_select
 //= require hydra_collections
 
+// this needs to be after batch_select so that the form ids get setup correctly
+//= require sufia/batch_edit
+
 //over ride the blacklight default to submit
 //form when sort by or show per page change
 Blacklight.do_select_submit = function() {

data/app/assets/javascripts/sufia/batch_edit.js

@@ -0,0 +1,170 @@
+function batch_edit_init () {
+
+    // initialize popover helpers
+    $("a[rel=popover]").popover({ html: true });
+
+    $("tr.expandable").click(function () {
+        $(this).next("ul").slideToggle();
+
+        $(this).find('i.toggle').toggleClass("icon-chevron-down");
+    });
+
+    $("tr.expandable_new").click(function () {
+        $(this).find('i').toggleClass("icon-chevron-down");
+    });
+
+
+    function deserialize(Params) {
+        var Data = Params.split("&");
+        var i = Data.length;
+        var Result  = {};
+        while (i--) {
+            var Pair = decodeURIComponent(Data[i]).split("=");
+            var Key = Pair[0];
+            var Val = Pair[1];
+            Result[Key] = Val;
+        }
+        return Result;
+    }
+
+    var ajaxManager = (function () {
+        var requests = [];
+        var running = false;
+        return {
+            addReq: function (opt) {
+                requests.push(opt);
+            },
+            removeReq: function (opt) {
+                if ($.inArray(opt, requests) > -1)
+                    requests.splice($.inArray(opt, requests), 1);
+            },
+            runNow: function () {
+                clearTimeout(self.tid);
+                if (!running) {
+                    this.run();
+                }
+            },
+            run: function () {
+                running = true;
+                var self = this,
+                        orgSuc;
+
+                if (requests.length) {
+                    oriSuc = requests[0].complete;
+
+                    // combine data from multiple requests
+                    if (requests.length > 1) {
+                        var data = deserialize(requests[0].data.replace(/\+/g, " "));
+                        form = [requests[0].form]
+                        for (var i = requests.length - 1; i > 0; i--) {
+                            req = requests.pop();
+                            adata = deserialize(req.data.replace(/\+/g, " "));
+                            for (key in  Object.keys(adata)) {
+                                curKey = Object.keys(adata)[key];
+                                if (curKey.slice(0, 12) == "generic_file") {
+                                    data[curKey] = adata[curKey];
+                                    form.push(req.form);
+                                }
+                            }
+                        }
+                        requests[0].data = $.param(data);
+                        requests[0].form = form;
+                    }
+
+                    requests[0].complete = function () {
+                        if (typeof oriSuc === 'function') oriSuc();
+                        if (typeof requests[0].form === 'object') {
+                            for (f in form) {
+                                form_id = form[f];
+                                after_ajax(form_id);
+                            }
+                        }
+                        requests.shift();
+                        self.run.apply(self, []);
+                    };
+
+                    $.ajax(requests[0]);
+                } else {
+                    self.tid = setTimeout(function () {
+                        self.run.apply(self, []);
+                    }, 500);
+                }
+                running = false;
+            },
+            stop: function () {
+                requests = [];
+                clearTimeout(this.tid);
+            }
+        };
+    }());
+
+
+    ajaxManager.run();
+
+    function after_ajax(form_id) {
+        var key = form_id.replace("form_", "");
+        var save_button = "#" + key + "_save";
+        var outer_div = "#collapse_" + key;
+        $("#status_" + key).html("Changes Saved");
+        $(save_button).removeAttr("disabled");
+        $(outer_div).removeClass("loading");
+        $('#' + form_id).children([".control-group"]).removeClass('hidden')
+    }
+
+    function before_ajax(form_id) {
+        var key = form_id.replace("form_", "");
+        var save_button = "#" + key + "_save";
+        var outer_div = "#collapse_" + key;
+        $(save_button).attr("disabled", "disabled");
+        $(outer_div).addClass("loading");
+        $('#' + form_id).children([".control-group"]).addClass('hidden')
+    }
+
+
+    function runSave(e) {
+        e.preventDefault();
+        var button = $(this);
+        var form = $(button.parent().parent()[0]);
+        var form_id = form[0].id
+        before_ajax(form_id);
+
+        ajaxManager.addReq({
+            form: form_id,
+            queue: "add_doc",
+            url: form.attr("action"),
+            dataType: "json",
+            type: form.attr("method").toUpperCase(),
+            data: form.serialize(),
+            success: function (e) {
+                eval(e.responseText);
+                after_ajax(form_id);
+            },
+            error: function (e) {
+                after_ajax(form_id);
+                if (e.status == 200) {
+                    eval(e.responseText);
+                } else {
+                    alert("Error!  Status: " + e.status);
+                }
+            }
+        });
+        setTimeout(ajaxManager.runNow(), 100);
+    }
+
+    $("#permissions_save").click(runSave);
+    $(".field-save").click(runSave);
+
+}
+
+
+
+
+// turbolinks triggers page:load events on page transition
+// If app isn't using turbolinks, this event will never be triggered, no prob.
+$(document).on('page:load', function() {
+    batch_edit_init();
+});
+
+$(document).ready(function() {
+    batch_edit_init();
+});

data/app/assets/stylesheets/{video-js.css → video-js.css.erb}

@@ -20,8 +20,11 @@ The control icons are from a custom font. Each icon corresponds to a character
 */
 @font-face {
   font-family: 'VideoJS';
-  src: url('font/vjs.eot');
-  src: url('font/vjs.eot?#iefix') format('embedded-opentype'), url('font/vjs.woff') format('woff'), url('font/vjs.ttf') format('truetype');
+  src:url(<%= asset_path 'vjs.eot' %>);
+  src:url(<%= asset_path 'vjs.eot?#iefix' %>) format('embedded-opentype'),
+          url(<%= asset_path 'vjs.woff' %>) format('woff'),
+          url(<%= asset_path 'vjs.ttf' %>) format('truetype'),
+          url(<%= asset_path 'vjs.svg#VideoJS' %>) format('svg');
   font-weight: normal;
   font-style: normal;
 }

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -50,9 +50,9 @@ module Sufia::UsersControllerBehavior
       @user.update_attributes(params.require(:user).permit(*User.permitted_attributes))
     end
     @user.populate_attributes if params[:update_directory]
-    @user.avatar = nil if params[:delete_avatar]
+    @user.remove_avatar = true if params[:delete_avatar]
     unless @user.save
-      redirect_to sufia.edit_profile_path(URI.escape(@user.to_s,'@.')), alert: @user.errors.full_messages
+      redirect_to sufia.edit_profile_path(@user.to_param), alert: @user.errors.full_messages
       return
     end
     params.keys.select {|k, v| k.starts_with? 'remove_trophy_' }.each do |smash_trophy|
@@ -60,7 +60,7 @@ module Sufia::UsersControllerBehavior
       current_user.trophies.where(generic_file_id: smash_trophy).destroy_all
     end
     Sufia.queue.push(UserEditProfileEventJob.new(@user.user_key))
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "Your profile has been updated"
+    redirect_to sufia.profile_path(@user.to_param), notice: "Your profile has been updated"
   end
 
   def toggle_trophy    
@@ -89,7 +89,7 @@ module Sufia::UsersControllerBehavior
       current_user.follow(@user)
       Sufia.queue.push(UserFollowEventJob.new(current_user.user_key, @user.user_key))
     end
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "You are following #{@user.to_s}"
+    redirect_to sufia.profile_path(@user.to_param), notice: "You are following #{@user.to_s}"
   end
 
   # Unfollow a user
@@ -98,7 +98,7 @@ module Sufia::UsersControllerBehavior
       current_user.stop_following(@user)
       Sufia.queue.push(UserUnfollowEventJob.new(current_user.user_key, @user.user_key))
     end
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "You are no longer following #{@user.to_s}"
+    redirect_to sufia.profile_path(@user.to_param), notice: "You are no longer following #{@user.to_s}"
   end
 
   protected
@@ -114,11 +114,11 @@ module Sufia::UsersControllerBehavior
   end
 
   def user_is_current_user
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), alert: "Permission denied: cannot access this page." unless @user == current_user
+    redirect_to sufia.profile_path(@user.to_param), alert: "Permission denied: cannot access this page." unless @user == current_user
   end
 
   def user_not_current_user
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), alert: "You cannot follow or unfollow yourself" if @user == current_user
+    redirect_to sufia.profile_path(@user.to_param), alert: "You cannot follow or unfollow yourself" if @user == current_user
   end
 
   def get_sort

data/app/views/batch_edits/edit.html.erb

@@ -1,178 +1,3 @@
-<% content_for :local_js do %>
-
-  window.onbeforeunload = clearBatch;
-  function clearBatch(){
-    // clear the batch edit items (do it inline so it is done before the next page load 
-    var clearState = $.ajax({
-      headers: {Accept : "application/javascript"},      
-      type: 'POST',
-      url: '<%=sufia.batch_edits_clear_path %>',
-      async: false,
-    });
-  }  
-
-// initialize popover helpers
-$("a[rel=popover]").popover({ html: true });
-  <% @terms.each do |term| %>
-    <% vals =  @show_file.send(term) %>
-    <% next if vals.blank? %>    
-    $("#<%='generic_file_'+term.to_s%>").autocomplete({"source":["<%=vals.join(",")%>"]});
-
-  <% end %>
-
-  function after_ajax(form_id){
-      var key = form_id.replace("form_","");
-      var save_button = "#"+key+"_save";
-      var outer_div = "#collapse_"+key;
-      $("#status_"+key).html("Changes Saved");
-      $(save_button).removeAttr("disabled");         
-      $(outer_div).removeClass("loading");
-      $('#'+form_id).children([".control-group"]).removeClass('hidden')
-  }
-
-  function before_ajax(form_id){
-        var key = form_id.replace("form_","");
-        var save_button = "#"+key+"_save";
-        var outer_div = "#collapse_"+key;
-        $(save_button).attr("disabled", "disabled");
-        $(outer_div).addClass("loading");
-        $('#'+form_id).children([".control-group"]).addClass('hidden')        
-    }
-
-
-    $("tr.expandable").click(function(){
-       $(this).next("ul").slideToggle();
-    
-       $(this).find('i.toggle').toggleClass("icon-chevron-down");
-    }); 
-
-    $("tr.expandable_new").click(function(){   
-       $(this).find('i').toggleClass("icon-chevron-down");
-    }); 
-
-    function deserialize(Params) {
-        var Data = Params.split("&");
-        var i = Data.length;
-        var Result  = {}; 
-        while (i--) {
-            var Pair = decodeURIComponent(Data[i]).split("=");
-            var Key = Pair[0];
-            var Val = Pair[1];
-            Result[Key] = Val;
-        }   
-        return Result;
-    }
- 
-    var ajaxManager = (function() {
-         var requests = [];
-         var running = false;
-         return {
-            addReq:  function(opt) {
-                requests.push(opt);
-            },
-            removeReq:  function(opt) {
-                if( $.inArray(opt, requests) > -1 )
-                    requests.splice($.inArray(opt, requests), 1);
-            },
-            runNow: function(){
-                clearTimeout(self.tid);
-                if (!running) {
-                   run();
-                }
-            },
-            run: function() {
-                running = true;
-                var self = this,
-                    orgSuc;
-    
-                if( requests.length ) {
-                    oriSuc = requests[0].complete;
-    
-                    // combine data from multiple requests
-                    if (requests.length > 1) {
-                       var data = deserialize(requests[0].data.replace(/\+/g," "));
-                       form = [requests[0].form]
-                       for (var i=requests.length-1; i>0 ; i--){
-                          req = requests.pop();
-                          adata = deserialize(req.data.replace(/\+/g," "));
-                          for (key in  Object.keys(adata)){ 
-                             curKey =   Object.keys(adata)[key] ;                      
-                             if (curKey.slice(0,12) == "generic_file"){
-                                data[curKey] = adata[curKey];
-                                form.push (req.form);
-                             }
-                          }
-                       } 
-                       requests[0].data = $.param(data);
-                       requests[0].form = form;
-                    }    
-    
-                    requests[0].complete = function() {
-                         if( typeof oriSuc === 'function' ) oriSuc();
-                         if (typeof requests[0].form === 'object'){
-                            for (f in form) {
-                               form_id = form[f];
-                               after_ajax(form_id);
-                            }
-                         }
-                         requests.shift();
-                         self.run.apply(self, []);
-                    };   
-    
-                    $.ajax(requests[0]);
-                } else {
-                  self.tid = setTimeout(function() {
-                     self.run.apply(self, []);
-                  }, 500);
-                }
-                running = false;
-            },
-            stop:  function() {
-                requests = [];
-                clearTimeout(this.tid);
-            }
-         };
-    }());
-        
-    ajaxManager.run();
-
-
-    $("#permissions_save").click(runSave);
-    $(".field-save").click(runSave);
-
-    function runSave(e){     
-      e.preventDefault();
-      var button = $(this);
-      var form = $(button.parent().parent()[0]);
-      var form_id = form[0].id
-      before_ajax(form_id);
-
-       ajaxManager.addReq({
-          form: form_id,
-          queue: "add_doc",
-          url: form.attr("action"),
-          dataType: "json",
-          type: form.attr("method").toUpperCase(),
-          data: form.serialize(),
-          success: function (e) {
-              eval(e.responseText);
-              after_ajax(form_id);
-          },
-          error: function (e) {
-            after_ajax(form_id);
-            if (e.status == 200) {
-              eval(e.responseText);
-            } else {
-              alert("Error!  Status: "+e.status);
-            }
-          }, 
-       });
-       setTimeout(ajaxManager.runNow(),100);
-   }
-
-<% end %>
-
-
 <%= render :partial => 'generic_files/breadcrumbs', :locals => {:include_file=>false} %>
 <h2 class="non lower">Batch Edit Descriptions &nbsp;&nbsp;&nbsp;<small>Click on labels below to edit file descriptions.</small> </h2>
 <div class="scrollx scrolly fileHeight"> <!-- original values -->

data/app/views/static/help.html.erb

@@ -17,6 +17,6 @@ limitations under the License.
 <h1>User Support</h1>
  <h2>Service Inquiries and Requests</h2>
  <p>
-   Use app/views/static/about.html.erb to override this file.
+   Use app/views/static/help.html.erb to override this file.
  </p>
 

data/app/views/users/edit.html.erb

@@ -5,7 +5,7 @@ $("a[rel=popover]").popover({ html: true });
 
 <h1>Edit Profile</h1>
 <div class="span45 well">
-  <%= form_for @user, :url => sufia.profile_path(URI.escape(@user.to_s, '@.')), :html => {:multipart => true, :class => 'form-horizontal' } do |f| %>
+  <%= form_for @user, :url => sufia.profile_path(@user.to_param), :html => {:multipart => true, :class => 'form-horizontal' } do |f| %>
     <div class="control-group">
       <%= f.label :avatar, '<i class="icon-camera-retro"></i> Change picture'.html_safe, :class => "control-label" %>
       <div class="controls">

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.7.0"
+  VERSION = "3.7.2"
 end

data/spec/controllers/users_controller_spec.rb

@@ -106,7 +106,7 @@ describe UsersController do
     end
     it "redirects to show profile when user attempts to edit another profile" do
       get :edit, id: @another_user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
       flash[:alert].should include("Permission denied: cannot access this page.")
     end
     describe "when the user has trophies" do
@@ -129,7 +129,7 @@ describe UsersController do
   describe "#update" do
     it "should not allow other users to update" do
       post :update, id: @another_user.user_key, user: { avatar: nil }
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
       flash[:alert].should include("Permission denied: cannot access this page.")
     end
     it "should set an avatar and redirect to profile" do
@@ -139,7 +139,7 @@ describe UsersController do
       Sufia.queue.should_receive(:push).with(s1).once
       f = fixture_file_upload('/world.png', 'image/png')
       post :update, id: @user.user_key, user: { avatar: f }
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
       flash[:notice].should include("Your profile has been updated")
       User.find_by_user_key(@user.user_key).avatar?.should be_true
     end
@@ -147,24 +147,31 @@ describe UsersController do
       Sufia.queue.should_receive(:push).never
       f = fixture_file_upload('/image.jp2', 'image/jp2')
       post :update, id: @user.user_key, user: { avatar: f }
-      response.should redirect_to(@routes.url_helpers.edit_profile_path(URI.escape(@user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.edit_profile_path(@user.to_param))
       flash[:alert].should include("Avatar You are not allowed to upload \"jp2\" files, allowed types: jpg, jpeg, png, gif, bmp, tif, tiff")
     end
     it "should validate the size of an avatar" do
       f = fixture_file_upload('/4-20.png', 'image/png')
       Sufia.queue.should_receive(:push).never
       post :update, id: @user.user_key, user: { avatar: f }
-      response.should redirect_to(@routes.url_helpers.edit_profile_path(URI.escape(@user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.edit_profile_path(@user.to_param))
       flash[:alert].should include("Avatar file size must be less than 2MB")
     end
-    it "should delete an avatar" do
-      s1 = double('one')
-      UserEditProfileEventJob.should_receive(:new).with(@user.user_key).and_return(s1)
-      Sufia.queue.should_receive(:push).with(s1).once
-      post :update, id: @user.user_key, delete_avatar: true
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
-      flash[:notice].should include("Your profile has been updated")
-      @user.avatar?.should be_false
+    context "user with existing avatar" do
+      before do
+        f = fixture_file_upload('/world.png', 'image/png')
+        @user.avatar = f
+        @user.save
+      end
+      it "should delete an avatar" do
+        s1 = double('one')
+        UserEditProfileEventJob.should_receive(:new).with(@user.user_key).and_return(s1)
+        Sufia.queue.should_receive(:push).with(s1).once
+        post :update, id: @user.user_key, delete_avatar: true
+        response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+        flash[:notice].should include("Your profile has been updated")
+        User.find_by_user_key(@user.user_key).avatar?.should be_false
+      end
     end
     it "should refresh directory attributes" do
       s1 = double('one')
@@ -172,7 +179,7 @@ describe UsersController do
       Sufia.queue.should_receive(:push).with(s1).once
       User.any_instance.should_receive(:populate_attributes).once
       post :update, id: @user.user_key, update_directory: true
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
       flash[:notice].should include("Your profile has been updated")
     end
     it "should set an social handles" do
@@ -181,7 +188,7 @@ describe UsersController do
       @user.googleplus_handle.blank?.should be_true
       @user.linkedin_handle.blank?.should be_true
       post :update, id: @user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo', linkedin_handle:"link" }
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
       flash[:notice].should include("Your profile has been updated")
       u = User.find_by_user_key(@user.user_key)
       u.twitter_handle.should == 'twit'
@@ -200,7 +207,7 @@ describe UsersController do
         expect {
           post :update, id: user.user_key,  'remove_trophy_'+file.noid => 'yes'
         }.to change { user.trophies.count }.by(-1)
-        response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(user.user_key,'@.')))
+        response.should redirect_to(@routes.url_helpers.profile_path(user.to_param))
         flash[:notice].should include("Your profile has been updated")
       end
     end
@@ -216,7 +223,7 @@ describe UsersController do
       UserFollowEventJob.should_receive(:new).with(@user.user_key, @another_user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
       post :follow, id: @another_user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
       flash[:notice].should include("You are following #{@another_user.user_key}")
     end
     it "should redirect to profile if already following and not log an event" do
@@ -224,14 +231,14 @@ describe UsersController do
       #Resque.should_receive(:enqueue).with(UserFollowEventJob, @user.user_key, @another_user.user_key).never
       Sufia.queue.should_receive(:push).never
       post :follow, id: @another_user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
       flash[:notice].should include("You are following #{@another_user.user_key}")
     end
     it "should redirect to profile if user attempts to self-follow and not log an event" do
       #Resque.should_receive(:enqueue).with(UserFollowEventJob, @user.user_key, @user.user_key).never
       Sufia.queue.should_receive(:push).never
       post :follow, id: @user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
       flash[:alert].should include("You cannot follow or unfollow yourself")
     end
   end
@@ -242,7 +249,7 @@ describe UsersController do
       UserUnfollowEventJob.should_receive(:new).with(@user.user_key, @another_user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
       post :unfollow, id: @another_user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
       flash[:notice].should include("You are no longer following #{@another_user.user_key}")
     end
     it "should redirect to profile if not following and not log an event" do
@@ -250,14 +257,14 @@ describe UsersController do
       #Resque.should_receive(:enqueue).with(UserUnfollowEventJob, @user.user_key, @another_user.user_key).never
       Sufia.queue.should_receive(:push).never
       post :unfollow, id: @another_user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
       flash[:notice].should include("You are no longer following #{@another_user.user_key}")
     end
     it "should redirect to profile if user attempts to self-follow and not log an event" do
       #Resque.should_receive(:enqueue).with(UserUnfollowEventJob, @user.user_key, @user.user_key).never
       Sufia.queue.should_receive(:push).never
       post :unfollow, id: @user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
+      response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
       flash[:alert].should include("You cannot follow or unfollow yourself")
     end
   end

data/spec/features/users_spec.rb

@@ -14,6 +14,7 @@ describe "User Profile" do
   it "should be editable" do
     click_link "curator1@example.com"
     click_link "Edit Your Profile"
+    page.should have_xpath("//form[@action='/users/curator1@example-dot-com']")
     fill_in 'user_twitter_handle', with: 'curatorOfData'
     click_button 'Save Profile'
     page.should have_content "Your profile has been updated"

data/spec/models/active_fedora_pid_based_job_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe ActiveFedoraPidBasedJob do
+  let (:user) {FactoryGirl.find_or_create(:user)}
+  let (:file) {GenericFile.new.tap do |gf|
+                  gf.apply_depositor_metadata(user)
+                  gf.save!
+                end}
+  after do
+    file.destroy
+    user.destroy
+  end
+  it "finds object" do
+    job = ActiveFedoraPidBasedJob.new(file.id)
+    expect(job.generic_file).to_not be_nil
+    expect(job.generic_file.reload_on_save?).to be_true
+  end
+end

data/spec/models/characterize_job_spec.rb

@@ -5,6 +5,7 @@ describe CharacterizeJob do
     @generic_file = GenericFile.new
     @generic_file.apply_depositor_metadata('jcoyne@example.com')
     @generic_file.save!
+    GenericFile.any_instance.stub(:reload_on_save?).and_return(false)
   end
 
   after do

data/spec/models/generic_file/reload_on_save_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Sufia::GenericFile::ReloadOnSave do
+  let(:user) { FactoryGirl.find_or_create(:user) }
+  let(:file) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
+
+  it 'defaults to not call reload' do
+    file.should_not_receive(:reload)
+    file.save
+  end
+
+  it 'can be set to call reload' do
+    file.reload_on_save = true
+    file.should_receive(:reload)
+    file.save
+  end
+
+  it 'allows reload to be turned off and on' do
+    file.reload_on_save = true
+    file.should_receive(:reload).once
+    file.save
+    file.reload_on_save = false
+    file.save
+  end
+end

data/spec/models/generic_file_spec.rb

@@ -1020,4 +1020,28 @@ describe GenericFile do
       end
     end
   end
+
+  describe "should create a full to_solr record" do
+    before do
+      subject.save
+    end
+    after do
+      subject.destroy
+    end
+    it "gets both sets of data into solr" do
+     f1= GenericFile.find(subject.id)
+     f2 = GenericFile.find(subject.id)
+     f2.reload_on_save = true
+     f1.mime_type = "video/abc123"
+     f2.title = "abc123"
+     f1.save
+     mime_type_key = Solrizer.solr_name("mime_type")
+     title_key = Solrizer.solr_name("desc_metadata__title", :stored_searchable, type: :string)
+     expect(f1.to_solr[mime_type_key]).to eq([f1.mime_type])
+     expect(f1.to_solr[title_key]).to_not eq(f2.title)
+     f2.save
+     expect(f2.to_solr[mime_type_key]).to eq([f1.mime_type])
+     expect(f2.to_solr[title_key]).to eq(f2.title)
+    end
+  end
 end

data/spec/models/geo_names_resource_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe GeoNamesResource do
+
+  it "should find locations" do
+    hits = GeoNamesResource.find_location("State")
+    hits.should_not be_nil
+  end
+end
+

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec/rails'
 require 'rspec/autorun'
 require 'capybara/rspec'
 require 'capybara/rails'
+require 'equivalent-xml/rspec_matchers'
 
 require File.expand_path('../support/features', __FILE__)
 
@@ -77,6 +78,7 @@ RSpec.configure do |config|
 
   config.include Devise::TestHelpers, :type => :controller
   config.include EngineRoutes, :type => :controller
+  config.include EquivalentXml::RSpecMatchers
 end
 
 module FactoryGirl

data/sufia-models/app/models/geo_names_resource.rb

@@ -5,10 +5,10 @@ class GeoNamesResource < ActiveResource::Base
  
   def self.collection_path(prefix_options = {}, query_options = nil)
     super(prefix_options, query_options).gsub(/\.json|\.xml/, "") 
-  end 
- 
-  def self.instantiate_collection(collection, prefix_options = {})
-      col = super(collection["geonames"],prefix_options)
+  end
+
+  def self.instantiate_collection(collection, original_params = {}, prefix_options = {})
+      col = super(collection["geonames"], original_params, prefix_options)
       col.map! {|item|  { label: item.name+ (item.adminName1 ? ", " + item.adminName1 : "")+", " + item.countryName, value: item.name+ (item.adminName1 ? ", " + item.adminName1 : "")+", " + item.countryName} }
       return col      
   end

data/sufia-models/lib/sufia/models/generic_file.rb

@@ -11,6 +11,7 @@ module Sufia
     autoload :Metadata, 'sufia/models/generic_file/metadata'
     autoload :Versions, 'sufia/models/generic_file/versions'
     autoload :VirusCheck, 'sufia/models/generic_file/virus_check'
+    autoload :ReloadOnSave, 'sufia/models/generic_file/reload_on_save'
     include Sufia::ModelMethods
     include Sufia::Noid
     include Sufia::GenericFile::MimeTypes
@@ -25,6 +26,7 @@ module Sufia
     include Sufia::GenericFile::Metadata
     include Sufia::GenericFile::Versions
     include Sufia::GenericFile::VirusCheck
+    include Sufia::GenericFile::ReloadOnSave
 
     included do
       belongs_to :batch, :property => :is_part_of

data/sufia-models/lib/sufia/models/generic_file/reload_on_save.rb

@@ -0,0 +1,18 @@
+# add this in here until we can use a version of Active Fedora that contains this ability
+module Sufia
+  module GenericFile
+    module ReloadOnSave
+
+      attr_writer :reload_on_save
+
+      def reload_on_save?
+        !!@reload_on_save
+      end
+
+      def refresh
+        self.reload if reload_on_save?
+      end
+    end
+  end
+end
+

data/sufia-models/lib/sufia/models/jobs/active_fedora_pid_based_job.rb

@@ -8,7 +8,7 @@ class ActiveFedoraPidBasedJob
     self.pid = pid
   end
   def object
-    @object ||= ActiveFedora::Base.find(pid, cast:true)
+    @object ||= ActiveFedora::Base.find(pid, cast:true).tap{|f| f.reload_on_save = true}
   end
   alias_method :generic_file, :object
   alias_method :generic_file_id, :pid

data/sufia-models/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.6.1"
+    VERSION = "3.7.2"
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_dependency 'rails', '> 4.0.0', '< 5.0'
-  spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
+  spec.add_dependency 'activeresource', "~>4.0.0" # No longer a dependency of rails 4.0
 
   spec.add_dependency "blacklight", "~> 4.7.0"
   spec.add_dependency "hydra-head", "~> 6.5.0"

data/sufia.gemspec

@@ -21,6 +21,12 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'blacklight_advanced_search', '~> 2.1.0'
   gem.add_dependency 'blacklight', '>= 4.5'
 
+  # sass-rails is typically generated into the app's gemfile by `rails new`
+  # In rails 3 it's put into the "assets" group and thus not available to the
+  # app. Blacklight 5.2 requires bootstrap-sass which requires (but does not
+  # declare a dependency on) sass-rails
+  gem.add_dependency 'sass-rails'
+
   gem.add_dependency 'hydra-batch-edit', '>= 1.1.1', '< 2.0.0'
 
   gem.add_dependency 'daemons', '1.1.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.2
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '4.5'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hydra-batch-edit
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +237,7 @@ files:
 - app/assets/javascripts/contact_form.js
 - app/assets/javascripts/sufia.js
 - app/assets/javascripts/sufia/audio.js
+- app/assets/javascripts/sufia/batch_edit.js
 - app/assets/javascripts/sufia/batch_select_all.js
 - app/assets/javascripts/sufia/edit_metadata.js
 - app/assets/javascripts/sufia/fileupload.js
@@ -249,7 +264,7 @@ files:
 - app/assets/stylesheets/sufia-audio-overrides.css
 - app/assets/stylesheets/sufia.css.scss
 - app/assets/stylesheets/trophy.css
-- app/assets/stylesheets/video-js.css
+- app/assets/stylesheets/video-js.css.erb
 - app/controllers/authorities_controller.rb
 - app/controllers/batch_controller.rb
 - app/controllers/batch_edits_controller.rb
@@ -560,6 +575,7 @@ files:
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
+- spec/models/active_fedora_pid_based_job_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb
@@ -569,9 +585,11 @@ files:
 - spec/models/file_content_datastream_spec.rb
 - spec/models/fits_datastream_spec.rb
 - spec/models/generic_file/actions_spec.rb
+- spec/models/generic_file/reload_on_save_spec.rb
 - spec/models/generic_file/visibility_spec.rb
 - spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
+- spec/models/geo_names_resource_spec.rb
 - spec/models/local_authority_spec.rb
 - spec/models/properties_datastream_spec.rb
 - spec/models/single_use_link_spec.rb
@@ -659,6 +677,7 @@ files:
 - sufia-models/lib/sufia/models/generic_file/metadata.rb
 - sufia-models/lib/sufia/models/generic_file/mime_types.rb
 - sufia-models/lib/sufia/models/generic_file/permissions.rb
+- sufia-models/lib/sufia/models/generic_file/reload_on_save.rb
 - sufia-models/lib/sufia/models/generic_file/thumbnail.rb
 - sufia-models/lib/sufia/models/generic_file/trophies.rb
 - sufia-models/lib/sufia/models/generic_file/versions.rb
@@ -801,6 +820,7 @@ test_files:
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
+- spec/models/active_fedora_pid_based_job_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb
@@ -810,9 +830,11 @@ test_files:
 - spec/models/file_content_datastream_spec.rb
 - spec/models/fits_datastream_spec.rb
 - spec/models/generic_file/actions_spec.rb
+- spec/models/generic_file/reload_on_save_spec.rb
 - spec/models/generic_file/visibility_spec.rb
 - spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
+- spec/models/geo_names_resource_spec.rb
 - spec/models/local_authority_spec.rb
 - spec/models/properties_datastream_spec.rb
 - spec/models/single_use_link_spec.rb