hydra-core 9.7.1 → 9.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e3f9c0bdf6318337c69b300b5100422e2c6f16f
-  data.tar.gz: ea3888ab223e4e7a6c1fa756f885b6bd1c78af29
+  metadata.gz: 1218b0be13908d308c1bf36d42054ad627ecb973
+  data.tar.gz: 4c07a1f43cf53d0fbdbb32a950af1173de36af9a
 SHA512:
-  metadata.gz: 6a11c12267ec0a760c9cbda4088ee6798c0c06b3c61b934b3dbf8f7f732ba4bbdc46535dc4635db14b06e52c3046d9c5e606ba70404a7d8760d35ff0b41a6aa1
-  data.tar.gz: b11267065ece3988669dd7aa37c40bb72975b6209685b63e25ec0588526d1ae78e4495b95c19c13b173034222b7441420cd35bc6466229eeba4b4eea1cb9d337
+  metadata.gz: 3c7a3966e1c8ff2ff266069fbaf797379adf6e723a571cfd099a0f8d0b45fba2e864b40ac76f12d1870cb5e45ae5abb2885809191df8bcd783bdd921839af305
+  data.tar.gz: a35f12fd32f795bf9eb264607fdea5a697ff4702512619d6dd43032ad3b5a3b03279f2dbf111b2be79db6d8a47664d44d206739bc211008cd8c458e1cb093013

data/lib/generators/hydra/head_generator.rb

@@ -6,7 +6,7 @@ module Hydra
 
     source_root File.expand_path('../templates', __FILE__)
 
-    argument :model_name, :type => :string , :default => "user"
+    argument :model_name, type: :string , default: 'User'
     class_option :'skip-rspec', type: :boolean, default: false, desc: "Skip the rspec generator"
 
 
@@ -21,6 +21,11 @@ module Hydra
     #
     # Config Files & Initializers
     #
+    def inject_fcrepo_wrapper
+      gem_group :development, :test do
+        gem "fcrepo_wrapper"
+      end
+    end
 
     def inject_test_framework
       return if options[:'skip-rspec']
@@ -55,13 +60,8 @@ module Hydra
     def create_configuration_files
 
       # Initializers
-      file_path = "config/initializers/hydra_config.rb"
-      copy_file "config/initializers/hydra_config.rb", file_path
-      unless model_name == 'user'
-        insert_into_file file_path, :after => 'Hydra.configure do |config|' do
-            "\n  config.user_model = '#{model_name.classify}'"
-        end
-      end
+      template "config/initializers/hydra_config.rb",
+               "config/initializers/hydra_config.rb"
 
       # Role Mappings
       copy_file "config/role_map.yml", "config/role_map.yml"

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

@@ -1,6 +1,6 @@
 development:
   adapter: solr
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/hydra-dev" %>
+  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

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

@@ -17,6 +17,6 @@ Hydra.configure do |config|
   # config.permissions.lease.expiration_date = ActiveFedora::SolrQueryBuilder.solr_name("lease_expiration_date", :stored_sortable, type: :date)
   #
   #
-  # specify the user model
-  # config.user_model = '#{model_name.classify}'
+  # Specify the user model
+  <%= '# ' if model_name == 'User' %>config.user_model = '<%= model_name %>'
 end

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "9.7.1"
+  VERSION = "9.8.0"
 end

data/lib/tasks/hydra.rake

@@ -0,0 +1,12 @@
+require 'active_fedora/rake_support'
+
+namespace :hydra do
+  desc "Start a solr, fedora and rails instance"
+  task :server do
+    with_server('development',
+                fcrepo_port: ENV.fetch('FCREPO_PORT', '8984'),
+                solr_port: ENV.fetch('SOLR_PORT', '8983')) do
+      `rails server`
+    end
+  end
+end

data/spec/test_app_templates/Gemfile.extra

@@ -2,5 +2,5 @@ gem 'rspec-rails', '~> 3.1', group: :test
 gem 'rspec-its'
 gem 'byebug' unless ENV['CI']
 
-gem 'rails', ENV.fetch('RAILS_VERSION', '4.2.5')
+gem 'rails', ENV.fetch('RAILS_VERSION', '4.2.5.1')
 gem 'blacklight', ENV.fetch('BLACKLIGHT_VERSION', '6.0.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.7.1
+  version: 9.8.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: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.7.1
+        version: 9.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.7.1
+        version: 9.8.0
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,7 @@ files:
 - lib/mods_asset.rb
 - lib/railties/active-fedora.rake
 - lib/railties/hydra_jetty.rake
+- lib/tasks/hydra.rake
 - spec/.gitignore
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb