ddr-models 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10c796f3f264346854c8dfb59cd616c556d47b55
-  data.tar.gz: cda6c4af2064e37075f6efdb1e10acb6a423c4f2
+  metadata.gz: fbcdaa441af1221abeda5c6a468e74475cd6e7c8
+  data.tar.gz: da11574b2613a2a00df3adce76abcb4519b3c46b
 SHA512:
-  metadata.gz: c0944a99559023c51b910234d4056ff5f20b8258c373fedcaa1ce40e5a942a863ba8a82fd70b0e489c4a037bef680cee03eca7059c142e82282b5c7f48a5607e
-  data.tar.gz: 025975b6d1f520635dfbaf5c9b9d35d800cd031dd77d84125131a8d4caf060e15b10ba18f4684554a89ecf64ad4cb2362b70202838c3f02bbd27458663304296
+  metadata.gz: c35091749c6e1c34a76aef939b85db065bd672e626c69201e1c1a9acf034e7eadf9203db5864eb60e0fa3567e9733acab048c78445f803129dd5e4ddd0aacf3b
+  data.tar.gz: cbaf8bdb8847ff9c2b85fe81946817660de3a4267fcbf80d1afe4a18bf467245eed8815f9b8b46bba3edc0650fe32d925247cb2b538bd85020a400f7e849eed9

data/lib/ddr/managers/derivatives_manager.rb

@@ -51,23 +51,23 @@ module Ddr
       end
 
       def generate_derivative!(derivative)
-        Dir.mktmpdir do |tempdir|
-          generator_source = create_source_file(tempdir)
-          generator_output = File.new(File.join(tempdir, "output.out"), 'wb')
-          results = derivative.generator.new(generator_source.path, generator_output.path, derivative.options).generate
-          generator_source.close unless generator_source.closed?
-          if results.status.success?
-            generator_output = File.open(generator_output, 'rb')
-            object.reload if object.persisted?
-            object.add_file generator_output, derivative.datastream, mime_type: derivative.generator.output_mime_type
-            object.save!
-          else
-            Rails.logger.error results.stderr
-            raise Ddr::Models::DerivativeGenerationFailure,
-                    "Failure generating #{derivative.name} for #{object.pid}: #{results.stderr}"
-          end
-          generator_output.close unless generator_output.closed?
+        tempdir = FileUtils.mkdir(File.join(Dir.tmpdir, Dir::Tmpname.make_tmpname('',nil))).first
+        generator_source = create_source_file(tempdir)
+        generator_output = File.new(File.join(tempdir, "output.out"), 'wb')
+        results = derivative.generator.new(generator_source.path, generator_output.path, derivative.options).generate
+        generator_source.close unless generator_source.closed?
+        if results.status.success?
+          generator_output = File.open(generator_output, 'rb')
+          object.reload if object.persisted?
+          object.add_file generator_output, derivative.datastream, mime_type: derivative.generator.output_mime_type
+          object.save!
+        else
+          Rails.logger.error results.stderr
+          raise Ddr::Models::DerivativeGenerationFailure,
+                  "Failure generating #{derivative.name} for #{object.pid}: #{results.stderr}"
         end
+        generator_output.close unless generator_output.closed?
+        FileUtils.remove_dir(tempdir)
       end
 
       def delete_derivative(derivative)

data/lib/ddr/models.rb

@@ -37,7 +37,6 @@ module Ddr
     autoload :ContentModelError, 'ddr/models/error'
     autoload :DerivativeGenerationFailure, 'ddr/models/error'
     autoload :Describable
-    autoload :EffectiveLicense
     autoload :Error
     autoload :EventLoggable
     autoload :FileManagement
@@ -52,13 +51,19 @@ module Ddr
     autoload :HasStructMetadata
     autoload :HasThumbnail
     autoload :Indexing
-    autoload :InheritedLicense
-    autoload :License
     autoload :SolrDocument
     autoload :StructDiv
     autoload :Structure
     autoload :YearFacet
 
+    autoload_under "licenses" do
+      autoload :AdminPolicyLicense
+      autoload :EffectiveLicense
+      autoload :License
+      autoload :InheritedLicense
+      autoload :ParentLicense
+    end
+
     # Base directory of default external file store
     mattr_accessor :external_file_store
 

data/lib/ddr/models/licenses/admin_policy_license.rb

@@ -0,0 +1,11 @@
+module Ddr::Models
+  class AdminPolicyLicense
+
+    def self.call(obj)
+      if obj.admin_policy_id && (obj.admin_policy_id != obj.id)
+        License.call obj.admin_policy
+      end
+    end
+
+  end
+end

data/lib/ddr/models/licenses/inherited_license.rb

@@ -0,0 +1,9 @@
+module Ddr::Models
+  class InheritedLicense
+
+    def self.call(obj)
+      ParentLicense.call(obj) || AdminPolicyLicense.call(obj)
+    end
+
+  end
+end

data/lib/ddr/models/licenses/parent_license.rb

@@ -0,0 +1,11 @@
+module Ddr::Models
+  class ParentLicense
+
+    def self.call(obj)
+      if obj.respond_to?(:parent) && obj.parent
+        License.call(obj.parent)
+      end
+    end
+
+  end
+end

data/lib/ddr/models/solr_document.rb

@@ -94,6 +94,7 @@ module Ddr::Models
       uri = admin_policy_uri
       uri &&= ActiveFedora::Base.pid_from_uri(uri)
     end
+    alias_method :admin_policy_id, :admin_policy_pid
 
     def admin_policy
       if has_admin_policy?

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

data/spec/models/effective_license_spec.rb

@@ -3,44 +3,58 @@ module Ddr::Models
 
     subject { described_class.call(obj) }
 
-    let(:mock) { Struct.new(:license, :parent, :admin_policy, :pid) }
-    let(:obj) { mock.new }
-
     let(:url) { "https://creativecommons.org/licenses/by-nc-nd/4.0/" }
 
     let(:license) { License.new(url: url) }
     before { allow(License).to receive(:find).with(url: url) { license } }
 
+    let(:obj) { double(pid: "test:1", id: "test:1", license: nil, parent: nil, admin_policy: nil, admin_policy_id: nil) }
+
     describe "when the object has a license" do
-      before { obj.license = url }
+      before { allow(obj).to receive(:license) { url } }
       it { is_expected.to eq(license) }
     end
 
     describe "when the object does not have a license" do
-      describe "when the object has a parent" do
-        let(:parent) { mock.new }
+      describe "and the object has a parent" do
+        let(:parent) { double(pid: "test:2", license: nil) }
         before do
-          parent.license = url
-          obj.parent = parent
+          allow(obj).to receive(:parent) { parent }
+        end
+        describe "and the parent has a license" do
+          before do
+            allow(parent).to receive(:license) { url }
+          end
+          it { is_expected.to eq(license) }
+        end
+        describe "and the parent does not have a license" do
+          it { is_expected.to be_nil }
         end
-        it { is_expected.to eq(license) }
       end
-      describe "when the object does not have a parent" do
-        describe "when the object has an admin policy" do
-          describe "and the admin policy is a different object" do
-            let(:admin_policy) { mock.new }
+      describe "and the object does not have a parent" do
+        describe "and the object has an admin policy" do
+          let(:admin_policy) { double(pid: "test:3", id: "test:3", license: nil) }
+          before { allow(obj).to receive(:admin_policy) { admin_policy } }
+          describe "and the admin policy has a different id from the object" do
             before do
-              admin_policy.license = url
-              obj.admin_policy = admin_policy
+              allow(obj).to receive(:admin_policy_id) { "test:3" }
+            end
+            describe "and the admin policy has a license" do
+              before do
+                allow(admin_policy).to receive(:license) { url }
+              end
+              it { is_expected.to eq(license) }
+            end
+            describe "and the admin policy does not have a license" do
+              it { is_expected.to be_nil }
             end
-            it { is_expected.to eq(license) }
           end
-          describe "and the admin policy is the object itself" do
-            before { obj.admin_policy = obj }
+          describe "and the admin policy has the same id as the object" do
+            before { allow(obj).to receive(:admin_policy_id) { obj.id } }
             it { is_expected.to be_nil }
           end
         end
-        describe "otherwise" do
+        describe "and the object does not have an admin policy" do
           it { is_expected.to be_nil }
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -486,7 +486,6 @@ files:
 - lib/ddr/models/admin_set.rb
 - lib/ddr/models/base.rb
 - lib/ddr/models/describable.rb
-- lib/ddr/models/effective_license.rb
 - lib/ddr/models/engine.rb
 - lib/ddr/models/error.rb
 - lib/ddr/models/event_loggable.rb
@@ -502,8 +501,11 @@ files:
 - lib/ddr/models/has_struct_metadata.rb
 - lib/ddr/models/has_thumbnail.rb
 - lib/ddr/models/indexing.rb
-- lib/ddr/models/inherited_license.rb
-- lib/ddr/models/license.rb
+- lib/ddr/models/licenses/admin_policy_license.rb
+- lib/ddr/models/licenses/effective_license.rb
+- lib/ddr/models/licenses/inherited_license.rb
+- lib/ddr/models/licenses/license.rb
+- lib/ddr/models/licenses/parent_license.rb
 - lib/ddr/models/solr_document.rb
 - lib/ddr/models/struct_div.rb
 - lib/ddr/models/structure.rb

data/lib/ddr/models/inherited_license.rb

@@ -1,13 +0,0 @@
-module Ddr::Models
-  class InheritedLicense
-
-    def self.call(obj)
-      if obj.respond_to?(:parent) && obj.parent
-        EffectiveLicense.call obj.parent
-      elsif obj.admin_policy && (obj.admin_policy != obj)
-        EffectiveLicense.call obj.admin_policy
-      end
-    end
-
-  end
-end