solrizer-fedora 2.0.0.rc2 → 2.0.0

data/Gemfile.lock

@@ -1,15 +1,14 @@
 PATH
   remote: .
   specs:
-    solrizer-fedora (2.0.0.rc2)
-      active-fedora (~> 4.0.0.rc15)
-      fastercsv
+    solrizer-fedora (2.0.0)
+      active-fedora (~> 4.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    active-fedora (4.0.0.rc15)
+    active-fedora (4.0.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -17,11 +16,11 @@ GEM
       mime-types (>= 1.16)
       multipart-post (= 1.1.2)
       nokogiri
-      om (>= 1.5.3)
+      om (~> 1.6.0)
       rdf
       rdf-rdfxml (= 0.3.5)
       rsolr
-      rubydora (~> 0.5.7)
+      rubydora (~> 0.5.8)
       solrizer (~> 1.2.0)
       xml-simple (>= 1.0.12)
     activemodel (3.0.11)
@@ -64,18 +63,18 @@ GEM
     logger (1.2.8)
     mediashelf-loggable (0.4.9)
     metaclass (0.0.1)
-    mime-types (1.17.2)
+    mime-types (1.18)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
     multipart-post (1.1.2)
     nokogiri (1.5.2)
     nori (1.1.0)
-    om (1.5.3)
+    om (1.6.0)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rack (1.4.1)
     rake (0.9.2.2)
-    rdf (0.3.5.1)
+    rdf (0.3.5.2)
       addressable (>= 2.2.6)
     rdf-rdfxml (0.3.5)
       nokogiri (>= 1.4.4)
@@ -84,7 +83,7 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rsolr (1.0.7)
+    rsolr (1.0.8)
       builder (>= 2.1.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -94,7 +93,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rubydora (0.5.7)
+    rubydora (0.5.8)
       activemodel
       activesupport
       fastercsv
@@ -117,7 +116,7 @@ GEM
       om (>= 1.5.0)
       stomp
       xml-simple
-    stomp (1.2.1)
+    stomp (1.2.2)
     wasabi (2.1.0)
       nokogiri (>= 1.4.0)
     xml-simple (1.1.1)

data/lib/solrizer/fedora/solrizer.rb

@@ -7,9 +7,6 @@ require 'solrizer/html'
 
 require 'active_support/core_ext/hash'
 
-require 'fastercsv' # this is used by solrize_objects when you pass it a csv file of pids
-
-
 module Solrizer::Fedora
   class Solrizer
     ALL_FIELDS = [
@@ -95,47 +92,27 @@ module Solrizer::Fedora
       puts "WARNING: You have turned off indexing of Full Text content.  Be sure to re-run indexer with @@index_full_text set to true in main.rb" if index_full_text == false
 
       if @@index_list == false
-        
-        objects = find_objects(:limit=>num_docs)
-
-        puts "Shelving #{objects.length} Fedora objects"
-        objects.each do |object|
-          solrize( object, opts )
-        end
-       
+        solrize_from_fedora_search(opts) 
       else
-         if File.exists?(@@index_list)
-            arr_of_pids = FasterCSV.read(@@index_list, :headers=>false)
-            
-            puts "Indexing from list at #{@@index_list}"
-            puts "Shelving #{arr_of_pids.length} Fedora objects"
-            
-           arr_of_pids.each do |row|
-              pid = row[0]
-              solrize( pid )
-           end #FASTERCSV
-         else
-           puts "#{@@index_list} does not exists!"
-         end #if File.exists
-       
-      end #if Index_LISTS
-    end #solrize_objects
-
-    def find_objects(*args)
-        raise ArgumentError, "Missing query string" unless args.length >= 1
-        options = args.last.is_a?(Hash) ? args.pop : {}
+        solrize_from_csv
+      end
+    end
 
-        params = {}
-        params[:query] = ''
-        params[:maxResults] = options[:limit] if options[:limit]
-        params[:pid] = true
-        
-        pids = []
-        connections.each do |conn|
-          response = Hash.from_xml(conn.find_objects(params))
-          pids << response["result"]["resultList"]["objectFields"].map{|x| x["pid"]}
+    def solrize_from_fedora_search(opts)
+      connections.each do |conn|
+        conn.search(nil) do |object|
+          solrize( object.pid, opts )
         end
-        pids.flatten
+      end 
+    end
+
+    def solrize_from_csv
+      raise ArgumentException, "#{@@index_list} does not exists!" unless File.exists?(@@index_list)
+      puts "Indexing from list at #{@@index_list}"
+      CSV.foreach(@@index_list) do |row|
+          pid = row[0]
+          solrize( pid )
+      end 
     end
 
     private

data/lib/solrizer/fedora/version.rb

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

data/solrizer-fedora.gemspec

@@ -20,11 +20,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "solrizer-fedora"
 
-  s.add_dependency('active-fedora', '~> 4.0.0.rc15') 
-  # s.add_dependency('rsolr', '>=1.0.6') 
-  # 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.add_dependency('activesupport', '>=3.0.11')
+  s.add_dependency('active-fedora', '~> 4.0.0') 
   s.add_development_dependency('jettywrapper', '>=1.1.0')
   s.add_development_dependency('rdoc')
 

data/spec/units/fedora_solrizer_spec.rb

@@ -31,40 +31,36 @@ describe Solrizer::Fedora::Solrizer do
 
   end
 
-  describe "find_objects" do
-    describe "when fedora is not sharded" do
-      it "should find_objects" do
-        @solrizer.find_objects(:limit=>2).should == ["fedora-system:ContentModel-3.0", "fedora-system:FedoraObject-3.0"]
-      end
-    end
+  describe "solrize_objects" do
     describe "when fedora is sharded" do
       before do
         @mock1 = mock("connection1")
         @mock2 = mock("connection2")
         @solrizer.expects(:connections).returns([@mock1, @mock2])
+        @mock1.expects(:search).yields(stub('obj', :pid=>'one'))
+        @mock2.expects(:search).yields(stub('obj', :pid=>'two'))
       end
       it "should hit all the shards" do
-        @mock1.expects(:find_objects).returns("<result><resultList><objectFields><pid>one</pid></objectFields><objectFields><pid>two</pid></objectFields></resultList></result>")
-        @mock2.expects(:find_objects).returns("<result><resultList><objectFields><pid>three</pid></objectFields><objectFields><pid>four</pid></objectFields></resultList></result>")
-
-        @solrizer.find_objects(:limit=>2).should == ['one', 'two', 'three', 'four']
+        @solrizer.expects(:solrize).with('one', {})
+        @solrizer.expects(:solrize).with('two', {})
+        @solrizer.solrize_objects()
       end
     end
 
-  end
-  
-  describe "solrize_objects" do
-    before do
-      @objects = ["pid1", "pid2", "pid3"]
-      @solrizer.expects(:find_objects).returns(@objects)
-    end 
-    it "should call solrize for each object returned by Fedora::Repository.find_objects" do
-      @objects.each {|x| @solrizer.expects(:solrize).with( x, {}) }
-      @solrizer.solrize_objects
-    end
-    it "should pass optional suppress_errors argument into .solrize method" do
-      @objects.each {|x| @solrizer.expects(:solrize).with( x, :suppress_errors => true ) }
-      @solrizer.solrize_objects( :suppress_errors => true )
+    describe "with one connection" do
+      before do
+        @mock1 = mock("connection1")
+        @solrizer.expects(:connections).returns([@mock1])
+        @mock1.expects(:search).yields(stub('obj', :pid=>'one'))
+      end 
+      it "should solrize_objects" do
+        @solrizer.expects(:solrize).with('one', {})
+        @solrizer.solrize_objects()
+      end
+      it "should pass optional suppress_errors argument into .solrize method" do
+        @solrizer.expects(:solrize).with( 'one', :suppress_errors => true )
+        @solrizer.solrize_objects( :suppress_errors => true )
+      end
     end
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424081
-  prerelease: 6
+  hash: 15
+  prerelease: 
   segments: 
   - 2
   - 0
   - 0
-  - rc
-  - 2
-  version: 2.0.0.rc2
+  version: 2.0.0
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 Z
+date: 2012-04-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: active-fedora
@@ -27,34 +25,18 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424139
+        hash: 63
         segments: 
         - 4
         - 0
         - 0
-        - rc
-        - 15
-        version: 4.0.0.rc15
+        version: 4.0.0
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jettywrapper
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,11 +48,11 @@ dependencies:
         - 0
         version: 1.1.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,7 +62,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 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: []
@@ -143,14 +125,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: solrizer-fedora