active-fedora 2.2.2 → 2.2.3

data/lib/active_fedora/semantic_node.rb

@@ -417,11 +417,27 @@ module ActiveFedora
           case predicate
           when :has_model, "hasModel", :hasModel
             xmlns="info:fedora/fedora-system:def/model#"
+            begin
+              rel_predicate = self.class.predicate_lookup(predicate,xmlns)
+            rescue UnregisteredPredicateError
+              xmlns = nil
+              rel_predicate = nil
+            end
           else
             xmlns="info:fedora/fedora-system:def/relations-external#"
+            begin
+              rel_predicate = self.class.predicate_lookup(predicate,xmlns)
+            rescue UnregisteredPredicateError
+              xmlns = nil
+              rel_predicate = nil
+            end
+          end
+          
+          unless xmlns && rel_predicate
+            rel_predicate, xmlns = self.class.find_predicate(predicate)
           end
           # puts ". #{predicate} #{target} #{xmlns}"
-          xml.root.elements["rdf:Description"].add_element(self.class.predicate_lookup(predicate), {"xmlns" => "#{xmlns}", "rdf:resource"=>target})
+          xml.root.elements["rdf:Description"].add_element(rel_predicate, {"xmlns" => "#{xmlns}", "rdf:resource"=>target})
         end
       end
       xml.to_s
@@ -747,7 +763,7 @@ module ActiveFedora
           if predicate_mappings[namespace].has_key?(predicate)
             return predicate_mappings[namespace][predicate]
           else
-            throw UnregisteredPredicateError
+            raise ActiveFedora::UnregisteredPredicateError
           end
         end
         return predicate
@@ -764,7 +780,21 @@ module ActiveFedora
       def default_predicate_namespace
         predicate_config[:default_namespace]
       end
+
+      def find_predicate(predicate)
+        predicate_mappings.each do |namespace,predicates|
+          if predicates.fetch(predicate,nil)
+            return predicates[predicate], namespace
+          end
+        end
+        debugger
+        raise ActiveFedora::UnregisteredPredicateError
+      end
+
       
     end
   end
+
+  class UnregisteredPredicateError < RuntimeError; end
+
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "2.2.2"
+    VERSION = "2.2.3"
 end

data/lib/fedora/fedora_object.rb

@@ -122,7 +122,7 @@ class Fedora::FedoraObject < Fedora::BaseObject
   end
 
   def owner_id=(new_owner_id)
-    self.attributes.merge!({:ownerID => new_owner_id})
+    self.attributes.merge!({:ownerId => new_owner_id})
   end
   
   def profile

data/spec/unit/fedora_object_spec.rb

@@ -63,4 +63,12 @@ describe Fedora::FedoraObject do
     
   end
 
+  describe ".owner_id=" do
+    it "should update the attributes hash with ownerId attribute" do
+      @test_object.owner_id.should be_nil
+      @test_object.owner_id="fooTest"
+      @test_object.attributes[:ownerId].should == "fooTest"
+    end
+  end
+
 end

data/spec/unit/semantic_node_spec.rb

@@ -495,6 +495,11 @@ describe ActiveFedora::SemanticNode do
     SpecNode.predicate_lookup(:is_part_of).should == "isPartOf"
     SpecNode.predicate_lookup(:is_member_of).should == "isMemberOf"
     SpecNode.predicate_lookup("isPartOfCollection").should == "isPartOfCollection"
+    SpecNode.predicate_config[:predicate_mapping].merge!({"some_namespace"=>{:has_foo=>"hasFOO"}})
+    SpecNode.find_predicate(:has_foo).should == ["hasFOO","some_namespace"]
+    SpecNode.predicate_lookup(:has_foo,"some_namespace").should == "hasFOO"
+    #SpecNode.predicate_lookup(:has_foo)
+    lambda { SpecNode.predicate_lookup(:has_foo) }.should raise_error ActiveFedora::UnregisteredPredicateError
   end
   
   it 'should provide #relationships_to_rels_ext' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 2
-  - 2
-  version: 2.2.2
+  - 3
+  version: 2.2.3
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-05 00:00:00 Z
+date: 2011-06-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: solr-ruby