solrizer-fedora 1.0.3 → 1.1.0

data/.gitignore

@@ -0,0 +1,25 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+/.bundle
+/.yardoc
+/doc
+jetty/*
+
+## PROJECT::SPECIFIC

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "jetty"]
+	path = jetty
+	url = git://github.com/projecthydra/hydra-jetty.git

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-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
+
+#(
+  # 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

@@ -1,11 +1,16 @@
 source "http://rubygems.org"
-gem 'active-fedora', '>=2.0.0' 
-gem 'rsolr' 
-gem 'solrizer', '>=1.0.0'
 
 group :development, :test do
+  gem 'jeweler'
+  gem 'jettywrapper'
+  gem 'rcov'
   gem 'ruby-debug'
   gem 'ruby-debug-base'
   gem 'rspec', '<2.0.0'
   gem 'mocha'
-end
+  gem 'yard'
+  gem 'RedCloth'
+end
+
+# Specify your gem's dependencies in solrizer.gemspec
+gemspec

data/Gemfile.lock

@@ -1,32 +1,58 @@
+PATH
+  remote: .
+  specs:
+    solrizer-fedora (1.0.3)
+      active-fedora (>= 2.2.0)
+      fastercsv
+      rsolr
+      solr-ruby (>= 0.0.6)
+      solrizer (>= 1.0.0)
+      solrizer-fedora
+
 GEM
   remote: http://rubygems.org/
   specs:
-    active-fedora (1.2.7)
-      activeresource (< 3.0.0)
+    RedCloth (4.2.7)
+    active-fedora (2.2.0)
+      active-fedora
+      activeresource
+      equivalent-xml
+      facets
+      mediashelf-loggable
       mime-types (>= 1.16)
       multipart-post
       nokogiri
       om (>= 1.0)
       solr-ruby (>= 0.0.6)
-      solrizer (>= 0.3.0)
+      solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
     activeresource (2.3.11)
       activesupport (= 2.3.11)
     activesupport (2.3.11)
     builder (3.0.0)
     columnize (0.3.2)
+    daemons (1.1.3)
+    equivalent-xml (0.2.6)
+      nokogiri (>= 1.4.3)
     facets (2.9.1)
+    fastercsv (1.5.4)
+    git (1.2.5)
+    jettywrapper (0.0.3)
+    jeweler (1.6.0)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
     linecache (0.43)
-    mediashelf-loggable (0.4.0)
+    mediashelf-loggable (0.4.2)
     mime-types (1.16)
     mocha (0.9.12)
     multipart-post (1.1.0)
     nokogiri (1.4.4)
-    om (1.0.2)
-      facets
-      facets
-      nokogiri
+    om (1.2.4)
       nokogiri (>= 1.4.2)
+      om
+    rake (0.8.7)
+    rcov (0.9.9)
     rsolr (1.0.0)
       builder (>= 2.1.2)
     rspec (1.3.1)
@@ -36,26 +62,32 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     solr-ruby (0.0.8)
-    solrizer (1.0.0)
+    solrizer (1.0.4)
+      daemons
       mediashelf-loggable
       mediashelf-loggable
       nokogiri
       nokogiri
       nokogiri
-      om (>= 1.0.0)
       om
-      solr-ruby
+      om (>= 1.0.0)
+      stomp
       xml-simple
-    xml-simple (1.0.14)
+    stomp (1.1.8)
+    xml-simple (1.0.15)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  active-fedora (= 1.2.7)
+  RedCloth
+  jettywrapper
+  jeweler
   mocha
-  rsolr
+  rcov
   rspec (< 2.0.0)
   ruby-debug
   ruby-debug-base
-  solrizer (>= 1.0.0)
+  solrizer-fedora!
+  yard

data/README.textile

@@ -2,29 +2,224 @@ h1. solrizer-fedora
 
 An extension to projecthydra/solrizer that provides utilities for loading objects from Fedora Repositories and creating solr documents from them.
 
-h2. Usage
+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:
+
+<pre>
+source "http://rubygems.org"
+
+gem 'solrizer-fedora'
+</pre>
+
+Then:
 
-<pre>gem install solrizer-fedora</pre>
+<pre>bundle install</pre>
 
-You must tell the app where to find fedora and solr.  Put that information into config/fedora.yml and config/solr.yml
 
-Then...
+h2. Testing
+
+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
+
+h3. Setup local hydra-jetty
+
+In order to use solrizer-fedora, you must first set up an instance of "hydra-jetty":https://github.com/projecthydra/hydra-jetty.
+
+Once you have set this up, cd into the directory and type:
+
+<pre>java -jar start.jar</pre>
+
+You must tell the app where to find fedora and solr.  Put that information into config/fedora.yml and config/solr.yml:
+
+Sample config files:
+
+config/fedora.yml
+<pre>
+development:
+  fedora:
+    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
+  solr:
+    url: http://127.0.0.1:8983/solr/development
+test:
+  fedora:
+    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
+  solr:
+    url: http://127.0.0.1:8983/solr/test
+production:
+  fedora:
+    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8080/fedora
+  solr:
+    url: http://127.0.0.1:8080/solr
+</pre>
+
+config/solr.yml
+<pre>
+development:
+  default:
+    url: http://localhost:8983/solr
+  full_text:
+    url: http://localhost:8983/solr
+test: &TEST
+  default:
+    url: http://localhost:8983/solr
+  full_text:
+    url: http://localhost:8983/solr
+production:
+  default:
+    url: http://localhost:8080/solr/production 
+  full_text:
+    url: http://localhost:8080/solr/production 
+</pre>
+
+h2. Usage
+
+h3. Fire up the console:
+
+Start up a console and load solrizer-fedora:
 
 <pre>
 irb
 require "rubygems"
 require "solrizer-fedora"
+</pre>
+
+Initialize ActiveFedora:
+
+<pre>
+ActiveFedora.init
+</pre>
+
+
+h3. Create an instance of Solrizer::Fedora::Solrizer:
+
+<pre>
 solrizer = Solrizer::Fedora::Solrizer.new
-solrizer.solrize("demo:5")
 </pre>
 
+Or, if you want to index full text rather than just fields (and you have provided a full text solr index in your solr.yml):
+
+<pre>
+full_text_solrizer = Solrizer::Fedora::Solrizer.new(:index_full_text=>true)
+</pre>
+
+
+h3. Solrizing a single object in your repository:
+
+If you have an existing object in your repository, you can solrize it by passing its pid:
+
+<pre>
+solrizer.solrize "demo:5"
+</pre>
+
+If you have either an instance of ActiveFedora::Base or Fedora::Object, you can solrize it by passing the object itself:
+
+<pre>
+my_object = ActiveFedora::Base.new
+
+solrizer.solrize my_object
+</pre>
+
+To view the resulting document, open a web browser and go to the jetty's solr admin page (most likely http://localhost/solr/admin) and query your solr instance for the pid (e.g. id:demo\:5).
+
+
+h3. Solrizing all the objects in your repository:
+
+In order to solrize all the objects in your repository, run:
+
+<pre>
+solrizer.solrize_objects
+</pre>
+
+
+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.
+
+Go to the fedora admin interface (http://FEDORA_BASE_URL/fedora/admin) and create a new object with an PID of "changeme:123" and whatever Label you want.
+
+Once you have created that object you will need to add the RELS-EXT datastream to it.  Make the datastream ID "RELS-EXT", MIME-Type of "application/rdf+xml", and put the XML below in the XML from text field.
+
+<pre>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about="info:fedora/changeme:123">
+    <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/afmodel:MyObject"></hasModel>
+  </rdf:Description>
+</rdf:RDF>
+</pre>
+
+Solrizer-fedora will check to see if you have a matching ruby model called MyObject.  If you do, it will load it and add any specific solr fields specified.  So, assuming the following model:
+
+<pre>
+class MyObject < ActiveFedora::Base
+
+  has_metadata :name => "properties", :type=> ActiveFedora::MetadataDatastream do |m|
+    m.field 'foo', :string
+  end
+
+end
+</pre>
+
+Now add another datastream to the changeme:123 object and give it a datastream ID of "properties", a MIME-Type of "text/xml", and add the following to the XML from text field:
+
+<pre>
+<fields>
+  <foo>bar</foo>
+</fields>
+</pre>
+
+If you still have your fedora-solrizer class from above you can now solrize the object by ID:
+
+<pre>
+solrizer.solrize "changeme:123"  
+</pre>
+
+Now your solr doc with the "changeme:123" ID will include the following:
+
+<pre>
+<arr name="foo_t">
+  <str>bar</str>
+</arr>
+</pre>
+
+
+
+
+
 
 h2.  Note on Patches/Pull Requests
  
 * Fork the project.
 * 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.
+* 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.
   (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/Rakefile

@@ -1,21 +1,11 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "solrizer-fedora"
-    gem.summary = %Q{An extension to solrizer that deals with Fedora objects & Repositories}
-    gem.description = %Q{An extension to projecthydra/solrizer that provides utilities for loading objects from Fedora Repositories and creating solr documents from them.}
-    gem.email = "matt.zumwalt@yourmediashelf.com"
-    gem.homepage = "http://github.com/projecthydra/solrizer-fedora"
-    gem.authors = ["Matt Zumwalt"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+# load rake tasks in lib/tasks
+Dir.glob('lib/tasks/*.rake').each { |r| import r }
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|

data/config/hydra_types.yml

@@ -1,3 +1,5 @@
+# This supports an experimental feature that allows Solrizer::Fedora::Extractor.extract_rels_ext to 
+# map between RDF URIs and compact model names like mods_document or jp2_document
 info:fedora/afmodel:SaltDocument : salt_document
 info:fedora/afmodel:JP2Document : jp2_document
 info:fedora/afmodel:ModsDocument : mods_document

data/lib/solrizer/fedora.rb

@@ -1,7 +1,14 @@
 require "rubygems"
 require "solrizer"
+
+# Solrizer::Fedora is an implementation of Solrizer that reads content from Fedora repositories and indexes it into solr.
+#
+# Note: This module automatically extends Solrizer::Extractor with additional Fedora-specific extractor behaviors from Solrizer::Fedora::Extractor.
 module Solrizer::Fedora
+  def self.version
+    Solrizer::Fedora::VERSION
+  end
 end
 Dir[File.join(File.dirname(__FILE__),"fedora","*.rb")].each {|file| require file }
 
-Solrizer::Extractor.send(:include, Solrizer::Fedora::Extractor)
+Solrizer::Extractor.send(:include, Solrizer::Fedora::Extractor)

data/lib/solrizer/fedora/extractor.rb

@@ -2,6 +2,8 @@ require 'rexml/document'
 require "nokogiri"
 require 'yaml'
 
+# Solrizer::Fedora::Extractor provides Fedora-specific extractor behaviors
+# This module is automatically mixed into Solrizer::Extractor when you load the solrizer-fedora gem into an application.  This is carried out in solrizer/fedora.rb 
 module Solrizer::Fedora::Extractor
 
   #
@@ -10,12 +12,16 @@ module Solrizer::Fedora::Extractor
   def extract_rels_ext( text, solr_doc=Hash.new )
     # TODO: only read in this file once
     
-    if defined?(RAILS_ROOT)
-      config_path = File.join(RAILS_ROOT, "config")
-    else
-      config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config")
-    end    
-    map = YAML.load(File.open(File.join(config_path, "hydra_types.yml")))
+    if defined?(Rails.root.to_s)
+      config_path = File.join(Rails.root.to_s, "config","hydra_types.yml")
+      config_path = nil unless File.exist?(config_path)
+    end
+    unless config_path
+      config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config","hydra_types.yml")
+    end
+    
+    
+    map = YAML.load(File.open(config_path))
     
     doc = Nokogiri::XML(text)
     doc.xpath( '//foo:hasModel', 'foo' => 'info:fedora/fedora-system:def/model#' ).each do |element|

data/lib/solrizer/fedora/indexer.rb

@@ -13,10 +13,15 @@ class Indexer
     @@unique_id
   end
 
-  #
-  # Member variables
-  #
-  attr_accessor :solr, :extractor, :index_full_text
+
+  # The instance of solr that updates will be written to
+  attr_accessor :solr
+  
+  # The extractor to use.  This is usually Solrizer::Extractor 
+  attr_accessor :extractor
+  
+  # [Boolean or "true" or "false"] tells the indexer whether to index full text or just field values 
+  attr_accessor :index_full_text
 
   #
   # This method performs initialization tasks
@@ -36,68 +41,67 @@ class Indexer
 
   #
   # This method connects to the Solr instance. It looks to see if Blacklight is loaded first for the 
-  # Blacklight.solr_config. If not loaded, it then looks for the RAILS_ROOT/config/solr.yaml file and loads
+  # Blacklight.solr_config. If not loaded, it then looks for the Rails.root.to_s/config/solr.yaml file and loads
   # it to get the solr url. The configuration strucuture can take both the 
   # { "development" => {"default" => { "url" => "http://localhost"}, "fulltext" => { "url" => "http://localhost"} }}
   # or { "development"=>{"url"=>"http://localhost" }}
   # Can also take Blacklight.solr_config["url"] and Blacklight.solr_config[:url] 
   #
-  
-   def connect
-    
-      if ActiveFedora.fedora_config.empty?
-        ActiveFedora.init
-      end
-  
-      if defined?(Blacklight)
-        solr_config = Blacklight.solr_config
-      else  
-        if defined?(RAILS_ROOT)
-          config_path = File.join(RAILS_ROOT, "config")
-          yaml = YAML.load(File.open(File.join(config_path, "solr.yml")))
-          puts RAILS_ENV + "*****"
-          solr_config = yaml[RAILS_ENV]
-          puts solr_config.inspect
-        else
-          config_path = File.join("config","solr.yml")
-          unless File.exist?(config_path)
-            config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config", "solr.yml")
-          end
-          logger.debug "SOLRIZER: reading config from " + config_path.inspect 
-          yaml = YAML.load(File.open(config_path))
-          
-          if ENV["environment"].nil?
-            environment = "development"
-          else
-            environment = ENV["environment"]
-          end #if
-        
-          solr_config = yaml[environment]
-          logger.debug "SOLRIZER solr_config:" + solr_config.inspect
-        end #if defined?(RAILS_ROOT)
-      
-      end #if defined?(Blacklight)
-        
-      if index_full_text == true && solr_config['fulltext'].has_key?('url')
-        url = solr_config['fulltext']['url']
-      elsif solr_config.has_key?("default") && 
-        url = solr_config['default']['url']
-      elsif solr_config.has_key?('url')
-        url = solr_config['url']
-      elsif solr_config.has_key?(:url)
-        url = solr_config[:url]
-      else
-        raise
-      end
 
-      @solr = RSolr.connect :url => url
-      # @connection = Solr::Connection.new(url, :autocommit => :on )
+  def connect
+
+    if ActiveFedora.fedora_config.empty?
+      ActiveFedora.init
+    end
+
+    if defined?(Blacklight)
+      solr_config = Blacklight.solr_config
+    else  
+      if defined?(Rails.root.to_s)
+        config_path = File.join(Rails.root.to_s, "config", "solr.yml")
+        yaml = YAML.load(File.open(File.join(config_path, "solr.yml")))
+        puts RAILS_ENV + "*****"
+        solr_config = yaml[RAILS_ENV]
+        puts solr_config.inspect
+      else
+        config_path = File.join("config","solr.yml")
+        unless File.exist?(config_path)
+          config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config", "solr.yml")
+        end
+        logger.debug "SOLRIZER: reading config from " + config_path.inspect 
+        yaml = YAML.load(File.open(config_path))
       
-    rescue RuntimeError => e
-      logger.debug "Unable to establish SOLR Connection with #{solr_config.inspect}.  Failed with #{e.message}"
-      raise  URI::InvalidURIError
+        if ENV["environment"].nil?
+          environment = "development"
+        else
+          environment = ENV["environment"]
+        end #if
+    
+        solr_config = yaml[environment]
+        logger.debug "SOLRIZER solr_config:" + solr_config.inspect
+      end #if defined?(Rails.root)
+    end #if defined?(Blacklight)
+    
+    if index_full_text == true && solr_config.has_key?('fulltext') && solr_config['fulltext'].has_key?('url')
+      url = solr_config['fulltext']['url']
+    elsif solr_config.has_key?("default") && solr_config['default'].has_key?('url')
+      url = solr_config['default']['url']
+    elsif solr_config.has_key?('url')
+      url = solr_config['url']
+    elsif solr_config.has_key?(:url)
+      url = solr_config[:url]
+    else
+      raise
     end
 
+    @solr = RSolr.connect :url => url
+    # @connection = Solr::Connection.new(url, :autocommit => :on )
+  
+  rescue RuntimeError => e
+    logger.debug "Unable to establish SOLR Connection with #{solr_config.inspect}.  Failed with #{e.message}"
+    raise  URI::InvalidURIError
+  end
+
   #
   # This method extracts the facet categories from the given Fedora object's external tag datastream
   #
@@ -153,7 +157,6 @@ class Indexer
     end
     
     return solr_doc
-#      end
         
   end
   

data/lib/solrizer/fedora/solrizer.rb

@@ -8,7 +8,7 @@ require 'solrizer/html'
 # Let people explicitly require xml support if they want it ...
 # require 'solrizer/xml.rb'
 
-# require 'fastercsv'
+require 'fastercsv' # this is used by solrize_objects when you pass it a csv file of pids
 require "ruby-debug"
 
 

data/lib/solrizer/fedora/version.rb

@@ -0,0 +1,5 @@
+module Solrizer
+  module Fedora
+    VERSION = "1.1.0"
+  end
+end

data/lib/tasks/solrizer-fedora.rake

@@ -1,3 +1,44 @@
+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
+
+# 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
   
   namespace :fedora  do
@@ -30,6 +71,15 @@ namespace :solrizer do
       solrizer.solrize_objects
       puts "Solrizer task complete."
     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
   
 end

data/solrizer-fedora.gemspec

@@ -1,93 +1,34 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "solrizer/fedora/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{solrizer-fedora}
-  s.version = "1.0.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.name        = "solrizer-fedora"
+  s.version     = Solrizer::Fedora::VERSION
   s.authors = ["Matt Zumwalt"]
-  s.date = %q{2011-05-03}
+  s.date = %q{2011-05-20}
   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.extra_rdoc_files = [
     "LICENSE",
     "README.textile"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "History.textile",
-    "LICENSE",
-    "README.textile",
-    "Rakefile",
-    "VERSION",
-    "config/fedora.yml",
-    "config/hydra_types.yml",
-    "config/solr.yml",
-    "lib/solrizer-fedora.rb",
-    "lib/solrizer/fedora.rb",
-    "lib/solrizer/fedora/extractor.rb",
-    "lib/solrizer/fedora/indexer.rb",
-    "lib/solrizer/fedora/repository.rb",
-    "lib/solrizer/fedora/solrizer.rb",
-    "lib/tasks/solrizer-fedora.rake",
-    "solrizer-fedora.gemspec",
-    "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",
-    "spec/units/fedora_indexer_spec.rb",
-    "spec/units/fedora_solrizer_spec.rb"
-  ]
+  s.platform    = Gem::Platform::RUBY
   s.homepage = %q{http://github.com/projecthydra/solrizer-fedora}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{An extension to solrizer that deals with Fedora objects & Repositories}
-  s.test_files = [
-    "spec/integration/fedora_indexer_spec.rb",
-    "spec/lib/solrizer/indexer_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/units/fedora_extractor_spec.rb",
-    "spec/units/fedora_indexer_spec.rb",
-    "spec/units/fedora_solrizer_spec.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "solrizer-fedora"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<active-fedora>, [">= 2.0.0"])
-      s.add_runtime_dependency(%q<rsolr>, [">= 0"])
-      s.add_runtime_dependency(%q<solrizer>, [">= 1.0.0"])
-      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<mocha>, [">= 0"])
-    else
-      s.add_dependency(%q<active-fedora>, [">= 2.0.0"])
-      s.add_dependency(%q<rsolr>, [">= 0"])
-      s.add_dependency(%q<solrizer>, [">= 1.0.0"])
-      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<mocha>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<active-fedora>, [">= 2.0.0"])
-    s.add_dependency(%q<rsolr>, [">= 0"])
-    s.add_dependency(%q<solrizer>, [">= 1.0.0"])
-    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<mocha>, [">= 0"])
-  end
-end
+  s.add_dependency('solr-ruby', '>= 0.0.6')
+  s.add_dependency('active-fedora', '>= 2.3.0') 
+  s.add_dependency('rsolr') 
+  s.add_dependency('solrizer', '>=1.0.0')
+  s.add_dependency('fastercsv') # this is used by solrize_objects when you pass it a csv file of pids
 
+  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"]
+end

data/spec/lib/solrizer/indexer_spec.rb

@@ -7,8 +7,9 @@ describe Solrizer::Fedora::Indexer do
   
   before(:all) do
     
-    unless defined?(RAILS_ROOT) and defined?(RAILS_ENV)
-      RAILS_ROOT = "."
+    unless defined?(Rails) and defined?(RAILS_ENV)
+      Object.const_set("Rails", String)
+      Rails.stubs(:root).returns(".") #RAILS_ROOT = "."
       RAILS_ENV = "test"
     end
     
@@ -34,45 +35,59 @@ describe Solrizer::Fedora::Indexer do
 
   describe "#new" do
     it "should return a URL from solr_config if the config has a :url" do
-          Blacklight.stubs(:solr_config).returns({:url => "http://foo.com:8080/solr"})
-          @indexer = Solrizer::Fedora::Indexer.new
+      Blacklight.stubs(:solr_config).returns({:url => "http://foo.com:8080/solr"})
+      @indexer = Solrizer::Fedora::Indexer.new
+      @indexer.solr.uri.to_s.should == "http://foo.com:8080/solr/"
     end
      
     it "should return a URL from solr_config if the config has a 'url' " do
-           Blacklight.stubs(:solr_config).returns({'url' => "http://foo.com:8080/solr"})
-           @indexer = Solrizer::Fedora::Indexer.new
+      Blacklight.stubs(:solr_config).returns({'url' => "http://foo.com:8080/solr"})
+      @indexer = Solrizer::Fedora::Indexer.new
+      @indexer.solr.uri.to_s.should == "http://foo.com:8080/solr/"
     end
      
     it "should raise and error if there is not a :url or 'url' in the config hash" do
-            Blacklight.stubs(:solr_config).returns({'boosh' => "http://foo.com:8080/solr"})
-            lambda { Solrizer::Fedora::Indexer.new }.should raise_error(URI::InvalidURIError)         
+      Blacklight.stubs(:solr_config).returns({'boosh' => "http://foo.com:8080/solr"})
+      lambda { Solrizer::Fedora::Indexer.new }.should raise_error(URI::InvalidURIError)         
     end
       
     it "should return a fulltext URL if solr_config has a fulltext url defined" do
-          Blacklight.stubs(:solr_config).returns({'fulltext' =>{ 'url' => "http://foo.com:8080/solr"}})
-          @indexer = Solrizer::Fedora::Indexer.new(:index_full_text => true)
+      Blacklight.stubs(:solr_config).returns({'fulltext' =>{ 'url' => "http://fulltext.com:8080/solr"}, 'default' =>{ 'url' => "http://default.com:8080/solr"}})
+      @indexer = Solrizer::Fedora::Indexer.new(:index_full_text => true)
+      @indexer.solr.uri.to_s.should == "http://fulltext.com:8080/solr/"
     end
       
+    it "should gracefully handle when index_full_text is true but there is no fulltext in the configuration" do
+      Blacklight.stubs(:solr_config).returns({'default' =>{ 'url' => "http://foo.com:8080/solr"}})
+      @indexer = Solrizer::Fedora::Indexer.new(:index_full_text => true)
+      @indexer.solr.uri.to_s.should == "http://foo.com:8080/solr/"
+    end
+    
     it "should return a fulltext URL if solr_config has a default url defined" do
-          Blacklight.stubs(:solr_config).returns({'default' =>{ 'url' => "http://foo.com:8080/solr"}})
-           @indexer = Solrizer::Fedora::Indexer.new(:index_full_text => false)
+      Blacklight.stubs(:solr_config).returns({'default' =>{ 'url' => "http://foo.com:8080/solr"}})
+      @indexer = Solrizer::Fedora::Indexer.new(:index_full_text => false)
+      @indexer.solr.uri.to_s.should == "http://foo.com:8080/solr/"
     end
       
     it "should find the solr.yml even if Blacklight is not loaded" do 
          Object.const_set("Blacklight_temp", Blacklight )
          Object.send(:remove_const, :Blacklight)
          YAML.stubs(:load).returns({'test' => {'url' => "http://thereisnoblacklightrunning.edu:8080/solr"}})
+         ENV["environment"]="test"
          @indexer = Solrizer::Fedora::Indexer.new
          Object.const_set("Blacklight", Blacklight_temp )  
+         ENV["environment"]=nil
     end
       
     it "should find the solr.yml even if Blacklight is not loaded and RAILS is not loaded" do 
           Object.const_set("Blacklight_temp", Blacklight )
           Object.send(:remove_const, :Blacklight)
-          Object.send(:remove_const, :RAILS_ROOT)
+          Object.const_set("Rails_temp", Rails)
+          Object.send(:remove_const, :Rails)
           YAML.stubs(:load).returns({'development' => {'url' => "http://noblacklight.norails.edu:8080/solr"}})
           @indexer = Solrizer::Fedora::Indexer.new  
-           Object.const_set("Blacklight", Blacklight_temp )  
+          Object.const_set("Blacklight", Blacklight_temp )
+          Object.const_set("Rails", Rails_temp)
     end    
   end     
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer-fedora
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,60 +15,44 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -05:00
-default_executable: 
+date: 2011-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: solr-ruby
   prerelease: false
-  name: active-fedora
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 19
         segments: 
-        - 2
         - 0
         - 0
-        version: 2.0.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+        - 6
+        version: 0.0.6
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: active-fedora
   prerelease: false
-  name: rsolr
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
+        - 3
         - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+        version: 2.3.0
   type: :runtime
-  prerelease: false
-  name: solrizer
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rsolr
   prerelease: false
-  name: ruby-debug
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,42 +61,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: solrizer
   prerelease: false
-  name: ruby-debug-base
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
-        - 2
+        - 1
         - 0
         - 0
-        version: 2.0.0
-  requirement: *id006
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: fastercsv
   prerelease: false
-  name: mocha
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,7 +91,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
+  type: :runtime
+  version_requirements: *id005
 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
 executables: []
@@ -133,13 +104,15 @@ extra_rdoc_files:
 - README.textile
 files: 
 - .document
+- .gitignore
+- .gitmodules
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - History.textile
 - LICENSE
 - README.textile
 - Rakefile
-- VERSION
 - config/fedora.yml
 - config/hydra_types.yml
 - config/solr.yml
@@ -149,6 +122,7 @@ files:
 - lib/solrizer/fedora/indexer.rb
 - lib/solrizer/fedora/repository.rb
 - lib/solrizer/fedora/solrizer.rb
+- lib/solrizer/fedora/version.rb
 - lib/tasks/solrizer-fedora.rake
 - solrizer-fedora.gemspec
 - spec/fixtures/rels_ext_cmodel.xml
@@ -160,7 +134,6 @@ files:
 - spec/units/fedora_extractor_spec.rb
 - spec/units/fedora_indexer_spec.rb
 - spec/units/fedora_solrizer_spec.rb
-has_rdoc: true
 homepage: http://github.com/projecthydra/solrizer-fedora
 licenses: []
 
@@ -189,15 +162,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: solrizer-fedora
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: An extension to solrizer that deals with Fedora objects & Repositories
 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
 - spec/units/fedora_indexer_spec.rb
 - spec/units/fedora_solrizer_spec.rb
+has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-1.0.3