ddr-models 3.0.0.beta.3 → 3.0.0.beta.4

data/spec/models/solr_document_spec.rb

@@ -128,9 +128,12 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
 
   describe "contacts" do
     before do
-      allow(YAML).to receive(:load_file) { { 'xa' => { 'name' => 'Contact A', 'short_name' => 'A' },
-                                             'yb' => { 'name' => 'Contact B', 'short_name' => 'B' } } }
-      Ddr::Contacts.load_contacts
+      allow(Ddr::Models::Contact).to receive(:get).with(:find, slug: 'xa') do
+        {'id'=>1, 'slug'=>'xa', 'name'=>'Contact A', 'short_name'=>'A'}
+      end
+      allow(Ddr::Models::Contact).to receive(:get).with(:find, slug: 'yb') do
+        {'id'=>1, 'slug'=>'yb', 'name'=>'Contact B', 'short_name'=>'B'}
+      end
     end
     describe "#research_help" do
       context "object has research help contact" do
@@ -192,4 +195,21 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
       end
     end
   end
+
+  describe "#has_datastream?" do
+    before do
+      allow(subject).to receive(:attached_files) { {"thumbnail"=>{"size"=>nil}, "content"=>{"size"=>987654} }}
+    end
+    context "when there is no content for the datastream" do
+      it "should return false" do
+        expect(subject.has_datastream?("thumbnail")).to be false
+      end
+    end
+    context "when there is content for the datastream" do
+      it "should return true" do
+        expect(subject.has_datastream?("content")).to be true
+      end
+    end
+  end
+
 end

data/spec/models/with_content_file_spec.rb

@@ -0,0 +1,32 @@
+module Ddr::Models
+  RSpec.describe WithContentFile do
+
+    let(:obj) { FactoryGirl.create(:component) }
+
+    it "yields a temp file path to the block and deletes the temp file afterwards" do
+      WithContentFile.new(obj) do |path|
+        @path = path
+        expect(File.exist?(path)).to be true
+      end
+      expect(File.exist?(@path)).to be false
+    end
+
+    it "deletes the temp file even when an exception is raised in the block" do
+      begin
+        WithContentFile.new(obj) do |path|
+          @path = path
+          expect(File.exist?(path)).to be true
+          raise Error, "error"
+        end
+      rescue Error
+        expect(File.exist?(@path)).to be false
+      end
+    end
+
+    it "raises an exception when the checksum verification fails" do
+      allow(obj.content).to receive(:checksum) { double(value: "foo", algorithm: "SHA1") }
+      expect { WithContentFile.new(obj) { |p| nil } }.to raise_error(ChecksumInvalid)
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 ENV['RAILS_ENV'] ||= "test"
 
+ENV['DDR_AUX_API_URL'] ||= "http://localhost:3000/api"
+
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 
 require "ddr-models"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.3
+  version: 3.0.0.beta.4
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.13
+- !ruby/object:Gem::Dependency
+  name: activeresource
+  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: active-triples
   requirement: !ruby/object:Gem::Requirement
@@ -186,67 +200,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: ddr-aux-client
+  name: ddr-antivirus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
-  name: ddr-antivirus
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 3.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 3.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -389,6 +403,7 @@ files:
 - config/initializers/active_fedora_file.rb
 - config/initializers/devise.rb
 - config/initializers/subscriptions.rb
+- config/locales/ddr-models.en.yml
 - config/routes.rb
 - db/migrate/20141021233359_create_events.rb
 - db/migrate/20141021234156_create_minted_ids.rb
@@ -452,7 +467,6 @@ files:
 - lib/ddr/auth/test_helpers.rb
 - lib/ddr/auth/user.rb
 - lib/ddr/auth/web_auth_context.rb
-- lib/ddr/contacts.rb
 - lib/ddr/datastreams.rb
 - lib/ddr/datastreams/datastream_behavior.rb
 - lib/ddr/datastreams/descriptive_metadata_datastream.rb
@@ -481,22 +495,30 @@ files:
 - lib/ddr/index.rb
 - lib/ddr/index/abstract_query_result.rb
 - lib/ddr/index/connection.rb
+- lib/ddr/index/csv_options.rb
 - lib/ddr/index/csv_query_result.rb
 - lib/ddr/index/document_builder.rb
 - lib/ddr/index/field.rb
+- lib/ddr/index/field_attribute.rb
 - lib/ddr/index/fields.rb
 - lib/ddr/index/filter.rb
 - lib/ddr/index/filters.rb
 - lib/ddr/index/query.rb
 - lib/ddr/index/query_builder.rb
 - lib/ddr/index/query_clause.rb
+- lib/ddr/index/query_params.rb
 - lib/ddr/index/query_result.rb
-- lib/ddr/index/query_value.rb
 - lib/ddr/index/response.rb
+- lib/ddr/index/solr_csv_options.rb
+- lib/ddr/index/sort_order.rb
 - lib/ddr/index/unique_key_field.rb
 - lib/ddr/jobs.rb
 - lib/ddr/jobs/fits_file_characterization.rb
+- lib/ddr/jobs/fixity_check.rb
+- lib/ddr/jobs/job.rb
 - lib/ddr/jobs/permanent_id.rb
+- lib/ddr/jobs/queue.rb
+- lib/ddr/jobs/update_index.rb
 - lib/ddr/managers.rb
 - lib/ddr/managers/derivatives_manager.rb
 - lib/ddr/managers/manager.rb
@@ -506,14 +528,15 @@ files:
 - lib/ddr/metadata.rb
 - lib/ddr/metadata/premis_event.rb
 - lib/ddr/models.rb
-- lib/ddr/models/access_controllable.rb
 - lib/ddr/models/admin_set.rb
 - lib/ddr/models/attached_file_profile.rb
 - lib/ddr/models/attached_files_profile.rb
 - lib/ddr/models/base.rb
+- lib/ddr/models/contact.rb
 - lib/ddr/models/engine.rb
 - lib/ddr/models/error.rb
 - lib/ddr/models/event_loggable.rb
+- lib/ddr/models/file_characterization.rb
 - lib/ddr/models/file_management.rb
 - lib/ddr/models/finding_aid.rb
 - lib/ddr/models/fixity_checkable.rb
@@ -547,6 +570,7 @@ files:
 - lib/ddr/models/validatable.rb
 - lib/ddr/models/validator.rb
 - lib/ddr/models/version.rb
+- lib/ddr/models/with_content_file.rb
 - lib/ddr/models/year_facet.rb
 - lib/ddr/notifications.rb
 - lib/ddr/utils.rb
@@ -568,7 +592,6 @@ files:
 - spec/auth/effective_roles_spec.rb
 - spec/auth/group_spec.rb
 - spec/auth/groups_spec.rb
-- spec/auth/ldap_gateway_spec.rb
 - spec/auth/roles/role_set_manager_spec.rb
 - spec/auth/roles/role_set_query_spec.rb
 - spec/auth/roles/role_set_spec.rb
@@ -577,7 +600,6 @@ files:
 - spec/auth/superuser_ability_spec.rb
 - spec/auth/user_spec.rb
 - spec/auth/web_auth_context_spec.rb
-- spec/contacts/contacts_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
 - spec/datastreams/fits_datastream_spec.rb
@@ -643,6 +665,7 @@ files:
 - spec/factories/user_factories.rb
 - spec/fixtures/16bit.tif
 - spec/fixtures/8bit.tif
+- spec/fixtures/arrow1rightred_e0.gif
 - spec/fixtures/bird.jpg
 - spec/fixtures/fits/document.xml
 - spec/fixtures/fits/image.xml
@@ -653,10 +676,15 @@ files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - spec/helpers/models_helper_spec.rb
+- spec/index/fields_spec.rb
 - spec/index/filter_spec.rb
-- spec/index/filters_spec.rb
+- spec/index/query_builder_spec.rb
+- spec/index/query_clause_spec.rb
 - spec/index/query_spec.rb
 - spec/jobs/fits_file_characterization_spec.rb
+- spec/jobs/fixity_check_spec.rb
+- spec/jobs/job_spec.rb
+- spec/jobs/update_index_spec.rb
 - spec/managers/derivatives_manager_spec.rb
 - spec/managers/technical_metadata_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
@@ -665,9 +693,11 @@ files:
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb
+- spec/models/contact_spec.rb
 - spec/models/descriptive_metadata_spec.rb
 - spec/models/effective_license_spec.rb
 - spec/models/events_spec.rb
