solrizer 1.1.2 → 1.2.0

data/Gemfile

@@ -2,3 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
+gem 'ruby-debug', :platforms => :ruby_18
+gem 'ruby-debug19', :platforms => :ruby_19
+

data/Gemfile.lock

@@ -3,9 +3,9 @@ PATH
   specs:
     solrizer (1.1.2)
       daemons
-      mediashelf-loggable
+      mediashelf-loggable (~> 0.4.7)
       nokogiri
-      om (>= 1.4.0)
+      om (>= 1.5.0)
       stomp
       xml-simple
 
@@ -13,28 +13,49 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.8)
+    archive-tar-minitar (0.5.2)
     columnize (0.3.4)
-    daemons (1.1.4)
+    daemons (1.1.6)
+    diff-lcs (1.1.3)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    mediashelf-loggable (0.4.7)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    mediashelf-loggable (0.4.9)
     metaclass (0.0.1)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
     nokogiri (1.5.0)
-    om (1.4.0)
+    om (1.5.0)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rbx-require-relative (0.0.5)
     rcov (0.9.10)
-    rspec (1.3.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
     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.9)
-    xml-simple (1.1.0)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    stomp (1.2.0)
+    xml-simple (1.1.1)
     yard (0.7.2)
 
 PLATFORMS
@@ -44,8 +65,8 @@ DEPENDENCIES
   RedCloth
   mocha
   rcov
-  rspec (< 2.0.0)
+  rspec (~> 2.0)
   ruby-debug
-  ruby-debug-base
+  ruby-debug19
   solrizer!
   yard

data/History.txt

@@ -1,3 +1,7 @@
+h2. 1.2.0
+Upgrade to om 1.5.
+Now works with ruby 1.9
+
 h2. 1.1.2
 
 BUG: Not responding to messages of type: "modifyDatastreamByValue"

data/Rakefile

@@ -7,19 +7,8 @@ Dir.glob('lib/tasks/*.rake').each { |r| import r }
 
 Bundler::GemHelper.install_tasks
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-# task :spec => :check_dependencies
+task :spec => ['solrizer:rspec']
+task :rcov => ['solrizer:rcov']
 
 task :default => :spec
 

data/lib/solrizer/extractor.rb

@@ -38,6 +38,7 @@ class Extractor
     if values.nil?
       return ""
     else
+      values = [values] unless values.respond_to? :map
       return values.map{|val| val.gsub(/\s+/,' ').strip}.join(" ")
     end
   end

data/lib/solrizer/version.rb

@@ -1,3 +1,3 @@
 module Solrizer
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/lib/solrizer/xml/extractor.rb

@@ -19,7 +19,7 @@ module Solrizer::XML::Extractor
         elsif value.length > 1
           solr_doc.merge!({:"#{name}_t" => value})
         else
-          solr_doc.merge!({:"#{name}_t" => "#{value}"})
+          solr_doc.merge!({:"#{name}_t" => "#{value.first}"})
         end
       else
         solr_doc.merge!({:"#{name}_t" => "#{value}"})

data/lib/tasks/solrizer.rake

@@ -40,13 +40,15 @@ namespace :solrizer do
   task :solrize_objects do
     puts "Nobody here.  Possibly you meant to run rake solrizer:fedora:solrize_objects"
   end
-    
-  Spec::Rake::SpecTask.new(:rspec) do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts = lambda do
-      IO.readlines("spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
-    end
+
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:rspec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
   end
 
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+     spec.pattern = FileList['spec/**/*_spec.rb']
+     spec.rcov = true
+     spec.rcov_opts = %q[--exclude "spec/*,gems/*" --rails]
+  end
 end

data/solrizer.gemspec

@@ -13,14 +13,12 @@ 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.4.0"
+  s.add_dependency "om", ">=1.5.0"
   s.add_dependency "xml-simple"
-  s.add_dependency "mediashelf-loggable"
+  s.add_dependency "mediashelf-loggable", "~>0.4.7"
   s.add_dependency "stomp"
   s.add_dependency "daemons"
-  s.add_development_dependency 'ruby-debug'
-  s.add_development_dependency 'ruby-debug-base'
-  s.add_development_dependency 'rspec', '<2.0.0'
+  s.add_development_dependency 'rspec', '~>2.0'
   s.add_development_dependency 'rcov'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'yard'

data/spec/rcov.opts

@@ -1,2 +0,0 @@
---exclude "spec/*,gems/*"
---rails

data/spec/spec_helper.rb

@@ -1,19 +1,11 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
+require 'rspec'
 require 'solrizer'
-require 'spec'
-require 'spec/autorun'
 
-require 'solrizer'
-require "ruby-debug"
-
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
   config.mock_with :mocha
-  
-  
-  def fixture(file)
-    File.new(File.join(File.dirname(__FILE__), 'fixtures', file))
-  end
-  
+end
+
+def fixture(file)
+  File.new(File.join(File.dirname(__FILE__), 'fixtures', file))
 end

data/spec/units/extractor_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'solrizer'
+require 'spec_helper'
 
 describe Solrizer::Extractor do
   
@@ -15,6 +14,10 @@ describe Solrizer::Extractor do
     it "should return an empty string if given an argument of nil" do
       Solrizer::Extractor.format_node_value(nil).should == ""
     end
+
+    it "should strip white space out of a string" do
+      Solrizer::Extractor.format_node_value("raw  string\n with whitespace").should == "raw string with whitespace"
+    end
   end
   
-end
+end

data/spec/units/field_mapper_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
 
 describe Solrizer::FieldMapper do
   

data/spec/units/field_name_mapper_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
 
 describe Solrizer::FieldNameMapper do
   
@@ -25,4 +25,4 @@ describe Solrizer::FieldNameMapper do
       TestFieldNameMapper.new.solr_name(:active_fedora_model, :symbol).should == "active_fedora_model_s"
     end
   end
-end
+end

data/spec/units/xml_extractor_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'solrizer'
+require 'spec_helper'
 
 describe Solrizer::XML::Extractor do
   
@@ -26,4 +25,4 @@ describe Solrizer::XML::Extractor do
     end
   end
   
-end
+end

data/spec/units/xml_terminology_based_solrizer_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'solrizer'
+require 'spec_helper'
 require 'solrizer/xml'
 
 describe Solrizer::XML::TerminologyBasedSolrizer do

metadata

@@ -1,220 +1,149 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: solrizer
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - Matt Zumwalt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-20 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70317099885740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: om
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70317099885740
+- !ruby/object:Gem::Dependency
+  name: om
+  requirement: &70317099884780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: xml-simple
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70317099884780
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: &70317099884280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mediashelf-loggable
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70317099884280
+- !ruby/object:Gem::Dependency
+  name: mediashelf-loggable
+  requirement: &70317099883740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.7
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: stomp
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70317099883740
+- !ruby/object:Gem::Dependency
+  name: stomp
+  requirement: &70317099883280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70317099883280
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &70317099882720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug-base
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70317099882720
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70317099881960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70317099881960
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70317099881440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70317099881440
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70317099880880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70317099880880
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70317099880380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70317099880380
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: &70317099879900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-description: 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
+  prerelease: false
+  version_requirements: *70317099879900
+description: 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
 email: matt.zumwalt@yourmediashelf.com
-executables: 
+executables:
 - solrizer
 - solrizerd
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.textile
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -259,41 +188,31 @@ 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: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A utility for building solr indexes, usually from Fedora repository content.
-test_files: 
+test_files:
 - spec/fixtures/druid-bv448hq0314-descMetadata.xml
 - spec/fixtures/druid-bv448hq0314-extProperties.xml
 - spec/fixtures/druid-cm234kq4672-extProperties.xml