sufia 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71322c27a772591f447020806f7f4893981a8dd
-  data.tar.gz: 7c100e412ef4198dc27e383ad03cbddd14a34b50
+  metadata.gz: 1a23f866c05484770f7f3caaec082f6cb36b7258
+  data.tar.gz: 47c0e1f3d27a544258f7d4d520d23152aad13773
 SHA512:
-  metadata.gz: d773e672c76ca18ca1141412b06a574292d38a86ea7c2d1e70c0b1a451e81250175d0935b950a09c7022ff51181759046dac74e0358bc66d35751d3be648acc9
-  data.tar.gz: cb3998ec362f8e3dd98ead5db0647515e2f3ae788c171c91c70a9910333b408087976371a0309ff81865c6b742649d39d009fdc1c3a9126dc6ab69d2fd1490e8
+  metadata.gz: d48523de8c674ffa5dd496b3595943ab4db13b9b42b26eb730b25bdb4db467a34863cb920d03b6d3c09c5a8e77ee4c3fed091ffa2316d3435bf3ab52c872c322
+  data.tar.gz: 2ab7bef74ddb9365f6f10695b2ade76c0149504dfebd349455ffc52cbbd58a8749410c581285c040b0abc4f790495597daf6797e27af46f2ad940e38f43c76e8

data/CONTRIBUTING.md

@@ -0,0 +1,111 @@
+# How to Contribute
+
+We want your help to make Project Hydra great.
+There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+## Hydra Project Intellectual Property Licensing and Ownership
+
+All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
+If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file.
+
+https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership
+
+You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
+
+## Contribution Tasks
+
+* Reporting Issues
+* Making Changes
+* Submitting Changes
+* Merging Changes
+
+### Reporting Issues
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a [Github issue](./issues) by:
+  * Clearly describing the issue
+    * Provide a descriptive summary
+    * Explain the expected behavior
+    * Explain the actual behavior
+    * Provide steps to reproduce the actual behavior
+
+### Making Changes
+
+* Fork the repository on GitHub
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
+  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
+  * Please avoid working directly on the `master` branch.
+  * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+* Make commits of logical units.
+  * Your commit should include a high level description of your work in HISTORY.textile 
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
+
+```
+    Present tense short summary (50 characters or less)
+
+    More detailed description, if necessary. It should be wrapped to 72
+    characters. Try to be as descriptive as you can, even if you think that
+    the commit content is obvious, it may not be obvious to others. You
+    should add such description also if it's already present in bug tracker,
+    it should not be necessary to visit a webpage to check the history.
+
+    Include Closes #<issue-number> when relavent.
+
+    Description can have multiple paragraphs and you can use code examples
+    inside, just indent it with 4 spaces:
+
+        class PostsController
+          def index
+            respond_with Post.limit(10)
+          end
+        end
+
+    You can also add bullet points:
+
+    - you can use dashes or asterisks
+
+    - also, try to indent next line of a point for readability, if it's too
+      long to fit in 72 characters
+```
+
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+* When you are ready to submit a pull request
+
+### Submitting Changes
+
+* Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
+* Make sure your branch is up to date with its parent branch (i.e. master)
+  * `git checkout master`
+  * `git pull --rebase`
+  * `git checkout <your-branch>`
+  * `git rebase master`
+  * It is likely a good idea to run your tests again.
+* Squash the commits for your branch into one commit
+  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request from your fork to the project.
+
+### Merging Changes
+
+* It is considered "poor from" to merge your own request.
+* Please take the time to review the changes and get a sense of what is being changed. Things to consider:
+  * Does the commit message explain what is going on?
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+  * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
+  * Did the Travis tests complete successfully?
+* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
+* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+
+# Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/Gemfile

@@ -8,13 +8,13 @@ gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
 gem 'sufia-models', path: './sufia-models'
 
 group :development, :test do
-  gem 'activerecord-import', '0.3.0'
+  # https://github.com/zdennis/activerecord-import/pull/79
+  #gem 'activerecord-import', '0.3.0'
   gem 'sqlite3'
   gem 'selenium-webdriver'
-  gem 'rspec-rails', '~> 2.13.1'
-  gem 'cucumber-rails', '~> 1.0', :require => false
+  gem 'rspec-rails', '~> 2.14'
+  gem 'launchy'
   gem 'database_cleaner'
-  gem 'devise'
   gem 'capybara', '~>2.1.0'
   gem 'bcrypt-ruby'
   gem "jettywrapper"

data/History.md

@@ -1,5 +1,131 @@
 # History of Sufia releases
 
+## 3.0.0
+* Update README.md paths for Sufia assets application.css and application.js [Jim
+Coble]
+
+* Moving resque rake task to sufia-models [Jeremy Friesen]
+
+* Resque should use the redis instance configured in redis.yml [Justin Coyne]
+
+* Profile link should generate a valid route. Fixes #150 [Justin Coyne]
+
+* Updating CONTRIBUTING.md as per Hydra v6.0.0 [Jeremy Friesen]
+
+* Delete all needs a delete HTTP method [Justin Coyne]
+
+* Put the specific version of kaminari we need into the test app [Justin Coyne]
+
+* Removed deprecated use of mock() and stub() [Justin Coyne]
+
+* Simpler rspec run [Justin Coyne]
+
+* Fix routing spec [Justin Coyne]
+
+* Replaced cucumber with feature specs [Justin Coyne]
+
+* Use resourceful routes for users [Justin Coyne]
+
+* Removed duplicate tasks [Justin Coyne]
+
+* Switch require spec_helper to relative [Justin Coyne]
+
+* Support rspec-rails 2.14 [Justin Coyne]
+
+* Removed empty tests [Justin Coyne]
+
+* Correct path for fonts [Justin Coyne]
+
+* Use assets_path [Justin Coyne]
+
+* Fix path to fixtures.rake [Justin Coyne]
+
+* Add active_resource as a dependency [Justin Coyne]
+
+* Distinct on notify_number is unnecessary [Justin Coyne]
+
+* check all view, should supply the controller [Justin Coyne]
+
+* Removed unused spec [Justin Coyne]
+
+* Fixed path to rakefile [Justin Coyne]
+
+* Fix test to work in an order independent manner [Justin Coyne]
+
+* Single Use links should be randomly generated [Justin Coyne]
+
+* Update paperclip gem [Justin Coyne]
+
+* Handle attributes in a way that works with rails 3 or 4 [Justin Coyne]
+
+* Fixed view spec [Justin Coyne]
+
+* Devise is not required by sufia-models [Justin Coyne]
+
+* Inherit the version of devise from blacklight [Justin Coyne]
+
+* Move to a released version of blacklight_advanced_search [Justin Coyne]
+
+* Rails 4 support [Justin Coyne]
+
+* updating the readme based on mye experience running through it. [Carolyn Cole]
+
+* The query for my uploads, should be me, not exclude me [Justin Coyne]
+
+* Multiform should rename the fields correctly [Justin Coyne]
+
+* more explicit editable docs test [Matt Zumwalt]
+
+* Dashboard search results test more specific -- avoids pagination causing false
+negatives [Matt Zumwalt]
+
+* explicit handling of kaminari pagination bug, plus info in install docs [Matt
+Zumwalt]
+
+* Test to confirm that pagination works -- fails because dashboard/pages routes
+are not properly inherited. [Matt Zumwalt]
+
+* Handle the odd values in the hidden fields on the
+generic_files/_permission.html.erb form.  These were added here:
+https://github.com/psu-stewardship/scholarsphere/commit/2a58d0c920cc87cad9a815b451613e3d327747e3#L9R5
+I have no idea why. [Justin Coyne]
+
+* Add a comment in the generator about the Sufia route being the very last line
+[Justin Coyne]
+
+* Generated controller uses the search_layout method for determining layout
+[Justin Coyne]
+
+* Force a two column layout for dashboard [Justin Coyne]
+
+* Use hydra-head 6.3.0 [Justin Coyne]
+
+* Bump active-fedora version to 6.4.0.rc4 [Justin Coyne]
+
+* allowing non-sufia controllers to inherit dashboard behaviors and helpers
+smoothly [Matt Zumwalt]
+
+* Set a permission value that actually exists (e.g. 'read') [Justin Coyne]
+
+* Added attr_accessible [Justin Coyne]
+
+* Fix the version in sufia-models.gemspec so you can bundle install [Justin
+Coyne]
+
+
+
+## 2.0.1
+* Fix version of sufia-models
+
+## 2.0.0
+* Dropbox support
+* Multiple layouts
+* UnzipJob can handle directories
+* Support for sufia and hydra-editor in the same app
+* Subdividing the upload partial
+* Lots of code cleanup
+
+
 ## 1.3.0
 * Depends on Hydra::Controller::DownloadBehavior
 * Upgraded to hydra-batch-edit 1.1 which includes session-less batches in hydra-collections

data/README.md

@@ -42,16 +42,21 @@ Sufia needs the following software to work:
 gem 'blacklight'
 gem 'hydra-head'
 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`
 
+Note the line with kaminari listed as a dependency.  This is a temporary fix to address a problem in the current release of kaminari.  Technically you should not have to list kaminari, which is a dependency of blacklight and sufia. 
+
 ### Run the blacklight, hydra and sufia generators
 ```
 rails g blacklight --devise
 rails g hydra:head -f
+bundle install 
 rails g sufia -f
+rm public/index.html
 ```
 
 ### Run the migrations
@@ -60,21 +65,35 @@ rails g sufia -f
 rake db:migrate
 ```
 
+### Get a copy of hydra-jetty
+```
+rails g hydra:jetty
+rake jetty:config
+rake jetty:start
+```
 
 ### If you want to use the assets that ship with Sufia...
-#### add the following to application.css
+#### Modify app/assets/stylesheets/application.css
+Add this line:
 ```
  *= require sufia
 ```
-You'll want to ensure you're not loading the blacklight.css, so remove this line ```*= require_tree .```
+**Remove** this line:  
+```*= require_tree .```  
+
+_Removing the require_tree from application.css will ensure you're not loading the blacklight.css.  This is because blacklight's css styling does not mix well with sufia's default styling._ 
+
+
+#### Modify app/assets/javascripts/application.js
 
-#### Add the following to application.js
+Add this line:
 ```
 //= require sufia
 ```
 
 ### Install Fits.sh
 http://code.google.com/p/fits/downloads/list
+Download a copy of fits & unpack it somewhere on your PATH.
 
 ### Start background workers
 ```
@@ -96,8 +115,7 @@ See https://ffmpeg.org/trac/ffmpeg/wiki/UbuntuCompilationGuide
 This information is for people who want to modify the engine itself, not an application that uses the engine:
 ### Create fixtures
 ```
-# start jetty
-git submodule init && git submodule update
+# configure jetty & start jetty (if you haven't already)
 rake jetty:config
 rake jetty:start
 

data/SUFIA_VERSION

@@ -1 +1 @@
-2.0.1
+3.0.0

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

@@ -6,6 +6,7 @@
     var settings = $.extend( { }, options);
 
     function addField() {
+      count = $(this).closest('.control-group').find('.controls').size();
       var cloneId = this.id.replace("submit", "clone");
       var newId = this.id.replace("submit", "elements");
       var cloneElem = $('#'+cloneId).clone();
@@ -14,6 +15,7 @@
       plusbttn.html('-<span class="accessible-hidden">remove this '+ this.name.replace("_", " ") +'</span>');
       plusbttn.on('click',removeField);
 
+
       // remove the help tag on subsequent added fields
       cloneElem.find('.formHelp').remove();
       cloneElem.find('i').remove();
@@ -21,8 +23,14 @@
 
       //clear out the value for the element being appended
       //so the new element has a blank value
-      cloneElem.find('input[type=text]').attr("value", "");
-      cloneElem.find('input[type=text]').attr("required", false);
+      // Note: there may be more than one input field. Example:
+      //   creator_name
+      //   creator_role
+      textFields = cloneElem.find('input[type=text]')
+      $.each(textFields, function(n, tf) {
+        newName = $(tf).attr('name').replace('[0]', '['+count+']');
+        $(tf).attr('name', newName).attr("value", "").attr("required", false)
+      })
 
       if (settings.afterAdd) {
         settings.afterAdd(this, cloneElem)

data/app/assets/stylesheets/{application-bootstrap.css → application-bootstrap.css.erb}

@@ -2,12 +2,12 @@
   font-family: 'Lato';
   font-style: normal;
   font-weight: normal;
-  src: url('/assets/Lato-Light.eot');
-  src: local('Lato'), local('Lato'), url('/assets/Lato-Light.ttf') format('truetype');
+  src: url(<%= asset_path 'fonts/Lato-Light.eot' %>);
+  src: local('Lato'), local('Lato'), url(<%= asset_path 'fonts/Lato-Light.ttf' %>) format('truetype');
 }
 body {
 	font: 13px/1.4em Arial, sans-serif;
-	background: #fff url(/assets/site_images/bg_body.png) left top repeat;
+	background: #fff url(<%= asset_path 'site_images/bg_body.png' %>) left top repeat;
 }
 p, address, ul, ol, li, dt, dd, td, th, div, blockquote {
 	color: #000;
@@ -56,7 +56,7 @@ li.expandable_new {
 }
 /* Layout */
 #wrapper {
-	background: url(/assets/site_images/bg_masthead.png) center top no-repeat;
+  background: url(<%= asset_path 'site_images/bg_masthead.png' %>) center top no-repeat;
 }
 /* #container { */
 #page-positioner {
@@ -67,13 +67,13 @@ li.expandable_new {
 #masthead { 
 	position: relative;
 	height: 165px;
-	background: url(/assets/site_images/bg_search_header.png) center 80px no-repeat;
+  background: url(<%= asset_path 'site_images/bg_search_header.png' %>) center 80px no-repeat;
 	width: 940px;
 	margin: 0 auto;
 }
 #content-wrapper {
 	padding: 0 19px 0 21px;
-	background: url(/assets/site_images/bg_content2.png) 0 0 no-repeat;
+  background: url(<%= asset_path 'site_images/bg_content2.png' %>) 0 0 no-repeat;
 }
 #content {
   /* width: 900px; */
