active-fedora 2.3.1 → 2.3.3

data/lib/active_fedora/solr_service.rb

@@ -47,6 +47,10 @@ module ActiveFedora
       return results
     end
     
+    # Construct a solr query for a list of pids
+    # This is used to get a solr response based on the list of pids in an object's RELS-EXT relationhsips
+    # If the pid_array is empty, defaults to a query of "id:NEVER_USE_THIS_ID", which will return an empty solr response
+    # @param [Array] pid_array the pids that you want included in the query
     def self.construct_query_for_pids(pid_array)
       query = ""
       pid_array.each_index do |i|

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "2.3.1"
+    VERSION = "2.3.3"
 end

data/lib/fedora/datastream.rb

@@ -3,15 +3,18 @@ require 'fedora/repository'
 
 class Fedora::Datastream < Fedora::BaseObject
   
-  attr_accessor :mime_type
   
   def initialize(attrs = {})
     super
     if attrs
-      if attrs[:mime_type] 
+      if attrs[:mime_type]
         self.mime_type = attrs[:mime_type]
-      elsif attrs[:mimeType] 
+      elsif attrs[:mimeType]
         self.mime_type = attrs[:mimeType]
+      elsif attrs["mimeType"]
+        self.mime_type = attrs["mimeType"]
+      elsif attrs["mime_type"]
+        self.mime_type = attrs["mime_type"]
       end 
     end
     self.control_group='M' if @attributes[:mimeType]
@@ -44,6 +47,14 @@ class Fedora::Datastream < Fedora::BaseObject
     @attributes[:dsLabel] = new_label
   end
   
+  def mime_type
+    @mime_type
+  end
+
+  def mime_type=(new_mime_type)
+    @mime_type =  new_mime_type
+  end
+
   # See http://www.fedora.info/definitions/identifiers/
   def uri
     "fedora:info/#{pid}/datastreams/#{dsid}"

data/lib/tasks/active_fedora_dev.rake

@@ -26,7 +26,7 @@ task :hudson do
   require 'jettywrapper'
   project_root = File.expand_path("#{File.dirname(__FILE__)}/../../")
   
