solrizer 1.0.3 → 1.0.4

data/.rvmrc

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+ruby_string="ree-1.8.7"
+gemset_name="solrizer"
+
+#
+rvm_install_on_use_flag=1
+
+# Specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="${ruby_string}@${gemset_name}"
+
+# First, attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create "$environment_id"
+fi
+
+#(
+  # Ensure that Bundler is installed, install it if it is not.
+  if ! command -v bundle ; then
+    printf "The rubygem 'bundler' is not installed, installing it now.\n"
+    gem install bundler
+  fi
+#)&
+

data/Gemfile

@@ -12,5 +12,8 @@ group :development, :test do
   gem 'ruby-debug'
   gem 'ruby-debug-base'
   gem 'rspec', '<2.0.0'
+  gem 'rcov'
   gem 'mocha'
+  gem 'yard'
+  gem 'RedCloth'
 end

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    RedCloth (4.2.7)
     columnize (0.3.2)
     daemons (1.1.2)
     git (1.2.5)
@@ -16,6 +17,7 @@ GEM
       nokogiri (>= 1.4.2)
       om
     rake (0.8.7)
+    rcov (0.9.9)
     rspec (1.3.1)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
@@ -24,19 +26,23 @@ GEM
       linecache (>= 0.3)
     stomp (1.1.8)
     xml-simple (1.0.15)
+    yard (0.6.8)
 
 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
+  yard

data/Rakefile

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'rake'
 
+# load rake tasks in lib/tasks
+Dir.glob('lib/tasks/*.rake').each { |r| import r }
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/solrizer/field_mapper.rb

@@ -268,7 +268,7 @@ module Solrizer
         
         # Add mapped name & value, unless it's a duplicate
         values = (results[name] ||= [])
-        values << value unless values.contains?(value)
+        values << value unless values.include?(value)
       end
       
       results

data/lib/solrizer/xml/terminology_based_solrizer.rb

@@ -71,7 +71,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|
-      unless field_value.join("").strip.blank?
+      unless field_value.join("").strip.empty?
         ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value)
       end
     end
@@ -79,7 +79,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|
-        unless field_value.join("").strip.blank?
+        unless field_value.join("").strip.empty?
           ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value)
         end
       end

data/lib/tasks/solrizer.rake

@@ -1,5 +1,29 @@
-namespace :solrizer do
-  
+desc "Task to execute builds on a Hudson Continuous Integration Server."
+task :hudson do
+  Rake::Task["doc"].invoke
+  Rake::Task["solrizer:rspec"].invoke
+end
+
+# Use yard to build docs
+begin
+  require 'yard'
+  require 'yard/rake/yardoc_task'
+  project_root = File.expand_path("#{File.dirname(__FILE__)}/../../")
+  doc_destination = File.join(project_root, 'doc')
+
+  YARD::Rake::YardocTask.new(:doc) do |yt|
+    yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + 
+                 [ File.join(project_root, 'README.textile') ]
+    yt.options = ['--output-dir', doc_destination, '--readme', 'README.textile']
+  end
+rescue LoadError
+  desc "Generate YARD Documentation"
+  task :doc do
+    abort "Please install the YARD gem to generate rdoc."
+  end
+end
+
+namespace :solrizer do    
   desc 'Placeholder for generic solrization task.'
   task :solrize do
     puts "Nobody here.  Possibly you meant to run rake solrizer:fedora:solrize PID=..."
@@ -9,5 +33,13 @@ 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
+  end
+
 end

data/solrizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solrizer}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   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-02}
   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.email = %q{matt.zumwalt@yourmediashelf.com}
   s.executables = ["solrizer", "solrizerd"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
     "README.textile"
   ]
   s.files = [
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "History.txt",
@@ -87,7 +88,10 @@ Gem::Specification.new do |s|
       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<rcov>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<RedCloth>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<om>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
@@ -108,7 +112,10 @@ Gem::Specification.new do |s|
       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<rcov>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<RedCloth>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<om>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
@@ -130,7 +137,10 @@ Gem::Specification.new do |s|
     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<rcov>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<RedCloth>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<om>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -04:00
+date: 2011-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: nokogiri
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,8 +33,8 @@ dependencies:
         version: "0"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: xml-simple
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,8 +47,8 @@ dependencies:
         version: "0"
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: om
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,8 +63,8 @@ dependencies:
         version: 1.0.0
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: mediashelf-loggable
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,8 +77,8 @@ dependencies:
         version: "0"
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: stomp
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,8 +91,8 @@ dependencies:
         version: "0"
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: daemons
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -105,8 +105,8 @@ dependencies:
         version: "0"
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
+  type: :development
   name: jeweler
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -119,8 +119,8 @@ dependencies:
         version: "0"
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
+  type: :development
   name: ruby-debug
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -133,8 +133,8 @@ dependencies:
         version: "0"
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
+  type: :development
   name: ruby-debug-base
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -147,8 +147,8 @@ dependencies:
         version: "0"
   requirement: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
+  type: :development
   name: rspec
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -163,9 +163,9 @@ dependencies:
         version: 2.0.0
   requirement: *id010
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: mocha
+  type: :development
+  name: rcov
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -177,9 +177,9 @@ dependencies:
         version: "0"
   requirement: *id011
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: nokogiri
+  type: :development
+  name: mocha
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -191,9 +191,9 @@ dependencies:
         version: "0"
   requirement: *id012
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: om
+  type: :development
+  name: yard
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -205,9 +205,9 @@ dependencies:
         version: "0"
   requirement: *id013
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: nokogiri
+  type: :development
+  name: RedCloth
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -219,9 +219,9 @@ dependencies:
         version: "0"
   requirement: *id014
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: mediashelf-loggable
+  type: :runtime
+  name: nokogiri
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -233,9 +233,9 @@ dependencies:
         version: "0"
   requirement: *id015
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: jeweler
+  type: :runtime
+  name: om
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -247,9 +247,9 @@ dependencies:
         version: "0"
   requirement: *id016
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: ruby-debug
+  type: :runtime
+  name: nokogiri
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -261,9 +261,9 @@ dependencies:
         version: "0"
   requirement: *id017
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: ruby-debug-base
+  type: :runtime
+  name: mediashelf-loggable
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -275,10 +275,52 @@ dependencies:
         version: "0"
   requirement: *id018
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+  name: jeweler
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id019
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  type: :development
+  name: ruby-debug
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id020
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: ruby-debug-base
+  version_requirements: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id021
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: rspec
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -289,12 +331,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id019
+  requirement: *id022
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
+  type: :development
   name: mocha
-  version_requirements: &id020 !ruby/object:Gem::Requirement 
+  version_requirements: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -303,7 +345,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id020
+  requirement: *id023
 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: 
@@ -315,6 +357,7 @@ extra_rdoc_files:
 - LICENSE
 - README.textile
 files: 
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - History.txt