cul_scv_hydra 0.22.9.1 → 0.22.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dae25c2c8e029c0f2233557738f5951e3ab2db40
-  data.tar.gz: 66111b4cae205483895936114652fe2814825837
+  metadata.gz: 4dfef7d4cc06013efb54de0725d882d49b043d6b
+  data.tar.gz: 6fb3fcdb39e0ed72bd1c6002efa969bd7edaeb12
 SHA512:
-  metadata.gz: e6e2d8640c9dcc3a6d5988d855a4742329be0dd8d280a95cc529896edc4b3b4983efb240da58fb5d49d93b1e9d8365bfdbdbda94ea2ac131bcf02ed4011f4221
-  data.tar.gz: 9be6ec791c59129190a90d9b86e539e2e0203d9797bb6cc79bb5ce4d214ba2e4663623ffa98a060b0d101481359fc9f1c9a2de7c67b72f32458a91642d9f8cff
+  metadata.gz: efdfeea63e0d34298a29015048ee81ea86945d97f3dd1585e61f68376ec90cee6ddc70ed7af4b82d79bbf44b8cf5adfb38a21906fb0d305e7f7a5a244a620d38
+  data.tar.gz: fc309b63eb069ccdae2169b4bf4cd86c4898a3de41958a8780d4737d07bf96fc05e4d44ff3fc783943bed28df89268d5f1fb992ef9892d98c587f75272a5dbeb

data/app/models/concerns/cul/hydra/models/image_resource.rb

@@ -21,6 +21,14 @@ module Cul::Hydra::Models::ImageResource
 
   DJATOKA_BASE_URL = "http://iris.cul.columbia.edu:8888/resolve"
 
+  EXIF_ORIENTATION_TO_DEGREES = {
+    'top-left' => 0,
+    'left-bottom' => 90,
+    'bottom-right' => 180,
+    'right-top' => 270
+  }
+  DEGREES_TO_EXIF_ORIENTATIONS = EXIF_ORIENTATION_TO_DEGREES.invert
+
   def long
     @long_side ||= max(width(), length())
   end
@@ -75,4 +83,24 @@ module Cul::Hydra::Models::ImageResource
       return {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
     end
   end
+
+  # The number of rotational degrees required to display this image as upright
+  def required_rotation_for_upright_display
+    required_rotation_orientation_in_degrees = (360 - self.orientation) % 360
+    return required_rotation_orientation_in_degrees
+  end
+
+  # Allowed degrees arg values: 0, 90, 180, 270
+  def orientation=(degrees)
+    degrees = degrees % 360
+    raise "Invalid value for degrees.  Must be a right angle (0, 90, 180, etc.)" unless (degrees % 90 == 0)
+    self.clear_relationship(:orientation)
+    self.add_relationship(:orientation, DEGREES_TO_EXIF_ORIENTATIONS[degrees], true)
+    return degrees # Hide RDF backing structure and make this look like a simple setter method
+  end
+
+  def orientation
+    self.relationships(:orientation).present? ? EXIF_ORIENTATION_TO_DEGREES[self.relationships(:orientation).first.to_s] : 0
+  end
+
 end

data/app/models/generic_resource.rb

@@ -142,24 +142,28 @@ class GenericResource < ::ActiveFedora::Base
     (zr = rels_int.relationships(datastreams['content'], :foaf_zooming) and not zr.first.blank?)
   end
 
-  def with_content_resource(fedora_content_filesystem_mounted=false, &block)
+  def with_ds_resource(ds_id, fedora_content_filesystem_mounted=false, &block)
 
-    content_ds = self.datastreams['content']
+    ds = self.datastreams[ds_id]
 
-    if fedora_content_filesystem_mounted
-      if content_ds.dsLocation =~ /^file:\//
-        dsLocation = content_ds.dsLocation.sub(/^file:\/+/,'/')
+    puts 'dsLocation.start_with?(self.pid) : ' + ds.dsLocation.start_with?(self.pid).to_s
+
+    # If the dsLocation starts with the pid, that means that we're dealing with an internally-managed ds,
+    # so we can't reference the file directly even if we do have the fedora content filesystem mounted.
+    if ! ds.dsLocation.start_with?(self.pid) && fedora_content_filesystem_mounted
+      if ds.dsLocation =~ /^file:\//
+        dsLocation = ds.dsLocation.sub(/^file:\/+/,'/')
         path = URI.unescape(dsLocation)
       else
-        path = content_ds.dsLocation
+        path = ds.dsLocation
       end
 
       yield(path)
     else
-      internal_uri = "info:fedora/#{self.pid}/content"
+      internal_uri = "info:fedora/#{self.pid}/#{ds_id}"
       # No local fedora mount, need to download content over http[s]
 
-      file_basename = File.basename(content_ds.dsLocation.gsub(/^file:/,''))
+      file_basename = File.basename(ds.dsLocation.gsub(/^file:/,''))
       file_extension = File.extname(file_basename)
 
       # In some cases, we actually do want to know the original extension of the file, so we'll preserve it in the temp file filename

data/lib/cul_hydra/version.rb

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '0.22.9.1'
+    VERSION = '0.22.9.2'
     def self.version
       VERSION
     end

data/lib/cul_hydra/version.rb~

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '0.22.9'
+    VERSION = '0.22.9.1'
     def self.version
       VERSION
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.22.9.1
+  version: 0.22.9.2
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -527,4 +527,3 @@ signing_key:
 specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL repository apps
 test_files: []
-has_rdoc: