cul_scv_hydra 0.22.9.8 → 0.22.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67ba675dbcd11ee3e44b2360d35ca40fbe1dba08
-  data.tar.gz: efec088da67ba317a7b1f93d3e3065ab42e1c9f8
+  metadata.gz: 9daaaef8f5ef79c01bca3a618c6c687047b46ca6
+  data.tar.gz: 62a0d6371903c02f98577e97e7ca55a5b39cc200
 SHA512:
-  metadata.gz: 7188765143462d4f6cdc93424982e95518903604680e0e06b6c62a6dd6ba08724a3a9e2aa514fd2431f7e691fd33813d229caa8544879166f10717dc647df2ec
-  data.tar.gz: 72fee1cbab65259f6c7f895ac180c65de15d7f0995d8f9dc46b690701ccc61a2ea2912468f96cfae5b1c8a7624cc1fdb4e6d8c58a67e16c0cbc11070fbf26bd1
+  metadata.gz: 41d07d66b3ab7dd0ffa81f8efe01ae9192c1bec194c11983c95bf06944950011520b3460e8ddd203a23f24417578e52ed790b0bee94009a91a80fa0c2906cbd7
+  data.tar.gz: 1563a31a1a26de436a4bc9cff92d8e98cc1cafb36ab90a889ad73f7f2d774a2fd6b58a5277944e42abfd191d7d1488f55e475e5aaf497cc767ddb033fefda299

data/lib/cul_hydra/version.rb

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

data/lib/cul_hydra/version.rb~

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

data/lib/tasks/cmodel.rake

@@ -1,122 +1,128 @@
-APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../") unless defined?(APP_ROOT)
-require 'active-fedora'
-
-def logger
-  @logger ||= Logger.new($stdout)
-end
-
-def filename_for_pid(pid)
-  pid.gsub(/\:/,'_') + '.xml'
-end
-
-def pid_for_filename(fname)
-  fname.sub(/\.xml$/,'').sub(/_/,':')
-end
-
-def cmodel_fixture(name)
-  path = File.join(APP_ROOT, 'fixtures','cmodels',name)
-  File.open(path, 'rb')
-end
-
-def each_cmodel
-  path = File.join(APP_ROOT, 'fixtures','cmodels')
-  Dir.new(path).each do |fname|
-    if fname =~ /\.xml$/
-      yield pid_for_filename(fname)
-    end
+# This first line is a temporary fix until we get rid of the dual cul_hydra/cul_scv_hydra nature of this gem.
+# Without it, these rake tasks will run twice when invoked.
+unless Rake::Task.task_defined?("cul_scv_hydra:cmodel:reload_all")
+
+  APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../") unless defined?(APP_ROOT)
+  require 'active-fedora'
+  
+  def logger
+    @logger ||= Logger.new($stdout)
   end
-end
-
-def config_subs
-  @subs ||= begin
-    cfile = File.join(APP_ROOT,'config','subs.yml')
-    subs = {}
-    if File.exists? cfile
-      open(cfile) {|blob| subs = YAML::load(blob)[ENV['RAILS_ENV'] || 'test'] }
-    else
-      logger.warn("No subs.yml found; CModels will be loaded without inline substitutions")
-    end
-    subs
+  
+  def filename_for_pid(pid)
+    pid.gsub(/\:/,'_') + '.xml'
   end
-  @subs
-end
-
-def do_subs(orig)
-  content = orig.clone
-  config_subs.each do |key, val|
-    content.gsub!(/\$#{key.to_s}\$/, val)
+  
+  def pid_for_filename(fname)
+    fname.sub(/\.xml$/,'').sub(/_/,':')
   end
-  content
-end
-
-def connection
-  # no need to go through AF for this except laziness re: finding the YAML
-  @connection ||= (ActiveFedora::Base.fedora_connection[0] ||= ActiveFedora::RubydoraConnection.new(ActiveFedora.config.credentials)).connection
-end
-
-def content_for(pid)
-  fname = filename_for_pid(pid)
-  fcontent = cmodel_fixture(fname).read
-  fcontent = do_subs(fcontent)
-end
-
-def load_content(content, pid)
-  begin
-    connection.ingest(:file=>StringIO.new(content), :pid=>pid)
-  rescue Exception => e
-    puts "possible problem with ingest of #{pid}: #{e.message}"
-    raise e
+  
+  def cmodel_fixture(name)
+    path = File.join(APP_ROOT, 'fixtures','cmodels',name)
+    File.open(path, 'rb')
   end
-end
-
-def purge(pid)
-  begin
-    connection.purge_object :pid=>pid
-  rescue Exception => e
-    puts "possible problem with purge of #{pid}: #{e.message}"
+  
+  def each_cmodel
+    path = File.join(APP_ROOT, 'fixtures','cmodels')
+    Dir.new(path).each do |fname|
+      if fname =~ /\.xml$/
+        yield pid_for_filename(fname)
+      end
+    end
   end
-
-end
-
-def reload(pid)
-  fcontent = content_for(pid)
-  purge(pid)
-  load_content(fcontent, pid)
-end
-
-
-namespace :cul_scv_hydra do
-  namespace :cmodel do
-    task :test do #=> :environment do
-      pid = ENV["PID"]
-      puts content_for(pid)
+  
+  def config_subs
+    @subs ||= begin
+      cfile = File.join(APP_ROOT,'config','subs.yml')
+      subs = {}
+      if File.exists? cfile
+        open(cfile) {|blob| subs = YAML::load(blob)[ENV['RAILS_ENV'] || 'test'] }
+      else
+        logger.warn("No subs.yml found; CModels will be loaded without inline substitutions")
+      end
+      subs
     end
-
-    task :load do #=> :environment do
-      pid = ENV["PID"]
-      load_content(content_for(pid),pid)
+    @subs
+  end
+  
+  def do_subs(orig)
+    content = orig.clone
+    config_subs.each do |key, val|
+      content.gsub!(/\$#{key.to_s}\$/, val)
     end
-
-    task :purge do #=> :environment do
-      pid = ENV["PID"]
-      purge(pid)
+    content
+  end
+  
+  def connection
+    # no need to go through AF for this except laziness re: finding the YAML
+    @connection ||= (ActiveFedora::Base.fedora_connection[0] ||= ActiveFedora::RubydoraConnection.new(ActiveFedora.config.credentials)).connection
+  end
+  
+  def content_for(pid)
+    fname = filename_for_pid(pid)
+    fcontent = cmodel_fixture(fname).read
+    fcontent = do_subs(fcontent)
+  end
+  
+  def load_content(content, pid)
+    begin
+      connection.ingest(:file=>StringIO.new(content), :pid=>pid)
+    rescue Exception => e
+      puts "possible problem with ingest of #{pid}: #{e.message}"
+      raise e
     end
-
-    task :reload do #=> :environment do
-      pid = ENV["PID"]
-      reload(pid)
+  end
+  
+  def purge(pid)
+    begin
+      connection.purge_object :pid=>pid
+    rescue Exception => e
+      puts "possible problem with purge of #{pid}: #{e.message}"
     end
-
-    task :reload_all do #=> :environment do
-      pattern = ENV["PATTERN"]
-      pattern = Regexp.compile(pattern) if pattern
-      reload("ldpd:nullbind")
-      each_cmodel do |pid|
-        unless (pattern and not pid =~ pattern)
-          puts "reloading #{pid}"
-          reload(pid)
+  
+  end
+  
+  def reload(pid)
+    fcontent = content_for(pid)
+    purge(pid)
+    load_content(fcontent, pid)
+  end
+  
+  
+  namespace :cul_scv_hydra do
+    namespace :cmodel do
+      task :test do #=> :environment do
+        pid = ENV["PID"]
+        puts content_for(pid)
+      end
+  
+      task :load do #=> :environment do
+        pid = ENV["PID"]
+        load_content(content_for(pid),pid)
+      end
+  
+      task :purge do #=> :environment do
+        pid = ENV["PID"]
+        purge(pid)
+      end
+  
+      task :reload do #=> :environment do
+        pid = ENV["PID"]
+        reload(pid)
+      end
+  
+      task :reload_all do #=> :environment do
+        pattern = ENV["PATTERN"]
+        pattern = Regexp.compile(pattern) if pattern
+        reload("ldpd:nullbind")
+        each_cmodel do |pid|
+          unless (pattern and not pid =~ pattern)
+            puts "reloading #{pid}"
+            reload(pid)
+          end
         end
       end
     end
   end
-end
+
+end

data/lib/tasks/cul_hydra_dev.rake

@@ -1,54 +1,60 @@
-APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../") unless defined?(APP_ROOT)
-
-require 'jettywrapper'
-JETTY_ZIP_BASENAME = '7.x-stable'
-Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
-
-namespace :cul_hydra do
-
-  begin
-    # This code is in a begin/rescue block so that the Rakefile is usable
-    # in an environment where RSpec is unavailable (i.e. production).
-
-    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']
+# This first line is a temporary fix until we get rid of the dual cul_hydra/cul_scv_hydra nature of this gem.
+# Without it, these rake tasks will run twice when invoked.
+unless Rake::Task.task_defined?("cul_scv_hydra:ci")
+  
+  APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../") unless defined?(APP_ROOT)
+  
+  require 'jettywrapper'
+  JETTY_ZIP_BASENAME = '7.x-stable'
+  Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
+  
+  namespace :cul_hydra do
+  
+    begin
+      # This code is in a begin/rescue block so that the Rakefile is usable
+      # in an environment where RSpec is unavailable (i.e. production).
+  
+      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
+  
+    rescue LoadError => e
+      puts "[Warning] Exception creating rspec rake tasks.  This message can be ignored in environments that intentionally do not pull in the RSpec gem (i.e. production)."
+      puts e
     end
-
-    RSpec::Core::RakeTask.new(:rcov) do |spec|
-      spec.pattern = FileList['spec/**/*_spec.rb']
-      spec.pattern += FileList['spec/*_spec.rb']
-      spec.rcov = true
+  
+    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
-
-  rescue LoadError => e
-    puts "[Warning] Exception creating rspec rake tasks.  This message can be ignored in environments that intentionally do not pull in the RSpec gem (i.e. production)."
-    puts e
-  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
+  
+    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
-    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
+end

data/lib/tasks/index.rake

@@ -1,73 +1,79 @@
-namespace :cul_scv_hydra do
-
-  namespace :index do
-
-    task :recursive => :environment do
-
-      puts '---------------------------'
-      puts 'Fedora URL: ' + ActiveFedora.config.credentials[:url]
-      puts 'Solr URL: ' + ActiveFedora.solr_config[:url]
-      puts '---------------------------'
-
-      ENV["RAILS_ENV"] ||= Rails.env
-
-      if ENV['PIDS']
-        pids = ENV['PIDS'].split(',')
-      else
-        puts 'Please specify one or more comma-delimited pids to recurse over (e.g. PIDS=ldpd:123 or PIDS=ldpd:123,ldpd:456)'
-        next
-      end
-
-      if ENV['OMIT']
-        pids_to_omit = ENV['OMIT'].split(',').map{|pid|pid.strip}
-      else
-        pids_to_omit = nil
+# This first line is a temporary fix until we get rid of the dual cul_hydra/cul_scv_hydra nature of this gem.
+# Without it, these rake tasks will run twice when invoked.
+unless Rake::Task.task_defined?("cul_scv_hydra:index:recursive")
+
+  namespace :cul_scv_hydra do
+  
+    namespace :index do
+  
+      task :recursive => :environment do
+  
+        puts '---------------------------'
+        puts 'Fedora URL: ' + ActiveFedora.config.credentials[:url]
+        puts 'Solr URL: ' + ActiveFedora.solr_config[:url]
+        puts '---------------------------'
+  
+        ENV["RAILS_ENV"] ||= Rails.env
+  
+        if ENV['PIDS']
+          pids = ENV['PIDS'].split(',')
+        else
+          puts 'Please specify one or more comma-delimited pids to recurse over (e.g. PIDS=ldpd:123 or PIDS=ldpd:123,ldpd:456)'
+          next
+        end
+  
+        if ENV['OMIT']
+          pids_to_omit = ENV['OMIT'].split(',').map{|pid|pid.strip}
+        else
+          pids_to_omit = nil
+        end
+  
+        skip_generic_resources = (ENV['skip_generic_resources'] == 'true')
+  
+        begin
+          pids.each do |pid|
+            Cul::Hydra::Indexer.recursively_index_fedora_objects(pid, pids_to_omit, skip_generic_resources, true)
+          end
+        rescue => e
+          puts 'Error: ' + e.message
+          puts e.backtrace
+          next
+        end
+  
       end
-
-      skip_generic_resources = (ENV['skip_generic_resources'] == 'true')
-
-      begin
+  
+      task :by_project_pid => :environment do
+  
+        puts '---------------------------'
+        puts 'Fedora URL: ' + ActiveFedora.config.credentials[:url]
+        puts 'Solr URL: ' + ActiveFedora.solr_config[:url]
+        puts '---------------------------'
+  
+        if ENV['PID']
+          project_pid = ENV['PID']
+        else
+          puts 'Please specify a project PID (e.g. PID=cul:123)'
+          next
+        end
+  
+        skip_generic_resources = (ENV['skip_generic_resources'] == 'true')
+  
+        start_time = Time.now
+        pids = Cul::Scv::Hydra::RisearchMembers.get_project_constituent_pids(project_pid, true)
+        total = pids.length
+        puts "Found #{total} project members."
+        counter = 0
+  
         pids.each do |pid|
-          Cul::Hydra::Indexer.recursively_index_fedora_objects(pid, pids_to_omit, skip_generic_resources, true)
+          Cul::Hydra::Indexer.index_pid(pid, skip_generic_resources, false)
+          counter += 1
+          puts "Indexed #{counter} of #{total} | #{Time.now - start_time} seconds"
         end
-      rescue => e
-        puts 'Error: ' + e.message
-        puts e.backtrace
-        next
+  
       end
-
-    end
-
-    task :by_project_pid => :environment do
-
-      puts '---------------------------'
-      puts 'Fedora URL: ' + ActiveFedora.config.credentials[:url]
-      puts 'Solr URL: ' + ActiveFedora.solr_config[:url]
-      puts '---------------------------'
-
-      if ENV['PID']
-        project_pid = ENV['PID']
-      else
-        puts 'Please specify a project PID (e.g. PID=cul:123)'
-        next
-      end
-
-      skip_generic_resources = (ENV['skip_generic_resources'] == 'true')
-
-      start_time = Time.now
-      pids = Cul::Scv::Hydra::RisearchMembers.get_project_constituent_pids(project_pid, true)
-      total = pids.length
-      puts "Found #{total} project members."
-      counter = 0
-
-      pids.each do |pid|
-        Cul::Hydra::Indexer.index_pid(pid, skip_generic_resources, false)
-        counter += 1
-        puts "Indexed #{counter} of #{total} | #{Time.now - start_time} seconds"
-      end
-
+  
     end
-
+  
   end
 
-end
+end

data/lib/tasks/transform.rake

@@ -1,23 +1,29 @@
-namespace :cul_scv_hydra do
+# This first line is a temporary fix until we get rid of the dual cul_hydra/cul_scv_hydra nature of this gem.
+# Without it, these rake tasks will run twice when invoked.
+unless Rake::Task.task_defined?("cul_scv_hydra:transform:marc")
 
-  namespace :transform do
-
-    task :marc => :environment do
-
-      begin
-        src_path = File.join(Rails.root,'fixtures','spec','MARCXML','3867996.xml')
-        xsl_path = File.join(Rails.root,'config','xsl','marc_to_mods.xsl')
-        doc   = Nokogiri::XML(File.read(src_path))
-        xslt  = Nokogiri::XSLT(File.read(xsl_path))
-        puts xslt.transform(doc)
-      rescue => e
-        puts 'Error: ' + e.message
-        puts e.backtrace
-        next
+  namespace :cul_scv_hydra do
+  
+    namespace :transform do
+  
+      task :marc => :environment do
+  
+        begin
+          src_path = File.join(Rails.root,'fixtures','spec','MARCXML','3867996.xml')
+          xsl_path = File.join(Rails.root,'config','xsl','marc_to_mods.xsl')
+          doc   = Nokogiri::XML(File.read(src_path))
+          xslt  = Nokogiri::XSLT(File.read(xsl_path))
+          puts xslt.transform(doc)
+        rescue => e
+          puts 'Error: ' + e.message
+          puts e.backtrace
+          next
+        end
+  
       end
-
+  
     end
-
+  
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.22.9.8
+  version: 0.22.9.9
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight