cul-fedora 0.8.2 → 0.8.3

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.3

data/cul-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cul-fedora}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Stuart"]
-  s.date = %q{2011-06-01}
+  s.date = %q{2011-06-02}
   s.description = %q{Columbia-specific Fedora libraries}
   s.email = %q{tastyhat@jamesstuart.org}
   s.extra_rdoc_files = [

data/lib/cul-fedora/item.rb

@@ -3,12 +3,12 @@ require "open3"
 module Cul
   module Fedora
     class Item
+      
       attr_reader :server, :pid
       include Open3 
 
       URI_TO_PID = 'info:fedora/'
 
-
       def <=>(other)
         pid <=> other.pid
       end
@@ -20,10 +20,15 @@ module Cul
       def initialize(*args)
         options = args.extract_options!
         @server = options[:server] || Server.new(options[:server_config])
+        @logger = options[:logger]
         @pid = options[:pid] || options[:uri] || raise(ArgumentError, "requires uri or pid")
         @pid = @pid.to_s.sub(URI_TO_PID, "")
       end
 
+      def logger
+        @logger ||= Logger.new
+      end
+
       def ==(other)
         self.server == other.server
         self.pid == other.pid

data/lib/cul-fedora/server.rb

@@ -1,20 +1,24 @@
 module Cul
   module Fedora
     class Server
+      
       attr_reader :riurl, :riquery
 
       def initialize(*args)
         options = args.extract_options!
         @riurl = options[:riurl] || raise(ArgumentError, "Must provide riurl argument")
         @riquery = options[:riquery] || raise(ArgumentError, "Must provide riquery argument")
-        @hc = options[:http_client] 
+        @hc = options[:http_client]
+        @logger = options[:logger] 
       end
 
-      def item(uri)
-        Item.new(:server => self, :uri => uri)
+      def logger
+        @logger ||= Logger.new(STDOUT)
       end
 
-
+      def item(uri)
+        Item.new(:server => self, :uri => uri, :logger => logger)
+      end
 
       def request(options= {})
         http_client.get_content(*request_path(options))
@@ -37,16 +41,13 @@ module Cul
         return [uri, query]
       end
 
-      def inspect
-        '#<Cul::Fedora::Server:' + self.object_id.to_s + ' @riurl="' + @riurl + '">'  
-      end
-
       private
 
       def http_client
         @hc ||= HTTPClient.new()
         @hc
       end
+      
     end
   end
 end

data/lib/cul-fedora/solr.rb

@@ -1,10 +1,16 @@
 module Cul
   module Fedora
     class Solr
+      
       attr_reader :url
+      
       def initialize(config = {})
         @url = config[:url] || raise(ArgumentError, "must provide url")
+        @logger = config[:logger]
+      end
 
+      def logger
+        @logger ||= Logger.new(STDOUT)
       end
 
       def item_exists?(item)
@@ -25,12 +31,12 @@ module Cul
         start = 0
         rows = 500
         results = rsolr.select({:q => "", :fl => "id", :start => start, :rows => rows})
-        $stdout.puts "Deleting items removed from Fedora..."
+        logger.info "Deleting items removed from Fedora..."
         while(!results["response"]["docs"].empty?)
           
           results["response"]["docs"].each do |doc|
             if(!fedora_server.item(doc["id"]).exists?)
-              $stdout.puts "Deleting " + doc["id"] + "..."
+              logger.info "Deleting " + doc["id"] + "..."
               rsolr.delete_by_query("id:" + doc["id"].to_s.gsub(/:/,'\\:'))
             end
           end
@@ -77,7 +83,7 @@ module Cul
         items.each do |i|
           
           if(ignore.index(i.pid).nil? == false)
-            $stdout.puts "Ignoring " + i.pid + "..."
+            logger.info "Ignoring " + i.pid + "..."
             next
           end
           
@@ -95,7 +101,7 @@ module Cul
           end    
           
 
-          $stdout.puts "Indexing " + i.pid + "..."
+          logger.info "Indexing " + i.pid + "..."
 
           result_hash = i.send("index_for_#{format}", options)
 
@@ -114,7 +120,7 @@ module Cul
           end
 
           if to_add.length >= 500
-            $stdout.puts "Adding Batch..."
+            logger.info "Adding batch to commit queue..."
             rsolr.add(to_add)
             to_add.clear
           end
@@ -122,10 +128,12 @@ module Cul
         end
         
         if to_add.length > 0
-          $stdout.puts "Adding Batch..."
+          logger.info "Adding batch to commit queue..."
           rsolr.add(to_add)
           to_add.clear
         end
+        
+        logger.info "Committing changes to Solr..."
         rsolr.commit
 
         return {:results => results, :errors => errors}
@@ -133,7 +141,5 @@ module Cul
       end
 
     end
-
-
   end
 end

data/lib/cul-fedora.rb

@@ -4,7 +4,7 @@ require "activesupport"
 require "rsolr"
 require "rsolr-ext"
 require "open3"
-
+require "logger"
 
 require "cul-fedora/item"
 require "cul-fedora/server"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cul-fedora
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - James Stuart
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 -04:00
+date: 2011-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency