active-fedora 3.1.3 → 3.1.4

data/CONSOLE_GETTING_STARTED.textile

@@ -75,7 +75,7 @@ As you can see, ActiveFedora.init defaults to using the fedora.yml included in t
 
 If you want to use a different yml file, put your info (pointing ActiveFedora to specific Fedora & Solr URLs) into the file and pass its path to ActiveFedora.init:
 
-<pre>ActiveFedora.init("path/to/fedora.yml")</pre>
+<pre>ActiveFedora.init(:fedora_config_path=>"path/to/fedora.yml")</pre>
 
 h4. ActiveFedora within Rails
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.1.3)
+    active-fedora (3.1.4)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml
@@ -13,7 +13,7 @@ PATH
       om (>= 1.4.3)
       rdf
       rdf-rdfxml
-      rubydora (= 0.2.4)
+      rubydora (~> 0.2.6)
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
@@ -42,13 +42,13 @@ GEM
       nokogiri (>= 1.4.3)
     facets (2.9.2)
     fastercsv (1.5.4)
-    ffi (1.0.10)
+    ffi (1.0.11)
     gyoku (0.4.4)
       builder (>= 2.1.2)
     httpi (0.9.5)
       rack
     i18n (0.5.0)
-    jettywrapper (1.0.1)
+    jettywrapper (1.1.0)
       activesupport (>= 3.0.0)
       childprocess
       i18n
@@ -87,7 +87,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.2.4)
+    rubydora (0.2.6)
       activemodel
       activesupport
       fastercsv
@@ -129,7 +129,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   active-fedora!
-  jettywrapper (>= 1.0.1)
+  jettywrapper (>= 1.1.0)
   mocha (>= 0.9.8)
   rake
   rcov

data/History.txt

@@ -1,3 +1,7 @@
+3.1.4
+Update rubydora to 0.2.6
+Created a consistent implementation of Model.classname_from_uri
+
 3.1.3
 Set mimeType for all datastreams, default to text/xml
 Update rubydora to 0.2.4

data/active-fedora.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
   s.add_dependency("facets")
-  s.add_dependency("rubydora", '0.2.4')
+  s.add_dependency("rubydora", '~>0.2.6')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml")
   s.add_development_dependency("yard")
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake")
   s.add_development_dependency("rcov")
   s.add_development_dependency("solrizer-fedora", ">=1.1.3") # used by the fixtures rake tasks
-  s.add_development_dependency("jettywrapper", ">=1.0.1")
+  s.add_development_dependency("jettywrapper", ">=1.1.0")
   s.add_development_dependency("rspec", "<2.0.0")
   s.add_development_dependency("mocha", ">= 0.9.8")
   s.add_development_dependency("ruby-debug")  

data/lib/active_fedora/content_model.rb

@@ -12,6 +12,7 @@ module ActiveFedora
       super
     end
     
+    ### TODO: Shouldn't this be the same as: klass.to_class_uri ?  - Justin
     def self.pid_from_ruby_class(klass,attrs={})
 
       unless klass.respond_to? :pid_suffix
@@ -33,7 +34,7 @@ module ActiveFedora
     end
     
     def self.models_asserted_by(obj)
-      obj.ids_for_outbound(:has_model)
+      obj.relationships(:has_model)
     end
     
     def self.known_models_for(obj)
@@ -58,22 +59,11 @@ module ActiveFedora
       ActiveFedora::Base
     end
     
-    # Returns a ruby class corresponding to the given uri if one can be found.
-    # Returns false if no corresponding class can be found.
-    def self.uri_to_ruby_class( uri )
-      classname = uri.split(':')[-1].titlecase.gsub(' ','')
-      
-      if class_exists?(classname)
-        Kernel.const_get(classname)
-      else
-        false
-      end
-    end
     
     # Returns an ActiveFedora Model class corresponding to the given uri if one can be found.
     # Returns false if no corresponding model can be found.
     def self.uri_to_model_class( uri )
-      rc = uri_to_ruby_class(uri)
+      rc = Model.from_class_uri(uri)
       if rc && rc.superclass == ActiveFedora::Base
         rc
       else
@@ -81,14 +71,5 @@ module ActiveFedora
       end
     end
     
-    private 
-    
-    def self.class_exists?(class_name)
-      klass = Module.const_get(class_name)
-      return klass.is_a?(Class)
-    rescue NameError
-      return false
-    end
-    
   end
 end

data/lib/active_fedora/model.rb

@@ -14,16 +14,23 @@ module ActiveFedora
       klass.extend(ClassMethods)
     end
     
+    # Takes a Fedora URI for a cModel and returns classname, namespace
+    def self.classname_from_uri(uri)
+      local_path = uri.split('/')[1]
+      parts = local_path.split(':')
+      return parts[-1].gsub('_','/').classify, parts[0]
+    end
+
     # Takes a Fedora URI for a cModel, and returns a 
     # corresponding Model if available
     # This method should reverse ClassMethods#to_class_uri
     def self.from_class_uri(uri)
-      if match_data = /info:fedora\/([a-zA-z0-9\-_]+):(.+)$/.match(uri)
-        pid_ns = match_data[1]
-        model_value = match_data[2]
-        model_value.gsub!('_', '::')
-      else
-        raise "model URI incorrectly formatted: #{uri}"
+      model_value, pid_ns = classname_from_uri(uri)
+      raise "model URI incorrectly formatted: #{uri}" unless model_value
+
+      unless class_exists?(model_value)
+        logger.warn "#{model_value} is not a real class"
+        return false
       end
       if model_value.include?("::")
         result = eval(model_value)
@@ -33,7 +40,7 @@ module ActiveFedora
       unless result.nil?
         model_ns = (result.respond_to? :pid_namespace) ? result.pid_namespace : DEFAULT_NS
         if model_ns != pid_ns
-          logger.warn "Model class namespace (#{model_ns}) and uri namespace (#{pid_ns}) do not match!"
+          logger.warn "Model class namespace '#{model_ns}' does not match uri: '#{uri}'"
         end
       end
       result
@@ -80,6 +87,7 @@ module ActiveFedora
       
       # Returns a suitable uri object for :has_model
       # Should reverse Model#from_class_uri
+      ### TODO: shouldn't this reverse ContentModel.pid_from_ruby_class
       def to_class_uri
         ns = (self.respond_to? :pid_namespace) ? self.pid_namespace : Model::DEFAULT_NS
         pid = self.name.gsub(/::/,'_')
@@ -274,5 +282,14 @@ module ActiveFedora
           END
     end
 
+    private 
+    
+    def self.class_exists?(class_name)
+      klass = class_name.constantize
+      return klass.is_a?(Class)
+    rescue NameError
+      return false
+    end
+    
   end
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.3"
+    VERSION = "3.1.4"
 end

data/spec/unit/content_model_spec.rb

@@ -73,12 +73,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(:ids_for_outbound).with(:has_model).returns(["info:fedora/fedora-system:ServiceDefinition-3.0", "info:fedora/afmodel:SampleModel", "info:fedora/afmodel:NonDefinedModel"])
+      mock_object.expects(:relationships).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(:ids_for_outbound).with(:has_model).returns([])
+      mock_object.expects(:relationships).with(:has_model).returns([])
       ActiveFedora::ContentModel.models_asserted_by(mock_object).should == []
     end
   end
@@ -86,36 +86,27 @@ 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(:ids_for_outbound).with(:has_model).returns(["info:fedora/fedora-system:ServiceDefinition-3.0", "info:fedora/afmodel:SampleModel", "info:fedora/afmodel:NonDefinedModel"])
+      mock_object.expects(:relationships).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(:ids_for_outbound).with(:has_model).returns(["info:fedora/afmodel:Sample_NamespacedModel"])
+      mock_object.expects(:relationships).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(:ids_for_outbound).with(:has_model).returns(["info:fedora/afmodel:NonDefinedModel"])
+      mock_object.expects(:relationships).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(:ids_for_outbound).with(:has_model).returns([])
+      mock_object.expects(:relationships).with(:has_model).returns([])
       ActiveFedora::ContentModel.known_models_for(mock_object).should == [ActiveFedora::Base]
     end
   end
   
-  describe "uri_to_ruby_class" do
-    it "should return ruby class corresponding to the given uri if a valid class can be found" do
-      ActiveFedora::ContentModel.uri_to_ruby_class("info:fedora/afmodel:SampleModel").should == SampleModel
-      ActiveFedora::ContentModel.uri_to_ruby_class("info:fedora/afmodel:NonDefinedModel").should == false
-      ActiveFedora::ContentModel.uri_to_ruby_class("info:fedora/afmodel:String").should == String
-      ActiveFedora::ContentModel.uri_to_ruby_class("info:fedora/hydra-cModel:genericContent").should == GenericContent
-    end
-  end
-  
   describe "uri_to_model_class" do
     it "should return an ActiveFedora Model class corresponding to the given uri if a valid model can be found" do
       ActiveFedora::ContentModel.uri_to_model_class("info:fedora/afmodel:SampleModel").should == SampleModel

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 3
   - 1
-  - 3
-  version: 3.1.3
+  - 4
+  version: 3.1.4
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 -06:00
+date: 2011-11-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -209,14 +209,14 @@ dependencies:
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 27
         segments: 
         - 0
         - 2
-        - 4
-        version: 0.2.4
+        - 6
+        version: 0.2.6
   requirement: *id013
 - !ruby/object:Gem::Dependency 
   name: rdf
@@ -327,12 +327,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 1
-        - 0
         - 1
-        version: 1.0.1
+        - 0
+        version: 1.1.0
   requirement: *id021
 - !ruby/object:Gem::Dependency 
   name: rspec