hydra-core 7.0.0.pre2 → 7.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4040dede7d96ba50c96112863b9f8138bd8b4968
-  data.tar.gz: 74dd51d0327981844843c1cec579cd6f7c8eeb30
+  metadata.gz: 18a618b3fb6dfe1dcc4cb985f041d1f672628228
+  data.tar.gz: 2bafd276b60113f63ff2b306614903b66aad9f97
 SHA512:
-  metadata.gz: 7da68c3bba86e3ed0b5a5699831e30d466a71ed3dec6c615c06c756b7d44fa770cd2ba8f7664c272d333d1943535bd9dcfc26cc13730890a19455cca24701670
-  data.tar.gz: 78ebf5c21299bc0bb4ea088ebfaf5d95a3c37d36374071075bf4fe590287d48c392abf571d91d5efc1e641221129e2fe471221daa73e4bacc16da9b3be006fa0
+  metadata.gz: 2b4b2695fc4e9fd5ff5bd1b6e0e4a43465ca9f72e19192f365b682f83b6f66aa82f0180d73e897ec7a92a16bec9661c413f3f8dde79916f409c0167cd6989281
+  data.tar.gz: 18417a2b15c3c2391ffe0abca2232fd4dbd38ff0a3f2a1b34d1a31e49f6c76767c5fa88dc9234b39592652442a612a93c58784e31788f50edbd07443b3af9995

data/app/helpers/hydra/blacklight_helper_behavior.rb

@@ -12,29 +12,11 @@ module Hydra
     #   document_partial_name('has_model_s' => ["info:fedora/hull-cModel:text.pdf"])
     #    => "text_pdf"
     def document_partial_name(document)
-      display_type = document[blacklight_config.show.display_type]
+      display_type = document[blacklight_config.show.display_type_field]
 
       return 'default' unless display_type 
 
       Array(display_type).first.gsub(/^[^\/]+\/[^:]+:/,"").gsub(/\./, '_').underscore
     end    
-
-  #   COPIED from vendor/plugins/blacklight/app/helpers/application_helper.rb
-    # Used in catalog/facet action, facets.rb view, for a click
-    # on a facet value. Add on the facet params to existing
-    # search constraints. Remove any paginator-specific request
-    # params, or other request params that should be removed
-    # for a 'fresh' display. 
-    # Change the action to 'index' to send them back to
-    # catalog/index with their new facet choice. 
-    def add_facet_params_and_redirect(field, value)
-      new_params = super
-
-      # Delete :qt, if needed - added to resolve NPE errors
-      new_params.delete(:qt)
-
-      new_params
-    end
-
   end
 end

data/hydra-core.gemspec

@@ -21,10 +21,7 @@ Gem::Specification.new do |gem|
 
 
   gem.add_dependency "rails", '>= 3.2.3', '< 5' 
-  gem.add_dependency "blacklight", '~> 4.0'  
-  gem.add_dependency "active-fedora"
   gem.add_dependency 'block_helpers'
-  gem.add_dependency 'deprecation', ">= 0.0.5"
   gem.add_dependency 'hydra-access-controls', version
   gem.add_dependency 'jettywrapper', ">=1.4.1"
   

data/lib/generators/hydra/templates/catalog_controller.rb

@@ -20,13 +20,9 @@ class CatalogController < ApplicationController
     }
 
     # solr field configuration for search results/index views
-    config.index.show_link = 'title_tesim'
-    config.index.record_display_type = 'has_model_ssim'
+    config.index.title_field = 'title_tesim'
+    config.index.display_type_field = 'has_model_ssim'
 
-    # solr field configuration for document/show views
-    config.show.html_title = 'title_tesim'
-    config.show.heading = 'title_tesim'
-    config.show.display_type = 'has_model_ssim'
 
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "7.0.0.pre2"
+  VERSION = "7.0.0.pre3"
 end
 

data/spec/controllers/catalog_controller_spec.rb

@@ -56,7 +56,7 @@ describe CatalogController do
       before(:all) do
         fq = "read_access_group_ssim:public OR edit_access_group_ssim:public OR discover_access_group_ssim:public"
         solr_opts = {:fq=>fq}
-        response = Blacklight.solr.get('select', :params=> solr_opts)
+        response = ActiveFedora::SolrService.instance.conn.get('select', :params=> solr_opts)
         @public_only_results = Blacklight::SolrResponse.new(response, solr_opts)
       end
 

data/spec/helpers/blacklight_helper_spec.rb

@@ -4,7 +4,7 @@ describe BlacklightHelper do
   describe "document_partial_name" do
     it "should lop off everything before the first colin after the slash" do
       @config = Blacklight::Configuration.new.configure do |config|
-        config.show.display_type = 'has_model_s'
+        config.show.display_type_field = 'has_model_s'
       end
       helper.stub(:blacklight_config).and_return(@config)
       helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:Presentation"]).should == "presentation"
@@ -12,7 +12,7 @@ describe BlacklightHelper do
     end
     it "should support single valued fields" do
       @config = Blacklight::Configuration.new.configure do |config|
-        config.show.display_type = 'active_fedora_model_ssi'
+        config.show.display_type_field = 'active_fedora_model_ssi'
       end
       helper.stub(:blacklight_config).and_return(@config)
       helper.document_partial_name('active_fedora_model_ssi' => "Chicken").should == "chicken" 
@@ -20,7 +20,7 @@ describe BlacklightHelper do
 
     it "should handle periods" do
       @config = Blacklight::Configuration.new.configure do |config|
-        config.show.display_type = 'has_model_s'
+        config.show.display_type_field = 'has_model_s'
       end
       helper.stub(:blacklight_config).and_return(@config)
       helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:text.PDF"]).should == "text_pdf"

data/spec/support/lib/generators/test_app_generator.rb

@@ -22,7 +22,7 @@ class TestAppGenerator < Rails::Generators::Base
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
 
-    generate 'blacklight', '--devise'
+    generate 'blacklight:install', '--devise'
   end
 
   def run_hydra_head_generator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 7.0.0.pre2
+  version: 7.0.0.pre3
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,166 +9,124 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: blacklight
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: active-fedora
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: block_helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: deprecation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: hydra-access-controls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.pre2
+        version: 7.0.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.pre2
+        version: 7.0.0.pre3
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 'Hydra-Head is a Rails Engine containing the core code for a Hydra application.
@@ -180,7 +138,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Rakefile
 - app/controllers/concerns/hydra/controller.rb
 - app/controllers/concerns/hydra/controller/controller_behavior.rb
@@ -262,17 +220,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)