solrizer-fedora 2.1.0 → 2.2.0

data/Gemfile

@@ -2,3 +2,8 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in solrizer.gemspec
 gemspec
+
+
+gem 'rcov', :platform => :mri_18
+gem 'simplecov', :platform => :mri_19
+gem 'simplecov-rcov', :platform => :mri_19

data/Gemfile.lock

@@ -61,6 +61,7 @@ GEM
     mime-types (1.18)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
+    multi_json (1.3.5)
     multipart-post (1.1.2)
     nokogiri (1.5.2)
     nori (1.1.0)
@@ -68,6 +69,7 @@ GEM
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rack (1.4.1)
+    rake (0.9.2.2)
     rcov (1.0.0)
     rdf (0.3.5.2)
       addressable (>= 2.2.6)
@@ -104,6 +106,12 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.1)
       wasabi (~> 2.1)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
     solrizer (1.2.0)
       daemons
       mediashelf-loggable (~> 0.4.7)
@@ -124,8 +132,11 @@ DEPENDENCIES
   RedCloth
   jettywrapper (>= 1.1)
   mocha
+  rake
   rcov
   rdoc
-  rspec (~> 2.6.0)
+  rspec (~> 2.6)
+  simplecov
+  simplecov-rcov
   solrizer-fedora!
   yard

data/History.textile

@@ -1,3 +1,8 @@
+h2. 2.2.0
+HYDRA-808 don't quit the whole job if one object fails to solrize 
+create_document in lib/solrizer/fedora/indexer.rb is public. Used by solrizer-rabbit
+code cleanup in lib/solrizer/fedora/indexer.rb
+
 h2. 2.1.0
 Requiring active-fedora >= 4.0 (so it will happily use 4.1.0)
 Relaxed jetty-wrapper requirement to >= 1.1

data/README.textile

@@ -182,6 +182,23 @@ Now your solr doc with the "changeme:123" ID will include the following:
 </pre>
 
 
+h3. Rake tasks
+
+h4. solrizer:fedora:solrize
+
+Required Argument:
+* PID=ns:123  The pid of the object to index
+
+Optional Arguments:
+* FULL_TEXT=true does a full text index
+
+h4. solrizer:fedora:solrize_objects
+
+Optional Arguments:
+* FULL_TEXT=true does a full text index
+* INDEX_LIST=_filename.csv_ indexes only the pids in the csv file
+
+
 h2. Modifying and Testing the Solrizer-Fedora gem
 
 In order to run the RSpec tests, it is necessary to have a hydra-jetty instance running.  This can be accomplished two ways:

data/lib/solrizer/fedora/indexer.rb

@@ -4,16 +4,6 @@ require 'solrizer/fedora/repository'
 
 module Solrizer::Fedora
 class Indexer  
-  #
-  # Class variables
-  #
-  @@unique_id = 0
-
-  def self.unique_id
-    @@unique_id
-  end
-
-
   # The instance of solr that updates will be written to
   attr_accessor :solr
   
@@ -162,7 +152,7 @@ class Indexer
     # Load the object as an instance of each of its other models and get the corresponding solr fields
     # Include :model_only=>true in the options in order to avoid adding the metadata from ActiveFedora::Base every time.
     model_klazz_array.each do |klazz|
-      instance = klazz.load_instance(obj.pid)
+      instance = klazz.find(obj.pid)
       solr_doc = instance.to_solr(solr_doc, :model_only=>true)
       logger.debug "  added solr fields from #{klazz.to_s}"
     end
@@ -170,9 +160,6 @@ class Indexer
     ::Solrizer::Extractor.insert_solr_field_value(solr_doc, :id_t, "#{obj.pid}" )
     ::Solrizer::Extractor.insert_solr_field_value(solr_doc, :id, "#{obj.pid}" ) unless solr_doc[:id]
     
-    # increment the unique id to ensure that all documents in the search index are unique
-    @@unique_id += 1
-
     return solr_doc
   end
 
@@ -180,30 +167,12 @@ class Indexer
   # This method adds a document to the Solr search index
   #
   def index( obj )
-   # print "Indexing '#{obj.pid}'..."
-    begin
-      
-      solr_doc = create_document( obj )
-      
-      begin
-        solr.add( solr_doc )
-        solr.commit
-      # rescue
-      #   debugger
-      end
- 
-     # puts solr.url
-     #puts solr_doc
-     #  puts "done"
-   
-    # rescue Exception => e
-    #    p "unable to index #{obj.pid}.  Failed with #{e.inspect}"
-    end
-   
+    solr.add( create_document( obj ) )
+    solr.commit
   end
   
 
-  private :connect, :create_document
+  private :connect
 
 end
 end

data/lib/solrizer/fedora/solrizer.rb

@@ -73,7 +73,7 @@ module Solrizer::Fedora
         
       rescue Exception => e
           if opts[:suppress_errors] 
-            logger.debug "SOLRIZER unable to index #{obj}.  Failed with #{e.inspect}"
+            logger.error "SOLRIZER unable to index #{obj}.  Failed with #{e.inspect}"
           else
             raise e
           end

data/lib/solrizer/fedora/version.rb

@@ -1,5 +1,5 @@
 module Solrizer
   module Fedora
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

data/lib/tasks/solrizer-fedora-dev.rake

@@ -21,7 +21,7 @@ namespace :solrizer do
           :startup_wait => 25
         }
         error = Jettywrapper.wrap(jetty_params) do
-          Rake::Task["solrizer:fedora:spec_w_cov"].invoke
+          Rake::Task["solrizer:fedora:coverage"].invoke
           Rake::Task["solrizer:fedora:doc"].invoke
         end
         raise "test failures: #{error}" if error
@@ -36,26 +36,18 @@ namespace :solrizer do
       spec.pattern = 'spec/**/*_spec.rb'
     end
 
-    desc "Run specs with coverage"
-    RSpec::Core::RakeTask.new(:spec_w_cov) do |spec|
-    #  spec.libs << 'lib' << 'spec'
-      spec.pattern = 'spec/**/*_spec.rb'
-      spec.rcov = true
-      spec.rcov_opts = %w{--exclude spec,gems}
-    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'
 
-    begin
-      require 'rcov/rcovtask'
-      Rcov::RcovTask.new do |test|
-        test.libs << 'test'
-        test.pattern = 'test/**/test_*.rb'
-        test.verbose = true
-      end
-    rescue LoadError
-      task :rcov do
-        abort "RCov is not available. "
-      end
-    end
+
+  Rake::Task['solrizer:fedora:spec'].invoke
+end
+
+
+    desc "Run specs with coverage"
 
     # Use yard to build docs
     begin

data/lib/tasks/solrizer-fedora.rake

@@ -22,12 +22,11 @@ namespace :solrizer do
       end
     
       puts "Re-indexing Fedora Repository."
-      puts "Fedora URL: #{ActiveFedora.config.credentials[:url]}"
       puts "Fedora Solr URL: #{ActiveFedora.solr_config[:url]}"
       puts "Doing full text index." if index_full_text
       solrizer = Solrizer::Fedora::Solrizer.new :index_full_text=> index_full_text
-      solrizer.solrize_objects
+      solrizer.solrize_objects :suppress_errors=>true
       puts "Solrizer task complete."
     end  
   end
-end
+end

data/solrizer-fedora.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
   s.add_dependency('active-fedora', '~> 4.0') 
   s.add_development_dependency('jettywrapper', '>=1.1')
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('rcov')
-  s.add_development_dependency('rspec', '~>2.6.0')  #'>=2.8.0'
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec', '~>2.6')  #'>=2.8.0'
   s.add_development_dependency('mocha')
   s.add_development_dependency('yard')
   s.add_development_dependency('RedCloth')

data/spec/spec_helper.rb

@@ -1,5 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start
+end
+
 require 'solrizer/fedora'
 require 'solrizer'
 require 'rspec'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer-fedora
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 Z
+date: 2012-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: active-fedora
@@ -62,7 +62,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -83,12 +83,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 2
         - 6
-        - 0
-        version: 2.6.0
+        version: "2.6"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency