solrizer-fedora 1.0.0 → 1.0.1

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
-gem 'active-fedora', '1.2.7'  
-gem 'solrizer', '>=0.3.0'
+gem 'active-fedora', '>=2.0.0' 
+gem 'rsolr' 
+gem 'solrizer', '>=1.0.0'
 
 group :development, :test do
   gem 'ruby-debug'

data/Gemfile.lock

@@ -10,16 +10,16 @@ GEM
       solr-ruby (>= 0.0.6)
       solrizer (>= 0.3.0)
       xml-simple (>= 1.0.12)
-    activeresource (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
+    activeresource (2.3.11)
+      activesupport (= 2.3.11)
+    activesupport (2.3.11)
+    builder (3.0.0)
     columnize (0.3.2)
-    facets (2.9.0)
+    facets (2.9.1)
     linecache (0.43)
     mediashelf-loggable (0.4.0)
     mime-types (1.16)
-    mocha (0.9.10)
-      rake
+    mocha (0.9.12)
     multipart-post (1.1.0)
     nokogiri (1.4.4)
     om (1.0.2)
@@ -27,7 +27,8 @@ GEM
       facets
       nokogiri
       nokogiri (>= 1.4.2)
-    rake (0.8.7)
+    rsolr (1.0.0)
+      builder (>= 2.1.2)
     rspec (1.3.1)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
@@ -35,13 +36,17 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     solr-ruby (0.0.8)
-    solrizer (0.3.2)
+    solrizer (1.0.0)
       mediashelf-loggable
+      mediashelf-loggable
+      nokogiri
       nokogiri
       nokogiri
+      om (>= 1.0.0)
       om
       solr-ruby
-    xml-simple (1.0.12)
+      xml-simple
+    xml-simple (1.0.14)
 
 PLATFORMS
   ruby
@@ -49,7 +54,8 @@ PLATFORMS
 DEPENDENCIES
   active-fedora (= 1.2.7)
   mocha
+  rsolr
   rspec (< 2.0.0)
   ruby-debug
   ruby-debug-base
-  solrizer (>= 0.3.0)
+  solrizer (>= 1.0.0)

data/Rakefile

@@ -29,7 +29,7 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
+# task :spec => :check_dependencies
 
 task :default => :spec
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/solrizer/fedora/extractor.rb

@@ -1,4 +1,3 @@
-require 'solr'
 require 'rexml/document'
 require "nokogiri"
 require 'yaml'
@@ -8,7 +7,7 @@ module Solrizer::Fedora::Extractor
   #
   # Extracts content-model and hydra-type from RELS-EXT datastream
   #
-  def extract_rels_ext( text, solr_doc=Solr::Document.new )
+  def extract_rels_ext( text, solr_doc=Hash.new )
     # TODO: only read in this file once
     
     if defined?(RAILS_ROOT)
@@ -21,10 +20,10 @@ module Solrizer::Fedora::Extractor
     doc = Nokogiri::XML(text)
     doc.xpath( '//foo:hasModel', 'foo' => 'info:fedora/fedora-system:def/model#' ).each do |element|
       cmodel = element.attributes['resource'].to_s
-      solr_doc << Solr::Field.new( :cmodel_t => cmodel )
+      ::Solrizer::Extractor.insert_solr_field_value(solr_doc,  :cmodel_t, cmodel )
       
       if map.has_key?(cmodel)
-        solr_doc << Solr::Field.new( :hydra_type_t => map[cmodel] )
+        ::Solrizer::Extractor.insert_solr_field_value(solr_doc, :hydra_type_t, map[cmodel] )
       end
     end
 

data/lib/solrizer/fedora/indexer.rb

@@ -1,4 +1,4 @@
-require 'solr'
+require 'rsolr'
 require 'solrizer/extractor'
 require 'solrizer/fedora/repository'
 
@@ -16,7 +16,7 @@ class Indexer
   #
   # Member variables
   #
-  attr_accessor :connection, :extractor, :index_full_text
+  attr_accessor :solr, :extractor, :index_full_text
 
   #
   # This method performs initialization tasks
@@ -86,7 +86,8 @@ class Indexer
       else
         raise
       end
-      @connection = Solr::Connection.new(url, :autocommit => :on )
+      @solr = RSolr.connect :url => url
+      # @connection = Solr::Connection.new(url, :autocommit => :on )
       
     rescue
         puts "Unable to establish SOLR Connection with #{solr_config.inspect}"
@@ -96,7 +97,7 @@ class Indexer
   #
   # This method extracts the facet categories from the given Fedora object's external tag datastream
   #
-  def extract_xml_to_solr( obj, ds_name, solr_doc=Solr::Document.new )
+  def extract_xml_to_solr( obj, ds_name, solr_doc=Hash.new )
     xml_ds = Repository.get_datastream( obj, ds_name )
     extractor.xml_to_solr( xml_ds.content, solr_doc )
   end
@@ -104,7 +105,7 @@ class Indexer
   #
   #
   #
-  def extract_rels_ext( obj, ds_name, solr_doc=Solr::Document.new )
+  def extract_rels_ext( obj, ds_name, solr_doc=Hash.new )
     rels_ext_ds = Repository.get_datastream( obj, ds_name )
     extractor.extract_rels_ext( rels_ext_ds.content, solr_doc )
   end
@@ -120,26 +121,31 @@ class Indexer
 
    #if there is not date_t, add on with easy-to-find value
    if solr_doc[:date_t].nil?
-        solr_doc << Solr::Field.new( :date_t => "9999-99-99")
+        ::Solrizer::Extractor.insert_solr_field_value(solr_doc, :date_t, "9999-99-99")
    end #if
 
-    # unless date_check !~  solr_doc[:date_t]     
-    date_obj = Date._parse(solr_doc[:date_t])
+    # Grab the date value from date_t regardless of wheter it is inside of an array
+    # then convert it to a Date object
+    date_value =    solr_doc[:date_t]
+    if date_value.kind_of? Array
+      date_value = date_value.first
+    end
+    date_obj = Date._parse(date_value)
     
     if date_obj[:mon].nil? 
-       solr_doc << Solr::Field.new(:month_facet => 99)
+       ::Solrizer::Extractor.insert_solr_field_value(solr_doc, :month_facet, "99")
     elsif 0 < date_obj[:mon] && date_obj[:mon] < 13
-      solr_doc << Solr::Field.new( :month_facet => date_obj[:mon].to_s.rjust(2, '0'))
+      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, :month_facet, date_obj[:mon].to_s.rjust(2, '0'))
     else
-      solr_doc << Solr::Field.new( :month_facet => 99)
+      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, :month_facet, "99")
     end
       
     if  date_obj[:mday].nil?
-      solr_doc << Solr::Field.new( :day_facet => 99)
+      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, :day_facet, "99")
     elsif 0 < date_obj[:mday] && date_obj[:mday] < 32   
-      solr_doc << Solr::Field.new( :day_facet => date_obj[:mday].to_s.rjust(2, '0'))
+      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, :day_facet, date_obj[:mday].to_s.rjust(2, '0'))
     else
-       solr_doc << Solr::Field.new( :day_facet => 99)
+       ::Solrizer::Extractor.insert_solr_field_value(solr_doc, :day_facet, "99")
     end
     
     return solr_doc
@@ -153,7 +159,7 @@ class Indexer
   #
   def create_document( obj )        
     
-    solr_doc = Solr::Document.new
+    solr_doc = Hash.new
     
     model_klazz_array = ActiveFedora::ContentModel.known_models_for( obj )
     model_klazz_array.delete(ActiveFedora::Base)
@@ -162,11 +168,11 @@ class Indexer
     # Otherwise, the object was passed in as a model instance other than ActiveFedora::Base,so call its to_solr method & allow it to insert the fields from ActiveFedora::Base
     if obj.class == ActiveFedora::Base
       solr_doc = obj.to_solr(solr_doc)
-      puts "  added base fields from #{obj.class.to_s}"
+      logger.debug "  added base fields from #{obj.class.to_s}"
     else
       solr_doc = obj.to_solr(solr_doc)
       model_klazz_array.delete(obj.class)
-      puts "    added base fields from #{obj.class.to_s} and model fields from #{obj.class.to_s}"
+      logger.debug "    added base fields from #{obj.class.to_s} and model fields from #{obj.class.to_s}"
     end
    
     # Load the object as an instance of each of its other models and get the corresponding solr fields
@@ -174,11 +180,11 @@ class Indexer
     model_klazz_array.each do |klazz|
       instance = klazz.load_instance(obj.pid)
       solr_doc = instance.to_solr(solr_doc, :model_only=>true)
-      puts "  added solr fields from #{klazz.to_s}"
+      logger.debug "  added solr fields from #{klazz.to_s}"
     end
     
-    solr_doc << Solr::Field.new( :id_t => "#{obj.pid}" )
-    solr_doc << Solr::Field.new( :id => "#{obj.pid}" ) unless solr_doc[:id]
+    ::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
@@ -194,9 +200,15 @@ class Indexer
     begin
       
       solr_doc = create_document( obj )
-      connection.add( solr_doc )
+      
+      begin
+        solr.add( solr_doc )
+        solr.commit
+      # rescue
+      #   debugger
+      end
  
-     # puts connection.url
+     # puts solr.url
      #puts solr_doc
      #  puts "done"
    

data/lib/solrizer/fedora/solrizer.rb

@@ -40,7 +40,7 @@ class Solrizer
       begin
       
       start = Time.now
-      print "Retrieving object #{obj} ..."
+      logger.debug "SOLRIZER Retrieving object #{obj} ..."
 
       case obj
       when ActiveFedora::Base
@@ -57,9 +57,9 @@ class Solrizer
         
           obj_done = Time.now
           obj_done_elapse = obj_done - start
-          puts  " completed. Duration: #{obj_done_elapse}"
+          logger.debug  " completed. Duration: #{obj_done_elapse}"
           
-         print "\t Indexing object #{obj.pid} ... "
+         logger.debug "\t Indexing object #{obj.pid} ... "
          # add the keywords and facets to the search index
          index_start = Time.now
          indexer.index( obj )
@@ -67,11 +67,11 @@ class Solrizer
          index_done = Time.now
          index_elapsed = index_done - index_start
          
-          puts "completed. Duration:  #{index_elapsed} ."
+          logger.debug "completed. Duration:  #{index_elapsed} ."
         
       
       rescue Exception => e
-           p "unable to index #{obj}.  Failed with #{e.inspect}"
+           p "SOLRIZER unable to index #{obj}.  Failed with #{e.inspect}"
         
       
       end #begin

data/solrizer-fedora.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solrizer-fedora}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt"]
@@ -64,23 +64,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<active-fedora>, ["= 1.2.7"])
-      s.add_runtime_dependency(%q<solrizer>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<active-fedora>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<rsolr>, [">= 0"])
+      s.add_runtime_dependency(%q<solrizer>, [">= 1.0.0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug-base>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      s.add_dependency(%q<active-fedora>, ["= 1.2.7"])
-      s.add_dependency(%q<solrizer>, [">= 0.3.0"])
+      s.add_dependency(%q<active-fedora>, [">= 2.0.0"])
+      s.add_dependency(%q<rsolr>, [">= 0"])
+      s.add_dependency(%q<solrizer>, [">= 1.0.0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<ruby-debug-base>, [">= 0"])
       s.add_dependency(%q<rspec>, ["< 2.0.0"])
       s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<active-fedora>, ["= 1.2.7"])
-    s.add_dependency(%q<solrizer>, [">= 0.3.0"])
+    s.add_dependency(%q<active-fedora>, [">= 2.0.0"])
+    s.add_dependency(%q<rsolr>, [">= 0"])
+    s.add_dependency(%q<solrizer>, [">= 1.0.0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<ruby-debug-base>, [">= 0"])
     s.add_dependency(%q<rspec>, ["< 2.0.0"])

data/spec/lib/solrizer/indexer_spec.rb

@@ -21,7 +21,7 @@ describe Solrizer::Fedora::Indexer do
      
        @extractor = mock("Extractor")
        @extractor.stubs(:html_content_to_solr).returns(@solr_doc)
-       @solr_doc = Solr::Document.new
+       @solr_doc = Hash.new
        Solrizer::Extractor.expects(:new).returns(@extractor)
   
   end

data/spec/units/fedora_extractor_spec.rb

@@ -11,12 +11,8 @@ describe Solrizer::Fedora::Extractor do
     it "should extract the content model of the RELS-EXT datastream of a Fedora object and set hydra_type using hydra_types mapping" do
       rels_ext = fixture("rels_ext_cmodel.xml")
       result = @extractor.extract_rels_ext( rels_ext )
-      result[:cmodel_t].should == "info:fedora/fedora-system:ContentModel-3.0"
-      result[:hydra_type_t].should == "salt_document"
-      
-      # ... and a hacky way of making sure that it added a field for each of the dc:medium values
-      result.inspect.include?('@value="info:fedora/afmodel:SaltDocument"').should be_true
-      result.inspect.include?('@value="jp2_document"').should be_true
+      result[:cmodel_t].sort.should == ["info:fedora/afmodel:DCDocument", "info:fedora/afmodel:JP2Document", "info:fedora/afmodel:SaltDocument", "info:fedora/fedora-system:ContentModel-3.0"]
+      result[:hydra_type_t].sort.should == ["dc_document", "jp2_document", "salt_document"]
     end
   end
   
@@ -24,7 +20,7 @@ describe Solrizer::Fedora::Extractor do
     it "should extract the hydra_type of a Fedora object" do
       rels_ext = fixture("rels_ext_cmodel.xml")
       result = @extractor.extract_rels_ext( rels_ext )
-      result[:hydra_type_t].should == "salt_document"
+      result[:hydra_type_t].sort.should == ["dc_document", "jp2_document", "salt_document"]
     end
   end
   

data/spec/units/fedora_indexer_spec.rb

@@ -13,7 +13,7 @@ describe Solrizer::Fedora::Indexer do
 #     @solr_doc.stubs(:<<)
 #     @solr_doc.stubs(:[])
      
-     @solr_doc = Solr::Document.new
+     @solr_doc = Hash.new
      
      Solrizer::Extractor.expects(:new).returns(@extractor)
      @indexer = Solrizer::Fedora::Indexer.new
@@ -23,55 +23,51 @@ describe Solrizer::Fedora::Indexer do
   describe "#generate_dates" do
     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)
-    solr_result.should be_kind_of Solr::Document
-    solr_result[:date_t].should == "9999-99-99"
-    solr_result[:month_facet].should == "99"
-    solr_result[:day_facet].should == '99'
+      solr_result = @indexer.generate_dates(@solr_doc)
+      solr_result.should be_kind_of Hash
+      solr_result[:date_t].should == ["9999-99-99"]
+      solr_result[:month_facet].should == ["99"]
+      solr_result[:day_facet].should == ['99']
     
     end
     
     it "should still give 9999-99-99 date if the solr_doc[:date_t] is not valid date in YYYY-MM-DD format " do
      
-      @solr_doc << Solr::Field.new(:date_t => "Unknown")
+      @solr_doc[:date_t] = "Unknown"
       solr_result = @indexer.generate_dates(@solr_doc)
-      solr_result.should be_kind_of Solr::Document
+      solr_result.should be_kind_of Hash
       solr_result[:date_t].should == "Unknown"
-      solr_result[:month_facet].should == "99"
-      solr_result[:day_facet].should == '99'
+      solr_result[:month_facet].should == ["99"]
+      solr_result[:day_facet].should == ['99']
   
     end
     
     it "should give month and dates even if the :date_t is not a valid date but is in YYYY-MM-DD format  " do
-      
-       @solr_doc << Solr::Field.new(:date_t => "0000-13-11")
-       solr_result = @indexer.generate_dates(@solr_doc)
-       solr_result.should be_kind_of Solr::Document
-       solr_result[:date_t].should == "0000-13-11"
-       solr_result[:month_facet].should == "99"
-       solr_result[:day_facet].should == '11'
-     end
-     
-     it "should give month and day when in a valid date format" do
-           @solr_doc << Solr::Field.new(:date_t => "1978-04-11")
-            solr_result = @indexer.generate_dates(@solr_doc)
-            solr_result.should be_kind_of Solr::Document
-            solr_result[:date_t].should == "1978-04-11"
-            solr_result[:month_facet].should == "04"
-            solr_result[:day_facet].should == '11'
-     
-     end
-     
-     it "should still give two digit strings even if the month/day is single digit" do
+      @solr_doc[:date_t] = "0000-13-11"      
+      solr_result = @indexer.generate_dates(@solr_doc)
+      solr_result.should be_kind_of Hash
+      solr_result[:date_t].should == "0000-13-11"
+      solr_result[:month_facet].should == ["99"]
+      solr_result[:day_facet].should == ['11']
+    end
      
-         @solr_doc << Solr::Field.new(:date_t => "1978-4-1")
-         solr_result = @indexer.generate_dates(@solr_doc)
-         solr_result.should be_kind_of Solr::Document
-         solr_result[:date_t].should == "1978-4-1"
-         solr_result[:month_facet].should == "04"
-         solr_result[:day_facet].should == '01'  
+    it "should give month and day when in a valid date format" do
+      @solr_doc[:date_t] = "1978-04-11"   
+      solr_result = @indexer.generate_dates(@solr_doc)
+      solr_result.should be_kind_of Hash
+      solr_result[:date_t].should == "1978-04-11"
+      solr_result[:month_facet].should == ["04"]
+      solr_result[:day_facet].should == ['11']
+    end
      
-     end
+    it "should still give two digit strings even if the month/day is single digit" do@solr_doc[:date_t] = "1978-04-11"  
+      @solr_doc[:date_t] = "1978-4-1" 
+      solr_result = @indexer.generate_dates(@solr_doc)
+      solr_result.should be_kind_of Hash
+      solr_result[:date_t].should == "1978-4-1"
+      solr_result[:month_facet].should == ["04"]
+      solr_result[:day_facet].should == ['01']  
+    end
      
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer-fedora
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -25,36 +25,50 @@ dependencies:
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
-        - 1
         - 2
-        - 7
-        version: 1.2.7
+        - 0
+        - 0
+        version: 2.0.0
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: solrizer
+  name: rsolr
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 0
-        version: 0.3.0
+        version: "0"
   requirement: *id002
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: solrizer
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: ruby-debug
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +77,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: ruby-debug-base
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,12 +91,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -93,12 +107,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: mocha
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,7 +121,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  requirement: *id007
 description: An extension to projecthydra/solrizer that provides utilities for loading objects from Fedora Repositories and creating solr documents from them.
 email: matt.zumwalt@yourmediashelf.com
 executables: []