solr_ead 0.3.4 → 0.4.4

data/.gitignore

@@ -15,3 +15,4 @@ test/tmp
 test/version_tmp
 tmp
 .DS_Store
+bin

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    solr_ead (0.3.4)
+    solr_ead (0.4.4)
       om
       rsolr
       sanitize

data/lib/solr_ead/indexer.rb

@@ -42,17 +42,19 @@ class Indexer
   # using the url supplied in your config/solr.yml file.
   def initialize(opts={})
     Solrizer.default_field_mapper = EadMapper.new
-    if defined?(Rails.root)
-      url = YAML.load_file(File.join(Rails.root,"config","solr.yml"))[Rails.env]['url']
+    if ENV['SOLR_URL']
+      url = ENV['SOLR_URL']
+    elsif defined?(Rails.root)
+      url = YAML.load(ERB.new(File.read(File.join(Rails.root,"config","solr.yml"))).result)[Rails.env]['url']
     elsif ENV['RAILS_ENV']
-      url = YAML.load_file(File.join(Rails.root,"config","solr.yml"))[ENV['RAILS_ENV']]['url']
+      url = YAML.load(ERB.new(File.read("config/solr.yml")).result)[ENV['RAILS_ENV']]['url']
     else
-      url = YAML.load_file("config/solr.yml")['development']['url']
+      url = YAML.load(ERB.new(File.read("config/solr.yml")).result)['development']['url']
     end
     self.solr = RSolr.connect :url => url
     self.options = opts
   end
-
+  
   # Indexes your ead and additional component documents with the supplied file, then
   # commits the results to your solr server.
   def create(file)

data/lib/solr_ead/version.rb

@@ -1,3 +1,3 @@
 module SolrEad
-  VERSION = "0.3.4"
+  VERSION = "0.4.4"
 end

data/lib/tasks/solr_ead.rake

@@ -2,8 +2,8 @@ namespace :solr_ead do
 
   desc "Index and ead into solr using FILE=<path/to/ead.xml>"
   task :index do
-    raise "Please specify your ead, ex. FILE=<path/to/ead.xml" unless ENV['FILE']
-    indexer = SolrEad::Indexer.new
+    raise "Please specify your ead, ex. FILE=<path/to/ead.xml>" unless ENV['FILE']
+    indexer = load_indexer
     indexer.update(ENV['FILE'])
   end
 
@@ -14,10 +14,10 @@ namespace :solr_ead do
     indexer.delete(ENV['ID'])
   end
 
-  desc "Index a directory of ead files given by DIR=path/to/directory"
+  desc "Index a directory of ead files given by DIR=<path/to/directory>"
   task :index_dir do
-    raise "Please specify your direction, ex. DIR=path/to/directory" unless ENV['DIR']
-    indexer = SolrEad::Indexer.new
+    raise "Please specify your directory, ex. DIR=<path/to/directory>" unless ENV['DIR']
+    indexer = load_indexer
     Dir.glob(File.join(ENV['DIR'],"*")).each do |file|
       print "Indexing #{File.basename(file)}..."
       indexer.update(file) if File.extname(file).match("xml$")
@@ -25,4 +25,20 @@ namespace :solr_ead do
     end
   end
 
+end
+
+# Set up a new indexer object
+# 
+# If CUSTOM_DOCUMENT is present, require the file and instantiate the indexer with it
+# Otherwise instantiate a default indexer
+def load_indexer
+  if ENV['CUSTOM_DOCUMENT']
+    raise "Please specify a valid file for your custom document." unless File.exists? ENV['CUSTOM_DOCUMENT']
+    require File.join(Rails.root, ENV['CUSTOM_DOCUMENT'])
+    custom_document = File.basename(ENV['CUSTOM_DOCUMENT']).split(".").first.classify.constantize
+    indexer = SolrEad::Indexer.new(:document=>custom_document)
+  else
+    indexer = SolrEad::Indexer.new
+  end
+  return indexer
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solr_ead
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: om
@@ -224,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1892170810412435467
+      hash: 2881959855902156324
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -233,10 +233,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1892170810412435467
+      hash: 2881959855902156324
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A gem for indexing ead into solr using OM