@@ -120,7 +120,7 @@ a.advanced_search:hover {
 
 /* Footer */
 #footer-wrapper {
-	background: #404040 url(/assets/site_images/bg_footer.png) 0 0 repeat-x;
+  background: #404040 url(<%= asset_path 'site_images/bg_footer.png' %>) 0 0 repeat-x;
 }
 #footer {
 	width: 920px;

data/app/assets/stylesheets/{bootstrap.min.css → bootstrap.min.css.erb}

@@ -676,7 +676,7 @@ table .span21{float:none;width:150px;margin-left:0;}
 table .span22{float:none;width:158px;margin-left:0;}
 table .span23{float:none;width:166px;margin-left:0;}
 table .span24{float:none;width:174px;margin-left:0;}
-@font-face{font-family:'FontAwesome';src:url('../assets/fontawesome-webfont.eot');src:url('../assets/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),url('../assets/fontawesome-webfont.woff') format('woff'),url('../assets/fontawesome-webfont.ttf') format('truetype'),url('../assets/fontawesome-webfont.svg#FontAwesome') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:FontAwesome;font-weight:normal;font-style:normal;display:inline-block;text-decoration:inherit;}
+@font-face{font-family:'FontAwesome';src:url(<%= asset_path 'fontawesome-webfont.eot'%>);src:url(<%= asset_path 'fontawesome-webfont.eot?#iefix' %>) format('embedded-opentype'),url(<%= asset_path 'fontawesome-webfont.woff' %>) format('woff'),url(<%= asset_path 'fontawesome-webfont.ttf' %>) format('truetype'),url(<%= asset_path 'fontawesome-webfont.svg#FontAwesome' %>) format('svg');font-weight:normal;font-style:normal;}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:FontAwesome;font-weight:normal;font-style:normal;display:inline-block;text-decoration:inherit;}
 a [class^="icon-"],a [class*=" icon-"]{display:inline-block;text-decoration:inherit;}
 .icon-large:before{vertical-align:middle;font-size:1.3333333333333333em;}
 .btn [class^="icon-"],.nav-tabs [class^="icon-"],.btn [class*=" icon-"],.nav-tabs [class*=" icon-"]{line-height:.9em;}

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

@@ -46,7 +46,13 @@ module Sufia::UsersControllerBehavior
 
   # Process changes from profile form
   def update
-    @user.update_attributes(params[:user])
+    if params[:user]
+      if Rails::VERSION::MAJOR == 3
+        @user.update_attributes(params[:user])
+      else
+        @user.update_attributes(params.require(:user).permit(*User.permitted_attributes))
+      end
+    end
     @user.populate_attributes if params[:update_directory]
     @user.avatar = nil if params[:delete_avatar]
     unless @user.save
@@ -109,8 +115,8 @@ module Sufia::UsersControllerBehavior
   end
 
   def find_user
-    @user = User.from_url_component(params[:uid])
-    redirect_to root_path, alert: "User '#{params[:uid]}' does not exist" if @user.nil?
+    @user = User.from_url_component(params[:id])
+    redirect_to root_path, alert: "User '#{params[:id]}' does not exist" if @user.nil?
   end
 
   def user_is_current_user