hydra-head 4.0.0.rc6 → 4.0.0

data/Gemfile

@@ -6,9 +6,5 @@ gemspec
 # For rvm users:
 # bundle config build.ruby-debug-base19 --with-ruby-include=$rvm_path/src/ruby-1.9.3-p0
 group :test do
-#  gem 'linecache19',       '>= 0.5.13'
-#  gem 'ruby-debug-base19', '>= 0.11.26'
-#  gem 'ruby-debug19'
    gem 'cucumber-rails', '>=1.2.0', :require=>false
-
 end

data/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: .
   specs:
-    hydra-head (4.0.0.rc5)
+    hydra-head (4.0.0)
       RedCloth (= 4.2.9)
-      active-fedora (~> 4.0.0.rc20)
-      blacklight (~> 3.3.1)
+      active-fedora (~> 4.0.0)
+      blacklight (~> 3.3.2)
       block_helpers
       cancan
       devise
-      rails (= 3.2.2)
+      rails (= 3.2.3)
       sanitize
 
 GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    active-fedora (4.0.0.rc20)
+    active-fedora (4.0.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -36,25 +36,25 @@ GEM
       mime-types (>= 1.16)
       multipart-post (= 1.1.2)
       nokogiri
-      om (~> 1.6.0.rc3)
+      om (~> 1.6.0)
       rdf
       rdf-rdfxml (= 0.3.5)
       rsolr
-      rubydora (~> 0.5.7)
+      rubydora (~> 0.5.8)
       solrizer (~> 1.2.0)
       xml-simple (>= 1.0.12)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.7)
@@ -62,7 +62,7 @@ GEM
       gyoku (>= 0.4.0)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    blacklight (3.3.1)
+    blacklight (3.3.2)
       compass-rails (~> 1.0.0)
       compass-susy-plugin (>= 0.9.0)
       kaminari
@@ -71,7 +71,7 @@ GEM
       rails (~> 3.1)
       rsolr (~> 1.0.6)
       rsolr-ext (~> 1.0.3)
-      sass-rails (~> 3.2.0)
+      sass-rails
       unicode
     block_helpers (0.3.3)
       activesupport (>= 2.0)
@@ -115,11 +115,11 @@ GEM
     equivalent-xml (0.2.9)
       nokogiri (>= 1.4.3)
     erubis (2.7.0)
-    factory_girl (3.0.0)
+    factory_girl (3.1.1)
       activesupport (>= 3.0.0)
     fastercsv (1.5.4)
     ffi (1.0.11)
-    fssm (0.2.8.1)
+    fssm (0.2.9)
     gherkin (2.9.3)
       json (>= 1.4.6)
     gyoku (0.4.4)
@@ -140,6 +140,8 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
+    libwebsocket (0.1.3)
+      addressable
     logger (1.2.8)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -149,9 +151,9 @@ GEM
     mediashelf-loggable (0.4.9)
     metaclass (0.0.1)
     mime-types (1.18)
-    mocha (0.10.5)
+    mocha (0.11.0)
       metaclass (~> 0.0.1)
-    multi_json (1.2.0)
+    multi_json (1.3.2)
     multipart-post (1.1.2)
     nokogiri (1.5.2)
     nori (1.1.0)
@@ -167,23 +169,23 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rdf (0.3.5.1)
+    rdf (0.3.5.2)
       addressable (>= 2.2.6)
     rdf-rdfxml (0.3.5)
       nokogiri (>= 1.4.4)
@@ -192,7 +194,7 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rsolr (1.0.6)
+    rsolr (1.0.8)
       builder (>= 2.1.2)
     rsolr-ext (1.0.3)
       rsolr (>= 1.0.2)
@@ -201,7 +203,7 @@ GEM
       rspec-expectations (~> 2.9.0)
       rspec-mocks (~> 2.9.0)
     rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
     rspec-rails (2.9.0)
@@ -209,7 +211,7 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.9.0)
-    rubydora (0.5.7)
+    rubydora (0.5.8)
       activemodel
       activesupport
       fastercsv
@@ -217,10 +219,10 @@ GEM
       nokogiri
       rest-client
       savon
-    rubyzip (0.9.6.1)
+    rubyzip (0.9.7)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.1.15)
+    sass (3.1.16)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -233,12 +235,12 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.1)
       wasabi (~> 2.1)
-    selenium-webdriver (2.20.0)
+    selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    solr-ruby (0.0.8)
     solrizer (1.2.0)
       daemons
       mediashelf-loggable (~> 0.4.7)
@@ -246,18 +248,13 @@ GEM
       om (>= 1.5.0)
       stomp
       xml-simple
-    solrizer-fedora (1.2.5)
-      active-fedora (>= 3.2.0)
-      activesupport (>= 3.0.11)
-      fastercsv
-      rsolr (= 1.0.6)
-      solr-ruby (>= 0.0.6)
-      solrizer (>= 1.0.0)
+    solrizer-fedora (2.0.0)
+      active-fedora (~> 4.0.0)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     stomp (1.2.2)
     term-ansicolor (1.0.7)
     thor (0.14.6)
@@ -265,7 +262,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
     unicode (0.4.2)
     warden (1.1.1)
       rack (>= 1.0)
@@ -286,6 +283,6 @@ DEPENDENCIES
   jettywrapper (>= 1.0.4)
   mocha
   rspec-rails
-  solrizer-fedora (>= 1.2.5)
+  solrizer-fedora (>= 2.0.0)
   sqlite3
   yard

data/README.textile

@@ -19,10 +19,10 @@ Ruby 1.9.3 is required by Hydra-Head release 4.0; RVM is strongly suggested.
 
 h3. Install Rails, Bundler and Devise
 
-Currently hydra-head is compatible with Rails 3.0.x and incompatible with Rails 3.1.
+Currently hydra-head is compatible with Rails 3.2
 
 <pre>
-gem install 'rails' --version '~>3.0.11'
+gem install 'rails' --version '~>3.2.2'
 </pre>
   
 h3. Generate a new rails application:
@@ -39,11 +39,10 @@ First, add them to the "Gemfile":http://gembundler.com/gemfile.html of your appl
 <pre>
   source 'http://rubygems.org'
 
-  gem 'rails', '~>3.0.11'
+  gem 'rails', '~>3.2.2'
 
-  gem 'blacklight', '~> 3.1.2'
-  gem 'hydra-head', '~> 3.2.0'
-  gem 'solrizer-fedora', '>=1.0.1'
+  gem 'blacklight', '~> 3.3.1'
+  gem 'hydra-head', '~> 4.0.0'
 
   # We will assume that you're using sqlite3 for testing/demo, 
   # but in a production setup you probably want to use a real sql database like mysql or postgres
@@ -53,16 +52,9 @@ First, add them to the "Gemfile":http://gembundler.com/gemfile.html of your appl
   # You are free to implement your own User/Authentication solution in its place.
   gem 'devise'
 
-  # For testing.  You will probably want to use all of these to run the tests you write for your hydra head
+  # For testing.  You will probably want to use these to run the tests you write for your hydra head
   group :development, :test do 
-         gem 'ruby-debug'
-         gem 'rspec'
-         gem 'rspec-rails', '>=2.5.0'
-         gem 'mocha'
-         gem 'cucumber-rails'
-         gem 'database_cleaner'
-         gem 'capybara'
-         gem 'bcrypt-ruby'
+         gem 'rspec-rails', '>=2.9.0'
          gem "jettywrapper"
   end # (leave this comment here to catch a stray line inserted by blacklight!)
 </pre>
@@ -79,7 +71,7 @@ Even if all of the dependencies are satisfied, this will take a _very_ long time
 
 <pre>
   gem install blacklight
-  gem install hydra-head -v 3.2.0
+  gem install hydra-head -v 4.0.0
 </pre>
 
 Then re-run bundle install and it will run slightly faster.

data/app/assets/stylesheets/hydra/html_refactor.css

@@ -7,7 +7,7 @@
 
 
 /* The hydra provided search button was miss-aligned w/ the form field */
-#search #submit {
+#search .submit {
 	margin-bottom:-12px;
 }
 
@@ -34,11 +34,6 @@
 #select-item-list li a:hover {background: #FAFAFA;}
 #select-item-box:hover #select-item-list, #select-item-list:hover {display: block;}
 
-/* =FACETS
--------------------------------------------------------------- */
-
-#bd #facets ul, #bd #facets h3 + div {border-bottom: none;}
-
 
 /* =SEARCH
 -------------------------------------------------------------- */
@@ -48,13 +43,12 @@
 background-image: -moz-linear-gradient(center bottom, #DDD 0%, #EEE 100%); }
 #bd .home-text #search { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;}
 #bd #search #q {margin: 0 15px 0 0; padding: 0.2em; width: 420px;}
-#bd #search #submit {background: #f3f3f3; border: 1px solid #AAA; font-size: 16px; margin: 0; padding: 4px 6px; width: 75px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; }
-#bd #search #submit:hover {background: #f7f7f7; cursor: pointer;}
+#bd #search .submit {background: #f3f3f3; border: 1px solid #AAA; font-size: 16px; margin: 0; padding: 4px 6px; width: 75px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; }
+#bd #search .submit:hover {background: #f7f7f7; cursor: pointer;}
 
 /* =RESULTS
 -------------------------------------------------------------- */
 
-#bd #appliedParams {border-top: 1px solid #FFF;}
 #documents th, #file_assets th {color: #555;   text-align: left;}
 .pageEntriesInfo, #sortAndPerPage {font-size: 12px;}
 

data/app/assets/stylesheets/hydra/styles.css

@@ -127,15 +127,6 @@ a.destructive:hover {
     width: 40px;
 }
 
-
-#appliedParams a#startOverLink {
-    font-size: 13px;
-    height: 22px;
-    margin-top: -12px;
-    padding-top: 0 10px 1px 10px;
-	right: 5px;
-}
-
 h2 {
     font-weight: bold;
     text-transform: uppercase;
@@ -257,71 +248,28 @@ table#file_assets {
     text-align: left;
 }
 
-#bd .sidebar {
-  margin: 0;
-	padding: 0;
-  text-align: right;
-  float: left;
-	width: 238px;
-}
-
 #facets {
-  text-align: left;
-  background-color: white;
 	padding: 0;
-	font-size: 12px;
-}
-
-.side_bar_heading, #facets div h3 {
-    background-color: white;
-    height: 50px;
-}
-
-#facets h2 {
-  color: blue;
-  font: normal normal normal 10px/20px "Helvetica Neue", Arial, Helvetica, sans-serif;
-  padding: 1em 0px 1em 10px;
-	margin: 0;
-	border-top: 1px solid #dddddd;
-  text-transform: uppercase;
-}
-
-#facets div {
-  background-color: #EEE;
 }
 
 #facets div h3 {
-    margin-top: 0;
-    margin-left: 0;
-    color: black;
     font-size: 13px;
     font-weight: bold;
-    line-height: 20px;
-    padding: 1.2em 10px;
-    height: 20px;
 }
 
 #facets div h3:hover {
     cursor: default;
 }
 
-#facets li span.selected {
-	color: #000000;
-}
-
-.side_bar_content, #facets div ul {
-    background-color: #ffffff;
-    padding: 0.5em 0;
+#facets div ul {
 	border-bottom: none;
 }
 
-.side_bar_content, #facets div ul li {
-    padding: 0.5em 12px;
-	margin: 0;
-    line-height: 20px;
-    display: block;
+#facets li span.selected {
+	color: black;
 }
 
+
 body .ui-widget {
 	font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
 	font-size: 13px;
@@ -359,46 +307,12 @@ tr.document {
     border-left: none;
 }
 
-#appliedParams {
-    width: 100%;
-		margin-left: 10px;
-    margin-top: 10px;
-		background-color: transparent;
-		border: none;
-		border-radius: 0;
-		margin-bottom: 0;
-		padding: 0;
-}
-
-#appliedParams h3 {
-    background-color: #FFF7E5;
-    border: 1px solid #E0D9CA;
-    color: #333;
-    display: block;
-    font-size: 15px;
-    padding: 5px 5px 5px 27px;
-    margin: 0 0 3px 0;
-    width: 671px;
-}
-
-#appliedParams div {
-    padding: 6px;
-    background-color: #C9D484;
-    height: 20px;
-    margin: 0;
-    width: 690px;
-}
-
-.pagination, #sortAndPerPage {
-/*	background-color: #F1F1F1;*/
+.pagination {
     background-color: white;
 		border-color: white;
 		border-style: solid;
 		border-width: 0;
 		border-radius: 0;
-}
-
-.pagination {
     width: 100%;
 		line-height: 2em;
 		padding: 0;
@@ -437,31 +351,6 @@ tr.document {
     background-color: #D1DFFD;
 }
 
-.appliedFilter {
-    background-color: #E2EDFE;
-    border: 1px solid #C4DAFE;
-    display: block;
-    height: 20px;
-    margin: 0 0 3px 0;
-    padding: 5px 5px 5px 25px;
-    width: 645px;
-}
-
-.filterName, .filterValue {
-    font-style: normal;
-    background-color: none;
-}
-
-#sortAndPerPage {
-	clear: both;
-    height: 20px;
-    margin: 0 15px;
-    padding: 10px 0;
-}
-
-#sortAndPerPage label {
-    font-weight: bold;
-}
 
 #documents {
 	width: 700px;
@@ -999,10 +888,6 @@ dd.person ul input.editable-edit.edit {
     background-color: white;
 }
 
-input[type="submit"] {
-    font-size: 18px;
-}
-
 input.textile-edit {
     width: 350px;
     height: 220px;