active-fedora 3.1.0.pre3 → 3.1.0.pre4

data/lib/active_fedora.rb

@@ -227,7 +227,7 @@ module ActiveFedora #:nodoc:
     
     # Last choice, check for the default config file
     config_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "config", "#{config_type}.yml"))
-    logger.warn "Using the default #{config_type}.yml that comes with active-fedora.  If you want to override this, pass the path to #{config_type}.yml to ActiveFedora - ie. ActiveFedora.init(:#{config_type} => '/path/to/#{config_type}.yml) - or set Rails.root and put #{config_type}.yml into \#{Rails.root}/config."
+    logger.warn "Using the default #{config_type}.yml that comes with active-fedora.  If you want to override this, pass the path to #{config_type}.yml to ActiveFedora - ie. ActiveFedora.init(:#{config_type}_config_path => '/path/to/#{config_type}.yml) - or set Rails.root and put #{config_type}.yml into \#{Rails.root}/config."
     return config_path if File.file? config_path
     raise ActiveFedoraConfigurationException "Couldn't load #{config_type} config file!"
   end

data/lib/active_fedora/content_model.rb

@@ -28,7 +28,7 @@ module ActiveFedora
     end
     
     def self.models_asserted_by(obj)
-      Array obj.relationships[:self][:has_model]
+      obj.ids_for_outbound(:has_model)
     end
     
     def self.known_models_for(obj)

data/lib/active_fedora/rels_ext_datastream.rb

@@ -62,7 +62,14 @@ module ActiveFedora
     end
 
     def self.short_predicate(predicate)
-      predicate.to_str.gsub(/^[^#]+#/, '').underscore.to_sym
+      if match = /^([^#]+#)(.+)$/.match(predicate.to_str)
+        namespace = match[1]
+        predicate = match[2]
+        pred = ActiveFedora::Base.predicate_mappings[namespace].invert[predicate]
+        pred
+      else
+        raise "Unable to parse predicate: #{predicate}"
+      end
     end
     
     # Serialize the datastream's RDF relationships to solr

data/lib/active_fedora/semantic_node.rb

@@ -195,6 +195,27 @@ module ActiveFedora
       id_array
     end
 
+    def load_bidirectional(name, inbound_method_name, outbound_method_name, opts) 
+        opts = {:rows=>25}.merge(opts)
+        if opts[:response_format] == :solr || opts[:response_format] == :load_from_solr
+          predicate = outbound_relationship_predicates["#{name}_outbound"]
+          outbound_id_array = ids_for_outbound(predicate)
+          query = self.class.bidirectional_relationship_query(self.pid,"#{name}",outbound_id_array)
+          solr_result = SolrService.instance.conn.query(query, :rows=>opts[:rows])
+          
+          if opts[:response_format] == :solr
+            return solr_result
+          elsif opts[:response_format] == :load_from_solr || self.load_from_solr
+            return ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
+          else
+            return ActiveFedora::SolrService.reify_solr_results(solr_result)
+          end
+        else
+          ary = send(inbound_method_name,opts) + send(outbound_method_name, opts)
+          return ary.uniq
+        end
+    end
+
     def load_outbound_relationship(name, predicate, opts={})
       id_array = ids_for_outbound(predicate)
       if opts[:response_format] == :id_array  && !self.class.relationship_has_solr_filter_query?(:self,"#{name}")
@@ -418,6 +439,8 @@ module ActiveFedora
         END
       end
       
+
+
       # Generates relationship finders for predicates that point in both directions
       # and registers predicate relationships for each direction.
       #
@@ -436,30 +459,7 @@ module ActiveFedora
 
         class_eval <<-END
         def #{name}(opts={})
-          opts = {:rows=>25}.merge(opts)
-          if opts[:response_format] == :solr || opts[:response_format] == :load_from_solr
-            outbound_id_array = []
-            predicate = outbound_relationship_predicates["#{name}_outbound"]
-            if !outbound_relationships[predicate].nil? 
-              outbound_relationships[predicate].each do |rel|
-                outbound_id_array << rel.gsub("info:fedora/", "")
-              end
-            end
-            #outbound_id_array = #{outbound_method_name}(:response_format=>:id_array)
-            query = self.class.bidirectional_relationship_query(self.pid,"#{name}",outbound_id_array)
-            solr_result = SolrService.instance.conn.query(query, :rows=>opts[:rows])
-            
-            if opts[:response_format] == :solr
-              return solr_result
-            elsif opts[:response_format] == :load_from_solr || self.load_from_solr
-              return ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
-            else
-              return ActiveFedora::SolrService.reify_solr_results(solr_result)
-            end
-          else
-            ary = #{inbound_method_name}(opts) + #{outbound_method_name}(opts)
-            return ary.uniq
-          end
+          load_bidirectional("#{name}", :#{inbound_method_name}, :#{outbound_method_name}, opts)
         end
         def #{name}_ids
           #{name}(:response_format => :id_array)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.pre3"
+    VERSION = "3.1.0.pre4"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -82,12 +82,12 @@ namespace :active_fedora do
   end
 
   task :load_fixtures => :environment do
-    require 'solrizer'
-    require 'solrizer-fedora'
-    require 'spec/samples/models/hydrangea_article'
-    ENV["FEDORA_HOME"] ||= File.expand_path(File.join(File.dirname(__FILE__),'..','..','jetty','fedora','default'))
-    retval = `$FEDORA_HOME/client/bin/fedora-ingest-demos.sh localhost 8983 fedoraAdmin fedoraAdmin http`
-    puts "loaded demo objects #{retval}"
+    # require 'solrizer'
+    # require 'solrizer-fedora'
+    # require 'spec/samples/models/hydrangea_article'
+    # ENV["FEDORA_HOME"] ||= File.expand_path(File.join(File.dirname(__FILE__),'..','..','jetty','fedora','default'))
+    # retval = `$FEDORA_HOME/client/bin/fedora-ingest-demos.sh localhost 8983 fedoraAdmin fedoraAdmin http`
+    # puts "loaded demo objects #{retval}"
     ActiveFedora.init unless Thread.current[:repo]
     
     ENV["pid"] = "hydrangea:fixture_mods_article1"

data/spec/unit/content_model_spec.rb

@@ -71,12 +71,12 @@ describe ActiveFedora::ContentModel do
   describe "models_asserted_by" do
     it "should return an array of all of the content models asserted by the given object" do
       mock_object = mock("ActiveFedora Object")
-      mock_object.expects(:relationships).returns( :self=>{:has_model=>["info:fedora/fedora-system:ServiceDefinition-3.0", "info:fedora/afmodel:SampleModel", "info:fedora/afmodel:NonDefinedModel"]} )
+      mock_object.expects(:ids_for_outbound).with(:has_model).returns(["info:fedora/fedora-system:ServiceDefinition-3.0", "info:fedora/afmodel:SampleModel", "info:fedora/afmodel:NonDefinedModel"])
       ActiveFedora::ContentModel.models_asserted_by(mock_object).should == ["info:fedora/fedora-system:ServiceDefinition-3.0", "info:fedora/afmodel:SampleModel", "info:fedora/afmodel:NonDefinedModel"]
     end
     it "should return an empty array if the object doesn't have a RELS-EXT datastream" do
       mock_object = mock("ActiveFedora Object")
-      mock_object.expects(:relationships).returns( :self=>{} )
+      mock_object.expects(:ids_for_outbound).with(:has_model).returns([])
       ActiveFedora::ContentModel.models_asserted_by(mock_object).should == []
     end
   end
@@ -84,23 +84,23 @@ describe ActiveFedora::ContentModel do
   describe "known_models_asserted_by" do
     it "should figure out the applicable models to load" do
       mock_object = mock("ActiveFedora Object")
-      mock_object.expects(:relationships).returns( :self=>{:has_model=>["info:fedora/fedora-system:ServiceDefinition-3.0", "info:fedora/afmodel:SampleModel", "info:fedora/afmodel:NonDefinedModel"]} )
+      mock_object.expects(:ids_for_outbound).with(:has_model).returns(["info:fedora/fedora-system:ServiceDefinition-3.0", "info:fedora/afmodel:SampleModel", "info:fedora/afmodel:NonDefinedModel"])
       ActiveFedora::ContentModel.known_models_for(mock_object).should == [SampleModel]
     end
     it "should support namespaced models" do
       pending "This is harder than it looks."
       mock_object = mock("ActiveFedora Object")
-      mock_object.expects(:relationships).returns( :self=>{:has_model=>["info:fedora/afmodel:Sample_NamespacedModel"]} )
+      mock_object.expects(:ids_for_outbound).with(:has_model).returns(["info:fedora/afmodel:Sample_NamespacedModel"])
       ActiveFedora::ContentModel.known_models_for(mock_object).should == [Sample::NamespacedModel]
     end
     it "should default to using ActiveFedora::Base as the model" do
       mock_object = mock("ActiveFedora Object")
-      mock_object.expects(:relationships).returns( :self=>{:has_model=>["info:fedora/afmodel:NonDefinedModel"]} )
+      mock_object.expects(:ids_for_outbound).with(:has_model).returns(["info:fedora/afmodel:NonDefinedModel"])
       ActiveFedora::ContentModel.known_models_for(mock_object).should == [ActiveFedora::Base]
     end
     it "should still work even if the object doesn't have a RELS-EXT datastream" do
       mock_object = mock("ActiveFedora Object")
-      mock_object.expects(:relationships).returns( :self=>{} )
+      mock_object.expects(:ids_for_outbound).with(:has_model).returns([])
       ActiveFedora::ContentModel.known_models_for(mock_object).should == [ActiveFedora::Base]
     end
   end

data/spec/unit/semantic_node_spec.rb

@@ -430,7 +430,7 @@ describe ActiveFedora::SemanticNode do
     end
     it "(:response_format => :solr) should construct a solr query that combines inbound and outbound searches" do
       # get the id array for outbound relationships then construct solr query by combining id array with inbound relationship search
-      @local_node.expects(:outbound_relationships).returns({:has_part=>["mypid:1"]}).at_least_once()
+      @local_node.expects(:ids_for_outbound).with(:has_part).returns(["mypid:1"])
       id_array_query = ActiveFedora::SolrService.construct_query_for_pids(["mypid:1"])
       solr_result = mock("solr result")
       ActiveFedora::SolrService.instance.conn.expects(:query).with("#{id_array_query} OR (is_part_of_s:info\\:fedora/test\\:sample_pid)", :rows=>25).returns(solr_result)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832031
+  hash: 1923832017
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 3
-  version: 3.1.0.pre3
+  - 4
+  version: 3.1.0.pre4
 platform: ruby
 authors: 
 - Matt Zumwalt