active-fedora 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,9 @@
+1.1.2 
+
+Bug: Model.find_by_solr fails when you pass it an argument of :all
+Testing: Updated RSpec tests to run against localhost:8983 with Fedora 3.3 (instead of localhost:8080 with Fedora 3.2).  This means you can use a copy of hydra-jetty from http://github.com/hydraproject/hydra-jetty
+Testing: Reduced the amount of noise output to the shell during tests
+
 1.1.1 2010-03-22
 
 Bug: .load_objects wipes out datastream attributes from model-defined datastreams (ie. label and mimeType)

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
-  s.date = %q{2010-03-22}
+  s.date = %q{2010-03-31}
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [

data/config/fedora.yml

@@ -1,16 +1,16 @@
 development:
   fedora:
-    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8080/fedora
+    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
   solr:
-    url: http://127.0.0.1:8080/solr
+    url: http://127.0.0.1:8983/solr/development
 test:
   fedora:
-    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8080/fedora
+    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
   solr:
-    url: http://127.0.0.1:8080/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://sulwebappdev1.stanford.edu:8100/salt_solr
+    url: http://127.0.0.1:8080/solr
     

data/lib/active_fedora/datastream.rb

@@ -94,7 +94,6 @@ module ActiveFedora
         object_xml = Fedora::FedoraObject.object_xml(self.pid).gsub("\n     ","")
         datastream_xml = REXML::Document.new(object_xml).root.elements["foxml:datastream[@ID='#{self.dsid}']"]
         
-        puts datastream_xml.length
         if datastream_xml.length > 3
           datastream_xml.elements.each do |el|
             puts el.inspect

data/lib/active_fedora/model.rb

@@ -56,7 +56,7 @@ module ActiveFedora
       def find(args)
         if args == :all
           escaped_class_name = self.name.gsub(/(:)/, '\\:')
-          q = "#{solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}"
+          q = "#{SolrMapper.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}"
         elsif args.class == String
           escaped_id = args.gsub(/(:)/, '\\:')
           q = "#{SOLR_DOCUMENT_ID}:#{escaped_id}"
@@ -89,7 +89,7 @@ module ActiveFedora
       def find_by_solr(query, args={})
         if query == :all
           escaped_class_name = self.name.gsub(/(:)/, '\\:')
-          SolrService.instance.conn.query("#{solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}", args)
+          SolrService.instance.conn.query("#{SolrMapper.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}", args)
         elsif query.class == String
           escaped_id = query.gsub(/(:)/, '\\:')          
           SolrService.instance.conn.query("#{SOLR_DOCUMENT_ID}:#{escaped_id}", args)

data/spec/integration/datastream_spec.rb

@@ -8,7 +8,6 @@ describe ActiveFedora::Datastream do
   
   before(:each) do
     @test_object = ActiveFedora::Base.new
-    puts @test_object.inspect
     @test_object.save
   end
   

data/spec/integration/full_featured_model_spec.rb

@@ -174,7 +174,6 @@ describe ActiveFedora::Base do
     @test_history.save
     
     @solr_result = OralHistory.find_by_solr(@test_history.pid).hits[0]
-    puts @solr_result.inspect 
     @properties_sample_values.each_pair do |field, value|
       (@solr_result["#{field.to_s}_t"] || @solr_result["#{field.to_s}_dt"]).should == [value] 
     end
@@ -197,6 +196,11 @@ describe ActiveFedora::Base do
     
   end
   
+  it "should support #find_by_solr" do
+    solr_result = OralHistory.find(:all)
+    solr_result.should_not be_nil
+  end
+  
   describe '#new' do
     it "should support custom pids" do
       oh = OralHistory.new(:pid=>"uuid:blah-blah-blah")
@@ -204,4 +208,6 @@ describe ActiveFedora::Base do
     end
   end
   
+
+  
 end

data/spec/integration/rf_fedora_object_spec.rb

@@ -68,7 +68,7 @@ describe Fedora::FedoraObject do
     it "should not set :label if it is not there in the object_xml" do
       object_rexml = REXML::Document.new(@test_object.object_xml)
       # The label node will be missing from the FOXML because label was never set.
-      object_rexml.root.elements["//foxml:property[@NAME='info:fedora/fedora-system:def/model#label']"].should == nil
+      object_rexml.root.elements["//foxml:property[@NAME='info:fedora/fedora-system:def/model#label']"].attributes["VALUE"].should == ""
       properties = @test_object.properties_from_fedora     
       properties[:label].should == nil 
     end

data/spec/integration/solr_service_spec.rb

@@ -2,9 +2,6 @@ require File.join( File.dirname(__FILE__), "../spec_helper" )
 
 require 'active_fedora'
 
-include ActiveFedora
-
-
 describe ActiveFedora::SolrService do
   describe "#reify_solr_results" do
     before(:all) do
@@ -20,8 +17,8 @@ describe ActiveFedora::SolrService do
       @foo_object.delete
     end
     it "should return an array of objects that are of the class stored in active_fedora_model_s" do
-      query = "id\:#{SolrService.escape_uri_for_query(@test_object.pid)} OR id\:#{SolrService.escape_uri_for_query(@foo_object.pid)}"
-      solr_result = SolrService.instance.conn.query(query)
+      query = "id\:#{ActiveFedora::SolrService.escape_uri_for_query(@test_object.pid)} OR id\:#{ActiveFedora::SolrService.escape_uri_for_query(@foo_object.pid)}"
+      solr_result = ActiveFedora::SolrService.instance.conn.query(query)
       result = ActiveFedora::SolrService.reify_solr_results(solr_result)
       result.length.should == 2
       result.each do |r|

data/spec/spec_helper.rb

@@ -10,6 +10,8 @@ rescue LoadError
   require 'spec'
 end
 
+ENV["RAILS_ENV"] ||= 'test'
+RAILS_ENV = ENV["RAILS_ENV"]
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 Dir[File.join(File.dirname(__FILE__)+'/../lib/')+'**/*.rb'].each{|x| require x}

data/spec/unit/base_spec.rb

@@ -313,7 +313,6 @@ describe ActiveFedora::Base do
       @test_object.expects(:create_date).returns("cDate")
       @test_object.expects(:modified_date).returns("mDate")
       solr_doc = @test_object.to_solr
-      puts solr_doc.inspect
       solr_doc[:system_create_dt].should eql("cDate")
       solr_doc[:system_modified_dt].should eql("mDate")
       solr_doc[:id].should eql(@test_object.pid)

data/spec/unit/rels_ext_datastream_spec.rb

@@ -55,7 +55,6 @@ describe ActiveFedora::RelsExtDatastream do
   
   describe "#from_xml" do
     before(:all) do
-      ActiveFedora::SolrService.register
       @test_obj = ActiveFedora::Base.new
       @test_obj.add_relationship(:is_member_of, "demo:10")
       @test_obj.add_relationship(:is_part_of, "demo:11")

data/spec/unit/rf_datastream_spec.rb

@@ -18,7 +18,7 @@ describe Fedora::Datastream do
   it "should provide .url" do
     @test_datastream.should respond_to(:url)
     @test_datastream.expects(:pid).returns("_foo_")
-    @test_datastream.url.should == 'http://localhost:8080/fedora/objects/_foo_/datastreams/'
+    @test_datastream.url.should == 'http://localhost:8983/fedora/objects/_foo_/datastreams/'
   end
   
   describe ".url" do

data/spec/unit/semantic_node_spec.rb

@@ -237,9 +237,6 @@ describe ActiveFedora::SemanticNode do
         local_node = SpecNode.new
         local_node.add_relationship(@test_relationship1)
         result = local_node.containers_ids
-        puts local_node.relationships.inspect
-        #puts local_node.outbound_relationships.inspect
-        puts local_node.internal_uri
         result.should be_instance_of(Array)
         result.should include("demo:10")
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-03-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency