sufia 6.0.0.rc1 → 6.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23a8aa646f0192a0e3637c499d513f8ee363f128
-  data.tar.gz: 7d98159bb2f6b95131dc290c271a53e62e18a043
+  metadata.gz: 66e90cd7b7ad05dfa098aeaa54478231dadb82e7
+  data.tar.gz: ad0c57d24b26850de77ee710268983018abe0bca
 SHA512:
-  metadata.gz: 329dd1e4e2580887878b25c14f8dc7553de38dd570da8ff66e37739e853a8d074524e4de8c31afda32e0140591633a256ecd3f173e1da4ff6c8c91dc0252bdd0
-  data.tar.gz: eea2cc4345bbd3c245d6c638cf8442151cc89e68d88de0957cadabf4444248dbcdcac17c7caab02fafa3b583cb8bab1c11c0b676a37efaa2c61edfe52bba876a
+  metadata.gz: e579cba46ffd2ed1e926e4b0948b7871cd768e22670338f9ffd5cb707e801df5e48be5b8859963675f55511630daac955e6a1e3e682b5ea542932d51fed059a1
+  data.tar.gz: 098a5f9024a5948189286035b180e8778de2bb2fc051929931f0fceb400633b94f11e9a6fa365691fd18c809a75db21e98ba86249bab6ad28e6c7406c6a026e7

data/README.md

@@ -48,7 +48,8 @@ We'd love to accept your contributions.  Please see our guide to [contributing t
 1. A SQL RDBMS (MySQL, SQLite)
 1. [Redis](http://redis.io/) key-value store
 1. [ImageMagick](http://www.imagemagick.org/)
-1. Ruby
+1. Ruby (*latest 2.1 recommended*)
+2. Rails (*latest 4.1 recommended*)
 
 #### !! Ensure that you have all of the above components installed before you continue. !!
 
@@ -60,12 +61,15 @@ If you have questions or need help, please email [the Hydra community developmen
 
 ### Generate base Rails install
 
-```rails new my_app```
+```
+gem install rails -v 4.1.8
+rails new my_app
+```
 
 ### Add gems to Gemfile
 
 ```
-gem 'sufia'
+gem 'sufia', '6.0.0.rc1'
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
 ```
 

data/SUFIA_VERSION

@@ -1 +1 @@
-6.0.0.rc1
+6.0.0.rc2

data/app/assets/stylesheets/sufia/_file-listing.scss

@@ -41,7 +41,6 @@ h4 .small {
 }
 
 .file_listing_thumbnail {
-  @extend .media-object;
   width: 64px;
 }
 
@@ -167,4 +166,4 @@ input#check_all {
   font-size: .75em;
   display: block;
   width: 30em;
-}
+}

data/app/controllers/collections_controller.rb

@@ -1,61 +1,3 @@
-# -*- coding: utf-8 -*-
 class CollectionsController < ApplicationController
-  include Hydra::CollectionsControllerBehavior
-  include Blacklight::Catalog::SearchContext
-  include BlacklightAdvancedSearch::ParseBasicQ
-  include BlacklightAdvancedSearch::Controller
-  include Sufia::Breadcrumbs
-  prepend_before_filter :normalize_identifier, except: [:index, :create, :new]
-  before_filter :filter_docs_with_read_access!, except: :show
-  before_filter :has_access?, except: :show
-  before_filter :initialize_fields_for_edit, only: [:edit, :new]
-  before_filter :build_breadcrumbs, only: [:edit, :show]
-  CollectionsController.solr_search_params_logic += [:add_access_controls_to_solr_params]
-
-  layout "sufia-one-column"
-
-  def show
-    super
-    @presenter = presenter
-  end
-
-  protected
-
-  def presenter
-    Sufia::CollectionPresenter.new(@collection)
-  end
-
-  def collection_params
-    params.require(:collection).permit(:title, :description, :members, part_of: [],
-      contributor: [], creator: [], publisher: [], date_created: [], subject: [],
-      language: [], rights: [], resource_type: [], identifier: [], based_near: [],
-      tag: [], related_url: [])
-  end
-
-  def query_collection_members
-    flash[:notice]=nil if flash[:notice] == "Select something first"
-    query = params[:cq]
-
-    #merge in the user parameters and the attach the collection query
-    solr_params =  (params.symbolize_keys).merge(q: query)
-
-    # run the solr query to find the collections
-    (@response, @member_docs) = get_search_results(solr_params)
-  end
-
-  def after_destroy(id)
-    respond_to do |format|
-      format.html { redirect_to sufia.dashboard_collections_path, notice: 'Collection was successfully deleted.' }
-      format.json { render json: {id: id}, status: :destroyed, location: @collection }
-    end
-  end
-
-  def initialize_fields_for_edit
-    @form = Sufia::Forms::CollectionEditForm.new(@collection)
-  end
-
-  def _prefixes
-    @_prefixes ||= super + ['catalog']
-  end
-
+  include Sufia::CollectionsControllerBehavior
 end

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

@@ -0,0 +1,84 @@
+module Sufia
+  module CollectionsControllerBehavior
+    extend ActiveSupport::Concern
+    include Hydra::CollectionsControllerBehavior
+
+    included do
+      include Blacklight::Catalog::SearchContext
+      include BlacklightAdvancedSearch::ParseBasicQ
+      include BlacklightAdvancedSearch::Controller
+      include Sufia::Breadcrumbs
+
+      prepend_before_filter :normalize_identifier, except: [:index, :create, :new]
+      before_filter :filter_docs_with_read_access!, except: :show
+      before_filter :has_access?, except: :show
+      before_filter :build_breadcrumbs, only: [:edit, :show]
+
+      self.solr_search_params_logic += [:add_access_controls_to_solr_params]
+
+      layout "sufia-one-column"
+    end
+
+    def new
+      super
+      form
+    end
+
+    def edit
+      super
+      form
+    end
+
+    def show
+      super
+      presenter
+    end
+
+    protected
+
+    def presenter
+      @presenter ||= presenter_class.new(@collection)
+    end
+
+    def presenter_class
+      Sufia::CollectionPresenter
+    end
+
+    def collection_params
+      params.require(:collection).permit(:title, :description, :members, part_of: [],
+        contributor: [], creator: [], publisher: [], date_created: [], subject: [],
+        language: [], rights: [], resource_type: [], identifier: [], based_near: [],
+        tag: [], related_url: [])
+    end
+
+    def query_collection_members
+      flash[:notice]=nil if flash[:notice] == "Select something first"
+      query = params[:cq]
+
+      #merge in the user parameters and the attach the collection query
+      solr_params =  (params.symbolize_keys).merge(q: query)
+
+      # run the solr query to find the collections
+      (@response, @member_docs) = get_search_results(solr_params)
+    end
+
+    def after_destroy(id)
+      respond_to do |format|
+        format.html { redirect_to sufia.dashboard_collections_path, notice: 'Collection was successfully deleted.' }
+        format.json { render json: {id: id}, status: :destroyed, location: @collection }
+      end
+    end
+
+    def form
+      @form ||= form_class.new(@collection)
+    end
+
+    def form_class
+      Sufia::Forms::CollectionEditForm
+    end
+
+    def _prefixes
+      @_prefixes ||= super + ['catalog']
+    end
+  end
+end

data/app/inputs/select_with_modal_help_input.rb

@@ -14,7 +14,7 @@ class SelectWithModalHelpInput < MultiValueWithHelpInput
       end
     end
 
-    def build_text_field(value)
+    def build_field(value, index)
       html_options = input_html_options.dup
 
       if @rendered_first_element

data/app/views/_footer.html.erb

@@ -5,7 +5,7 @@
       <p>v.<%= Sufia::VERSION %></p>
   </div>
     <div class="col-xs-12 col-sm-7">
-      <p><strong>Copyright &copy; 2013 Project Hydra</strong> Licensed under the Apache License, Version 2.0</p>
+      <p><%= t('sufia.footer.copyright_html') %></p>
       <p><%= t('sufia.background_attribution') %></p>
     </div>
   </div><!-- /footer -->

data/app/views/collections/_show_document_list_row.html.erb

@@ -11,7 +11,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to sufia.generic_file_path(document), class: "pull-left" do %>
+      <%= link_to sufia.generic_file_path(document), class: "media-left" do %>
         <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail" }, { suppress_link: true } %>
       <% end %>
       <div class="media-body">

data/app/views/my/_index_partials/_list_files.html.erb

@@ -13,7 +13,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to sufia.generic_file_path(document), class: "pull-left", "aria-hidden" => true do %>
+      <%= link_to sufia.generic_file_path(document), class: "media-left", "aria-hidden" => true do %>
         <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail" }, { suppress_link: true } %>
       <% end %>
       <div class="media-body">

data/config/locales/sufia.en.yml

@@ -150,6 +150,8 @@ en:
       delete:   'Delete Message'
     generic_file:
       browse_view: "Browse View"
+    footer:
+      copyright_html: "<strong>Copyright &copy; 2015 Project Hydra</strong> Licensed under the Apache License, Version 2.0"
 
   simple_form:
     labels:

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "6.0.0.rc1"
+  VERSION = "6.0.0.rc2"
 end

data/spec/models/user_spec.rb

@@ -28,6 +28,11 @@ describe User, :type => :model do
       expect(user).to be_valid
       expect(user.save).to be true
     end
+    it 'saves when an ORCID with a non-numeric check digit is provided' do
+      user.orcid = 'http://orcid.org/0000-0000-1111-222X'
+      expect(user).to be_valid
+      expect(user.save).to be true
+    end
     it 'saves when a valid ORCID URI is supplied' do
       user.orcid = 'http://orcid.org/0000-0000-1111-2222'
       expect(user).to be_valid

data/sufia-models/app/models/concerns/sufia/user.rb

@@ -44,7 +44,7 @@ module Sufia::User
     #   2. the orcid field is blank
     #   3. the orcid is already in its normalized form
     return if self.errors[:orcid].first.present? || self.orcid.blank? || self.orcid.starts_with?('http://orcid.org/')
-    bare_orcid = /\d{4}-\d{4}-\d{4}-\d{4}/.match(self.orcid).string
+    bare_orcid = Sufia::OrcidValidator.match(self.orcid).string
     self.orcid = "http://orcid.org/#{bare_orcid}"
   end
 

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

@@ -2,7 +2,11 @@ module Sufia
   class OrcidValidator < ActiveModel::Validator
     def validate(record)
       return if record.orcid.blank?
-      record.errors.add(:orcid, 'must be a string of 19 characters, e.g., "0000-0000-0000-0000"') unless /\d{4}-\d{4}-\d{4}-\d{4}/.match(record.orcid)
+      record.errors.add(:orcid, 'must be a string of 19 characters, e.g., "0000-0000-0000-0000"') unless self.class.match(record.orcid)
+    end
+
+    def self.match(string)
+      /\d{4}-\d{4}-\d{4}-\d{3}[\dX]/.match(string)
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "6.0.0.rc1"
+    VERSION = "6.0.0.rc2"
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '~> 4.0', '< 5.0.0'
   spec.add_dependency 'activeresource', "~> 4.0" # No longer a dependency of rails 4.0
 
-  spec.add_dependency "hydra-head", "~> 9.0.0.rc2"
-  spec.add_dependency "active-fedora", "~> 9.0.0.rc2"
+  spec.add_dependency "hydra-head", "~> 9.0.0.rc3"
+  spec.add_dependency "active-fedora", "~> 9.0.0.rc3"
   spec.add_dependency "hydra-collections", "~> 4.0.0.rc2"
   spec.add_dependency 'hydra-derivatives', '~> 1.0.0.rc1'
   spec.add_dependency 'nest', '~> 1.1'

data/sufia.gemspec

@@ -28,14 +28,14 @@ Gem::Specification.new do |gem|
   # 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 'hydra-batch-edit', '~> 1.1'
   gem.add_dependency 'browse-everything', '~> 0.4'
   gem.add_dependency 'daemons', '~> 1.1'
   gem.add_dependency 'mail_form'
   gem.add_dependency 'rails_autolink', '~> 1.1'
   gem.add_dependency 'yaml_db', '~> 0.2'
   gem.add_dependency 'font-awesome-rails'
-  gem.add_dependency 'hydra-editor', '~> 1.0.0.rc2'
+  gem.add_dependency 'hydra-editor', '~> 1.0.0.rc3'
   gem.add_dependency 'blacklight-gallery'
   gem.add_dependency 'breadcrumbs_on_rails', '~>2.3.0'
   gem.add_dependency 'select2-rails'

data/tasks/sufia-dev.rake

@@ -3,7 +3,6 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 require 'jettywrapper'
-Jettywrapper.hydra_jetty_version = "v8.1.1"
 
 require 'engine_cart/rake_task'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc1
+  version: 6.0.0.rc2
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -99,22 +99,16 @@ dependencies:
   name: hydra-batch-edit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: browse-everything
   requirement: !ruby/object:Gem::Requirement
@@ -205,14 +199,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: blacklight-gallery
   requirement: !ruby/object:Gem::Requirement
@@ -545,6 +539,7 @@ files:
 - app/controllers/concerns/sufia/batch_edits_controller_behavior.rb
 - app/controllers/concerns/sufia/breadcrumbs.rb
 - app/controllers/concerns/sufia/catalog.rb
+- app/controllers/concerns/sufia/collections_controller_behavior.rb
 - app/controllers/concerns/sufia/contact_form_controller_behavior.rb
 - app/controllers/concerns/sufia/controller.rb
 - app/controllers/concerns/sufia/dashboard_controller_behavior.rb