sufia 6.6.0 → 6.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c1e5c64eca348793606e623debb1ad8bd047b46
-  data.tar.gz: 5f81c3cbf777333d417103baf8bea1d32dd087b2
+  metadata.gz: 75ebe5a7ba6376387d3c17bfa1f4faaf98d43bb5
+  data.tar.gz: 313535cd837f9640ad3d5c0b2b1d26157d006c0b
 SHA512:
-  metadata.gz: 9ae3c7d7685f039792cceb23ae03c31d43e527e35235733a55cd050fd09fd66422825bbe10ba818c8f880b86ece6eb420425d41c96a3f1a097565cae7cf701d0
-  data.tar.gz: a3b315a19b8bee86f65455aa2bb686c2e41254f6e17d29d62c78c0a6698a3fe05909be953f9b7bfccb15eba8184b7cf8574648a371ed6bc8e3e246d0217f9ddd
+  metadata.gz: dccece1330a5ee29a1232710a63e31188f306ee4f6e1552e5e8522fa59a7bf420d2215f4b8a6ec3f96be5f8c53109fa9f01167a7a842d2967a517cfdab935bcf
+  data.tar.gz: e489a1d9a56ad351fb46106e30e8818ce8d8930b703ea01efad2eb22afa870dcd7e0449de36563f8f6771d00a76a55cc5f743dd5d6ebe100f92cb1f754da0c54

data/.rubocop.yml

@@ -124,6 +124,12 @@ Style/ClassVars:
 Style/SignalException:
   Enabled: false
 
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'app/controllers/concerns/sufia/files_controller_behavior.rb'
+    - 'sufia-models/app/services/sufia/generic_file_audit_service.rb'
+    - 'sufia-models/app/models/concerns/sufia/file_stat_utils.rb'
+
 Rails:
   Enabled: true
 
@@ -162,3 +168,9 @@ RSpec/DescribeClass:
     - 'spec/views/**/*'
     - 'spec/routing/**/*'
     - 'spec/inputs/**/*'
+
+RSpec/AnyInstance:
+  Enabled: false
+
+RSpec/NotToNot:
+  Enabled: false

data/.travis.yml

@@ -6,12 +6,12 @@ rvm:
 matrix:
   include:
     - rvm: 2.1
-      env: "RAILS_VERSION=4.2.3"
+      env: "RAILS_VERSION=4.2.6"
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-    - "RAILS_VERSION=4.2.3"
+    - "RAILS_VERSION=4.2.6"
 notifications:
   irc:
     channels:

data/Gemfile

@@ -12,7 +12,7 @@ group :development, :test do
   gem "simplecov", require: false
   gem 'byebug' unless ENV['CI']
   gem 'coveralls', require: false
-  gem 'rubocop', '~> 0.36', require: false
+  gem 'rubocop', '~> 0.37.2', require: false
   gem 'rubocop-rspec', require: false
 end
 

data/History.md

@@ -1,4 +1,12 @@
 # History of Sufia releases
+## 6.6.1
+* Upping the versions for 6.6.1 release [Carolyn Cole]
+* Removing group and login from profile update [Carolyn Cole]
+* Test with Rails 4.2.6 [Justin Coyne]
+* Add auto-fix + exclusions for new Rubocop violations [Michael J. Giarlo]
+* Temporarily pin Rubocop to get past broken 0.38.0 error [Michael J. Giarlo]
+* Hydra-Jetty should be the default service container in 6.x. [Michael J. Giarlo]
+* Escape property values before presenting them with auto_link. [Olli Lyytinen]
 
 ## 6.6.0
 * Update background workers doc [E. Lynette Rayle]

data/SUFIA_VERSION

@@ -1 +1 @@
-6.6.0
+6.6.1

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

@@ -106,9 +106,9 @@ module Sufia::UsersControllerBehavior
   protected
 
     def user_params
-      params.require(:user).permit(:email, :login, :display_name, :address, :admin_area,
+      params.require(:user).permit(:display_name, :address, :admin_area,
                                    :department, :title, :office, :chat_id, :website, :affiliation,
-                                   :telephone, :avatar, :group_list, :groups_last_update, :facebook_handle,
+                                   :telephone, :avatar, :facebook_handle,
                                    :twitter_handle, :googleplus_handle, :linkedin_handle, :remove_avatar, :orcid)
     end
 

data/app/helpers/generic_file_helper.rb

@@ -28,7 +28,7 @@ module GenericFileHelper
   end
 
   def display_multiple(value)
-    auto_link(value.join(" | "))
+    auto_link(html_escape(value.join(" | ")))
   end
 
   private

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -116,7 +116,7 @@ module Sufia
     def iconify_auto_link(text, show_link = true)
       # this block is only executed when a link is inserted;
       # if we pass text containing no links, it just returns text.
-      auto_link(text) do |value|
+      auto_link(html_escape(text)) do |value|
         "<i class='glyphicon glyphicon-new-window'></i>#{('&nbsp;' + value) if show_link}<br />"
       end
     end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "6.6.0".freeze
+  VERSION = "6.6.1".freeze
 end

data/spec/controllers/users_controller_spec.rb

@@ -220,6 +220,19 @@ describe UsersController, type: :controller do
       expect(u.orcid).to eq 'http://orcid.org/0000-0000-1111-2222'
     end
 
+    it "does not allow groups to be set" do
+      user.group_list = 'private group'
+      user.save
+      post :update, id: user.user_key, user: { group_list: ['my group'] }
+      expect(user.reload.group_list).to eq 'private group'
+    end
+
+    it "does not allow email to be set" do
+      original_email = user.email
+      post :update, id: user.user_key, user: { email: ['myemail.email.com'] }
+      expect(user.reload.email).to eq original_email
+    end
+
     it 'displays a flash when invalid ORCID is entered' do
       expect(user.orcid).to be_blank
       post :update, id: user.user_key, user: { orcid: 'foobar' }

data/spec/helpers/generic_file_helper_spec.rb

@@ -62,4 +62,15 @@ describe GenericFileHelper do
       end
     end
   end
+
+  describe '#display_multiple' do
+    subject { helper.display_multiple(['Title with < 50Hz frequency. http://www.example.com. & More text', 'Other title']) }
+    it "escapes input" do
+      expect(subject).to start_with('Title with &lt; 50Hz frequency. ')
+      expect(subject).to end_with('. &amp; More text | Other title')
+    end
+    it "adds links" do
+      expect(subject).to include('<a href="http://www.example.com">')
+    end
+  end
 end

data/spec/helpers/sufia_helper_spec.rb

@@ -198,4 +198,18 @@ describe SufiaHelper, type: :helper do
       expect(helper.is_url?(url)).to be_truthy
     end
   end
+
+  describe "#iconify_auto_link" do
+    subject { helper.iconify_auto_link('Foo < http://www.example.com. & More text') }
+    it "escapes input" do
+      expect(subject).to start_with('Foo &lt;')
+      expect(subject).to end_with('. &amp; More text')
+    end
+    it "adds links" do
+      expect(subject).to include('<a href="http://www.example.com">')
+    end
+    it "adds icons" do
+      expect(subject).to include('class="glyphicon glyphicon-new-window"')
+    end
+  end
 end

data/spec/models/ability_spec.rb

@@ -43,7 +43,7 @@ describe Sufia::Ability, type: :model do
     let(:sender) { FactoryGirl.find_or_create(:jill) }
     let(:user) { FactoryGirl.find_or_create(:archivist) }
     let(:file) do
-      GenericFile.new.tap do|file|
+      GenericFile.new.tap do |file|
         file.apply_depositor_metadata(sender.user_key)
         file.save!
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 6.6.0
+  version: 6.6.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-05-19 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.6.0
+        version: 6.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.6.0
+        version: 6.6.1
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -1247,7 +1247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University