active-fedora 4.0.0.rc15 → 4.0.0.rc16

data/CONSOLE_GETTING_STARTED.textile

@@ -1,383 +1 @@
-The concepts covered in this tutorial can be applied in any application with the active-fedora gem installed. (Don't forget to "require 'active-fedora'").
-
-h2. Dependencies
-
-You will need Ruby 1.8.7+ to go through this tutorial.  If you don't have Ruby 1.8.7 installed, "RVM":https://rvm.beginrescueend.com/ is the best way to install it.
-
-h2. Get a Copy of the Code
-
-It is probably easiest to Because this tutorial uses the sample files included   For this tutorial, you're cloning a full copy of the active-fedora code so you have access to the sample files that are stored there.
-
-First, clone the git repository and cd into the root:
-
-<pre>
-git clone git@github.com:mediashelf/active_fedora.git
-cd active_fedora
-</pre>
-
-If you don't have bundler installed yet, install it:
-
-<pre>
-gem install bundler
-</pre>
-
-Now let bundler handle installing active-fedora's dependencies:
-
-<pre>
-bundle install
-</pre>
-
-h2. Run Solr & Fedora
-
-h3. Get a copy of hydra-jetty and start it (easiest)
-
-"hydra-jetty":http://github.com/projecthydra/hydra-jetty is a copy of a Jetty server with Fedora and Solr installed and ready to use with ActiveFedora.  Grab a copy and start it up.
-
-<pre>
-git clone git://github.com/projecthydra/hydra-jetty.git
-cd hydra-jetty
-java -jar start.jar
-</pre>
-
-This will start Jetty and spit a bunch of info out onto the console.  Leave that terminal window open and open a new one to play around with ActiveFedora.
-
-You can also set up your own copies of Fedora and Solr to run against.  For info on that, see "Setting up Fedora and Solr for use with ActiveFedora":http://projects.mediashelf.us/projects/active-fedora/wiki/Setting_up_Fedora_and_Solr_for_use_with_ActiveFedora
-
-h2. Open up the (Rails) Console (or, use irb)
-
-<pre>
-script/console
-</pre>
-  
-<pre> 
-require "rubygems"
-require "active-fedora"
-require "active_fedora/samples" # these are the sample models and datastreams that come with ActiveFedora
-</pre>
-
-h2. Initialize ActiveFedora
-
-In order to function, ActiveFedora needs to know where Fedora and Solr are running.  It gets this information from a YAML file.  You can see a sample fedora.yml in the ActiveFedora code on GitHub: "http://github.com/mediashelf/active_fedora/blob/master/config/fedora.yml":http://github.com/mediashelf/active_fedora/blob/master/config/fedora.yml
-
-<pre>
-ActiveFedora.init
-I, [...]  INFO -- : Using the default fedora.yml that comes with active-fedora.  
-If you want to override this, pass the path to fedora.yml as an argument to ActiveFedora.init or set RAILS_ROOT and put fedora.yml into #{RAILS_ROOT}/config.
-I, [...]  INFO -- : FEDORA: loading ActiveFedora config from /opt/local/lib/ruby/gems/1.8/gems/active-fedora-1.1.3/config/fedora.yml
-I, [...]  INFO -- : FEDORA: initializing ActiveFedora::SolrService with solr_config: {:url=>"http://127.0.0.1:8983/solr/development"}
-I, [...8]  INFO -- : FEDORA: initialized Solr with ActiveFedora.solr_config: #<ActiveFedora::SolrService:0x1021245f0 @conn=#<Solr::Connection:... >>>
-I, [...]  INFO -- : FEDORA: initializing Fedora with fedora_config: {:url=>"http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"}
-I, [...]  INFO -- : FEDORA: initialized Fedora as: #<Fedora::Repository:0x102123b78 ....>
-=> true
-</pre>
-
-As you can see, ActiveFedora.init defaults to using the fedora.yml included in the gem, which points to a local instance of jetty running on port 8983 with fedora and solr installed.
-
-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(:fedora_config_path=>"path/to/fedora.yml")</pre>
-
-h4. ActiveFedora within Rails
-
-If you are running a rails app, ActiveFedora.init will automatically look for config/fedora.yml
-
-Also, within a rails app, you should create a file in config/initializers (ie. fedora_config.rb) that calls ActiveFedora.init
-
-h2. Load a Fixture Object To Play With
-
-The ActiveFedora code includes sample Fedora objects (as foxml files) that you can load into a Fedora repository and play around with.  Here we will load the one called hydrangea_fixture_mods_article1.foxml.xml:
-
-<pre>
-filename = File.join(File.dirname(__FILE__),"spec","fixtures", "hydrangea_fixture_mods_article1.foxml.xml")
-file = File.new(filename, "r")
-result = foxml = Fedora::Repository.instance.ingest(file.read)
-</pre>
-
-If you get an error that starts with the lines below, this means that you already have a copy of that object in fedora.
-
-<pre>
-  Fedora::ServerError: Failed with 500 Error from Fedora: javax.ws.rs.WebApplicationException: org.fcrepo.server.errors.ObjectExistsException: The PID 'hydrangea:fixture_mods_article1' already exists in the registry; the object can't be re-created.
-</pre>
-
-The easiest way to delete an object from Fedora is to use the following line.  Note that this will raise an error if the object didn't exist in the first place.
-
-<pre>
-  ActiveFedora::Base.load_instance("hydrangea:fixture_mods_article1").delete
-</pre>
-
-
-To see a more complete implementation of importing and deleting Fedora objects, see the code in this gem's fedora rake tasks "https://github.com/mediashelf/active_fedora/blob/master/lib/tasks/fedora.rake":https://github.com/mediashelf/active_fedora/blob/master/lib/tasks/fedora.rake
-
-
-*When you're done playing around with importing and deleting, make sure that you leave a copy of hydrangea:fixture_mods_article1 in fedora so we can play with it.*
-
-
-h2. Define a Model for Your (Active)Fedora Objects
-
-Look at the SpecialThing model defined in spec/samples/special_thing.rb to see how you declare an ActiveFedora model.
-
-Create an instance of the SpecialThing class:
-
-<pre>
-newthing = SpecialThing.new
-</pre>
-
-Get the pid of your new object:
-
-<pre>
-newthing.pid
-=> "changeme:30"
-</pre>
-
-This pid was retrieved from Fedora's getNextPid method.  
-
-Your object will not show up in the actual Fedora repository until you save it using newthing.save, but let's hold off on saving it for now.
-
-h2. Fedora RELATIONSHIPS in ActiveFedora
-
-ActiveFedora provides convenience methods for creating and editing Fedora RELS-EXT relationships.  It also auto-generates methods for searching these relationships with Solr. (see https://github.com/projecthydra/solrizer and https://github.com/projecthydra/solrizer-fedora)
-
-Use the relationships method to list the object's relationships:
-
-<pre>
-newthing.relationships
-=> #<RDF::Graph:0x83a53088(<>)> 
-
-newthing.relationships.statements.map(&:inspect)
-=> ["#<RDF::Statement:0x8371a858(<info:fedora/changeme:30> <info:fedora/fedora-system:def/model#hasModel> <info:fedora/hydra-cModel:DisplaySet> .)>",
-    "#<RDF::Statement:0x8371a6f0(<info:fedora/changeme:30> <info:fedora/fedora-system:def/model#hasModel> <info:fedora/hydra-cModel:CommonMetadata> .)>",
-    "#<RDF::Statement:0x8371a3e4(<info:fedora/changeme:30> <info:fedora/fedora-system:def/relations-external#isMemberOf> <info:fedora/changeme:parentSet> .)>"]
-
-newthing.relationships(:is_member_of)
- => ["info:fedora/changeme:parentSet"] 
-</pre>
-
-The SpecialThing class definition contains these lines:
-
-<pre>
-  #
-  # RELATIONSHIPS
-  #
-  
-  # This is an example of how you can add a custom relationship to a model
-  # This will allow you to call .derivations on instances of the model to get a list of all of the _outbound_ "hasDerivation" relationships in the RELS-EXT datastream
-  has_relationship "derivations", :has_derivation
-
-  # This will allow you to call .inspirations on instances of the model to get a list of all of the objects that assert "hasDerivation" relationships pointing at this object
-  has_relationship "inspirations", :has_derivation, :inbound => true  
-</pre>
-
-ActiveFedora creates methods for the SpecialThing object based on has_relationship lines.  So we can call the "inspirations" method that is automatically created by ActiveFedora:
-
-<pre>
-newthing.inspirations
-=> []
-</pre>
-
-This method is actually making a search request to Solr -- it is looking in Solr to see if the "newthing" object has any "inspirations" relationships.
-
-Now we'll create another Fedora object (using the default ActiveFedora object model) and we'll use ActiveFedora's add_relationship method to relate our new object to the SpecialThing object.  We'll also save our new object in our Fedora repository.
-
-<pre>
-newobj = ActiveFedora::Base.new
-newobj.add_relationship(:has_derivation, newthing)
-=> true
-
-newobj.relationships
-=> #<RDF::Graph:0x83a53088(<>)> 
-
-newobj.relationships.statements.map(&:inspect)
-=> ["#<RDF::Statement:0x8371a3e4(<info:fedora/changeme:30> <info:fedora/fedora-system:def/relations-external#hasDerivation> <info:fedora/changeme:30> .)>"]
-
-newobj.relationships(:has_derivation)
- => ["info:fedora/changeme:30"] 
-
-
-newobj.save
-=> ...
-newobj.pid
-=> "changeme:164" # this is the pid you want to put in the following URLs as a replacement for (PID)
-</pre>
-
-You can see objects in Fedora by going to http://localhost:8983/fedora/objects/(PID) and you can see the relationships for an object by looking at the RELS-EXT datastream content:  http://localhost: 8983/fedora/objects/(PID)/datastreams/RELS-EXT/content
-
-Now let's see if the "newthing" object has an "inspiration" relationship with our "newobj"
-
-<pre>
-newthing.inspirations
-=> ... (FIXME: put expected output here)
-newthing.inspirations.each {|pt| puts pt.pid }
-=> ... (FIXME: put expected output here)
-newthing.inspirations(:response_format=>:id_array)
-=> ... (FIXME: put expected output here)
-</pre>
-
-Note that you didn't have to save the "newthing" object in order for this relationship to show up in Solr because it is an inbound relationship. 
-
-Only the ActiveFedora object making the assertion needs to be saved in order for the search to work.  In our example above, new_obj asserts :has_derivation (rather than the derivative asserting :is_derivation_of), so only new_obj had to be saved. 
-
-
-h2. Fedora DATASTREAMS & METADATA in ActiveFedora
-
-h3. Blobs (a.k.a. File Datastreams, a.k.a Managed Content Datastreams)
-
-Here we create a simple Datastream (using the default Datastream model). 
-
-<pre>
-file = File.new('spec/fixtures/minivan.jpg')
-=> #<File:spec/fixtures/minivan.jpg>
-file_ds = ActiveFedora::Datastream.new(:dsID => "minivan", :dsLabel => 'hello', :controlGroup => 'M', :blob => file)
-=> ...
-newthing.add_datastream(file_ds)
-=> "minivan"
-newthing.save
-=> true
-</pre>
-
-Now use your browser to find the file datastreams in Fedora ...
-
-
-h3. On auto-generating datastream ids
-
-If you don't specify a dsid, ActiveFedora will generate one for you.  In the example below, "DS1" is the dsID assigned to the new datastream
-
-<pre>
-file_ds2 = ActiveFedora::Datastream.new(:dsLabel => 'Minivan Plays', :altIDs => 'default', :controlGroup => 'M', :blob => file)
-newthing.add_datastream(file_ds2)
-=> "DS1"
-newthing.datastreams.keys
-=> ["DS1", "descMetadata", "minivan", "RELS-EXT", "rightsMetadata", "DC", "extraMetadataForFun"]
-newthing.datastreams_in_memory["DS1"] == file_ds2
-=> true
-</pre>
-
-You can choose a different prefix for the dsid by passing a :prefix value to add_datastream (be careful to ensure that the resulting dsid is a valid XMLString, or fedora will reject it!)
-
-<pre>
-file_ds3 = ActiveFedora::Datastream.new(:dsLabel => 'Minivan Plays', :altIDs => 'default', :controlGroup => 'M', :blob => file)
-newthing.add_datastream(file_ds3, :prefix=>"Foo")
-=> "Foo1"
-newthing.datastreams.keys
-newthing.save
-</pre>
-
-h2. Retrieving Existing Fedora Repository Objects 
-
-When you want your code to interact with existing digital objects in a Fedora repository, use the ActiveFedora load_instance method.
-
-You can use the load_instance class method on any kind of ActiveFedora::Base class to load objects from Fedora.  In the example below, the ActiveFedora object model for "copy_as_base" is ActiveFedora::Base.
-
-<pre>
-newthing.pid
-=> "changeme:30"
-copy_as_base = ActiveFedora::Base.load_instance("changeme:30")
-copy_as_base.pid
-=> "changeme:30"
-newthing.datastreams.keys
-=> ["DS1", "descMetadata", "Foo1", "minivan", "RELS-EXT", "rightsMetadata", "DC", "extraMetadataForFun"] 
-copy_as_base.datastreams.keys
-=> ["DS1", "descMetadata", "Foo1", "minivan", "RELS-EXT", "rightsMetadata", "DC", "extraMetadataForFun"] 
-</pre>
-
-As you can see, ActiveFedora::Base will load the object, its datastreams, its generic Fedora Object information, and even its RELS-EXT relationships.  It will _not_, however, know how to deserialize any model-specific metadata datastreams.  In other words, *ActiveFedora::Base treats all datastreams as generic Fedora datastreams*.
-
-<pre>
-copy_as_base.datastreams["extraMetadataForFun"].class
-=> ActiveFedora::Datastream
-</pre>
-
-If you want the model-specific metadata to be deserialized, you must call load_instance on the appropriate ActiveFedora model class.  This will load all of the same info as ActiveFedora::Base, but it will also attempt to deserialize the xml from any metadata datastreams that were declared by the has_metadata method in the model.
-
-<pre>
-copy_as_specialthing = SpecialThing.load_instance(newthing.pid)
-copy_as_specialthing.datastreams["descMetadata"].class
-=> Hydra::ModsArticleDatastream
-copy_as_specialthing.datastreams["extraMetadataForFun"].class
-=> ActiveFedora::Marpa::DcDatastream
-</pre>
-
-
-You can use "find" instead of "load_instance".  In practice, we tend to use load_instance though -- it's more direct.
-
-<pre>
-Base.find("changeme:30")
-SpecialThing.find("changeme:30")
-</pre>
-
-
-h3. Finding Fedora Repository Objects of the Same Class
-
-All descendants of the ActiveFedora::Base class inherit the "find" method which searches Solr for Fedora repository objects of the given class.  The method is somewhat incomplete at the moment, but is functional.  We are actively working on making it better.
-
-h3. Finding Instances of the Class
-
-Imitating ActiveRecord, the find(:all) method (inherited from the ActiveFedora::Base class) searches for instances of the calling class.  In current versions of the gem, this method searches solr using the active_fedora_model_field.  In future versions it will not hit solr at all, instead relying on Fedora's Resource Index and searching for anything that asserts "conformsTo" or "hasModel" relationships pointing at the given model.
-
-<pre>
-ActiveFedora::Base.find(:all)
-SpecialThing.find(:all)
-</pre>
-
-You can also query solr directly like so:
-
-<pre>
-solr_result = ActiveFedora::SolrService.instance.conn.query('has_model_s:info\:fedora/afmodel\:SpecialThing')
-</pre>
-
-This query will return a Solr::Result containing all of the objects that have conformsTo relationships pointing at info:fedora/afmodel:SpecialThing in their RELS-EXT.  This relationship gets added to the RELS-EXT whenever you save an object as a given ActiveFedora model and it does not get erased if you later save it as a different model.
-
-
-h2. More About ActiveFedora Models
-
-ActiveFedora Models for Fedora objects don't actually do much.  They mainly keep a list of datastream ids and associate them with classes that help you use the content from those datastreams.
-
-Let's load an instance of the SpecialThing model and take a look at its datastreams.
-
-<pre>
-st = SpecialThing.load_instance("hydrangea:fixture_mods_article1")
-st.datastreams
-... woah.  that's a lot of stuff.  how about just the datastream ids
-st.datastreams.keys
- => ["descMetadata", "RELS-EXT", "rightsMetadata", "DC", "extraMetadataForFun", "properties"] 
-</pre>
-
-We see the three datastreams that are declared by the SpecialThing Model, but where did the other datastreams come from?
-
-h3. Default Fedora Datastreams
-
-The RELS-EXT is where Fedora objects store their relationships, so SpecialThing uses that datastream when it uses the methods created by has_relationship.
-
-The other two datastreams, DC and properties, were already there in the object we imported.  Our model doesn't define anything about those datastreams, so they are loaded as mere ActiveFedora::Datastreams.  When a datastream is loaded in this way, you can still see it and access/update its content as a blob, but your model doesn't know anything special about its contents.  This behavior is what allows us to have multiple interfaces for the same content.  One model might care only about the descMetadata and the properties while another model only cares about the descMetadata and rightsMetadata.  The two models only need to be consistent with each other when they are both operating on the same datastream in the same object.
-
-Let's see what classes the datastreams have been bound to
-
-<pre>
-st.datastreams.keys.each do |dsid|
-  puts "#{dsid}:"  
-  puts "    #{st.datastreams[dsid].class}"
-end
-</pre>
-
-This will output 
-
-<pre>
-descMetadata:
-    Hydra::ModsArticleDatastream
-RELS-EXT:
-    ActiveFedora::RelsExtDatastream
-rightsMetadata:
-    Hydra::RightsMetadataDatastream
-DC:
-    ActiveFedora::Datastream
-extraMetadataForFun:
-    Marpa::DcDatastream
-properties:
-    ActiveFedora::Datastream
-</pre>
-
-Notice that properties and DC have been loaded as ActiveFedora::Datastream, RELS-EXT has been loaded as ActiveFedora::RelsExtDatastream, and the other three have been loaded as the classes specified in the Model.
-
-h2.  Where to Find More Information
-
-You can examine the files in lib/active_fedora/samples to learn more about how to define ActiveFedora models and OM-based datastreams.  We also suggest you read about "OM-based NokogiriDatastreams":http://hudson.projecthydra.org/job/active_fedora/Documentation/file.NOKOGIRI_DATASTREAMS.html to learn about manipulating XML contained in datastreams.
-
+Moved to "https://github.com/mediashelf/active_fedora/wiki/Getting-Started:---Console-Tour":https://github.com/mediashelf/active_fedora/wiki/Getting-Started:---Console-Tour

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.0.0.rc15)
+    active-fedora (4.0.0.rc16)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -9,7 +9,7 @@ PATH
       mime-types (>= 1.16)
       multipart-post (= 1.1.2)
       nokogiri
-      om (>= 1.5.3)
+      om (~> 1.6.0.rc1)
       rdf
       rdf-rdfxml (= 0.3.5)
       rsolr
@@ -63,7 +63,7 @@ GEM
     multipart-post (1.1.2)
     nokogiri (1.5.2)
     nori (1.1.0)
-    om (1.5.3)
+    om (1.6.0.rc1)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rack (1.4.1)

data/History.txt

@@ -1,4 +1,4 @@
-4.0.0.rc15
+4.0.0.rc16
 Removed deprecations
   * allowing :fedora level in fedora.yml
   * automatic includes of Relationships and FileMethods is removed
@@ -21,6 +21,9 @@ Fixes for Ruby 1.9 compatibility
 HYDRA-741 Use fixture loader in repo:* rake tasks. Parameters changed to foxml and dir.
 rubydora to 0.5.7
 Lazily load solr config
+HYDRA-766 Model#classname_from_uri singularizes terms, but it shouldn't change them.
+HYDRA-767 Remove Model::DEFAULT_NS
+Upgrade Om to 1.6.0
 
 3.3.2
 HYDRA-745 No need to require :url be present on external datastreams

data/active-fedora.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency('mime-types', '>= 1.16')
   s.add_dependency('multipart-post', "= 1.1.2")
   s.add_dependency('nokogiri')
-  s.add_dependency('om', '>= 1.5.3')
+  s.add_dependency('om', '~> 1.6.0.rc1')
   s.add_dependency('solrizer', '~>1.2.0')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')

data/config/predicate_mappings.yml

@@ -40,7 +40,9 @@
     :is_subset_of: isSubsetOf
     :is_topic_of: isTopicOf
   info:fedora/fedora-system:def/model#:
-    :has_model: hasModel
+    :is_contractor_of: isContractorOf
+    :is_deployment_of: isDeploymentOf
     :has_service: hasService
+    :has_model: hasModel
   http://www.openarchives.org/OAI/2.0/: 
     :oai_item_id: itemID

data/lib/active_fedora.rb

@@ -47,6 +47,7 @@ module ActiveFedora #:nodoc:
     autoload :Persistence
     autoload :QualifiedDublinCoreDatastream
     autoload :RDFDatastream
+    autoload :RdfxmlRDFDatastream
     autoload :RelsExtDatastream
     autoload :ServiceDefinitions
     autoload :SemanticNode

data/lib/active_fedora/associations/association_collection.rb

@@ -120,7 +120,7 @@ module ActiveFedora
                 @target = find_target
               end
             end
-          rescue ObjectNotFoundError # TODO this isn't ever thrown. Maybe check for nil instead
+          rescue ObjectNotFoundError
             reset
           end
         end

data/lib/active_fedora/base.rb

@@ -252,7 +252,8 @@ module ActiveFedora
       # end
       
       datastreams.each_value do |ds|  
-        ds.to_xml(fields_xml) if ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) || ds.kind_of?(ActiveFedora::RelsExtDatastream)
+        ds.to_xml(fields_xml) if ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper)
+        ds.to_rels_ext if ds.kind_of?(ActiveFedora::RelsExtDatastream)
       end
       return xml.to_s
     end
@@ -324,6 +325,12 @@ module ActiveFedora
       end
       klass.allocate.init_with(inner_object)
     end
+
+    # Examine the :has_model assertions in the RELS-EXT.  Adapt this class to the first first known model
+    def adapt_to_cmodel
+      the_model = ActiveFedora::ContentModel.known_models_for( self ).first
+      self.class != the_model ? self.adapt_to(the_model) : self
+    end
     
     # ** EXPERIMENTAL **
     # This method returns a new object of the same class, with the internal SolrDigitalObject
@@ -359,10 +366,10 @@ module ActiveFedora
     def self.load_instance_from_solr(pid,solr_doc=nil)
       if solr_doc.nil?
         result = find_by_solr(pid)
-        raise "Object #{pid} not found in solr" if result.nil?
+        raise ActiveFedora::ObjectNotFoundError, "Object #{pid} not found in solr" if result.nil?
         solr_doc = result.first
         #double check pid and id in record match
-        raise "Object #{pid} not found in Solr" unless !result.nil? && !solr_doc.nil? && pid == solr_doc[SOLR_DOCUMENT_ID]
+        raise ActiveFedora::ObjectNotFoundError, "Object #{pid} not found in Solr" unless !result.nil? && !solr_doc.nil? && pid == solr_doc[SOLR_DOCUMENT_ID]
       else
         raise "Solr document record id and pid do not match" unless pid == solr_doc[SOLR_DOCUMENT_ID]
       end

data/lib/active_fedora/model.rb

@@ -5,8 +5,6 @@ module ActiveFedora
   # This module mixes various methods into the including class,
   # much in the way ActiveRecord does.  
   module Model 
-    DEFAULT_NS = 'afmodel'
-
     def self.included(klass) # :nodoc:
       klass.extend(ClassMethods)
     end
@@ -15,7 +13,7 @@ module ActiveFedora
     def self.classname_from_uri(uri)
       local_path = uri.split('/')[1]
       parts = local_path.split(':')
-      return parts[-1].split(/_/).map(&:classify).join('::'), parts[0]
+      return parts[-1].split(/_/).map(&:camelize).join('::'), parts[0]
     end
 
     # Takes a Fedora URI for a cModel, and returns a 
@@ -36,7 +34,7 @@ module ActiveFedora
         result = Kernel.const_get(model_value)
       end
       unless result.nil?
-        model_ns = (result.respond_to? :pid_namespace) ? result.pid_namespace : DEFAULT_NS
+        model_ns = (result.respond_to? :pid_namespace) ? result.pid_namespace : ContentModel::CMODEL_NAMESPACE
         if model_ns != pid_ns
           logger.warn "Model class namespace '#{model_ns}' does not match uri: '#{uri}'"
         end
@@ -96,9 +94,13 @@ module ActiveFedora
         "info:fedora/#{namespace}:#{ContentModel.sanitized_class_name(self)}#{pid_suffix}" 
       end
       
-      # Takes :all or a pid as arguments
       # Returns an Array of objects of the Class that +find+ is being 
       # called on
+      #
+      # @param[String,Symbol] either a pid or :all  
+      # @param [Hash] opts the options to create a message with.
+      # @option opts [Integer] :rows when :all is passed, the maximum number of rows to load from solr
+      # @option opts [Boolean] :cast when true, examine the model and cast it to the first known cModel
       def find(args, opts={})
         opts = {:rows=>25}.merge(opts)
         if args == :all
@@ -107,10 +109,10 @@ module ActiveFedora
           hits = SolrService.query(q, :rows=>opts[:rows]) 
           return hits.map do |hit|
              pid = hit[SOLR_DOCUMENT_ID]
-             find_one(pid)
+             find_one(pid, opts[:cast])
           end
         elsif args.class == String
-          return find_one(args)
+          return find_one(args, opts[:cast])
         end
       end
 
@@ -272,18 +274,15 @@ module ActiveFedora
       # using #{ActiveFedora::ContentModel.known_models_for} and cast to that class.
       # Raises a ObjectNotFoundError if the object is not found.
       # @param [String] pid of the object to load
+      # @param [Boolean] cast when true, cast the found object to the class of the first known model defined in it's RELS-EXT
       #
       # @example because the object hydra:dataset1 asserts it is a Dataset (hasModel info:fedora/afmodel:Dataset), return a Dataset object (not a Book).
       #   Book.find_one("hydra:dataset1") 
-      def find_one(pid)
+      def find_one(pid, cast=false)
         inner = DigitalObject.find(self, pid)
-        raise ActiveFedora::ObjectNotFoundError if inner.new?
+        raise ActiveFedora::ObjectNotFoundError, "Unable to find '#{pid}' in fedora" if inner.new?
         af_base = self.allocate.init_with(inner)
-        the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
-        if af_base.class != the_model
-          return af_base.adapt_to(the_model)
-        end
-        af_base
+        cast ? af_base.adapt_to_cmodel : af_base
       end
 
     end

data/lib/active_fedora/rdf_datastream.rb

@@ -32,10 +32,23 @@ module ActiveFedora
           pre = self.to_s.sub(/RDFDatastream$/, '').underscore
           return "#{pre}__#{name}".to_sym
         end
+
+        ##
+        # Register a ruby block that evaluates to the subject of the graph
+        # By default, the block returns the current object's pid
+        # @yield [ds] 'ds' is the datastream instance
+        def rdf_subject &block
+          if block_given?
+             return @subject_block = block
+          end
+
+          @subject_block ||= lambda { |ds| "info:fedora/#{ds.pid}" }
+        end
+
         def register_vocabularies(*vocabs)
           @vocabularies = {}
           vocabs.each do |v|
-            if v.respond_to? :property and v.respond_to? :to_uri
+            if v.is_a?(RDF::Vocabulary) or (v.respond_to? :property and v.respond_to? :to_uri)
               @vocabularies[v.to_uri] = v 
             else
               raise "not an RDF vocabulary: #{v}"
@@ -150,23 +163,26 @@ module ActiveFedora
 
     # returns a Hash, e.g.: {field => {:values => [], :type => :something, :behaviors => []}, ...}
     def fields
+    ensure_loaded
       field_map = {}
       graph.relationships.each do |predicate, values|
         vocab_sym, name = predicate.qname
-        vocabs_list = self.class.vocabularies.select { |ns, v| v.__prefix__ == vocab_sym }
-        vocab = vocabs_list.first.first.to_s
-        vocab_hash = self.class.config[:predicate_mapping][vocab]
-        mapped_names = vocab_hash.select { |k, v| name.to_s == v.to_s && k.to_s.split("__")[0] == self.class.prefix(name).to_s.split("__")[0]}
-        name = mapped_names.first.first.to_s
-        next unless vocab_hash.has_key?("#{name}type".to_sym) and vocab_hash.has_key?("#{name}behaviors".to_sym)
-        type = vocab_hash["#{name}type".to_sym]
-        behaviors = vocab_hash["#{name}behaviors".to_sym]
+        uri, vocab = self.class.vocabularies.select { |ns, v| v.__prefix__ == vocab_sym }.first
+        next unless vocab
+
+        config = self.class.config[:predicate_mapping][vocab.to_s]
+
+        name, indexed_as = config.select { |k, v| name.to_s == v.to_s && k.to_s.split("__")[0] == self.class.prefix(name).to_s.split("__")[0]}.first
+        next unless name and config.has_key?("#{name}type".to_sym) and config.has_key?("#{name}behaviors".to_sym)
+        type = config["#{name}type".to_sym]
+        behaviors = config["#{name}behaviors".to_sym]
         field_map[name.to_sym] = {:values => values.map {|v| v.to_s}, :type => type, :behaviors => behaviors}
       end
       field_map
     end
 
     def to_solr(solr_doc = Hash.new) # :nodoc:
+    ensure_loaded
       fields.each do |field_key, field_info|
         values = field_info.fetch(:values, false)
         if values
@@ -201,7 +217,7 @@ module ActiveFedora
       return if results.nil?
       values = []
       results.each do |object|
-        values << (object.kind_of?(RDF::Literal) ? object.value : object.to_str)
+        values << (object.kind_of?(RDF::Literal) ? object.value : object.to_s)
       end
       TermProxy.new(graph, predicate, values)
     end
@@ -243,6 +259,12 @@ module ActiveFedora
         super
       end
     end
+
+    ##
+    # Get the subject for this rdf/xml datastream
+    def rdf_subject
+      @subject ||= self.class.rdf_subject.call(self)
+    end
     
     # Populate a RDFDatastream object based on the "datastream" content 
     # Assumes that the datastream contains RDF XML from a Fedora RELS-EXT datastream 
@@ -251,9 +273,9 @@ module ActiveFedora
       unless data.nil?
         RDF::Reader.for(serialization_format).new(data) do |reader|
           reader.each_statement do |statement|
-            next unless statement.subject == "info:fedora/#{pid}"
+            next unless statement.subject == rdf_subject
             literal = statement.object.kind_of?(RDF::Literal)
-            object = literal ? statement.object.value : statement.object.to_str
+            object = literal ? statement.object.value : statement.object.to_s
             graph.add(statement.predicate, object, literal)
           end
         end
@@ -265,7 +287,7 @@ module ActiveFedora
     # Note: This method is implemented on SemanticNode instead of RelsExtDatastream because SemanticNode contains the relationships array
     def serialize
       out = RDF::Writer.for(serialization_format).buffer do |writer|
-        graph.to_graph("info:fedora/#{pid}").each_statement do |statement|
+        graph.to_graph(rdf_subject).each_statement do |statement|
           writer << statement
         end
       end

data/lib/active_fedora/rdfxml_rdf_datastream.rb

@@ -0,0 +1,17 @@
+require 'rdf/rdfxml'
+
+module ActiveFedora
+  class RdfxmlRDFDatastream < RDFDatastream
+    def serialization_format
+      :rdfxml 
+    end
+
+    def mimeType
+      'text/xml'
+    end
+
+    def controlGroup
+      'M'
+    end
+  end
+end

data/lib/active_fedora/relationship_graph.rb

@@ -4,7 +4,7 @@ module ActiveFedora
     attr_accessor :relationships, :dirty
 
 
-    def initialize
+    def initialize 
       self.dirty = false
       self.relationships = Hash.new { |h, k| h[k] = [] }
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.0.0.rc15"
+    VERSION = "4.0.0.rc16"
 end

data/spec/fixtures/mixed_rdf_descMetadata.nt

@@ -3,4 +3,5 @@
 <info:fedora/test:1> <http://purl.org/dc/terms/publisher> "Penn State" .
 <info:fedora/test:1> <http://xmlns.com/foaf/0.1/based_near> "New York, NY, US" .
 <info:fedora/test:1> <http://www.w3.org/2000/01/rdf-schema#seeAlso> <http://google.com/> .
+<info:fedora/test:1/content> <http://purl.org/dc/terms/title> "Title of datastream" .
 

data/spec/integration/base_spec.rb

@@ -41,7 +41,7 @@ describe "has_metadata" do
       @obj.save
     end
     it "should save the datastream." do
-      ActiveFedora::Base.find(@obj.pid).foo.person.should == ['bob']
+      ActiveFedora::Base.find(@obj.pid, :cast=>true).foo.person.should == ['bob']
       ActiveFedora::SolrService.query("id:#{@obj.pid.gsub(":", "\\:")}", :fl=>'id person_t').first.should == {"id"=>@obj.pid, 'person_t'=>['bob']}
     end
   end