+- spec/models/file_characterization_spec.rb
 - spec/models/file_management_spec.rb
 - spec/models/finding_aid_spec.rb
 - spec/models/has_admin_metadata_spec.rb
@@ -681,6 +711,7 @@ files:
 - spec/models/struct_div_spec.rb
 - spec/models/structure_spec.rb
 - spec/models/target_spec.rb
+- spec/models/with_content_file_spec.rb
 - spec/models/year_facet_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/spec_helper.rb
@@ -732,7 +763,6 @@ test_files:
 - spec/auth/effective_roles_spec.rb
 - spec/auth/group_spec.rb
 - spec/auth/groups_spec.rb
-- spec/auth/ldap_gateway_spec.rb
 - spec/auth/roles/role_set_manager_spec.rb
 - spec/auth/roles/role_set_query_spec.rb
 - spec/auth/roles/role_set_spec.rb
@@ -741,7 +771,6 @@ test_files:
 - spec/auth/superuser_ability_spec.rb
 - spec/auth/user_spec.rb
 - spec/auth/web_auth_context_spec.rb
-- spec/contacts/contacts_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
 - spec/datastreams/fits_datastream_spec.rb
@@ -807,6 +836,7 @@ test_files:
 - spec/factories/user_factories.rb
 - spec/fixtures/16bit.tif
 - spec/fixtures/8bit.tif
+- spec/fixtures/arrow1rightred_e0.gif
 - spec/fixtures/bird.jpg
 - spec/fixtures/fits/document.xml
 - spec/fixtures/fits/image.xml
@@ -817,10 +847,15 @@ test_files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - spec/helpers/models_helper_spec.rb
+- spec/index/fields_spec.rb
 - spec/index/filter_spec.rb
-- spec/index/filters_spec.rb
+- spec/index/query_builder_spec.rb
+- spec/index/query_clause_spec.rb
 - spec/index/query_spec.rb
 - spec/jobs/fits_file_characterization_spec.rb
+- spec/jobs/fixity_check_spec.rb
+- spec/jobs/job_spec.rb
+- spec/jobs/update_index_spec.rb
 - spec/managers/derivatives_manager_spec.rb
 - spec/managers/technical_metadata_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
@@ -829,9 +864,11 @@ test_files:
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb
+- spec/models/contact_spec.rb
 - spec/models/descriptive_metadata_spec.rb
 - spec/models/effective_license_spec.rb
 - spec/models/events_spec.rb
+- spec/models/file_characterization_spec.rb
 - spec/models/file_management_spec.rb
 - spec/models/finding_aid_spec.rb
 - spec/models/has_admin_metadata_spec.rb
@@ -845,6 +882,7 @@ test_files:
 - spec/models/struct_div_spec.rb
 - spec/models/structure_spec.rb
 - spec/models/target_spec.rb
+- spec/models/with_content_file_spec.rb
 - spec/models/year_facet_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/spec_helper.rb

data/lib/ddr/contacts.rb

@@ -1,25 +0,0 @@
-module Ddr
-  module Contacts
-    extend ActiveSupport::Autoload
-
-    class << self
-      attr_accessor :contacts
-    end
-
-    def self.get(contact_slug)
-      load_contacts unless contacts
-      contacts[contact_slug]
-    end
-
-    def self.load_contacts
-      self.contacts = OpenStruct.new
-      contacts_file = File.join(Rails.root, 'config', 'contacts.yml')
-      YAML.load_file(contacts_file).each do |key, value|
-        contacts[key] = OpenStruct.new(value.merge('slug' => key))
-      end
-    rescue SystemCallError
-      Rails.logger.warn("Unable to load Contacts file: #{contacts_file}")
-    end
-
-  end
-end

data/lib/ddr/index/query_value.rb

@@ -1,18 +0,0 @@
-require "rsolr"
-
-module Ddr::Index
-  class QueryValue
-
-    class << self
-      def build(value)
-        RSolr.solr_escape(value)
-      end
-
-      def or_values(*values)
-        value = values.map { |v| build(v) }.join(" OR ")
-        "(#{value})"
-      end
-    end
-
-  end
-end

data/lib/ddr/models/access_controllable.rb

@@ -1,12 +0,0 @@
-module Ddr
-  module Models
-    module AccessControllable
-      extend ActiveSupport::Concern
-
-      included do
-        include Hydra::AccessControls::Permissions
-      end
-
-    end
-  end
-end