Merge pull request #2127 from avalonmediasystem/staging

Release 6.1

Author: cjcolvar

Gemfile

@@ -3,12 +3,12 @@ gem 'fedora-migrate', '~> 0.5.0'
 gem 'rdf-rdfxml'
 
 gem 'hydra-head', '~> 10.3.4'
-gem 'active-fedora', '>= 10.3.0'
+gem 'active-fedora', '~> 11.2'
 gem 'active_fedora-datastreams'
-gem 'active_fedora-noid', '~> 2.0.0'
-gem 'speedy-af', git: 'https://github.com/projecthydra-labs/speedy_af.git', tag: 'v0.1.0'
+gem 'active_fedora-noid', '~> 2.0.2'
+gem 'speedy-af', '~>0.1.1'
 gem 'blacklight', '~> 6.6'
-gem 'rdf', '~> 2.1.1'
+gem 'rdf', '~> 2.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.7.1'
@@ -47,11 +47,11 @@ gem 'devise'
 #gem 'devise-guests', '~> 0.3'
 
 # Avalon-specific
-gem 'avalon-workflow', git: "https://github.com/avalonmediasystem/avalon-workflow.git", tag: 'avalon-r6'
-gem 'active_encode', '~> 0.0.3'
+gem 'avalon-workflow', git: "https://github.com/avalonmediasystem/avalon-workflow.git", tag: 'avalon-r6.1'
+gem 'active_encode', '~> 0.1.1'
 gem 'hooks'
 gem 'iconv'
-gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", tag: 'avalon-r6'
+gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", tag: 'avalon-r6.1'
 gem 'omniauth-identity'
 gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git", tag: 'avalon-r4'
 gem 'net-ldap'
@@ -63,7 +63,7 @@ gem 'api-pagination'
 gem 'browse-everything', '~> 0.10.5'
 gem 'bootstrap_form'
 gem 'bootstrap-toggle-rails'
-gem 'rubyhorn', git: "https://github.com/avalonmediasystem/rubyhorn.git"
+gem 'rubyhorn', git: "https://github.com/avalonmediasystem/rubyhorn.git", tag: 'avalon-r6'
 gem 'roo'
 gem 'activerecord-session_store'
 gem 'whenever', git: "https://github.com/javan/whenever.git", require: false
@@ -73,14 +73,14 @@ gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git'
 gem 'about_page', git: 'https://github.com/avalonmediasystem/about_page.git', tag: 'avalon-r6'
 
 #MediaElement.js related
-gem 'mediaelement_rails', git: 'https://github.com/avalonmediasystem/mediaelement_rails.git', tag: 'avalon-r6'
+gem 'mediaelement_rails', git: 'https://github.com/avalonmediasystem/mediaelement_rails.git', tag: 'avalon-r6_flash-fix'
 gem 'mediaelement-qualityselector', git:'https://github.com/avalonmediasystem/mediaelement-qualityselector.git', tag: 'avalon-r4'
 gem 'media_element_thumbnail_selector', git: 'https://github.com/avalonmediasystem/media-element-thumbnail-selector', tag: 'avalon-r4'
 gem 'mediaelement-skin-avalon', git:'https://github.com/avalonmediasystem/mediaelement-skin-avalon.git', tag: 'avalon-r5'
 gem 'mediaelement-title', git:'https://github.com/avalonmediasystem/mediaelement-title.git', tag: 'avalon-r4'
 gem 'mediaelement-hd-toggle', git:'https://github.com/avalonmediasystem/mediaelement-hd-toggle.git', tag: 'avalon-r4'
 gem 'media-element-logo-plugin'
-gem 'media_element_add_to_playlist', git: 'https://github.com/avalonmediasystem/media-element-add-to-playlist.git', tag: 'avalon-r6'
+gem 'media_element_add_to_playlist', git: 'https://github.com/avalonmediasystem/media-element-add-to-playlist.git', tag: 'avalon-r6.1'
 gem 'mediaelement-track-scrubber', git: 'https://github.com/avalonmediasystem/mediaelement-track-scrubber.git', tag: 'avalon-r6'
 
 
@@ -135,10 +135,10 @@ group :test do
   gem 'coveralls'
   gem 'shoulda-matchers'
   gem 'fakefs', require: 'fakefs/safe'
-  gem 'fakeweb'
   gem 'email_spec'
   gem 'capybara'
   gem 'hashdiff'
+  gem 'webmock'
 end
 
 group :mysql, optional: true do

Gemfile.lock

@@ -17,15 +17,15 @@ GIT
 
 GIT
   remote: https://github.com/avalonmediasystem/avalon-workflow.git
-  revision: 5a1de58dd3cad3953eeb3dd53756dcde996ddb30
-  tag: avalon-r6
+  revision: ce676ddcec233fb525305579f26142965691d2ba
+  tag: avalon-r6.1
   specs:
     avalon-workflow (0.0.3)
 
 GIT
   remote: https://github.com/avalonmediasystem/media-element-add-to-playlist.git
-  revision: af3644c432e8c61dc6d31a0c72ab4bf28c6ecbdd
-  tag: avalon-r6
+  revision: fd9c084cf9c39c05b96a5e4ecfb1b9bcfd5c883d
+  tag: avalon-r6.1
   specs:
     media_element_add_to_playlist (0.0.1)
       rails (~> 4.0)
@@ -76,17 +76,17 @@ GIT
 
 GIT
   remote: https://github.com/avalonmediasystem/mediaelement_rails.git
-  revision: 6a9911e34a02c4fd8989d723b105b13168bb2611
-  tag: avalon-r6
+  revision: 8ce0042124460f1c3893372afcee34a93d25f8fd
+  tag: avalon-r6_flash-fix
   specs:
     mediaelement_rails (0.5.1)
       jquery-rails (>= 1.0)
       railties (>= 3.1)
 
 GIT
   remote: https://github.com/avalonmediasystem/mediainfo.git
-  revision: af770d3c4c9867335a2ae0e564f2cfd9bce56aa3
-  tag: avalon-r6
+  revision: 5e28f2b58cefb20b6e06f022256ea1d13b761b1f
+  tag: avalon-r6.1
   specs:
     mediainfo (0.7.1)
 
@@ -101,7 +101,8 @@ GIT
 
 GIT
   remote: https://github.com/avalonmediasystem/rubyhorn.git
-  revision: 9849835a4711f671371e8ef8b18e87bb9183cbba
+  revision: fd1e0ee2cca53df515f58690603e9a6351066106
+  tag: avalon-r6
   specs:
     rubyhorn (0.0.6)
       activesupport
@@ -119,15 +120,6 @@ GIT
     whenever (0.9.7)
       chronic (>= 0.6.3)
 
-GIT
-  remote: https://github.com/projecthydra-labs/speedy_af.git
-  revision: 661b34c57f4e8de9db2c07aa80acce7c6288462d
-  tag: v0.1.0
-  specs:
-    speedy-af (0.1.0)
-      active-fedora (>= 11.0.0)
-      activesupport
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -150,14 +142,15 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active-fedora (11.0.1)
+    active-fedora (11.2.0)
       active-triples (~> 0.11.0)
       activemodel (>= 4.2, < 6)
       activesupport (>= 4.2.4, < 6)
       deprecation
       ldp (~> 0.6.0)
