hydra-core 8.2.0 → 9.0.0.beta1

data/spec/lib/catalog_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Hydra::Controller::ControllerBehavior do
+
+  before do
+    class CatalogTest < ApplicationController
+      include Hydra::Controller::ControllerBehavior
+    end
+  end
+
+  it "should extend classes with the necessary Hydra modules" do
+    expect(CatalogTest.included_modules).to include(Hydra::AccessControlsEnforcement)
+  end
+
+end

data/spec/lib/model_methods_spec.rb

@@ -6,7 +6,8 @@ describe Hydra::ModelMethods do
     class TestModel < ActiveFedora::Base
       include Hydra::AccessControls::Permissions
       include Hydra::ModelMethods
-      has_metadata "properties", type: Hydra::Datastream::Properties
+      contains "properties", class_name: 'Hydra::Datastream::Properties'
+      has_attributes :depositor, datastream: :properties, multiple: false
     end
   end
 
@@ -15,13 +16,15 @@ describe Hydra::ModelMethods do
   describe "apply_depositor_metadata" do
     it "should add edit access" do
       subject.apply_depositor_metadata('naomi')
-      expect(subject.rightsMetadata.users).to eq('naomi' => 'edit')
+      expect(subject.edit_users).to eq ['naomi']
     end
+
     it "should not overwrite people with edit access" do
-      subject.rightsMetadata.permissions({:person=>"jessie"}, 'edit')
+      subject.edit_users = ['jessie']
       subject.apply_depositor_metadata('naomi')
-      expect(subject.rightsMetadata.users).to eq('naomi' => 'edit', 'jessie' =>'edit')
+      expect(subject.edit_users).to match_array ['naomi', 'jessie']
     end
+
     it "should set depositor" do
       subject.apply_depositor_metadata('chris')
       expect(subject.properties.depositor).to eq ['chris']
@@ -34,13 +37,20 @@ describe Hydra::ModelMethods do
   end
 
   describe 'add_file' do
+    let(:file_name) { "my_file.foo" }
+    let(:mock_file) { "File contents" }
+
     it "should set the dsid, mimetype and content" do
-      file_name = "my_file.foo"
-      mock_file = "File contents"
-      expect(subject).to receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid=>'bar')
-      expect(subject).to receive(:set_title_and_label).with( file_name, :only_if_blank=>true )
-      expect(MIME::Types).to receive(:of).with(file_name).and_return([double(:content_type=>"mymimetype")])
+      expect(subject).to receive(:add_file_datastream).with(mock_file, label: file_name, mime_type: "mymimetype", dsid: 'bar', original_name: file_name)
+      expect(subject).to receive(:set_title_and_label).with(file_name, only_if_blank: true )
+      expect(MIME::Types).to receive(:of).with(file_name).and_return([double(content_type: "mymimetype")])
       subject.add_file(mock_file, 'bar', file_name)
     end
+
+    it "should accept a supplied mime_type and content" do
+      expect(subject).to receive(:add_file_datastream).with(mock_file, label: file_name, mime_type: "image/png", dsid: 'bar', original_name: file_name)
+      expect(subject).to receive(:set_title_and_label).with(file_name, only_if_blank: true )
+      subject.add_file(mock_file, 'bar', file_name, 'image/png')
+    end
   end
 end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ require 'bundler/setup'
 require 'rspec/rails'
 require 'hydra-core'
 
-if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+if ENV['COVERAGE']
   require 'simplecov'
   require 'simplecov-rcov'
 
@@ -16,11 +16,15 @@ if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
   SimpleCov.start
 end
 
+ActiveFedora::Base.logger = Logger.new(STDOUT)
+
+require 'active_fedora/cleaner'
 RSpec.configure do |config|
-  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::TestHelpers, type: :controller
   config.use_transactional_fixtures = true
-  config.before(:suite) { User.destroy_all }
   config.infer_spec_type_from_file_location!
-end
-
 
+  config.before(:each) do
+    ActiveFedora::Cleaner.clean!
+  end
+end

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

@@ -3,16 +3,9 @@ require 'rails/generators'
 class TestAppGenerator < Rails::Generators::Base
   source_root File.expand_path("../../../../support", __FILE__)
 
-  def copy_test_fixtures
-    copy_file "app/models/generic_content.rb"
-
+  def copy_test_classes
     # Download controller
     copy_file "app/controllers/downloads_controller.rb"
-
-    copy_file "spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml" 
-
-    # For testing Hydra::SubmissionWorkflow
-    copy_file "spec/fixtures/hydra_test_generic_content.foxml.xml"
   end
 
   def copy_rspec_rake_task

data/spec/support/lib/tasks/rspec.rake

@@ -2,6 +2,7 @@ require 'rspec/core/rake_task'
 desc "run the hydra-core gem spec"
 gem_home = File.expand_path('../../../../..', __FILE__)
 RSpec::Core::RakeTask.new(:myspec) do |t|
-  t.rspec_opts = ["--colour", '--backtrace', "--default-path #{gem_home}"]
+  t.pattern = gem_home + '/spec/**/*_spec.rb'
+  t.rspec_opts = ["--colour", '--backtrace']
   t.ruby_opts = "-I#{gem_home}/spec"
 end

data/tasks/rspec.rake

@@ -3,7 +3,7 @@ ENV["RAILS_ROOT"] ||= 'spec/internal'
 GEM_ROOT= File.expand_path(File.join(File.dirname(__FILE__),".."))
 
 desc "Run specs"
-task :spec => [:generate, :fixtures] do |t|
+task spec: :generate do |t|
   focused_spec = ENV['SPEC'] ? " SPEC=#{File.join(GEM_ROOT, ENV['SPEC'])}" : ''
   within_test_app do
     system "rake myspec#{focused_spec}"
@@ -11,12 +11,6 @@ task :spec => [:generate, :fixtures] do |t|
   end
 end
 
-task :fixtures do
-  within_test_app do
-    system "rake hydra:fixtures:refresh RAILS_ENV=test"
-  end
-end
-
 
 desc "Create the test rails app"
 task :generate do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 9.0.0.beta1
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2014-12-03 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: '4.0'
+        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: '4.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: block_helpers
   requirement: !ruby/object:Gem::Requirement
@@ -45,28 +51,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.2.0
+        version: 9.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.2.0
+        version: 9.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -144,40 +150,34 @@ files:
 - app/models/concerns/hydra/solr.rb
 - app/models/hydra/datastream/properties.rb
 - app/models/mods_asset.rb
-- app/search_builders/hydra/search_builder.rb
 - config/jetty.yml
 - config/locales/hydra.en.yml
 - hydra-core.gemspec
 - lib/application_helper.rb
 - lib/generators/hydra/head_generator.rb
-- lib/generators/hydra/hyhead_fixtures_generator.rb
 - lib/generators/hydra/jetty_generator.rb
 - lib/generators/hydra/templates/ability.rb
 - lib/generators/hydra/templates/catalog_controller.rb
-- lib/generators/hydra/templates/config/blacklight.yml
 - lib/generators/hydra/templates/config/initializers/hydra_config.rb
 - lib/generators/hydra/templates/config/role_map.yml
 - lib/hydra-core.rb
 - lib/hydra-head/engine.rb
 - lib/hydra-head/version.rb
 - lib/railties/active-fedora.rake
-- lib/railties/hydra-fixtures.rake
 - lib/railties/hydra_jetty.rake
 - spec/.gitignore
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
+- spec/lib/catalog_spec.rb
 - spec/lib/model_methods_spec.rb
-- spec/models/mods_asset_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
 - spec/rcov.opts
-- spec/search_builders/search_builder_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/app/controllers/downloads_controller.rb
-- spec/support/app/models/generic_content.rb
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
@@ -185,12 +185,9 @@ files:
 - spec/support/lib/tasks/rspec.rake
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
-- spec/support/spec/fixtures/hydra_test_generic_content.foxml.xml
-- spec/support/spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
 - spec/test_app_templates/Gemfile.extra
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb
-- tasks/hydra-head-fixtures.rake
 - tasks/hydra_jetty.rake
 - tasks/rspec.rake
 homepage: http://projecthydra.org
@@ -205,15 +202,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      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.6.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)
@@ -223,16 +220,14 @@ test_files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
+- spec/lib/catalog_spec.rb
 - spec/lib/model_methods_spec.rb
-- spec/models/mods_asset_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
 - spec/rcov.opts
-- spec/search_builders/search_builder_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/app/controllers/downloads_controller.rb
-- spec/support/app/models/generic_content.rb
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
@@ -240,8 +235,7 @@ test_files:
 - spec/support/lib/tasks/rspec.rake
 - spec/support/matchers/helper_matcher.rb
 - spec/support/matchers/solr_matchers.rb
-- spec/support/spec/fixtures/hydra_test_generic_content.foxml.xml
-- spec/support/spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
 - spec/test_app_templates/Gemfile.extra
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb
+has_rdoc: 

data/app/search_builders/hydra/search_builder.rb

@@ -1,5 +0,0 @@
-module Hydra
-  class SearchBuilder < Blacklight::Solr::SearchBuilder
-    include Hydra::AccessControlsEnforcement
-  end
-end

data/lib/generators/hydra/hyhead_fixtures_generator.rb

@@ -1,27 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-require 'rails/generators/migration'
-
-module Hydra
-class HyheadFixturesGenerator < Rails::Generators::Base
-
-  source_root File.expand_path('../../../../', __FILE__)
-
-  desc """
-  This Generator copies the hydra-head sample/test objects into your application's test_support/fixtures directory
-  These objects are useful for getting a sense of how hydra works, but you will want to delete them and create your own
-  fixtures to run your application's tests against.
-
-  After running this generator, you can import your fixtures into fedora & solr by running
-
-  rake hydra:fixtures:refresh
-  rake hydra:fixtures:refresh RAILS_ENV=test
-
-  """
-
-  def copy_hyhead_fixtures
-    directory("test_support/fixtures", "spec/fixtures")
-  end
-
-end
-end

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

@@ -1,9 +0,0 @@
-development:
-  adapter: solr
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/development" %>
-test: &test
-  adapter: solr
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
-production:
-  adapter: solr
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>

data/lib/railties/hydra-fixtures.rake

@@ -1,49 +0,0 @@
-namespace :hydra do
-  
-  desc "Init Hydra configuration" 
-  task :init => [:environment] do
-    # We need to just start rails so that all the models are loaded
-  end
-
-  desc "Load hydra-head models"
-  task :load_models do
-    Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), "..",'app','models', '*.rb')).each do |model|
-      load model
-    end
-  end
-
-  namespace :fixtures do
-    task :load do
-      ENV["dir"] ||= File.join("spec", "fixtures")
-      loader = ActiveFedora::FixtureLoader.new(ENV['dir'])
-      Dir.glob("#{ENV['dir']}/*.foxml.xml").each do |fixture_path|
-        pid = File.basename(fixture_path, ".foxml.xml").sub("_",":")
-        begin
-          foo = loader.reload(pid)
-          puts "Updated #{pid}"
-        rescue Errno::ECONNREFUSED => e
-          puts "Can't connect to Fedora! Are you sure jetty is running? (#{ActiveFedora::Base.connection_for_pid(pid).inspect})"
-        rescue Exception => e
-          puts("Received a Fedora error while loading #{pid}\n#{e}")
-          logger.error("Received a Fedora error while loading #{pid}\n#{e}")
-        end
-      end
-    end
-
-    desc "Remove default Hydra fixtures"
-    task :delete do
-      ENV["dir"] ||= File.join("spec", "fixtures")
-      loader = ActiveFedora::FixtureLoader.new(ENV['dir'])
-      Dir.glob("#{ENV['dir']}/*.foxml.xml").each do |fixture_path|
-        ENV["pid"] = File.basename(fixture_path, ".foxml.xml").sub("_",":")
-        Rake::Task["repo:delete"].reenable
-        Rake::Task["repo:delete"].invoke
-      end
-    end
-
-    desc "Refresh default Hydra fixtures"
-    task :refresh => [:delete, :load]
-
-  end
-end
-  

data/spec/models/mods_asset_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe ModsAsset do
-
-  let(:asset) { ModsAsset.new nil }
-
-  it "Should be a kind of ActiveFedora::Base" do
-    expect(asset).to be_kind_of(ActiveFedora::Base)
-  end
-
-  it "should set up descMetadata and rightsMetadata datastreams" do
-    expect(asset.datastreams).to have_key("rightsMetadata")
-    expect(asset.datastreams["rightsMetadata"]).to be_instance_of(Hydra::Datastream::RightsMetadata)
-  end
-
-end

data/spec/search_builders/search_builder_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe Hydra::SearchBuilder do
-  let(:processor_chain) { [:add_access_controls_to_solr_params] }
-  let(:context) { double('context') }
-  let(:user) { double('user', user_key: 'joe') }
-  let(:current_ability) { double('ability', user_groups: [], current_user: user) }
-
-  subject { described_class.new(processor_chain, context) }
-  before { subject.current_ability = current_ability }
-
-  it "should extend classes with the necessary Hydra modules" do
-    expect(Hydra::SearchBuilder.included_modules).to include(Hydra::AccessControlsEnforcement)
-  end
-
-  context "when a query is generated" do
-    it "should triggers add_access_controls_to_solr_params" do
-      expect(subject).to receive(:add_access_controls_to_solr_params)
-      subject.query
-    end
-  end
-end