-  if (ENV['RAILS_ENV'] == "test")
+  if (ENV['environment'] == "test")
     Rake::Task["active_fedora:doc"].invoke
     Rake::Task["active_fedora:configure_jetty"].invoke
     jetty_params = {
@@ -44,7 +44,7 @@ task :hudson do
     end
     raise "test failures: #{error}" if error
   else
-    system("rake hudson RAILS_ENV=test")
+    system("rake hudson environment=test")
     fail unless $?.success?
   end
 end

data/spec/fixtures/rails_root/config/fedora.yml

@@ -1,13 +1,13 @@
 development:
   fedora:
-    url: http://fedoraAdmin:fedoraAdmin@localhost:8983/fedora
+    url: http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora
   solr:
-    url: http://localhost:8983/solr/development
+    url: http://testhost.com:8983/solr/development
 test:
   fedora:
-    url: http://fedoraAdmin:fedoraAdmin@localhost:8983/fedora
+    url: http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora
   solr:
-    url: http://localhost:8983/solr/development
+    url: http://testhost.com:8983/solr/development
 production:
   fedora:
     url: http://fedoraAdmin:fedoraAdmin@testhost.com:8080/fedora

data/spec/integration/bug_spec.rb

@@ -7,7 +7,7 @@ require 'ftools'
 require 'mocha'
 
 include ActiveFedora::Model
-include Mocha::Standalone
+include Mocha::API
 
 describe 'bugs' do
 class FooHistory < ActiveFedora::Base

data/spec/integration/model_spec.rb

@@ -7,7 +7,7 @@ require 'ftools'
 require 'mocha'
 
 include ActiveFedora::Model
-include Mocha::Standalone
+include Mocha::API
 
 describe ActiveFedora::Model do
   

data/spec/integration/nokogiri_datastream_spec.rb

@@ -20,8 +20,7 @@ describe ActiveFedora::NokogiriDatastream do
         m.field 'collection', :string
       end
     end
-    
-    RAILS_ENV='development'
+
     @pid = "hydrangea:fixture_mods_article1"
     @test_solr_object = HydrangeaArticle2.load_instance_from_solr(@pid)
     @test_object = HydrangeaArticle2.load_instance(@pid)

data/spec/integration/semantic_node_spec.rb

@@ -13,15 +13,6 @@ describe ActiveFedora::SemanticNode do
     class SNSpecModel < ActiveFedora::Base
       has_relationship("parts", :is_part_of, :inbound => true)
       has_relationship("containers", :is_member_of)
-      has_bidirectional_relationship("bi_containers", :is_member_of, :has_member)
-    end
-    class SpecNodeQueryParam < ActiveFedora::Base
-      has_relationship("parts", :is_part_of, :inbound => true)
-      has_relationship("special_parts", :is_part_of, :inbound => true, :query_params=>{:q=>{"has_model_s"=>"info:fedora/SpecialPart"}})
-      has_relationship("containers", :is_member_of)
-      has_relationship("special_containers", :is_member_of, :query_params=>{:q=>{"has_model_s"=>"info:fedora/SpecialContainer"}})
-      has_bidirectional_relationship("bi_containers", :is_member_of, :has_member)
-      has_bidirectional_relationship("bi_special_containers", :is_member_of, :has_member, :query_params=>{:q=>{"has_model_s"=>"info:fedora/SpecialContainer"}})
     end
     
     @test_object = SNSpecModel.new
@@ -34,89 +25,24 @@ describe ActiveFedora::SemanticNode do
     @part2.add_relationship(:is_part_of, @test_object)
     @part2.save
     
+    
     @container1 = ActiveFedora::Base.new()
     @container1.save
     @container2 = ActiveFedora::Base.new()    
     @container2.save
-    @container3 = ActiveFedora::Base.new()    
-    @container3.save
     
     @test_object.add_relationship(:is_member_of, @container1)
     @test_object.add_relationship(:is_member_of, @container2)
     @test_object.save
-
-    @special_container = ActiveFedora::Base.new()
-    @special_container.add_relationship(:has_model,"SpecialContainer")
-    @special_container.save
-
-    #even though adding container3 and special container, it should only include special_container when returning via named finder methods
-    #also should only return special part similarly
-    @test_object_query = SpecNodeQueryParam.new
-    @test_object_query.add_relationship(:is_member_of, @container3)
-    @test_object_query.add_relationship(:is_member_of, @special_container)
-    @test_object_query.save
-
-    @special_container2 = ActiveFedora::Base.new()
-    @special_container2.add_relationship(:has_model,"SpecialContainer")
-    @special_container2.add_relationship(:has_member,@test_object_query.pid)
-    @special_container2.save
-
-    @part3 = ActiveFedora::Base.new()
-    @part3.add_relationship(:is_part_of, @test_object_query)
-    @part3.save
-
-    @special_part = ActiveFedora::Base.new()
-    @special_part.add_relationship(:has_model,"SpecialPart")
-    @special_part.add_relationship(:is_part_of, @test_object_query)
-    @special_part.save
-   
   end
   
   after(:all) do
-    begin
     @part1.delete 
-    rescue
-    end
-    begin
     @part2.delete
-    rescue
-    end
-    begin
-    @part3.delete
-    rescue
-    end
-    begin
     @container1.delete
-    rescue
-    end
-    begin
     @container2.delete
-    rescue
-    end
-    begin
-    @container3.delete
-    rescue
-    end
-    begin
     @test_object.delete
-    rescue
-    end
-    begin
-    @test_object_query.delete
-    rescue
-    end
-    begin
-    @special_part.delete
-    rescue
-    end
-    begin
-    @special_container.delete
-    rescue
-    end
-    begin
-    @special_container2.delete
-    rescue
-    end
+    
     Object.send(:remove_const, :SNSpecModel)
 
   end
@@ -148,73 +74,6 @@ describe ActiveFedora::SemanticNode do
         id.should satisfy {|id| id == @part1.pid || @part2.pid}
       end  
     end
-    it "should return an array of Base objects with some filtered out if using query params" do
-      @test_object_query.special_parts_ids.should == [@special_part.pid]
-    end
-
-    it "should return an array of all Base objects with relationship if not using query params" do
-      @test_object_query.parts_ids.size.should == 2
-      @test_object_query.parts_ids.include?(@special_part.pid).should == true
-      @test_object_query.parts_ids.include?(@part3.pid).should == true
-    end
-
-    it "should return a solr query for an inbound relationship" do
-      @test_object_query.special_parts_query.should == "#{@test_object_query.named_relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialPart"
-    end
-  end
-
-  describe "inbound named relationship query" do
-    it "should return a properly formatted query for a relationship that has a query param defined" do
-      SpecNodeQueryParam.inbound_named_relationship_query(@test_object_query.pid,"special_parts").should == "#{@test_object_query.named_relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialPart"
-    end
-
-    it "should return a properly formatted query for a relationship that does not have a query param defined" do
-      SpecNodeQueryParam.inbound_named_relationship_query(@test_object_query.pid,"parts").should == "is_part_of_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')}"
-    end
-  end
-
-  describe "outbound named relationship query" do
-    it "should return a properly formatted query for a relationship that has a query param defined" do
-      expected_string = ""
-      @test_object_query.containers_ids.each_with_index do |id,index|
-        expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
-      end
-      SpecNodeQueryParam.outbound_named_relationship_query("special_containers",@test_object_query.containers_ids).should == expected_string
-    end
-
-    it "should return a properly formatted query for a relationship that does not have a query param defined" do
-      expected_string = ""
-      @test_object_query.containers_ids.each_with_index do |id,index|
-        expected_string << " OR " if index > 0
-        expected_string << "id:" + id.gsub(/(:)/, '\\:')
-      end
-      SpecNodeQueryParam.outbound_named_relationship_query("containers",@test_object_query.containers_ids).should == expected_string
-    end
-  end
-
-  describe "bidirectional named relationship query" do
-    it "should return a properly formatted query for a relationship that has a query param defined" do
-      expected_string = ""
-      @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
-        expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
-      end
-      expected_string << " OR "
-      expected_string << "(#{@test_object_query.named_relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialContainer)"
-      SpecNodeQueryParam.bidirectional_named_relationship_query(@test_object_query.pid,"bi_special_containers",@test_object_query.bi_containers_outbound_ids).should == expected_string
-    end
-
-    it "should return a properly formatted query for a relationship that does not have a query param defined" do
-      expected_string = ""
-      @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
-        expected_string << " OR " if index > 0
-        expected_string << "id:" + id.gsub(/(:)/, '\\:')
-      end
-      expected_string << " OR "
-      expected_string << "(#{@test_object_query.named_relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')})"
-      SpecNodeQueryParam.bidirectional_named_relationship_query(@test_object_query.pid,"bi_containers",@test_object_query.bi_containers_outbound_ids).should == expected_string
-    end
   end
   
   describe "outbound relationship finders" do
@@ -231,121 +90,5 @@ describe ActiveFedora::SemanticNode do
         id.should satisfy {|id| id == @container1.pid || @container2.pid}
       end  
     end
-
-    it "should return an array of Base objects with some filtered out if using query params" do
-      @test_object_query.special_containers_ids.size.should == 1
-      @test_object_query.special_containers_ids.include?(@container3.pid).should == false
-      @test_object_query.special_containers_ids.include?(@special_container.pid).should == true
-    end
-
-    it "should return an array of all Base objects with relationship if not using query params" do
-      @test_object_query.containers_ids.size.should == 2
-      @test_object_query.containers_ids.include?(@special_container2.pid).should == false
-      @test_object_query.containers_ids.include?(@special_container.pid).should == true
-      @test_object_query.containers_ids.include?(@container3.pid).should == true
-    end
-
-    it "should return a solr query for an outbound relationship" do
-      expected_string = ""
-      @test_object_query.containers_ids.each_with_index do |id,index|
-        expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
-      end
-      @test_object_query.special_containers_query.should == expected_string
-    end 
   end  
-
-  describe "bidirectional relationship finders" do
-    it "should return an array of Base objects" do
-      containers = @test_object.bi_containers
-      containers.length.should > 0
-      containers.each do |container|
-        container.should be_kind_of(ActiveFedora::Base)
-      end  
-    end
-    it "_ids should return an array of pids" do
-      ids = @test_object.bi_containers_ids
-      ids.size.should == 2
-      ids.each do |id|
-        id.should satisfy {|id| id == @container1.pid || @container2.pid}
-      end  
-    end
-
-    it "should return an array of Base objects with some filtered out if using query params" do
-      ids = @test_object_query.bi_special_containers_ids
-      ids.size.should == 2
-      ids.each do |id|
-        id.should satisfy {|id| id == @special_container.pid || @special_container2.pid}
-      end  
-    end
-
-    it "should return an array of all Base objects with relationship if not using query params" do
-      ids = @test_object_query.bi_containers_ids
-      ids.size.should == 3
-      ids.each do |id|
-        id.should satisfy {|id| id == @special_container.pid || @special_container2.pid || @container3.pid}
-      end  
-    end
-
-    it "should return a solr query for a bidirectional relationship" do
-      expected_string = ""
-      @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
-        expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
-      end
-      expected_string << " OR "
-      expected_string << "(#{@test_object_query.named_relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialContainer)"
-      @test_object_query.bi_special_containers_query.should == expected_string
-    end
-  end 
-
-  describe "named_relationship_query" do
-    it "should return correct query for a bidirectional relationship with query params" do
-      expected_string = ""
-      @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
-        expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
-      end
-      expected_string << " OR "
-      expected_string << "(#{@test_object_query.named_relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialContainer)"
-      @test_object_query.named_relationship_query("bi_special_containers").should == expected_string
-    end
-  
-    it "should return correct query for a bidirectional relationship without query params" do
-      expected_string = ""
-      @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
-        expected_string << " OR " if index > 0
-        expected_string << "id:" + id.gsub(/(:)/, '\\:')
-      end
-      expected_string << " OR "
-      expected_string << "(#{@test_object_query.named_relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')})"
-      @test_object_query.named_relationship_query("bi_containers").should == expected_string
-    end
-
-    it "should return a properly formatted query for an outbound relationship that has a query param defined" do
-      expected_string = ""
-      @test_object_query.containers_ids.each_with_index do |id,index|
-        expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
-      end
-      @test_object_query.named_relationship_query("special_containers").should == expected_string
-    end
-
-    it "should return a properly formatted query for an outbound relationship that does not have a query param defined" do
-      expected_string = ""
-      @test_object_query.containers_ids.each_with_index do |id,index|
-        expected_string << " OR " if index > 0
-        expected_string << "id:" + id.gsub(/(:)/, '\\:')
-      end
-      @test_object_query.named_relationship_query("containers").should == expected_string
-    end
-
-    it "should return a properly formatted query for an inbound relationship that has a query param defined" do
-      @test_object_query.named_relationship_query("special_parts").should == "#{@test_object_query.named_relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialPart"
-    end
-
-    it "should return a properly formatted query for an inbound relationship that does not have a query param defined" do
-      @test_object_query.named_relationship_query("parts").should == "is_part_of_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')}"
-    end
-  end 
 end

data/spec/unit/active_fedora_spec.rb

@@ -71,6 +71,11 @@ describe ActiveFedora do
   end
 
   describe ".init" do
+    
+    after(:all) do
+      # Restore to default fedora configs
+      ActiveFedora.init()
+    end
 
     describe "outside of rails" do
       it "should load the default packaged config/fedora.yml file if no explicit config path is passed" do
@@ -79,7 +84,7 @@ describe ActiveFedora do
       end
       it "should load the passed config if explicit config passed in" do
         ActiveFedora.init('./spec/fixtures/rails_root/config/fedora.yml')
-        ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@localhost:8983/fedora"
+        ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora"
       end
     end
 
@@ -115,7 +120,7 @@ describe ActiveFedora do
             ActiveFedora.init()
             ActiveFedora.solr.class.should == ActiveFedora::SolrService
             ActiveFedora.fedora.class.should == Fedora::Repository
-            ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@localhost:8983/fedora"
+            ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora"
           end
           it "should load the default file if no config is found at Rails.root" do
             Rails.expects(:root).returns(File.join(File.dirname(__FILE__),"../fixtures/bad/path/to/rails_root"))