@@ -56,7 +56,7 @@ describe "has_metadata" do
       @obj.save
     end
     it "should save the datastream." do
-      ActiveFedora::Base.find(@obj.pid).foo.person.should == ['frank']
+      ActiveFedora::Base.find(@obj.pid, :cast=>true).foo.person.should == ['frank']
       ActiveFedora::SolrService.query("id:#{@obj.pid.gsub(":", "\\:")}", :fl=>'id person_t').first.should == {"id"=>@obj.pid, 'person_t'=>['frank']}
     end
   end

data/spec/integration/model_spec.rb

@@ -42,10 +42,14 @@ describe ActiveFedora::Model do
         end
       end
     end
-    describe "#find with a valid pid" do
-      subject { ActiveFedora::Base.find('hydrangea:fixture_mods_article1') }
+    describe "#find with a valid pid with cast" do
+      subject { ActiveFedora::Base.find('hydrangea:fixture_mods_article1', :cast=>true) }
       it { should be_instance_of HydrangeaArticle}
     end
+    describe "#find with a valid pid without cast" do
+      subject { ActiveFedora::Base.find('hydrangea:fixture_mods_article1') }
+      it { should be_instance_of ActiveFedora::Base}
+    end
   end
 
   

data/spec/samples/samples.rb

@@ -1,2 +1,3 @@
 # require all of the files in the samples directory
 require 'samples/models/hydrangea_article'
+require 'samples/special_thing'

data/spec/samples/special_thing.rb

@@ -1,7 +1,4 @@
-require "active-fedora"
-# require "active_fedora/samples/hydra-mods_article_datastream.rb"
-# require "active_fedora/samples/hydra-rights_metadata_datastream.rb"
-# require "active_fedora/samples/marpa-dc_datastream.rb"
+require "spec/samples/marpa-dc_datastream.rb"
 
 # This is an example of an ActiveFedora Model
 #

data/spec/unit/base_spec.rb

@@ -505,6 +505,18 @@ describe ActiveFedora::Base do
       end
     end
 
+    describe ".adapt_to_cmodel" do
+      subject { FooHistory.new } 
+      it "should cast when a cmodel is found" do
+        ActiveFedora::ContentModel.expects(:known_models_for).with( subject).returns([FooAdaptation])
+        subject.adapt_to_cmodel.should be_kind_of FooAdaptation
+      end
+      it "should not cast when a cmodel is same as the class" do
+        ActiveFedora::ContentModel.expects(:known_models_for).with( subject).returns([FooHistory])
+        subject.adapt_to_cmodel.should === subject
+      end
+    end
+
     describe ".to_xml" do
       it "should provide .to_xml" do
         @test_object.should respond_to(:to_xml)

data/spec/unit/model_spec.rb

@@ -69,21 +69,29 @@ describe ActiveFedora::Model do
   end
   
   describe '#find' do
-    it "(:all) should query solr for all objects with :active_fedora_model_s of self.class" do
-      ActiveFedora::SolrService.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :rows=>1001).returns([{"id" => "changeme:30"}, {"id" => "changeme:22"}])
-      SpecModel::Basic.expects(:find_one).with("changeme:30").returns("Fake Object1")
-      SpecModel::Basic.expects(:find_one).with("changeme:22").returns("Fake Object2")
-      SpecModel::Basic.find(:all, :rows=>1001).should == ["Fake Object1", "Fake Object2"]
-    end
-    it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
-      ActiveFedora::ContentModel.expects(:known_models_for).returns([SpecModel::Basic])
-      SpecModel::Basic.any_instance.expects(:init_with).returns(mock("Model", :adapt_to=>SpecModel::Basic ))
-      ActiveFedora::DigitalObject.expects(:find).returns(stub("inner obj", :'new?'=>false))
-      SpecModel::Basic.find("_PID_")
+    describe "without :cast" do
+      it "(:all) should query solr for all objects with :active_fedora_model_s of self.class" do
+        ActiveFedora::SolrService.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :rows=>1001).returns([{"id" => "changeme:30"}, {"id" => "changeme:22"}])
+        SpecModel::Basic.expects(:find_one).with("changeme:30", nil).returns("Fake Object1")
+        SpecModel::Basic.expects(:find_one).with("changeme:22", nil).returns("Fake Object2")
+        SpecModel::Basic.find(:all, :rows=>1001).should == ["Fake Object1", "Fake Object2"]
+      end
+      it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
+        SpecModel::Basic.any_instance.expects(:init_with).returns(SpecModel::Basic.new)
+        ActiveFedora::DigitalObject.expects(:find).returns(stub("inner obj", :'new?'=>false))
+        SpecModel::Basic.find("_PID_").should be_a SpecModel::Basic
+      end
+      it "should raise an exception if it is not found" do
+        SpecModel::Basic.expects(:connection_for_pid).with("_PID_")
+        lambda {SpecModel::Basic.find("_PID_")}.should raise_error ActiveFedora::ObjectNotFoundError
+      end
     end
-    it "should raise an exception if it is not found" do
-      SpecModel::Basic.expects(:connection_for_pid).with("_PID_")
-      lambda {SpecModel::Basic.find("_PID_")}.should raise_error ActiveFedora::ObjectNotFoundError
+    describe "with :cast" do
+      it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
+        SpecModel::Basic.any_instance.expects(:init_with).returns(mock("Model", :adapt_to_cmodel=>SpecModel::Basic.new ))
+        ActiveFedora::DigitalObject.expects(:find).returns(stub("inner obj", :'new?'=>false))
+        SpecModel::Basic.find("_PID_", :cast=>true)
+      end
     end
   end
 
@@ -154,9 +162,16 @@ describe ActiveFedora::Model do
       its(:to_class_uri) {should == 'info:fedora/afmodel:SpecModel_CamelCased-TEST-SUFFIX' }
     end
   
-    
-    it "should turn an afmodel URI into a Model class name" do
-      ActiveFedora::Model.classname_from_uri('info:fedora/afmodel:SpecModel_CamelCased').should == ['SpecModel::CamelCased', 'afmodel']
+    describe ".classname_from_uri" do 
+      it "should turn an afmodel URI into a Model class name" do
+        ActiveFedora::Model.classname_from_uri('info:fedora/afmodel:SpecModel_CamelCased').should == ['SpecModel::CamelCased', 'afmodel']
+      end
+      it "should not change plurality" do
+        ActiveFedora::Model.classname_from_uri('info:fedora/afmodel:MyMetadata').should == ['MyMetadata', 'afmodel']
+      end
+      it "should capitalize the first letter" do
+        ActiveFedora::Model.classname_from_uri('info:fedora/afmodel:image').should == ['Image', 'afmodel']
+      end
     end
   end
   

data/spec/unit/ntriples_datastream_spec.rb

@@ -18,6 +18,10 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @subject.stubs(:pid => 'test:1')
       @subject.stubs(:new? => false)
     end
+
+    it "should have a subject" do
+      @subject.rdf_subject.should == "info:fedora/test:1"
+    end
     it "should have controlGroup" do
       @subject.controlGroup.should == 'M'
     end
@@ -55,6 +59,34 @@ describe ActiveFedora::NtriplesRDFDatastream do
     end
   end
 
+  describe "an instance with a custom subject" do
+    before do 
+      class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+        register_vocabularies RDF::DC, RDF::FOAF, RDF::RDFS
+        rdf_subject { |ds| "info:fedora/#{ds.pid}/content" }
+        map_predicates do |map|
+          map.created(:in => RDF::DC)
+          map.title(:in => RDF::DC)
+          map.publisher(:in => RDF::DC)
+          map.based_near(:in => RDF::FOAF)
+          map.related_url(:to => "seeAlso", :in => RDF::RDFS)
+        end
+      end
+      @subject = MyDatastream.new(@inner_object, 'mixed_rdf')
+      @subject.content = File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
+      @subject.stubs(:pid => 'test:1')
+      @subject.stubs(:new? => false)
+    end
+
+    it "should have fields" do
+      @subject.title.should == ["Title of datastream"]
+    end
+
+    it "should have a custom subject" do
+      @subject.rdf_subject.should == 'info:fedora/test:1/content'
+    end
+  end
+
   describe "a new instance" do
     before(:each) do
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream

data/spec/unit/rdfxml_rdf_datastream_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe ActiveFedora::RdfxmlRDFDatastream do
+    describe "a new instance" do
+    before(:each) do
+      class MyRdfxmlDatastream < ActiveFedora::RdfxmlRDFDatastream
+        register_vocabularies RDF::DC
+        map_predicates do |map|
+          map.publisher(:in => RDF::DC)
+        end
+      end
+      @subject = MyRdfxmlDatastream.new(@inner_object, 'mixed_rdf')
+      @subject.stubs(:pid => 'test:1')
+    end
+    after(:each) do
+      Object.send(:remove_const, :MyRdfxmlDatastream)
+    end
+    it "should save and reload" do
+      @subject.publisher = ["St. Martin's Press"]
+      @subject.serialize.should =~ /<rdf:RDF/
+    end
+ end
+end

data/spec/unit/relationships_spec.rb

@@ -236,7 +236,7 @@ describe ActiveFedora::Relationships do
           local_node = SpecNode.new
           local_node.expects(:ids_for_outbound).with(:is_member_of).returns(["my:_PID1_", "my:_PID2_", "my:_PID3_"])
 
-          ActiveFedora::ContentModel.expects(:known_models_for).returns([SpecNode]).times(3)
+          #ActiveFedora::ContentModel.expects(:known_models_for).returns([SpecNode]).times(3)
           ActiveFedora::SolrService.expects(:query).with("id:my\\:_PID1_ OR id:my\\:_PID2_ OR id:my\\:_PID3_").returns([{"id"=> "my:_PID1_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]},
                          {"id"=> "my:_PID2_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}, 
                          {"id"=> "my:_PID3_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}])

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424139
+  hash: 15424181
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 15
-  version: 4.0.0.rc15
+  - 16
+  version: 4.0.0.rc16
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-18 00:00:00 Z
+date: 2012-03-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -101,14 +101,16 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15424087
         segments: 
         - 1
-        - 5
-        - 3
-        version: 1.5.3
+        - 6
+        - 0
+        - rc
+        - 1
+        version: 1.6.0.rc1
   version_requirements: *id006
   name: om
   type: :runtime
@@ -397,6 +399,7 @@ files:
 - lib/active_fedora/qualified_dublin_core_datastream.rb
 - lib/active_fedora/rdf_datastream.rb
 - lib/active_fedora/rdf_xml_writer.rb
+- lib/active_fedora/rdfxml_rdf_datastream.rb
 - lib/active_fedora/reflection.rb
 - lib/active_fedora/relationship_graph.rb
 - lib/active_fedora/relationships.rb
@@ -533,6 +536,7 @@ files:
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
+- spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb
 - spec/unit/relationships_spec.rb
 - spec/unit/rels_ext_datastream_spec.rb
@@ -693,6 +697,7 @@ test_files:
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
+- spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb
 - spec/unit/relationships_spec.rb
 - spec/unit/rels_ext_datastream_spec.rb