-      rsolr (~> 1.1, >= 1.1.2)
-      solrizer (~> 3.4)
+      rsolr (>= 1.1.2, < 3)
+      ruby-progressbar (~> 1.0)
+      solrizer (>= 3.4, < 5)
     active-triples (0.11.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -166,14 +159,14 @@ GEM
     active_annotations (0.2.2)
       json-ld
       rdf-vocab (~> 2.1.0)
-    active_encode (0.0.3)
+    active_encode (0.1.1)
       activesupport
     active_fedora-datastreams (0.1.0)
       active-fedora (>= 11.0.0.pre, < 12)
       nom-xml (>= 0.5.1)
       om (~> 3.1)
       rdf-rdfxml (~> 2.0)
-    active_fedora-noid (2.0.0)
+    active_fedora-noid (2.0.2)
       active-fedora (>= 9.7, < 12)
       noid (~> 0.9)
       rails (>= 4.2.7.1, < 6)
@@ -296,6 +289,8 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     daemons (1.2.4)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
@@ -339,7 +334,6 @@ GEM
     fakefs (0.10.1)
     faker (1.6.6)
       i18n (~> 0.5)
-    fakeweb (1.3.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     fcrepo_wrapper (0.7.0)
@@ -351,8 +345,8 @@ GEM
     flamegraph (0.9.5)
     font-awesome-rails (4.7.0.1)
       railties (>= 3.2, < 5.1)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     google-api-client (0.8.7)
       activesupport (>= 3.2, < 5.0)
       addressable (~> 2.3)
@@ -409,7 +403,7 @@ GEM
       hydra-access-controls (= 10.3.4)
       hydra-core (= 10.3.4)
       rails (>= 3.2.6)
-    i18n (0.8.1)
+    i18n (0.8.4)
     iconv (1.0.4)
     ims-lti (1.1.13)
       builder
@@ -424,9 +418,9 @@ GEM
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (1.8.6)
-    json-ld (2.1.0)
-      multi_json (~> 1.11)
-      rdf (~> 2.1)
+    json-ld (2.1.3)
+      multi_json (~> 1.12)
+      rdf (~> 2.2)
     jwt (1.5.6)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
@@ -454,7 +448,7 @@ GEM
       railties (>= 4, < 5.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     media-element-logo-plugin (0.0.2)
       rails (>= 3.2.3)
@@ -466,20 +460,20 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     mono_logger (1.1.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     mysql2 (0.4.5)
-    net-http-digest_auth (1.4)
+    net-http-digest_auth (1.4.1)
     net-ldap (0.15.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
     netrc (0.11.0)
     noid (0.9.0)
-    nokogiri (1.7.0.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     nom-xml (0.6.0)
       activesupport (>= 3.2.18)
@@ -520,7 +514,7 @@ GEM
     pry-rails (0.3.4)
       pry (>= 0.9.10)
     public_suffix (2.0.4)
-    rack (1.6.5)
+    rack (1.6.8)
     rack-mini-profiler (0.10.2)
       rack (>= 1.2.0)
     rack-protection (1.5.3)
@@ -555,7 +549,7 @@ GEM
     rake (12.0.0)
     rb-readline (0.5.3)
     rchardet (1.6.1)
-    rdf (2.1.1)
+    rdf (2.2.6)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (2.0.0)
@@ -573,10 +567,10 @@ GEM
       rdf (~> 2.0)
       rdf-rdfa (~> 2.0)
       rdf-xsd (~> 2.0)
-    rdf-turtle (2.0.0)
-      ebnf (~> 1.0, >= 1.0.1)
-      rdf (~> 2.0)
-    rdf-vocab (2.1.0)
+    rdf-turtle (2.2.0)
+      ebnf (~> 1.1)
+      rdf (~> 2.2)
+    rdf-vocab (2.1.1)
       rdf (~> 2.1)
     rdf-xsd (2.0.0)
       rdf (~> 2.0)
@@ -648,6 +642,7 @@ GEM
     rubyzip (1.2.1)
     rufus-scheduler (3.3.1)
       tzinfo
+    safe_yaml (1.0.4)
     sass (3.4.22)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
@@ -684,12 +679,15 @@ GEM
       faraday
       ruby-progressbar
       rubyzip
-    solrizer (3.4.0)
+    solrizer (3.4.1)
       activesupport
       daemons
       nokogiri
       stomp
       xml-simple
+    speedy-af (0.1.1)
+      active-fedora (>= 11.0.0)
+      activesupport
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -715,7 +713,7 @@ GEM
       actionpack (>= 3.1)
       jquery-rails
       railties (>= 3.1)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uber (0.0.15)
     uglifier (3.0.4)
@@ -733,6 +731,10 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
+    webmock (3.0.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
     with_locking (1.0.2)
     xml-simple (1.1.5)
     xpath (2.0.0)
@@ -743,11 +745,11 @@ PLATFORMS
 
 DEPENDENCIES
   about_page!
-  active-fedora (>= 10.3.0)
+  active-fedora (~> 11.2)
   active_annotations (~> 0.2.2)
-  active_encode (~> 0.0.3)
+  active_encode (~> 0.1.1)
   active_fedora-datastreams
-  active_fedora-noid (~> 2.0.0)
+  active_fedora-noid (~> 2.0.2)
   activerecord-session_store
   acts_as_list
   api-pagination
@@ -775,7 +777,6 @@ DEPENDENCIES
   factory_girl_rails
   fakefs
   faker
-  fakeweb
   fcrepo_wrapper
   fedora-migrate (~> 0.5.0)
   flamegraph
@@ -808,7 +809,7 @@ DEPENDENCIES
   rack-mini-profiler
   rails (= 4.2.7.1)
   rb-readline
-  rdf (~> 2.1.1)
+  rdf (~> 2.2)
   rdf-rdfxml
   resque (~> 1.26.0)
   resque-scheduler (~> 4.3.0)
@@ -823,13 +824,14 @@ DEPENDENCIES
   shoulda-matchers
   simplecov
   solr_wrapper (>= 0.16)
-  speedy-af!
+  speedy-af (~> 0.1.1)
   sqlite3
   stackprof
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
+  webmock
   whenever!
   with_locking
 
 BUNDLED WITH
-   1.14.3
+   1.14.6