cul_scv_hydra 0.21.5 → 0.21.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 255cb8ceedd709522e6a803f6813b8cae17f6895
-  data.tar.gz: e5dd126f6d863d71d8bf8e4a14c81f3f1598bd18
+  metadata.gz: 9007c29b846febed8e9db69330bdd01ad4ff888e
+  data.tar.gz: ecda81d35bcbac9b01e488079091648f5523ac0f
 SHA512:
-  metadata.gz: ab1a0cb02e2e45bb2b9185edf51cab4c0d04af5c51048a91ac9be3a1cbd99e3a115718a9b22bb03b4660e60a83bfd463c030990cdfc3cd4dfe2c71903eef67fd
-  data.tar.gz: ab6955065a75b7fbfab1e123181e8e6e86cd9a9f46edb34acf81e2edf926fe68b1f3f91ce42cd342f1847d0909a866b8fa222cd216930d778c6264b905dd0a0f
+  metadata.gz: 57fc6fb0bef9f0bf6143d696fb2b95c109db9961ef017f8ea003833db988b88524dcf17f7d42769d873f87fce4c997734e0441772b9ef8c61688e16ecf646169
+  data.tar.gz: 796e3c83263621ce1a33c65cab31c9fcb8197c34997cd4488df54784c474c17d4b25e2e3e34ec9dd76d378be62b8a583c9fc9da19f0e0583d9f90d66005d2326

data/app/models/generic_resource.rb

@@ -136,6 +136,46 @@ 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)
+
+    content_ds = self.datastreams['content']
+
+    if fedora_content_filesystem_mounted
+      if content_ds.dsLocation =~ /^file:\//
+        dsLocation = content_ds.dsLocation.sub(/^file:\/+/,'/')
+        path = URI.unescape(dsLocation)
+      else
+        path = content_ds.dsLocation
+      end
+
+      yield(path)
+    else
+      internal_uri = "info:fedora/#{self.pid}/content"
+      # No local fedora mount, need to download content over http[s]
+
+      file_basename = File.basename(content_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
+      temp_file = Tempfile.new([file_basename, file_extension])
+      begin
+        parts = internal_uri.split('/')
+        open(temp_file.path, 'wb') do |blob|
+          repo = ActiveFedora::Base.connection_for_pid(parts[1])
+          repo.datastream_dissemination({:dsid=>parts[2], :pid=>parts[1], :finished=>false}) do |res|
+            res.read_body do |seg|
+              blob << seg
+            end
+          end
+        end
+        yield(temp_file.path)
+      ensure
+        temp_file.unlink
+      end
+    end
+
+  end
+
   private
   def datastream_as_resource(dsid, props={})
     ds = datastreams[dsid]

data/config/fedora.yml

@@ -8,4 +8,10 @@ test:
   :user: fedoraAdmin
   :password: fedoraAdmin
   :url: http://localhost:8983/fedora-test
+  :time_zone: "America/New_York"
+  
+production:
+  :user: fedoraAdmin
+  :password: f+BULUS*^
+  :url: http://alcott.cul.columbia.edu:8080/fedora
   :time_zone: "America/New_York"

data/config/solr.yml

@@ -2,4 +2,7 @@ development:
   url: http://localhost:8983/solr/test
   
 test:
-  url: http://localhost:8983/solr/test
+  url: http://localhost:8983/solr/test
+  
+production:
+  url: http://katana.cul.columbia.edu:8080/solr-4.7/dcv_private_dev

data/config/subs.yml

@@ -0,0 +1,17 @@
+development:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://sayers.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu/dev"
+test:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://sayers.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu/dev"
+production:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://alcott.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu"
+  
+hyacinth_prod:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://alcott.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu"

data/lib/cul_scv_hydra/version.rb

@@ -2,7 +2,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.21.5'
+        VERSION = '0.21.6'
         def self.version
           VERSION
         end

data/lib/cul_scv_hydra/version.rb~

@@ -2,7 +2,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.21.4'
+        VERSION = '0.21.5'
         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.21.5
+  version: 0.21.6
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -331,6 +331,7 @@ files:
 - config/solr.yml
 - config/solr_mappings.yml
 - config/solr_value_maps.yml
+- config/subs.yml
 - fixtures/cmodels/ldpd_ADLMetadata.xml
 - fixtures/cmodels/ldpd_AESMetadata.xml
 - fixtures/cmodels/ldpd_BagAggregator.xml