solrizer-fedora 2.0.0 → 2.1.0

data/.rvmrc

@@ -1,39 +1 @@
-#!/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"
-rubygems_version="1.8.17"
-gemset_name="solrizer-fedora"
-
-#
-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
-
-# Use the specified rubygems_version
-if [[ -n "${rubygems_version}" && ("$(gem --version)" != ${rubygems_version}) ]] ; then
-  rvm rubygems "${rubygems_version}"
-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
-
+rvm use ree-1.8.7@solrizer-fedora --create

data/Gemfile

@@ -1,13 +1,4 @@
 source "http://rubygems.org"
 
-group :development, :test do
-  gem 'jeweler'
-  gem 'jettywrapper'
-  gem 'rspec', '~>2.6.0'#'>=2.8.0'
-  gem 'mocha'
-  gem 'yard'
-  gem 'RedCloth'
-end
-
 # Specify your gem's dependencies in solrizer.gemspec
 gemspec

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    solrizer-fedora (2.0.0)
-      active-fedora (~> 4.0.0)
+    solrizer-fedora (2.1.0)
+      active-fedora (~> 4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    active-fedora (4.0.0)
+    active-fedora (4.1.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -31,7 +31,7 @@ GEM
       activemodel (= 3.0.11)
       activesupport (= 3.0.11)
     activesupport (3.0.11)
-    addressable (2.2.7)
+    addressable (2.2.8)
     akami (1.0.0)
       gyoku (>= 0.4.0)
     builder (2.1.2)
@@ -43,10 +43,9 @@ GEM
       nokogiri (>= 1.4.3)
     fastercsv (1.5.4)
     ffi (1.0.11)
-    git (1.2.5)
     gyoku (0.4.4)
       builder (>= 2.1.2)
-    httpi (0.9.6)
+    httpi (0.9.7)
       rack
     i18n (0.5.0)
     jettywrapper (1.2.0)
@@ -55,10 +54,6 @@ GEM
       i18n
       logger
       mediashelf-loggable
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
     json (1.6.5)
     logger (1.2.8)
     mediashelf-loggable (0.4.9)
@@ -73,7 +68,7 @@ GEM
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rack (1.4.1)
-    rake (0.9.2.2)
+    rcov (1.0.0)
     rdf (0.3.5.2)
       addressable (>= 2.2.6)
     rdf-rdfxml (0.3.5)
@@ -127,9 +122,9 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  jettywrapper
-  jeweler
+  jettywrapper (>= 1.1)
   mocha
+  rcov
   rdoc
   rspec (~> 2.6.0)
   solrizer-fedora!

data/History.textile

@@ -1,3 +1,9 @@
+h2. 2.1.0
+Requiring active-fedora >= 4.0 (so it will happily use 4.1.0)
+Relaxed jetty-wrapper requirement to >= 1.1
+Fix rake tasks and coverage so hudson builds pass
+Don't require a particular rubygems version in .rvmrc
+
 h2. 2.0.0
 Requiring active-fedora >= 4.0.0 
 Supports sharding.

data/README.textile

@@ -4,7 +4,7 @@ An extension to projecthydra/solrizer that provides utilities for loading object
 
 h2. Installation
 
-The gem is hosted on rubygems.org. The bset way to manage the gems for your project is to use bundler.  Create a Gemfile in the root of your application and include the following:
+The gem is hosted on rubygems.org. The best way to manage the gems for your project is to use bundler.  Create a Gemfile in the root of your application and include the following:
 
 <pre>
 source "http://rubygems.org"
@@ -17,37 +17,9 @@ Then:
 <pre>bundle install</pre>
 
 
-h2. Testing
+h2. Pre-requisite to Use of Solrizer-Fedora
 
-In order to run the RSpec tests, it is necesary to have a hydra-jetty instance running.  This can be accomplished two ways:
-
-h3. Using the bundled jetty instance:
-
-Configure the bundled hydra-jetty instance.
-
-<pre>
-git submodule init
-git submodule update
-</pre>
-
-Once you have updated the jetty submodule, you can easily run the rspec tests with the following rake task:
-
-<pre>
-rake hudson
-</pre>
-
-While the primary intention of this task is to provide test coverage and documentation out on projecthydra's "continuous integration server":http://hudson.projecthydra.org, it can also be used locally to run tests without having to install and configure an instance of "hydra-jetty":https://github.com/projecthydra/hydra-jetty.
-
-Note: if you have another instance of hydra-jetty running, you should either close it down prior to running the rake hudson task.
-
-
-h3. Using a different instance of hydra-jetty:
-
-If you prefer, you can run the specs against a different hydra-jetty instance.  Follow the instructions included with those projects to start the jetty instance.
-
-
-
-h2. Pre-requisite
+In order to use solrizer-fedora, you must have a Solr and a Fedora instance available.  The easiest approach is to set up an instance of "hydra-jetty":https://github.com/projecthydra/hydra-jetty.
 
 h3. Setup local hydra-jetty
 
@@ -159,7 +131,7 @@ solrizer.solrize_objects
 </pre>
 
 
-h3. Advanced usage
+h3. Advanced Usage
 
 Solrizer-fedora inspects your repository objects and attempts to match your objects to your ruby models based on the hasModel declarations in the RELS-EXT datastream.
 
@@ -210,7 +182,33 @@ Now your solr doc with the "changeme:123" ID will include the following:
 </pre>
 
 
+h2. Modifying and Testing the Solrizer-Fedora gem
+
+In order to run the RSpec tests, it is necessary to have a hydra-jetty instance running.  This can be accomplished two ways:
+
+h3. Using the bundled jetty instance:
+
+Configure the bundled hydra-jetty instance.
+
+<pre>
+git submodule init
+git submodule update
+</pre>
+
+Once you have updated the jetty submodule, you can easily run the rspec tests with the following rake task:
 
+<pre>
+rake hudson
+</pre>
+
+While the primary intention of this task is to provide test coverage and documentation out on projecthydra's "continuous integration server":http://hudson.projecthydra.org, it can also be used locally to run tests without having to install and configure an instance of "hydra-jetty":https://github.com/projecthydra/hydra-jetty.
+
+Note: if you have another instance of hydra-jetty running, you should either close it down prior to running the rake hudson task.
+
+
+h3. Using a different instance of hydra-jetty:
+
+If you prefer, you can run the specs against a different hydra-jetty instance.  Follow the instructions included with those projects to start the jetty instance.
 
 
 
@@ -220,7 +218,7 @@ h2.  Note on Patches/Pull Requests
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so it doesn't get broken unintentionally 
   in a future version.
-* 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/fedora/version.rb

@@ -1,5 +1,5 @@
 module Solrizer
   module Fedora
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/tasks/solrizer-fedora-dev.rake

@@ -1,84 +1,91 @@
 require 'jettywrapper'
 require 'rspec/core/rake_task'
 
-APP_ROOT = File.expand_path("../..",File.dirname(__FILE__))
-desc "Task to execute builds on a Hudson Continuous Integration Server."
-task :hudson do
-  if (ENV['RAILS_ENV'] == "test")  
-    require "jettywrapper"
-    jetty_params = { 
-      :jetty_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty'), 
-      :quiet => false, 
-      :jetty_port => 8983, 
-      :solr_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/solr/test-core'),
-      :fedora_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/fedora/default'),
-      :startup_wait => 25
-    }
-    error = Jettywrapper.wrap(jetty_params) do
-      Rake::Task["doc"].invoke
-      Rake::Task["solrizer:fedora:rspec"].invoke
-    end
-    raise "test failures: #{error}" if error
-  else
-    system("rake hudson RAILS_ENV=test")
-  end
-end
+APP_ROOT = File.expand_path("../..", File.dirname(__FILE__))
+
+namespace :solrizer do
+  namespace :fedora do
 
-# 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')
+    task :default => :spec
 
-  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
+    desc "Task to execute build on a Continuous Integration Server."
+    task :ci do
+      if (ENV['RAILS_ENV'] == "test")  
+        require "jettywrapper"
+        jetty_params = { 
+          :jetty_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty'), 
+          :quiet => false, 
+          :jetty_port => 8983, 
+          :solr_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/solr/test-core'),
+          :fedora_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/fedora/default'),
+          :startup_wait => 25
+        }
+        error = Jettywrapper.wrap(jetty_params) do
+          Rake::Task["solrizer:fedora:spec_w_cov"].invoke
+          Rake::Task["solrizer:fedora:doc"].invoke
+        end
+        raise "test failures: #{error}" if error
+      else
+        system("rake solrizer:fedora:ci RAILS_ENV=test")
+      end
+    end
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  # spec.libs << 'lib' << 'spec'
-  # spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.pattern = 'spec/**/*_spec.rb'
-end
+    RSpec::Core::RakeTask.new(:spec) do |spec|
+      # spec.libs << 'lib' << 'spec'
+      # spec.spec_files = FileList['spec/**/*_spec.rb']
+      spec.pattern = 'spec/**/*_spec.rb'
+    end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-#  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+    desc "Run specs with coverage"
+    RSpec::Core::RakeTask.new(:spec_w_cov) do |spec|
+    #  spec.libs << 'lib' << 'spec'
+      spec.pattern = 'spec/**/*_spec.rb'
+      spec.rcov = true
+      spec.rcov_opts = %w{--exclude spec,gems}
+    end
 
-# task :spec => :check_dependencies
+    begin
+      require 'rcov/rcovtask'
+      Rcov::RcovTask.new do |test|
+        test.libs << 'test'
+        test.pattern = 'test/**/test_*.rb'
+        test.verbose = true
+      end
+    rescue LoadError
+      task :rcov do
+        abort "RCov is not available. "
+      end
+    end
 
-task :default => :spec
+    # 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')
+      version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+      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', '--title', "Solrizer-Fedora #{version} Documentation"]
+      end
+    rescue LoadError
+      desc "Generate YARD Documentation"
+      task :doc do
+        abort "Please install the YARD gem to generate rdoc."
+      end
+    end
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "solrizer #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+    require 'rdoc/task'
+    RDoc::Task.new do |rdoc|
+      version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
+      rdoc.rdoc_dir = 'rdoc'
+      rdoc.title = "solrizer-fedora #{version}"
+      rdoc.rdoc_files.include('README*')
+      rdoc.rdoc_files.include('lib/**/*.rb')
+    end
 
+ end
+end 

data/lib/tasks/solrizer-fedora.rake

@@ -30,4 +30,4 @@ namespace :solrizer do
       puts "Solrizer task complete."
     end  
   end
-end
+end

data/solrizer-fedora.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Solrizer::Fedora::VERSION
   s.authors = ["Matt Zumwalt"]
   s.description = %q{An extension to projecthydra/solrizer that provides utilities for loading objects from Fedora Repositories and creating solr documents from them.}
-  s.email = %q{matt.zumwalt@yourmediashelf.com}
+  s.email = %q{hydra-tech@googlegroups.com}
   s.extra_rdoc_files = [
     "LICENSE",
     "README.textile"
@@ -20,12 +20,16 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "solrizer-fedora"
 
-  s.add_dependency('active-fedora', '~> 4.0.0') 
-  s.add_development_dependency('jettywrapper', '>=1.1.0')
+  s.add_dependency('active-fedora', '~> 4.0') 
+  s.add_development_dependency('jettywrapper', '>=1.1')
   s.add_development_dependency('rdoc')
+  s.add_development_dependency('rcov')
+  s.add_development_dependency('rspec', '~>2.6.0')  #'>=2.8.0'
+  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.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
+#  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 end

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'solrizer/fedora'
-require 'rspec'
-
 require 'solrizer'
+require 'rspec'
 
 
 # this allows us to unload constants for testing
@@ -19,14 +18,11 @@ module Kernel
 end
 
 
-
 RSpec.configure do |config|
   
   config.mock_with :mocha
   config.color_enabled = true
   
-  
-  
   def fixture(file)
     File.new(File.join(File.dirname(__FILE__), 'fixtures', file))
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 Z
+date: 2012-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: active-fedora
@@ -25,12 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 27
         segments: 
         - 4
         - 0
-        - 0
-        version: 4.0.0
+        version: "4.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +40,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 13
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        version: "1.1"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -63,8 +61,80 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: yard
+  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: RedCloth
+  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
 description: An extension to projecthydra/solrizer that provides utilities for loading objects from Fedora Repositories and creating solr documents from them.
-email: matt.zumwalt@yourmediashelf.com
+email: hydra-tech@googlegroups.com
 executables: []
 
 extensions: []
@@ -99,7 +169,6 @@ files:
 - spec/fixtures/rels_ext_cmodel.xml
 - spec/integration/fedora_indexer_spec.rb
 - spec/lib/solrizer/indexer_spec.rb
-- spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/units/fedora_extractor_spec.rb
@@ -142,7 +211,6 @@ test_files:
 - spec/fixtures/rels_ext_cmodel.xml
 - spec/integration/fedora_indexer_spec.rb
 - spec/lib/solrizer/indexer_spec.rb
-- spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/units/fedora_extractor_spec.rb

data/spec/rcov.opts

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