hydra-core 10.4.0 → 10.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de2f55b5b9b847e3d3b13920ea2142534f89f0a
-  data.tar.gz: d6fdf3504b7e3f1f86660e2c8a9258d4432a2e53
+  metadata.gz: 390e410597d92f2ea211e30a83b3b1b4cb49c823
+  data.tar.gz: 633207d0e603be5b0230211df550c7844f2c8000
 SHA512:
-  metadata.gz: 8b62c71271993b3f1737458ae31971c0d09223c832448af354d6731e81ac4a8886a6a30f3a099fec24f9a932e00b8d1bb36adfdac1920dd11f97b7e769877bb8
-  data.tar.gz: 82e0111d3f2500f5178bcfd8ce4722f8e7dfeef824cea78b70b3bf6ec667592def182311a36beb0612a38750b24402e9ef092c3fea681a63e89e34397098e1e9
+  metadata.gz: 5e00c2afff1bd6aadc322275c7e5407130660fe1068263fa185d7ae79ffeaf597f5778d0649819198a50cde37061782954d0c0f1467dabad48adfe89ff242abd
+  data.tar.gz: c1a44dbbe07da54548db0fe6f275da4dcfecabd5f4236cfdf70de8b185a95665c532f6b5210b41f8b67cd7c25cf10d753c7645e123beda163695ca716228affb

data/lib/generators/hydra/head_generator.rb

@@ -33,14 +33,9 @@ module Hydra
       end
     end
 
-    def inject_test_framework
+    def install_rspec
       return if options[:'skip-rspec']
-
-      application("\n" <<
-        "    config.generators do |g|\n" <<
-        "      g.test_framework :rspec, :spec => true\n" <<
-        "    end\n\n"
-      )
+      generate 'rspec:install'
     end
 
     def overwrite_catalog_controller
@@ -57,6 +52,7 @@ module Hydra
     # Add Hydra to the SearchBuilder
     def inject_hydra_search_builder_behavior
       insert_into_file "app/models/search_builder.rb", after: "include Blacklight::Solr::SearchBuilderBehavior\n" do
+        "  # Add a filter query to restrict the search to documents the current user has access to\n" \
         "  include Hydra::AccessControlsEnforcement\n"
       end
     end

data/lib/generators/hydra/templates/config/blacklight.yml

@@ -3,8 +3,7 @@ development:
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_DEVELOPMENT_PORT', 8983)}/solr/hydra-development" %>
 test: &test
   adapter: solr
-  url: http://localhost:<%= ENV['SOLR_TEST_PORT'] || 8985 %>/solr/hydra-test
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hydra-test" %>
 production:
   adapter: solr
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>
-

data/lib/generators/hydra/templates/config/initializers/hydra_config.rb

@@ -19,4 +19,6 @@ Hydra.configure do |config|
   #
   # Specify the user model
   <%= '# ' if model_name == 'User' %>config.user_model = '<%= model_name %>'
+
+  config.user_key_field = Devise.authentication_keys.first
 end

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "10.4.0"
+  VERSION = "10.5.0"
 end

data/lib/tasks/hydra.rake

@@ -3,29 +3,32 @@ require 'active_fedora/rake_support'
 namespace :hydra do
   desc "Start a solr, fedora and rails instance"
   task :server do
-    with_server('development') do
-      # 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
+    with_server(ENV['RAILS_ENV'] || 'development') do
+      puts "Fedora: #{ActiveFedora.config.credentials[:url]}"
+      puts "Solr..: #{ActiveFedora.solr_config[:url]}"
+      begin
+        if ENV['SKIP_RAILS']
+          puts "^C to exit"
+          sleep
+        else
+          # 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|
+            io.each do |line|
+              puts line
+            end
           end
-        rescue Interrupt
-          puts "Stopping server"
         end
+      rescue Interrupt
+        puts "Stopping server"
       end
     end
   end
 
   desc "Start solr and fedora instances for tests"
   task :test_server do
-    with_server('test') do
-      begin
-        sleep
-      rescue Interrupt
-        puts "Stopping server"
-      end
-    end
+    ENV['RAILS_ENV'] = 'test'
+    ENV['SKIP_RAILS'] = 'true'
+    Rake::Task['hydra:server'].invoke
   end
 end

data/spec/models/user_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'hydra/shared_spec/group_service_interface'
 
 describe User do
 
@@ -25,6 +26,11 @@ describe User do
     end
   end
 
+  describe '.group_service' do
+    let(:group_service) { described_class.group_service }
+    it_behaves_like 'a Hydra group_service interface'
+  end
+
   describe "#groups" do
     let(:user) { FactoryGirl.create(:user) }
     let(:mock_service) { double }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 10.4.0
+  version: 10.5.0
 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: 2017-01-25 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: 10.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)