hydra-core 10.3.4 → 10.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f22d63c40f395b64d39964503b3cd5bbd506a54
-  data.tar.gz: 45afddc95efdfb66a68897156cbc4acd2700942e
+  metadata.gz: 96edaa48ae802442e0cf200e2314d496c1d4ffb4
+  data.tar.gz: 70dcb3c1d56a9eb810ebf83218a7ee502c5f8159
 SHA512:
-  metadata.gz: 6f9962c603971a98ecbb513095ac06c4f0cd06822cb97b796b615104651dd28ca713109cf743a27da84ea7e51d2bf02b900f3553115cc4d708ff5dcc82791229
-  data.tar.gz: 4ea31720d3a2c144fa4f0df169a701d6460a7152ee5f6e4d6f62242a903c4724fce07a3c00efebc63178df4ea4e25e7e15e40e13fb416ea0f929aafa9f32da2f
+  metadata.gz: 8ef8018d7bfd99c3e0a2a2c9b0de32f314d2b7ee9869ee8c017ce841b49516aa78db88fc7344917f623adf7fdc118ba67653b988d37caae0130ec735e269f533
+  data.tar.gz: db4fda19263dd2f2ffdc72587ae5e95fb8c98b04367c84976fc13593fb4f3d1fb4f1bcac296ed3c0ccd66676c94f2a9ca87f9d25903e3e753f281e34a9c5fea0

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "10.3.4"
+  VERSION = "10.4.0.rc1"
 end

data/lib/tasks/hydra.rake

@@ -4,7 +4,9 @@ namespace :hydra do
   desc "Start a solr, fedora and rails instance"
   task :server do
     with_server('development') do
-      IO.popen('rails server') do |io|
+      # If HOST specified, bind to that IP with -b
+      server_options = " -b #{ENV['HOST']}" if ENV['HOST']
+      IO.popen("rails server#{server_options}") do |io|
         begin
           io.each do |line|
             puts line

data/spec/controllers/catalog_controller_spec.rb

@@ -6,7 +6,7 @@ describe CatalogController do
     session[:user]='bob'
   end
 
-  it "should use CatalogController" do
+  it "uses the CatalogController" do
     expect(controller).to be_an_instance_of CatalogController
   end
 
@@ -47,8 +47,8 @@ describe CatalogController do
         allow(controller).to receive(:enforce_show_permissions)
       end
       context "with no asset" do
-        it "should return a not found response code" do
-          get 'show', :id => "test", :format => :nt
+        it "returns a not found response code" do
+          get 'show', params: { id: "test", format: :nt }
 
           expect(response).to be_not_found
         end
@@ -66,35 +66,39 @@ describe CatalogController do
         let(:related) do
           ActiveFedora::Base.create
         end
-        it "should be able to negotiate jsonld" do
-          get 'show', :id => asset.id, :format => :jsonld
+        it "is able to negotiate jsonld" do
+          get 'show', params: { id: asset.id, format: :jsonld }
 
           expect(response).to be_success
           expect(response.headers['Content-Type']).to include("application/ld+json")
           graph = RDF::Reader.for(:jsonld).new(response.body)
           expect(graph.statements.to_a.length).to eq 3
         end
-        it "should be able to negotiate ttl" do
-          get 'show', :id => asset.id, :format => :ttl
+
+        it "is able to negotiate ttl" do
+          get 'show', params: { id: asset.id, format: :ttl }
           
           expect(response).to be_success
           graph = RDF::Reader.for(:ttl).new(response.body)
           expect(graph.statements.to_a.length).to eq 3
         end
-        it "should return an n-triples graph with just the content put in" do
-          get 'show', :id => asset.id, :format => :nt
+
+        it "returns an n-triples graph with just the content put in" do
+          get 'show', params: { id: asset.id, format: :nt }
 
           graph = RDF::Reader.for(:ntriples).new(response.body)
           statements = graph.statements.to_a
           expect(statements.length).to eq 3
           expect(statements.first.subject).to eq asset.rdf_subject
         end
+
         context "with a configured subject converter" do
           before do
             Hydra.config.id_to_resource_uri = lambda { |id, _| "http://hydra.box/catalog/#{id}" }
-            get 'show', :id => asset.id, :format => :nt
+            get 'show', params: { id: asset.id, format: :nt }
           end
-          it "should convert it" do
+
+          it "converts the subject using the specified converter" do
             graph = RDF::Graph.new << RDF::Reader.for(:ntriples).new(response.body)
             title_statement = graph.query([nil, RDF::Vocab::DC.title, nil]).first
             related_statement = graph.query([nil, RDF::Vocab::DC.isReferencedBy, nil]).first
@@ -108,10 +112,10 @@ describe CatalogController do
 
   describe "filters" do
     describe "show" do
-      it "should trigger enforce_show_permissions" do
+      it "triggers enforce_show_permissions" do
         allow(controller).to receive(:current_user).and_return(nil)
         expect(controller).to receive(:enforce_show_permissions)
-        get :show, id: 'test:3'
+        get :show, params: { id: 'test:3' }
       end
     end
   end

data/spec/controllers/downloads_controller_spec.rb

@@ -10,8 +10,9 @@ describe DownloadsController do
   end
 
   describe "routing" do
-    it "should route" do
-      assert_recognizes( {:controller=>"downloads", :action=>"show", "id"=>"test1"}, "/downloads/test1?filename=my%20dog.jpg" )
+    it "routes" do
+      assert_recognizes({ controller: "downloads", action: "show", id: "test1" },
+                        "/downloads/test1?filename=my%20dog.jpg")
     end
   end
 
@@ -41,8 +42,8 @@ describe DownloadsController do
     context "when not logged in" do
 
       context "when a specific datastream is requested" do
-        it "should redirect to the root path and display an error" do
-          get :show, id: obj, file: "descMetadata"
+        it "redirects to the root path and display an error" do
+          get :show, params: { id: obj, file: "descMetadata" }
           expect(response).to redirect_to new_user_session_path
           expect(flash[:alert]).to eq "You are not authorized to access this page."
         end
@@ -55,8 +56,8 @@ describe DownloadsController do
         sign_in user
       end
       context "when a specific datastream is requested" do
-        it "should redirect to the root path and display an error" do
-          get :show, id: obj, file: "descMetadata"
+        it "redirects to the root path and display an error" do
+          get :show, params: { id: obj, file: "descMetadata" }
           expect(response).to redirect_to root_path
           expect(flash[:alert]).to eq "You are not authorized to access this page."
         end
@@ -72,7 +73,7 @@ describe DownloadsController do
       describe "#show" do
         it "defaults to returning default download configured by object" do
           allow(ContentHolder).to receive(:default_file_path).and_return('buzz')
-          get :show, id: obj
+          get :show, params: { id: obj }
           expect(response).to be_successful
           expect(response.headers['Content-Type']).to start_with "image/png"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"buzz.png\""
@@ -81,7 +82,7 @@ describe DownloadsController do
 
         it "defaults to returning default download configured by controller" do
           expect(DownloadsController.default_file_path).to eq "content"
-          get :show, id: obj
+          get :show, params: { id: obj }
           expect(response).to be_successful
           expect(response.headers['Content-Type']).to start_with "image/png"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
@@ -90,14 +91,14 @@ describe DownloadsController do
 
         context "when a specific datastream is requested" do
           context "and it doesn't exist" do
-            it "should return :not_found when the datastream doesn't exist" do
-              get :show, id: obj, file: "thumbnail"
+            it "returns :not_found when the datastream doesn't exist" do
+              get :show, params: { id: obj, file: "thumbnail" }
               expect(response).to be_not_found
             end
           end
           context "and it exists" do
-            it "should return it" do
-              get :show, id: obj, file: "descMetadata"
+            it "returns it" do
+              get :show, params: { id: obj, file: "descMetadata" }
               expect(response).to be_successful
               expect(response.headers['Content-Type']).to start_with "text/plain"
               expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"metadata.xml\""
@@ -105,15 +106,17 @@ describe DownloadsController do
             end
           end
         end
-        it "should support setting disposition to inline" do
-          get :show, id: obj, :disposition => "inline"
+
+        it "supports setting disposition to inline" do
+          get :show, params: { id: obj, disposition: "inline" }
           expect(response).to be_successful
           expect(response.headers['Content-Type']).to start_with "image/png"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
           expect(response.body).to eq 'foobarfoobarfoobar'
         end
-        it "should allow you to specify filename for download" do
-          get :show, id: obj, "filename" => "my%20dog.png"
+
+        it "allows you to specify filename for download" do
+          get :show, params: { id: obj, "filename" => "my%20dog.png" }
           expect(response).to be_successful
           expect(response.headers['Content-Type']).to start_with "image/png"
           expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"my%20dog.png\""
@@ -131,7 +134,7 @@ describe DownloadsController do
 
         it "head request" do
           request.env["HTTP_RANGE"] = 'bytes=0-15'
-          head :show, id: parent, file: 'webm'
+          head :show, params: { id: parent, file: 'webm' }
           expect(response.headers['Content-Length']).to eq 16
           expect(response.headers['Accept-Ranges']).to eq 'bytes'
           expect(response.headers['Content-Type']).to start_with 'video/webm'
@@ -139,7 +142,7 @@ describe DownloadsController do
 
         it "sends the whole thing" do
           request.env["HTTP_RANGE"] = 'bytes=0-15'
-          get :show, id: '1234', file: 'webm'
+          get :show, params: { id: '1234', file: 'webm' }
           expect(response.body).to eq 'one1two2threfour'
           expect(response.headers["Content-Range"]).to eq 'bytes 0-15/16'
           expect(response.headers["Content-Length"]).to eq '16'
@@ -151,13 +154,13 @@ describe DownloadsController do
 
         it "sends the whole thing when the range is open ended" do
           request.env["HTTP_RANGE"] = 'bytes=0-'
-          get :show, id: '1234', file: 'webm'
+          get :show, params: { id: '1234', file: 'webm' }
           expect(response.body).to eq 'one1two2threfour'
         end
 
         it "gets a range not starting at the beginning" do
           request.env["HTTP_RANGE"] = 'bytes=3-15'
-          get :show, id: '1234', file: 'webm'
+          get :show, params: { id: '1234', file: 'webm' }
           expect(response.body).to eq '1two2threfour'
           expect(response.headers["Content-Range"]).to eq 'bytes 3-15/16'
           expect(response.headers["Content-Length"]).to eq '13'
@@ -165,7 +168,7 @@ describe DownloadsController do
 
         it "gets a range not ending at the end" do
           request.env["HTTP_RANGE"] = 'bytes=4-11'
-          get :show, id: '1234', file: 'webm'
+          get :show, params: { id: '1234', file: 'webm' }
           expect(response.body).to eq 'two2thre'
           expect(response.headers["Content-Range"]).to eq 'bytes 4-11/16'
           expect(response.headers["Content-Length"]).to eq '8'
@@ -182,9 +185,9 @@ describe DownloadsController do
         end
         sign_in @user
       end
-      it "should use the custom param value to retrieve the asset" do
+      it "uses the custom param value to retrieve the asset" do
         allow(controller).to receive(:asset_param_key).and_return(:object_id)
-        get :show, object_id: obj
+        get :show, params: { object_id: obj }
         expect(response).to be_successful
       end
     end

data/spec/models/user_spec.rb

@@ -2,31 +2,39 @@ require 'spec_helper'
 
 describe User do
 
-  describe "user_key" do
+  describe "#user_key" do
     let(:user) { User.new.tap {|u| u.email = "foo@example.com"} }
     before do
       allow(user).to receive(:username).and_return('foo')
     end
+    subject { user.user_key }
 
-    it "should return email" do
-      expect(user.user_key).to eq 'foo@example.com'
+    context "by default" do
+      it "returns email" do
+        expect(subject).to eq 'foo@example.com'
+      end
     end
 
-    it "should return username" do
-      allow(Devise).to receive(:authentication_keys).and_return([:username])
-      expect(user.user_key).to eq 'foo'
+    context "when devise is configured to use the username" do
+      before do
+        allow(Devise).to receive(:authentication_keys).and_return([:username])
+      end
+      it "returns username" do
+        expect(subject).to eq 'foo'
+      end
     end
-
   end
 
-end
-
-module UserTestAttributes
-  ['first_name','last_name','full_name','affiliation','photo'].each do |attr|
-    class_eval <<-EOM
-      def #{attr}
-        "test_#{attr}"
-      end
-    EOM
+  describe "#groups" do
+    let(:user) { FactoryGirl.create(:user) }
+    let(:mock_service) { double }
+    before do
+      user.group_service = mock_service
+    end
+    subject { user.groups }
+    it "returns a list of groups" do
+      expect(mock_service).to receive(:fetch_groups).with(user: user).and_return(['my_group'])
+      expect(subject).to eq ['my_group']
+    end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ EngineCart.load_application! path
 require 'bundler/setup'
 require 'rspec/rails'
 require 'hydra-core'
+require "factory_girl"
+require "factories"
 
 if ENV['COVERAGE']
   require 'simplecov'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 10.3.4
+  version: 10.4.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.3.4
+        version: 10.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.3.4
+        version: 10.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -175,12 +175,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)