cul_scv_hydra 0.14.2 → 0.15.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGNiMWVjMGJkNjg5NzdlOTQ0MWViODRlNjE0YTc1YzcxODQxYTcxNg==
+    MjMwMTA4NzFkZDdjYzVlNDFkZWY4MTUxMzIwNWRjMzlhZjNkZjY5Mw==
   data.tar.gz: !binary |-
-    ZDZmZWZhMzQwOGJkY2RjYmM0ZDg2Y2QxMjA2MTRjZDA2NjE2YWU5Mg==
+    YjYwYzkxNjFlY2VmY2UzOTRiY2MwZmJhNWEwMGJhOWJhODhhY2UwYg==
 SHA512:
   metadata.gz: !binary |-
-    NjlmZTg3YjdmODlhYWI1OGFkOTM3ZDFjNTI3N2I2NmVkNmUyNDJlOWRiNjlh
-    YjFmZGQwNThjNGY3ZmZlNWM3ZGZhODNlZjlhMjc0NjExYzAxODMyODg4MzQ4
-    ZGY4Y2FkMjRmYTAwZWExYjFjMDMzYTdhNTRiMTY1NGMxYTdmMjk=
+    M2NiZjkxOTQ4YjEyNGE1NTE0YWVhNzQxNTdlZDVmMGRlOTk0NmU4ZDNlMzgw
+    NWJhNDJlMGY4MmFkYWQzMjg5MmVjYjY4NGM5NjhhMDgzZTRkNzE3MWFhYWE1
+    MjllZTg4Y2NkODhlNDZjYmE1NDdiZWYwYTQxNDY3ZmUyODYzY2Q=
   data.tar.gz: !binary |-
-    YmViODEyNGFjMzBiNzYzYmYyODkwZDdlMjMwMTMwMTEwMjdiYjY0MTVlZTk0
-    OGIwYjBjMjYwNGVhNDcyMGQ5MjViNjI4ODE0Y2VjODg1OWJhY2FhNmEzMmFl
-    MzU3NTlkYWE4NjliNDhjZTI1N2VmMjFjYjI2MTg1NzcyMzE4NmY=
+    NDY3Njc4ZTJjOTRjMzNjNWE0ZWE1YjZlNzVkM2Q4MTUxZGU4ZjI0NzYwMDE0
+    YmI4YmRmMzdhODUzNTNmNzNjN2YyZGExNGI3MzJlMmE5MGRjNGMwYWM1MDQ4
+    NTkyN2VmMjJkNjBhMTE5NmM5MWNiNmNlZDExZTBiMWYzMTZiNDA=

data/app/models/concerns/cul/scv/hydra/models/aggregator.rb

@@ -38,7 +38,7 @@ module Cul::Scv::Hydra::Models::Aggregator
   end
 
   def members(opts={})
-    parts(opts)
+    parts({:response_format=>:solr}.merge(opts))
   end
 
   def member_ids(opts={})

data/app/models/concerns/cul/scv/hydra/models/common.rb

@@ -75,6 +75,7 @@ module Cul::Scv::Hydra::Models::Common
 
   def to_solr(solr_doc = Hash.new, opts={})
     solr_doc = super(solr_doc, opts)
+
     if has_desc?
       solr_doc["descriptor_ssi"] = ["mods"]
     else
@@ -114,6 +115,7 @@ module Cul::Scv::Hydra::Models::Common
       end
     }
     solr_doc[:structured_bsi] = 'false' unless solr_doc.has_key? :structured_bsi
+
     solr_doc
   end
 
@@ -180,4 +182,19 @@ module Cul::Scv::Hydra::Models::Common
       response[OM::XML::Terminology.term_hierarchical_name(pointer)] = returned
     }
   end
+
+  def legacy_content_path(ds, ds_root=ActiveFedora.config.credentials[:datastreams_root])
+    unless ds.controlGroup == 'M'
+      return ds.dsLocation
+    end
+    cd = ds.dsCreateDate
+    tz = ActiveFedora.config.credentials[:time_zone]
+    tzi = ActiveSupport::TimeZone.find_tzinfo(tz)
+    ld = tzi.utc_to_local(cd)
+    month = (ld.month < 10) ? "0#{ld.month}" : ld.month.to_s
+    day = (ld.day < 10) ? "0#{ld.day}" : ld.day.to_s
+    hour = (ld.hour < 10) ? "0#{ld.hour}" : ld.hour.to_s
+    min = (ld.min < 10) ? "0#{ld.min}" : ld.min.to_s
+    return File.join(ds_root,"#{ld.year}/#{month}#{day}/#{hour}/#{min}", ds.dsLocation.sub(':','_'))
+  end
 end

data/app/models/generic_aggregator.rb

@@ -32,4 +32,10 @@ class GenericAggregator < ::ActiveFedora::Base
     label
   end
 
+  def to_solr(solr_doc = Hash.new, opts={})
+    solr_doc = super(solr_doc, opts)
+    solr_doc["cul_number_of_members_isi"] = Cul::Scv::Hydra::RisearchMembers.get_direct_member_pids(pid).length
+    solr_doc
+  end
+
 end

data/app/models/generic_resource.rb

@@ -61,7 +61,7 @@ class GenericResource < ::ActiveFedora::Base
     if self.zooming?
       fz = rels_int.relationships(datastreams['content'], :foaf_zooming).first.object.to_s.split('/')[-1]
       ds = datastreams[fz]
-      rft_id = ds.controlGroup == 'E' ? datastreams[fz].dsLocation : fedora_ds_url(pid, ds.dsid) + '/content'
+      rft_id = ds.controlGroup == 'E' ? datastreams[fz].dsLocation : legacy_content_path(ds,'info:fedora/datastreams/')
       solr_doc['rft_id_ss'] = rft_id
     end
     solr_doc

data/config/jetty.yml

@@ -0,0 +1,6 @@
+default:
+  startup_wait: 90
+  jetty_port: 8983
+  java_opts:
+    - "-Xmx256m" 
+    - "-XX:MaxPermSize=128m"

data/lib/cul_scv_fedora/rubydora_patch.rb

@@ -3,7 +3,12 @@ module Cul
     module Fedora
       module RubydoraPatch
         def find_by_itql query, options = {}
-          self.risearch(query, {:lang => 'itql'}.merge(options))
+          begin
+          	self.risearch(query, {:lang => 'itql'}.merge(options))
+          rescue Exception => e
+          	logger.error e
+          	"{\"results\":[]}"
+          end
         end
       end
     end

data/lib/cul_scv_hydra/indexer.rb

@@ -25,24 +25,7 @@ module Cul::Scv::Hydra::Indexer
 
     puts 'Recursively retreieving and indexing all members...'
 
-    member_query =
-      'select $child $parent $cmodel from <#ri>
-      where
-      walk($child <http://purl.oclc.org/NET/CUL/memberOf> <fedora:' + pid + '> and $child <http://purl.oclc.org/NET/CUL/memberOf> $parent)
-      and
-      $child <fedora-model:hasModel> $cmodel'
-
-    puts 'Performing query:' if verbose_output
-    puts member_query if verbose_output
-
-    search_response = JSON(Cul::Scv::Fedora.repository.find_by_itql(member_query, {
-      :type => 'tuples',
-      :format => 'json',
-      :limit => '',
-      :stream => 'on'
-    }))
-
-    unique_pids = search_response['results'].map{|result| result['child'].gsub('info:fedora/', '') }.uniq
+    unique_pids = Cul::Scv::Hydra::RisearchMembers.get_recursive_member_pids(pid, true)
 
     total_number_of_members = unique_pids.length
     puts 'Recursive search found ' + total_number_of_members.to_s + ' members.' if verbose_output

data/lib/cul_scv_hydra/risearch_members.rb

@@ -0,0 +1,51 @@
+module Cul::Scv::Hydra::RisearchMembers
+
+  def self.get_recursive_member_pids(pid, verbose_output=false)
+
+    recursive_member_query =
+      'select $child $parent $cmodel from <#ri>
+      where
+      walk($child <http://purl.oclc.org/NET/CUL/memberOf> <fedora:' + pid + '> and $child <http://purl.oclc.org/NET/CUL/memberOf> $parent)
+      and
+      $child <fedora-model:hasModel> $cmodel'
+
+    puts 'Performing query:' if verbose_output
+    puts recursive_member_query if verbose_output
+
+    search_response = JSON(Cul::Scv::Fedora.repository.find_by_itql(recursive_member_query, {
+      :type => 'tuples',
+      :format => 'json',
+      :limit => '',
+      :stream => 'on'
+    }))
+
+    unique_pids = search_response['results'].map{|result| result['child'].gsub('info:fedora/', '') }.uniq
+
+    return unique_pids
+
+  end
+
+  def self.get_direct_member_pids(pid, verbose_output=false)
+
+    direct_member_query =
+      'select $pid $cmodel from <#ri>
+      where $pid <http://purl.oclc.org/NET/CUL/memberOf> <fedora:' + pid + '>
+      and $pid <fedora-model:hasModel> $cmodel'
+
+    puts 'Performing query:' if verbose_output
+    puts direct_member_query if verbose_output
+
+    search_response = JSON(Cul::Scv::Fedora.repository.find_by_itql(direct_member_query, {
+      :type => 'tuples',
+      :format => 'json',
+      :limit => '',
+      :stream => 'on'
+    }))
+
+    unique_pids = search_response['results'].map{|result| result['pid'].gsub('info:fedora/', '') }.uniq
+
+    return unique_pids
+
+  end
+
+end

data/lib/cul_scv_hydra/version.rb

@@ -1,7 +1,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.14.2'
+        VERSION = '0.15.0'
         def self.version
           VERSION
         end

data/lib/cul_scv_hydra.rb

@@ -45,6 +45,7 @@ require "cul_scv_hydra/access_controls_enforcement"
 require "cul_scv_hydra/controllers"
 require "cul_scv_hydra/om"
 require "cul_scv_hydra/indexer"
+require "cul_scv_hydra/risearch_members"
 require "cul_scv_hydra/solrizer"
 require "cul_scv_hydra/version"
 require "cul_scv_hydra/engine" if defined? Rails

data/lib/tasks/cmodel.rake

@@ -1,4 +1,9 @@
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
+require 'active-fedora'
+
+def logger
+  @logger ||= Logger.new($stdout)
+end
 
 def filename_for_pid(pid)
   pid.gsub(/\:/,'_') + '.xml'
@@ -27,9 +32,9 @@ def config_subs
     cfile = File.join(APP_ROOT,'config','subs.yml')
     subs = {}
     if File.exists? cfile
-      open(cfile) {|blob| subs = YAML::load(blob)[Rails.env] }
+      open(cfile) {|blob| subs = YAML::load(blob)[ENV['RAILS_ENV'] || 'test'] }
     else
-      Rails.logger.warn("No subs.yml found; CModels will be loaded without inline substitutions")
+      logger.warn("No subs.yml found; CModels will be loaded without inline substitutions")
     end
     subs
   end

data/lib/tasks/cul_hydra_dev.rake

@@ -0,0 +1,43 @@
+APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
+
+require 'jettywrapper'
+JETTY_ZIP_BASENAME = 'master'
+Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
+
+namespace :cul_hydra do
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:rspec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+    spec.pattern += FileList['spec/*_spec.rb']
+    spec.rspec_opts = ['--backtrace'] if ENV['CI']
+  end
+
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+    spec.pattern += FileList['spec/*_spec.rb']
+    spec.rcov = true
+  end
+
+desc "CI build"
+task :ci do
+  ENV['environment'] = "test"
+  #Rake::Task["active_fedora:configure_jetty"].invoke
+  jetty_params = Jettywrapper.load_config
+  error = Jettywrapper.wrap(jetty_params) do
+    Rake::Task["cul_scv_hydra:cmodel:reload_all"].invoke
+    Rake::Task['cul_hydra:coverage'].invoke
+  end
+  raise "test failures: #{error}" if error
+end
+
+desc "Execute specs with coverage"
+task :coverage do 
+  # Put spec opts in a file named .rspec in root
+  ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+  ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
+
+ # Rake::Task["active_fedora:fixtures"].invoke
+  Rake::Task["cul_hydra:rspec"].invoke
+end
+
+end

data/lib/tasks/index.rake

@@ -20,7 +20,8 @@ namespace :cul_scv_hydra do
       begin
         Cul::Scv::Hydra::Indexer.recursively_index_fedora_objects(pid, skip_top_level_object_indexing, true)
       rescue => e
-        puts e
+        puts 'Error: ' + e.message
+        puts e.backtrace
         next
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -164,6 +164,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: jettywrapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +252,7 @@ files:
 - app/models/static_image_aggregator.rb
 - bin/rails
 - config/fedora.yml
+- config/jetty.yml
 - config/predicate_mappings.yml
 - config/solr_mappings.yml
 - config/solr_value_maps.yml
@@ -269,6 +284,7 @@ files:
 - lib/cul_scv_hydra/indexer.rb
 - lib/cul_scv_hydra/om.rb
 - lib/cul_scv_hydra/om/standard_mods.rb
+- lib/cul_scv_hydra/risearch_members.rb
 - lib/cul_scv_hydra/solrizer.rb
 - lib/cul_scv_hydra/solrizer/extractor.rb
 - lib/cul_scv_hydra/solrizer/field_mapper.rb
@@ -277,6 +293,7 @@ files:
 - lib/cul_scv_hydra/solrizer/value_mapper.rb
 - lib/cul_scv_hydra/version.rb
 - lib/tasks/cmodel.rake
+- lib/tasks/cul_hydra_dev.rake
 - lib/tasks/index.rake
 homepage: https://github.com/cul/cul_scv_hydra
 licenses: []