solrizer 2.0.0.rc3 → 2.0.0.rc4

data/Gemfile

@@ -2,11 +2,8 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'ruby-debug', :platforms => :ruby_18
-gem 'ruby-debug19', :platforms => :ruby_19
-
-
-gem 'rcov', :platform => :mri_18
-gem 'simplecov', :platform => :mri_19
-gem 'simplecov-rcov', :platform => :mri_19
-
+group :development, :test do
+  gem 'rcov', :platform => :mri_18
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end

data/History.txt

@@ -1,5 +1,12 @@
 h2. 2.0.0
 HYDRA-827 DO NOT index terms by default
+HYDRA-863 Null pointer exception fixed.
+
+BUG: Replaced data_type method with type which was causing the :type option in OM terms not to work.  This makes certain tests
+     not pass under Ruby 1.8.7, specifically when using :type option with a proxied term in OM.
+
+Test fixes such as properly testing solr field suffixes when using the :type option in OM as well as using correct
+ISO.8601 dates in our fixtures
 
 h2. 1.2.2
 BUG: RSolr::Client doesn't have a delete method.  Changed to delete_by_id. (only affects solrizer shell script)  Thanks to mkorcy.

data/Rakefile

@@ -11,13 +11,3 @@ task :spec => ['solrizer:rspec']
 task :rcov => ['solrizer:rcov']
 
 task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "solrizer #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/solrizer/version.rb

@@ -1,3 +1,3 @@
 module Solrizer
-  VERSION = "2.0.0.rc3"
+  VERSION = "2.0.0.rc4"
 end

data/lib/solrizer/xml/terminology_based_solrizer.rb

@@ -36,7 +36,7 @@ module Solrizer::XML::TerminologyBasedSolrizer
     nodeset.each do |node|
       # create solr fields
       
-      self.solrize_node(node, doc, term_pointer, term, solr_doc, field_mapper)
+      doc.solrize_node(node, term_pointer, term, solr_doc, field_mapper)
       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)}]})
@@ -68,7 +68,7 @@ module Solrizer::XML::TerminologyBasedSolrizer
     
     generic_field_name_base = OM::XML::Terminology.term_generic_name(*term_pointer)
     
-    field_mapper.solr_names_and_values(generic_field_name_base, node_value, term.data_type, term.index_as).each do |field_name, field_value|
+    field_mapper.solr_names_and_values(generic_field_name_base, node_value, term.type, term.index_as).each do |field_name, field_value|
       unless field_value.join("").strip.empty?
         ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value)
       end
@@ -76,7 +76,7 @@ module Solrizer::XML::TerminologyBasedSolrizer
     
     if term_pointer.length > 1
       hierarchical_field_name_base = OM::XML::Terminology.term_hierarchical_name(*term_pointer)
-      field_mapper.solr_names_and_values(hierarchical_field_name_base, node_value, term.data_type, term.index_as).each do |field_name, field_value|
+      field_mapper.solr_names_and_values(hierarchical_field_name_base, node_value, term.type, term.index_as).each do |field_name, field_value|
         unless field_value.join("").strip.empty?
           ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value)
         end
@@ -98,7 +98,7 @@ module Solrizer::XML::TerminologyBasedSolrizer
   end
   
   def solrize_node(node, term_pointer, term, solr_doc = Hash.new, field_mapper = self.field_mapper, opts={})
-    Solrizer::XML::TerminologyBasedSolrizer.solrize_node(node, self, term_pointer, solr_doc, field_mapper, opts)
+    Solrizer::XML::TerminologyBasedSolrizer.solrize_node(node, self, term_pointer, term, solr_doc, field_mapper, opts)
   end
   
 end

data/solrizer.gemspec

@@ -20,10 +20,8 @@ Gem::Specification.new do |s|
   s.add_dependency "daemons"
   s.add_development_dependency 'rspec', '~>2.0'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'mocha'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'RedCloth'
+  s.add_development_dependency 'RedCloth' # yard depends on redcloth
     
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")

data/spec/fixtures/mods_article.rb

@@ -54,7 +54,7 @@ module Samples
         t.title_info(:index_as=>[:facetable],:ref=>[:title_info])
         t.origin_info(:path=>"originInfo") {
           t.publisher
-          t.date_issued(:path=>"dateIssued")
+          t.date_issued(:path=>"dateIssued", :type => :date, :index_as => [:searchable])
           t.issuance(:index_as=>[:facetable])
         }
         t.issn(:path=>"identifier", :attributes=>{:type=>"issn"})
@@ -68,7 +68,7 @@ module Samples
           }
           t.start_page(:proxy=>[:pages, :start])
           t.end_page(:proxy=>[:pages, :end])
-          t.publication_date(:path=>"date", :index_as=>[:searchable])
+          t.publication_date(:path=>"date", :type => :date, :index_as => [:searchable])
         }
       }
       t.note
@@ -78,6 +78,8 @@ module Samples
       t.publication_url(:proxy=>[:location,:url])
       t.title(:proxy=>[:title_info, :main_title])
       t.journal_title(:proxy=>[:journal, :title_info, :main_title])
+      t.pub_date(:proxy=>[:journal, :issue, :publication_date])
+      t.issue_date(:ref=>[:journal, :origin_info, :date_issued])
     end
     
     # Changes from OM::Properties implementation

data/spec/fixtures/mods_articles/hydrangea_article1.xml

@@ -61,7 +61,7 @@
         </titleInfo>
         <originInfo>
             <publisher>PUBLISHER</publisher>
-            <dateIssued>DATE</dateIssued>
+            <dateIssued>2007-02-15</dateIssued>
         </originInfo>
         <identifier type="issn">0013-8908</identifier>    
         <part>
@@ -75,7 +75,7 @@
                 <start>195</start>
                 <end>230</end>
             </extent>
-            <date>FEB. 2007</date>
+            <date>2007-02-01</date>
         </part>            
     </relatedItem>
 

data/spec/spec_helper.rb

@@ -13,7 +13,6 @@ require 'rspec'
 require 'solrizer'
 
 RSpec.configure do |config|
-  config.mock_with :mocha
 end
 
 def fixture(file)

data/spec/units/xml_terminology_based_solrizer_spec.rb

@@ -35,7 +35,7 @@ describe Solrizer::XML::TerminologyBasedSolrizer do
       solr_doc = Hash.new
       @mods_article.field_mapper = Solrizer::FieldMapper::Default.new
       Samples::ModsArticle.terminology.terms.each_pair do |k,v|
-        @mods_article.expects(:solrize_term).with(v, solr_doc, @mods_article.field_mapper)
+        @mods_article.should_receive(:solrize_term).with(v, solr_doc, @mods_article.field_mapper)
       end
       @mods_article.to_solr(solr_doc)
     end
@@ -55,7 +55,7 @@ describe Solrizer::XML::TerminologyBasedSolrizer do
       solr_doc["topic_tag_t"].sort.should == ["CONTROLLED TERM", "TOPIC 1", "TOPIC 2"]
       
       # These are a holdover from an old verison of OM
-      solr_doc['journal_0_issue_0_publication_date_t'].should == ["FEB. 2007"]
+      solr_doc['journal_0_issue_0_publication_date_dt'].should == ["2007-02-01"]
 
       
     end
@@ -85,6 +85,20 @@ describe Solrizer::XML::TerminologyBasedSolrizer do
       end
     end
 
+    it "should add fields based on type using proxy" do
+      unless RUBY_VERSION.match("1.8.7")
+        solr_doc = Hash.new
+        result = @mods_article.solrize_term(Samples::ModsArticle.terminology.retrieve_term(:pub_date), solr_doc)
+        solr_doc["pub_date_dt"].should == ["2007-02-01"]
+      end
+    end
+
+    it "should add fields based on type using ref" do
+      solr_doc = Hash.new
+      result = @mods_article.solrize_term(Samples::ModsArticle.terminology.retrieve_term(:issue_date), solr_doc)
+      solr_doc["issue_date_dt"].should == ["2007-02-15"]
+    end
+
     it "shouldn't index terms where index_as is an empty array" do
       fake_solr_doc = {}
       term = Samples::ModsArticle.terminology.retrieve_term(:name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrizer
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -139,38 +139,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement