solrizer 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -1,48 +1,51 @@
+PATH
+  remote: .
+  specs:
+    solrizer (1.1.1)
+      daemons
+      mediashelf-loggable
+      nokogiri
+      om (>= 1.4.0)
+      stomp
+      xml-simple
+
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.7)
-    columnize (0.3.2)
-    daemons (1.1.2)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    linecache (0.43)
-    mediashelf-loggable (0.4.2)
-    mocha (0.9.12)
-    nokogiri (1.4.4)
-    om (1.2.2)
+    RedCloth (4.2.8)
+    columnize (0.3.4)
+    daemons (1.1.4)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mediashelf-loggable (0.4.7)
+    metaclass (0.0.1)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    nokogiri (1.5.0)
+    om (1.4.0)
+      mediashelf-loggable
       nokogiri (>= 1.4.2)
-      om
-    rake (0.8.7)
-    rcov (0.9.9)
-    rspec (1.3.1)
+    rbx-require-relative (0.0.5)
+    rcov (0.9.10)
+    rspec (1.3.2)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    stomp (1.1.8)
-    xml-simple (1.0.15)
-    yard (0.6.8)
+    stomp (1.1.9)
+    xml-simple (1.1.0)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   RedCloth
-  daemons
-  jeweler
-  mediashelf-loggable
   mocha
-  nokogiri
-  om (>= 1.0.0)
   rcov
   rspec (< 2.0.0)
   ruby-debug
   ruby-debug-base
-  stomp
-  xml-simple
+  solrizer!
   yard

data/History.txt

@@ -1,3 +1,10 @@
+h2. 1.1.1
+
+BUG: Trying to index the children of proxy terms (can't access them in OM).  Added a check to make sure it doesn't do this.
+BUG: Not responding to messages of type: "modifyDatastreamByReference"
+BUG: Not logging unavailable message types
+
+
 h2. 1.0.3
 
 BUG: Extractor.format_field_values was choking when value was nil
@@ -31,4 +38,4 @@ Updated FieldNameMapper to use new FieldMapper
 
 h2. 0.1.2
 
-Minor: switched active-fedora gem requirement to >= 1.1.5 instead of = 1.1.5 (was breaking apps that use later versions of active-fedora)
+Minor: switched active-fedora gem requirement to >= 1.1.5 instead of = 1.1.5 (was breaking apps that use later versions of active-fedora)

data/bin/solrizer

@@ -61,7 +61,7 @@ if options[:hydra_home]
 
   puts "app loaded"
 else
-   "The --hydra_home PATH option is mandatory. Please provide the path to the root of a valid Hydra instance."
+  $stderr.puts "The --hydra_home PATH option is mandatory. Please provide the path to the root of a valid Hydra instance."
   exit 1
 end
 
@@ -89,11 +89,13 @@ begin
 
       puts @msg.headers.inspect
       puts "\nPID: #{@msg.headers["pid"]}\n"
-      if ["addDatastream", "addRelationship","ingest","modifyDatastream","modifyObject","purgeDatastream","urgeRelationship"].include? method
+      if ["addDatastream", "addRelationship","ingest","modifyDatastream","modifyDatastreamByReference","modifyObject","purgeDatastream","purgeRelationship"].include? method
         solrizer = Solrizer::Fedora::Solrizer.new
         solrizer.solrize @msg.headers["pid"]
       elsif method == "purgeObject"
         ActiveFedora::SolrService.instance.conn.delete(pid)
+      else
+        $stderr.puts "Unknown Method: #{method}"
       end
       puts  "updated solr index for #{@msg.headers["pid"]}\n"
       @conn.ack @msg.headers["message-id"]

data/lib/solrizer/version.rb

@@ -1,3 +1,3 @@
 module Solrizer
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/solrizer/xml/terminology_based_solrizer.rb

@@ -31,21 +31,16 @@ module Solrizer::XML::TerminologyBasedSolrizer
     parents = opts.fetch(:parents, [])
 
     term_pointer = parents+[term.name]
-  
-    # term = terminology.retrieve_term(term_pointer)
-
-    # prep children hash
-    # child_accessors = accessor_info.fetch(:children, {})
-    # xpath = term.xpath_for(*term_pointer)
     nodeset = doc.find_by_terms(*term_pointer)
     
     nodeset.each do |node|
       # create solr fields
       
       self.solrize_node(node, doc, term_pointer, term, solr_doc, field_mapper)
-      term.children.each_pair do |child_term_name, child_term|
-        doc.solrize_term(child_term, solr_doc, field_mapper, opts={:parents=>parents+[{term.name=>nodeset.index(node)}]})
-        # self.solrize_term(doc, child_term_name, child_term, opts={:solr_doc=>solr_doc, :parents=>parents+[{accessor_name=>nodeset.index(node)}] })
+      unless term.kind_of? OM::XML::NamedTermProxy
+        term.children.each_pair do |child_term_name, child_term|
+          doc.solrize_term(child_term, solr_doc, field_mapper, opts={:parents=>parents+[{term.name=>nodeset.index(node)}]})
+        end
       end
     end
     solr_doc

data/solrizer.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Use solrizer to populate solr indexes from Fedora repository content or from other sources.  You can run solrizer from within your apps, using the provided rake tasks, or as a JMS listener}
 
   s.add_dependency "nokogiri"
-  s.add_dependency "om", ">=1.0.0"
+  s.add_dependency "om", ">=1.4.0"
   s.add_dependency "xml-simple"
   s.add_dependency "mediashelf-loggable"
   s.add_dependency "stomp"

data/spec/fixtures/mods_articles/hydrangea_article1.xml

@@ -3,7 +3,7 @@
 
     <titleInfo>
         <nonSort>THE</nonSort>
-        <title>ARTICLE TITLE HYDRANGEA ARTICLE 1</title>
+        <title xml:lang="eng">ARTICLE TITLE HYDRANGEA ARTICLE 1</title>
         <subTitle>SUBTITLE</subTitle>
     </titleInfo>
     <titleInfo lang="finnish">
@@ -87,4 +87,4 @@
     <accessCondition type="restrictionOnAccess">EMBARGO NOTE</accessCondition>
     <accessCondition type="use and reproduction">OPEN ACCESS</accessCondition>
 
-</mods>
+</mods>

data/spec/units/xml_terminology_based_solrizer_spec.rb

@@ -80,7 +80,10 @@ describe Solrizer::XML::TerminologyBasedSolrizer do
 
     it "should add multiple fields based on index_as" do
       fake_solr_doc = {}
-      @mods_article.solrize_term(OM::Samples::ModsArticle.terminology.retrieve_term(:name), fake_solr_doc)
+      term = OM::Samples::ModsArticle.terminology.retrieve_term(:name)
+      term.children[:namePart].index_as = [:displayable, :facetable]
+
+      @mods_article.solrize_term(term, fake_solr_doc)
       
       expected_names = ["DR.", "FAMILY NAME", "GIVEN NAMES"]
       %w(_t _display _facet).each do |suffix|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 Z
+date: 2011-09-19 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -39,12 +40,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 7
         segments: 
         - 1
+        - 4
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.4.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -258,6 +259,7 @@ files:
 - spec/units/field_name_mapper_spec.rb
 - spec/units/xml_extractor_spec.rb
 - spec/units/xml_terminology_based_solrizer_spec.rb
+has_rdoc: true
 homepage: http://github.com/projecthydra/solrizer
 licenses: []
 
@@ -287,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A utility for building solr indexes, usually from Fedora repository content.
@@ -306,4 +308,3 @@ test_files:
 - spec/units/field_name_mapper_spec.rb
 - spec/units/xml_extractor_spec.rb
 - spec/units/xml_terminology_based_solrizer_spec.rb
-has_rdoc: