solrizer-fedora 1.0.2 → 1.0.3

data/History.textile

@@ -1,3 +1,9 @@
+h2. 1.0.3
+
+smarter loading of config files 
+switched solrize_objects to only intercept errors if it's given an optional parameter of :suppress_errors=>true
+cleaner command line output
+
 h2. 1.0.2
 
 switched solrize_objects to only intercept errors if it's given an optional parameter of :suppress_errors=>true

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/solrizer/fedora/indexer.rb

@@ -48,7 +48,7 @@ class Indexer
       if ActiveFedora.fedora_config.empty?
         ActiveFedora.init
       end
-    
+  
       if defined?(Blacklight)
         solr_config = Blacklight.solr_config
       else  
@@ -59,9 +59,12 @@ class Indexer
           solr_config = yaml[RAILS_ENV]
           puts solr_config.inspect
         else
-          config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config")
-          puts config_path.inspect + "&&&&&&&"
-          yaml = YAML.load(File.open(File.join(config_path, "solr.yml")))
+          config_path = File.join("config","solr.yml")
+          unless File.exist?(config_path)
+            config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config", "solr.yml")
+          end
+          logger.debug "SOLRIZER: reading config from " + config_path.inspect 
+          yaml = YAML.load(File.open(config_path))
           
           if ENV["environment"].nil?
             environment = "development"
@@ -70,7 +73,7 @@ class Indexer
           end #if
         
           solr_config = yaml[environment]
-          puts solr_config.inspect
+          logger.debug "SOLRIZER solr_config:" + solr_config.inspect
         end #if defined?(RAILS_ROOT)
       
       end #if defined?(Blacklight)
@@ -86,12 +89,13 @@ class Indexer
       else
         raise
       end
+
       @solr = RSolr.connect :url => url
       # @connection = Solr::Connection.new(url, :autocommit => :on )
       
-    rescue
-        logger.debug "Unable to establish SOLR Connection with #{solr_config.inspect}"
-        raise  URI::InvalidURIError
+    rescue RuntimeError => e
+      logger.debug "Unable to establish SOLR Connection with #{solr_config.inspect}.  Failed with #{e.message}"
+      raise  URI::InvalidURIError
     end
 
   #

data/lib/solrizer/fedora/solrizer.rb

@@ -31,9 +31,12 @@ class Solrizer
     @indexer = Indexer.new( :index_full_text=>@index_full_text )
   end
 
+  # Solrize the given Fedora object's full-text and facets into the search index
   #
-  # This method solrizes the given Fedora object's full-text and facets into the search index
-  #
+  # @param [String or ActiveFedora::Base] obj the object to solrize
+  # @param [Hash] opts optional parameters
+  # @example Suppress errors using :suppress_errors option
+  #   solrizer.solrize("my:pid", :suppress_errors=>true)
   def solrize( obj, opts={} )
     # retrieve the Fedora object based on the given unique id
       
@@ -80,10 +83,12 @@ class Solrizer
 
   end
   
+  # Retrieve a comprehensive list of all the unique identifiers in Fedora and 
+  # solrize each object's full-text and facets into the search index
   #
-  # This method retrieves a comprehensive list of all the unique identifiers in Fedora and 
-  # solrizes each object's full-text and facets into the search index
-  def solrize_objects
+  # @example Suppress errors using :suppress_errors option
+  #   solrizer.solrize_objects( :suppress_errors=>true )
+  def solrize_objects(opts={})
     # retrieve a list of all the pids in the fedora repository
     num_docs = 1000000   # modify this number to guarantee that all the objects are retrieved from the repository
     puts "WARNING: You have turned off indexing of Full Text content.  Be sure to re-run indexer with @@index_full_text set to true in main.rb" if index_full_text == false
@@ -94,7 +99,7 @@ class Solrizer
 
       puts "Shelving #{objects.length} Fedora objects"
       objects.each do |object|
-        solrize( object )
+        solrize( object, opts )
       end
      
     else

