solrizer 1.2.0 → 1.2.1

data/Gemfile

@@ -5,3 +5,8 @@ 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
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    solrizer (1.1.2)
+    solrizer (1.2.0)
       daemons
       mediashelf-loggable (~> 0.4.7)
       nokogiri
@@ -15,7 +15,7 @@ GEM
     RedCloth (4.2.8)
     archive-tar-minitar (0.5.2)
     columnize (0.3.4)
-    daemons (1.1.6)
+    daemons (1.1.8)
     diff-lcs (1.1.3)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
@@ -25,8 +25,8 @@ GEM
     metaclass (0.0.1)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
-    nokogiri (1.5.0)
-    om (1.5.0)
+    nokogiri (1.5.2)
+    om (1.6.0)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rbx-require-relative (0.0.5)
@@ -54,7 +54,7 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    stomp (1.2.0)
+    stomp (1.2.2)
     xml-simple (1.1.1)
     yard (0.7.2)
 

data/History.txt

@@ -1,3 +1,8 @@
+h2. 1.2.1
+BUG: name mappings message is a "debug" message, not "info"
+fixed rake tasks to include coverage properly
+changed email, summary, description in gemspec
+
 h2. 1.2.0
 Upgrade to om 1.5.
 Now works with ruby 1.9

data/README.textile

@@ -4,8 +4,7 @@ A lightweight, configurable tool for indexing metadata into solr.  Can be trigge
 
 Solrizer provides the baseline and structures for the process of solrizing.  In order to actually read objects from a 
 datasource and write solr documents into a solr instance, you need to use an implementation specific gem, such as 
-"solrizer-fedora":https://github.com/projecthydra/solrizer-fedora, which provides the
-mechanics for reading from a fedora repository and writing to a solr instance. 
+"solrizer-fedora":https://github.com/projecthydra/solrizer-fedora, which provides the mechanics for reading from a fedora repository and writing to a solr instance. 
 
 
 h2. Installation
@@ -57,11 +56,14 @@ default_mapper.solr_name("foo",:integer,:facetable)     # returns foo_facet
 </pre>
 
 FieldMapper provides some defaults:
+
 <pre>
 default_mapper.solr_names_and_values("foo","bar",:string,[:facetable])                    # returns searchable and facetable by default => {"foo_facet"=>["bar"], "foo_t"=>["bar"]}
 default_mapper.solr_names_and_values("foo","bar",:string,[:not_searchable, :facetable])   # returns just facetable => {"foo_facet"=>["bar"]}
 </pre>
+
 Which can be tweaked:
+
 <pre>
 default_mapper.default_index_types << :facetable
 default_mapper.solr_names_and_values("foo","bar",:string,[])                              # returns searchable and facetable by default => {"foo_facet"=>["bar"], "foo_t"=>["bar"]}
@@ -167,7 +169,7 @@ h2. Note on Patches/Pull Requests
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
+* Commit, do not mess with rake file, version, or history.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 

data/lib/solrizer/field_mapper.rb

@@ -160,7 +160,7 @@ module Solrizer
         end
       end
 
-      logger.info("SOLRIZER: loading field name mappings from #{File.expand_path(config_path)}")
+      logger.debug("SOLRIZER: loading field name mappings from #{File.expand_path(config_path)}")
       mappings_from_file = YAML::load(File.open(config_path))
       
       self.clear_mappings

data/lib/solrizer/version.rb

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

data/lib/tasks/solrizer.rake

@@ -1,7 +1,29 @@
 desc "Task to execute builds on a Hudson Continuous Integration Server."
 task :hudson do
   Rake::Task["doc"].invoke
-  Rake::Task["solrizer:rspec"].invoke
+  Rake::Task["coverage:ci"].invoke
+end
+
+desc "Execute specs with coverage"
+task :coverage do 
+  # Put spec opts in a file named .rspec in root
+  ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+  ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
+
+
+  Rake::Task['solrizer:rspec'].invoke
+end
+
+namespace :coverage do
+desc "Execute ci build with coverage"
+task :ci do 
+  # Put spec opts in a file named .rspec in root
+  ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+  ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
+
+
+  Rake::Task['hudson'].invoke
+end
 end
 
 # Use yard to build docs
@@ -47,8 +69,6 @@ namespace :solrizer do
   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]
+    Rake::Task['coverage']
   end
 end

data/solrizer.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |s|
   s.version     = Solrizer::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Matt Zumwalt"]
-  s.email       = %q{matt.zumwalt@yourmediashelf.com}
+  s.email       = %q{hydra-tech@googlegroups.com}
   s.homepage    = %q{http://github.com/projecthydra/solrizer}
-  s.summary     = %q{A utility for building solr indexes, usually from Fedora repository content.}
-  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.summary     = %q{A utility for building solr indexes, usually from Fedora repository content with solrizer-fedora extension gem.}
+  s.description = %q{Use solrizer to populate solr indexes.  You can run solrizer from within your app, using the provided rake tasks, or as a JMS listener}
 
   s.add_dependency "nokogiri"
   s.add_dependency "om", ">=1.5.0"
@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
   s.add_dependency "stomp"
   s.add_dependency "daemons"
   s.add_development_dependency 'rspec', '~>2.0'
-  s.add_development_dependency 'rcov'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'RedCloth'
     
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.extra_rdoc_files = [
     "LICENSE",

data/spec/spec_helper.rb

@@ -1,4 +1,14 @@
 require 'rubygems'
+
+
+if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start
+end
+
 require 'rspec'
 require 'solrizer'
 

metadata

@@ -1,149 +1,192 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: solrizer
-version: !ruby/object:Gem::Version
-  version: 1.2.0
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 1
+  version: 1.2.1
 platform: ruby
-authors:
+authors: 
 - Matt Zumwalt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &70317099885740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70317099885740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: om
-  requirement: &70317099884780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70317099884780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: xml-simple
-  requirement: &70317099884280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70317099884280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: mediashelf-loggable
-  requirement: &70317099883740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 4
+        - 7
         version: 0.4.7
   type: :runtime
-  prerelease: false
-  version_requirements: *70317099883740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: stomp
-  requirement: &70317099883280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70317099883280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: daemons
-  requirement: &70317099882720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70317099882720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70317099881960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *70317099881960
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70317099881440 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70317099881440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &70317099880880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70317099880880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &70317099880380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70317099880380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: RedCloth
-  requirement: &70317099879900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  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:
+  version_requirements: *id011
+description: Use solrizer to populate solr indexes.  You can run solrizer from within your app, using the provided rake tasks, or as a JMS listener
+email: hydra-tech@googlegroups.com
+executables: 
 - solrizer
 - solrizerd
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.textile
-files:
+files: 
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -181,7 +224,6 @@ files:
 - spec/fixtures/druid-hc513kw4806-descMetadata.xml
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/test_solr_mappings.yml
-- spec/rcov.opts
 - spec/spec_helper.rb
 - spec/units/extractor_spec.rb
 - spec/units/field_mapper_spec.rb
@@ -190,29 +232,38 @@ files:
 - spec/units/xml_terminology_based_solrizer_spec.rb
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: A utility for building solr indexes, usually from Fedora repository content.
-test_files:
+summary: A utility for building solr indexes, usually from Fedora repository content with solrizer-fedora extension gem.
+test_files: 
 - spec/fixtures/druid-bv448hq0314-descMetadata.xml
 - spec/fixtures/druid-bv448hq0314-extProperties.xml
 - spec/fixtures/druid-cm234kq4672-extProperties.xml
@@ -220,7 +271,6 @@ test_files:
 - spec/fixtures/druid-hc513kw4806-descMetadata.xml
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/test_solr_mappings.yml
-- spec/rcov.opts
 - spec/spec_helper.rb
 - spec/units/extractor_spec.rb
 - spec/units/field_mapper_spec.rb