sufia 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 600ffd64ac5050922d558df0919adff82b5c86e9
-  data.tar.gz: 1c3206cbd65b85dfdbc75c37a0fd539aa577518e
+  metadata.gz: cd1c1d869e175044e6997471f0e6c3dcf2e89cbc
+  data.tar.gz: 8020119fe464f600fc9d645d543ded8f053da959
 SHA512:
-  metadata.gz: f5b565ade76f51e2b2a89d291c0bea3413c90c4e7a3769fdf5d87baa16d727aa7bc3bd76719cb8722975402540187c703ec7df09adbc1d8f8c30a0eec84b25b6
-  data.tar.gz: 40a89c2d24aa9a953991eeb6d7453ab3de9e4e935445a122680f791172c45aa85971c6ec977f84dfe010bf0817cf51668bdd264174f15e529847b14b4272baa4
+  metadata.gz: 051e1e361d4cf1403c1ad55619403efab4dae5a5c72d1d427034c1124a3f07ebebd9c2473c12c8f341b0464c8f1f603e87accb2bc8bfacac3dfd344c650a873c
+  data.tar.gz: df859a53507cff81e851d5f318990f7cc69f5db67fa70de01cbca865138c665b31f7ff5124915d9d6cd26d4da7679ecfd18f07791199fd41183476f7c74a4998

data/.travis.yml

@@ -1,10 +1,7 @@
 language: ruby
-before_install:
-  - sudo apt-get install libclamav-dev clamav-data clamav-daemon
-  - sudo freshclam -v
 rvm:
+  - "2.1.0"
   - "2.0.0"
-  - "2.1.0-preview2"
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile

@@ -8,9 +8,6 @@ gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
 gem 'sufia-models', path: './sufia-models'
 
 group :development, :test do
-  gem 'devise'
-#  gem 'byebug'
-  gem 'clamav'
   gem 'sqlite3'
   gem 'rspec-rails'
   gem 'launchy' unless ENV['TRAVIS']

data/History.md

@@ -1,4 +1,33 @@
 # History of Sufia releases
+## 3.7.0
+
+* The UsersController needs to set @trophies to a list of GenericFiles [Justin Coyne]
+* Removed patches for rails 3	 [Justin Coyne]
+* Short-circuit freshclam for a faster build	 [Michael J. Giarlo]
+* Use blacklight 4.5 methods for accessing the search_session. Fixes #296	  [Justin Coyne]
+* Test with ruby 2.1.0 final release	  [Justin Coyne]
+* Simplify tests for GenericFile#related_files	  [Justin Coyne]
+* Remove duplicate includes. Fixes #289	  [Justin Coyne]
+* Remove non-functioning rake tasks …	  [Justin Coyne]
+* Better documentation for GenericFile#related_files [ci skip]	[Justin Coyne]
+* Linked in handle seems to have been missed in the permitted attibiute… …	[Carolyn Cole]
+* Updated: - Don't need to exlicity add 'jettywrapper' to Gemfile b/c added by hydra:head generator (called by sufia generator)
+           - Don't need to remove public/index.html (Rails 4 presumably)
+           - Run `rake jetty:clean` instead of hydra:jetty generator -- does the same thing
+           - Added note that fits can be installed with homebrew (and may require adding a symlink)
+           	 [David Chandek-Stark]
+* Upgrade blacklight to 4.6	  [Justin Coyne]
+* Allowing the link to either be sufia based or blacklight based	 [Carolyn Cole]
+* Removing extra_head_content, and paginate deprication warnings	 [Carolyn Cole]
+* Remove deprecated method paginate_rsolr_response. Fixes #312	 [Justin Coyne]
+* Moving single use link java script into asset pipeline.	 [Carolyn Cole]
+* Update to blacklight 4.7	 [Justin Coyne]
+* Modifying how zclip works when a flash player is not present, since t… …	 [Carolyn Cole]
+* Upgrading video.js to the latest version so it will work in firefox, … …	 [Carolyn Cole]
+* Removing hard coded asset paths, which do not work in production. Whi… …	 [Carolyn Cole]
+* Fixing audiojs to only display if audio is not supported by the brows… …	 [Carolyn Cole]
+
+## 3.6.0
 
 ## 3.4.0
 * Handle facets with 3 or more words [Jeremy Friesen]

data/README.md

@@ -42,7 +42,6 @@ Sufia has the following features:
 ```
 gem 'sufia'
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
-gem 'jettywrapper'
 gem 'font-awesome-sass-rails'
 ```
 Then `bundle install`
@@ -52,7 +51,6 @@ Note the line with kaminari listed as a dependency.  This is a temporary fix to
 ### Run the sufia generator
 ```
 rails g sufia -f
-rm public/index.html
 ```
 
 ### Run the migrations
@@ -63,7 +61,7 @@ rake db:migrate
 
 ### Get a copy of hydra-jetty
 ```
-rails g hydra:jetty
+rake jetty:clean
 rake jetty:config
 rake jetty:start
 ```
@@ -95,7 +93,7 @@ Add this line:
 Turbolinks does not mix well with Blacklight.
 
 ### Install Fits.sh
-1. Go to http://code.google.com/p/fits/downloads/list and download a copy of fits & unpack it somewhere on your Machine.
+1. Go to http://code.google.com/p/fits/downloads/list and download a copy of fits & unpack it somewhere on your machine.  You can also install fits on OSX with homebrew `brew install fits` (you may also have to create a symlink from `fits.sh -> fits` in the next step).
 1. Give your system access to fits
     1. By adding the path to fits.sh to your excutable PATH. (ex. in your .bashrc)
         * OR

data/SUFIA_VERSION

@@ -1 +1 @@
-3.6.0
+3.7.0

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

@@ -0,0 +1,28 @@
+function initialize_audio() {
+
+    var test_audio= document.createElement("audio") //try and create sample audio element
+    var audiosupport= (test_audio.play)? true : false
+
+    if (audiosupport){
+        $('audio').each(function() {
+            this.controls = true;
+        });
+    }else {
+        $('audio').each(function() {
+            $(this).attr("preload","auto");
+        });
+        audiojs.events.ready(function() {
+          var as = audiojs.createAll({
+                 imageLocation: '/assets/player-graphics.gif',
+                 swfLocation: '/assets/audiojs.swf'
+                 });
+
+          // remove html 5 player from veiw on firefox and safari
+          $('.audiojs').addClass('no-audio-background')
+          $('.audiojs .play-pause').addClass('hide')
+          $('.audiojs .scrubber').addClass('hide')
+          $('.audiojs .time').addClass('hide')
+
+        });
+    };
+}

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

@@ -0,0 +1,35 @@
+function getSingleUse(id) {
+    var rurl = window.location.protocol+"//"+window.location.host;
+    var resp = $.ajax({
+        headers: { Accept: "application/javascript" },
+        type: 'get',
+        url: rurl + "/single_use_link/generate_show/" + id.slice(10),
+        async: false
+    });
+    return rurl  + resp.responseText;
+}
+
+// short hand for $(document).ready();
+$(function() {
+    ZeroClipboard.setDefaults({ moviePath: "/assets/ZeroClipboard.swf" });
+    $.each($(".copypaste"), function(idx, item) {
+        var clip = new ZeroClipboard();
+        clip.on("dataRequested", function(client, args) {
+            clip.setText(getSingleUse(this.id));
+        })
+        clip.on("complete", function(client, args) {
+            alert("A single use link to " + args.text + " was copied to your clipboard.")
+        })
+        clip.on("noflash", function(client, args) {
+            $(item).bind('click', function(e) {
+                alert("Your single-use link (please copy): " + getSingleUse(item.id));
+            } );
+        })
+        clip.on("wrongflash", function(client, args) {
+            $(item).bind('click', function(e) {
+                alert("Your single-use link (please copy): " + getSingleUse(item.id));
+            } );
+        })
+        clip.glue($("#" + this.id))
+    })
+});

data/app/assets/javascripts/sufia.js

@@ -44,6 +44,8 @@ limitations under the License.
 //= require sufia/batch_select_all
 //= require sufia/multiForm
 //= require sufia/edit_metadata
+//= require sufia/single_use_link
+//= require sufia/audio
 //= require hydra/batch_select
 //= require hydra_collections
 
@@ -174,23 +176,3 @@ function preg_quote( str ) {
 
     return (str+'').replace(/([\\\.\+\*\?\[\^\]\$\(\)\{\}\=\!\<\>\|\:])/g, "\\$1");
 }
-
-
-function initialize_audio() {
-
-  if (navigator.userAgent.match("Chrome")){
-      $('audio').each(function() {
-         this.controls = true;
-      });
-  }else {
-      $('audio').each(function() {
-         $(this).attr("preload","auto");
-      });
-    audiojs.events.ready(function() {
-          var as = audiojs.createAll({
-                 imageLocation: '/assets/player-graphics.gif',
-                 swfLocation: '/assets/audiojs.swf'
-          });
-    });
-  };
-}

data/app/assets/stylesheets/sufia-audio-overrides.css

@@ -0,0 +1,9 @@
+
+.no-audio-background {
+    background: none;
+    box-shadow: none;
+}
+
+.span40 .audiojs audio {
+    left: 10px;
+}

data/app/assets/stylesheets/sufia.css.scss

@@ -10,7 +10,7 @@
  *= require audio-js
  *= require dashboard
  *= require jquery-ui
+ *= require sufia-audio-overrides
 */
 
 @import 'font-awesome';
-