solrizer-fedora 0.1.0 → 0.1.1

data/Gemfile

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
-gem 'active-fedora', '1.2.4'  
+gem 'active-fedora', '1.2.7'  
 gem 'solrizer', '>=0.3.0'
 
 group :development, :test do

data/Gemfile.lock

@@ -1,44 +1,55 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    active-fedora (1.2.4)
+    active-fedora (1.2.7)
+      activeresource (< 3.0.0)
       mime-types (>= 1.16)
       multipart-post
       nokogiri
       om (>= 1.0)
       solr-ruby (>= 0.0.6)
+      solrizer (>= 0.3.0)
       xml-simple (>= 1.0.12)
-    columnize (0.3.1)
+    activeresource (2.3.10)
+      activesupport (= 2.3.10)
+    activesupport (2.3.10)
+    columnize (0.3.2)
     facets (2.9.0)
     linecache (0.43)
+    mediashelf-loggable (0.4.0)
     mime-types (1.16)
-    mocha (0.9.9)
+    mocha (0.9.10)
       rake
-    multipart-post (1.0.1)
-    nokogiri (1.4.3.1)
-    om (1.0.0)
+    multipart-post (1.1.0)
+    nokogiri (1.4.4)
+    om (1.0.2)
       facets
+      facets
+      nokogiri
       nokogiri (>= 1.4.2)
     rake (0.8.7)
     rspec (1.3.1)
-    ruby-debug (0.10.3)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     solr-ruby (0.0.8)
-    solrizer (0.3.0)
-      active-fedora (>= 1.1.5)
-      om (>= 1.0.0)
+    solrizer (0.3.2)
+      mediashelf-loggable
+      nokogiri
+      nokogiri
+      om
+      solr-ruby
     xml-simple (1.0.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  active-fedora (= 1.2.4)
+  active-fedora (= 1.2.7)
   mocha
   rspec (< 2.0.0)
   ruby-debug
   ruby-debug-base
-  solrizer (>= 0.2.0)
+  solrizer (>= 0.3.0)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/solrizer/fedora/indexer.rb

@@ -35,49 +35,63 @@ class Indexer
   end
 
   #
-  # This method connects to the Solr instance
+  # 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
+  # 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
+  
+   def connect
     
-    if ActiveFedora.fedora_config.empty?
-      ActiveFedora.init
-    end
+      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")))
-        solr_config = yaml[RAILS_ENV]
-        puts solr_config.inspect
-      else
-        config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config")
-        yaml = YAML.load(File.open(File.join(config_path, "solr.yml")))
-        
-        
-        if ENV["environment"].nil?
-          environment = "development"
+      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
-          environment = ENV["environment"]
-        end
+          config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config")
+          puts config_path.inspect + "&&&&&&&"
+          yaml = YAML.load(File.open(File.join(config_path, "solr.yml")))
+          
+          if ENV["environment"].nil?
+            environment = "development"
+          else
+            environment = ENV["environment"]
+          end #if
         
-        solr_config = yaml[environment]
-        puts solr_config.inspect
-      end
+          solr_config = yaml[environment]
+          puts solr_config.inspect
+        end #if defined?(RAILS_ROOT)
       
-    end
+      end #if defined?(Blacklight)
         
-    if index_full_text == true
-      url = solr_config['fulltext']['url']
-    elsif solr_config.has_key?("default")
-      url = solr_config['default']['url']
-    else
-      url = solr_config['url']
+      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
+      @connection = Solr::Connection.new(url, :autocommit => :on )
+      
+    rescue
+        puts "Unable to establish SOLR Connection with #{solr_config.inspect}"
+        raise  URI::InvalidURIError
     end
-    @connection = Solr::Connection.new(url, :autocommit => :on )
-  end
 
   #
   # This method extracts the facet categories from the given Fedora object's external tag datastream

data/lib/tasks/solrizer-fedora.rake

@@ -1,6 +1,6 @@
 namespace :solrizer do
   
-  namespace :fedora  
+  namespace :fedora  do
     desc 'Index a fedora object of the given pid.'
     task :solrize => :environment do 
       index_full_text = ENV['FULL_TEXT'] == 'true'

data/solrizer-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solrizer-fedora}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt"]
-  s.date = %q{2010-10-26}
+  s.date = %q{2011-01-22}
   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 = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "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",
@@ -53,6 +54,7 @@ Gem::Specification.new do |s|
   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",

data/spec/lib/solrizer/indexer_spec.rb

@@ -0,0 +1,79 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'solrizer'
+require "solrizer/fedora"
+
+
+describe Solrizer::Fedora::Indexer do
+  
+  before(:all) do
+    
+    unless defined?(RAILS_ROOT) and defined?(RAILS_ENV)
+      RAILS_ROOT = "."
+      RAILS_ENV = "test"
+    end
+    
+    unless defined?(Blacklight)
+      Object.const_set("Blacklight", String )
+    end
+  end
+  
+  before(:each) do
+     
+       @extractor = mock("Extractor")
+       @extractor.stubs(:html_content_to_solr).returns(@solr_doc)
+       @solr_doc = Solr::Document.new
+       Solrizer::Extractor.expects(:new).returns(@extractor)
+  
+  end
+    
+  after(:all) do
+    if Blacklight == String
+      Object.send(:remove_const,:Blacklight)
+    end
+  end
+
+  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
+    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
+    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)         
+    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)
+    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)
+    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"}})
+         @indexer = Solrizer::Fedora::Indexer.new
+         Object.const_set("Blacklight", Blacklight_temp )  
+    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)
+          YAML.stubs(:load).returns({'development' => {'url' => "http://noblacklight.norails.edu:8080/solr"}})
+          @indexer = Solrizer::Fedora::Indexer.new  
+           Object.const_set("Blacklight", Blacklight_temp )  
+    end    
+  end     
+end
+    

data/spec/spec_helper.rb

@@ -6,6 +6,21 @@ require 'spec/autorun'
 
 require 'solrizer'
 
+
+# this allows us to unload constants for testing
+module Kernel
+  # Suppresses warnings within a given block.
+  def with_warnings_suppressed
+    saved_verbosity = $-v
+    $-v = nil
+    yield
+  ensure
+    $-v = saved_verbosity
+  end
+end
+
+
+
 Spec::Runner.configure do |config|
   
   config.mock_with :mocha

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer-fedora
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -05:00
+date: 2011-01-22 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -51,6 +51,7 @@ files:
 - 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
@@ -93,6 +94,7 @@ specification_version: 3
 summary: An extension to solrizer that deals with Fedora objects & Repositories
 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