data/solrizer-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solrizer-fedora}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-05-03}
   s.description = %q{An extension to projecthydra/solrizer that provides utilities for loading objects from Fedora Repositories and creating solr documents from them.}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [

data/spec/units/fedora_indexer_spec.rb

@@ -4,23 +4,82 @@ require "solrizer/fedora"
 
 describe Solrizer::Fedora::Indexer do
     
-  before(:each) do
-     Solrizer::Fedora::Indexer.any_instance.stubs(:connect).returns("foo")
+  before(:all) do
+    if !defined?(Blacklight)
+      class Blacklight
+        def self.is_stub?
+          true
+        end
+      end
+    end
+  end
   
-     @extractor = mock("Extractor")
-     @extractor.stubs(:html_content_to_solr).returns(@solr_doc)
-#     @solr_doc = mock('solr_doc')
-#     @solr_doc.stubs(:<<)
-#     @solr_doc.stubs(:[])
-     
-     @solr_doc = Hash.new
-     
-     Solrizer::Extractor.expects(:new).returns(@extractor)
-     @indexer = Solrizer::Fedora::Indexer.new
-     
-   end
+  after(:all) do
+    Object.instance_eval {remove_const :Blacklight} unless !Blacklight.respond_to?(:is_stub?)
+  end
   
+  before(:each) do
+    @extractor = mock("Extractor")
+    @extractor.stubs(:html_content_to_solr).returns(@solr_doc)
+    #     @solr_doc = mock('solr_doc')
+    #     @solr_doc.stubs(:<<)
+    #     @solr_doc.stubs(:[])
+
+    @solr_doc = Hash.new
+
+    Solrizer::Extractor.stubs(:new).returns(@extractor)
+  end
+
+  describe "#new" do
+    it "should return a URL from solr_config if the config has a :url" do
+         Blacklight.stubs(:solr_config).returns({:url => "http://foo.com:8080/solr"})
+         @indexer = Solrizer::Fedora::Indexer.new
+    end
+
+    it "should return a URL from solr_config if the config has a 'url' " do
+          Blacklight.stubs(:solr_config).returns({'url' => "http://foo.com:8080/solr"})
+          @indexer = Solrizer::Fedora::Indexer.new
+    end
+
+    it "should raise an error if the solr_config does not have a :url" do
+        Blacklight.stubs(:solr_config).returns({'boosh' => "http://foo.com:8080/solr"})
+        lambda { Solrizer::Fedora::Indexer.new }.should raise_error(URI::InvalidURIError)         
+    end
+
+    it "should return a fulltext URL if solr_config has a fulltext url defined" do
+         Blacklight.stubs(:solr_config).returns({'fulltext' =>{ 'url' => "http://foo.com:8080/solr"}})
+         @indexer = Solrizer::Fedora::Indexer.new(:index_full_text => true)
+    end
+
+    it "should return a fulltext URL if solr_config has a default url defined" do
+         Blacklight.stubs(:solr_config).returns({'default' =>{ 'url' => "http://foo.com:8080/solr"}})
+          @indexer = Solrizer::Fedora::Indexer.new(:index_full_text => false)
+    end
+
+    # it "should find the solr.yml even if Blacklight is not loaded and RAILS is not loaded" do 
+    #   pending "Need to unset Blacklight in order to make this work..."
+    #   # Store RAILS_ROOT if it's set
+    #   if defined? RAILS_ROOT
+    #     temp_rails_root = RAILS_ROOT
+    #     Object.send(:remove_const, :RAILS_ROOT)        
+    #   end
+    #   sample_config = {'development' => {'solr'=> {'url' => "http://noblacklight.norails.edu:8080/solr"}}}
+    #   YAML.stubs(:load).returns(sample_config)
+    #   ActiveFedora.stubs(:init)
+    #   @indexer = Solrizer::Fedora::Indexer.new  
+    #   # Re-set RAILS_ROOT if it was stored
+    #   unless  temp_rails_root.nil?
+    #     RAILS_ROOT = temp_rails_root
+    #   end
+    # end    
+  end
+   
   describe "#generate_dates" do
+    before(:each) do
+      Solrizer::Fedora::Indexer.any_instance.stubs(:connect).returns("foo")
+      @indexer = Solrizer::Fedora::Indexer.new
+    end
+    
     it "should still give 9999-99-99 date if the solr document does not have a date_t field" do
     
       solr_result = @indexer.generate_dates(@solr_doc)

data/spec/units/fedora_solrizer_spec.rb

@@ -35,8 +35,14 @@ describe Solrizer::Fedora::Solrizer do
     it "should call solrize for each object returned by Fedora::Repository.find_objects" do
       objects = [["pid1"], ["pid2"], ["pid3"]]
       Fedora::Repository.any_instance.expects(:find_objects).returns(objects)
-      objects.each {|object| @solrizer.expects(:solrize).with( object ) }
+      objects.each {|object| @solrizer.expects(:solrize).with( object, {} ) }
       @solrizer.solrize_objects
     end
+    it "should pass optional suppress_errors argument into .solrize method" do
+      objects = [["pid1"], ["pid2"], ["pid3"]]
+      Fedora::Repository.any_instance.expects(:find_objects).returns(objects)
+      objects.each {|object| @solrizer.expects(:solrize).with( object, :suppress_errors => true ) }
+      @solrizer.solrize_objects( :suppress_errors => true )
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer-fedora
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -04:00
+date: 2011-05-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency