active-fedora 3.3.1 → 3.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.3.1)
+    active-fedora (3.3.2)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -12,7 +12,7 @@ PATH
       om (>= 1.5.1)
       rdf
       rdf-rdfxml
-      rubydora (~> 0.5.2)
+      rubydora (~> 0.5.3)
       solr-ruby (>= 0.0.6)
       solrizer (~> 1.2.0)
       xml-simple (>= 1.0.12)
@@ -30,7 +30,7 @@ GEM
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
+    addressable (2.2.7)
     akami (1.0.0)
       gyoku (>= 0.4.0)
     builder (3.0.0)
@@ -44,7 +44,7 @@ GEM
     ffi (1.0.11)
     gyoku (0.4.4)
       builder (>= 2.1.2)
-    httpi (0.9.5)
+    httpi (0.9.6)
       rack
     i18n (0.6.0)
     jettywrapper (1.2.1)
@@ -62,13 +62,13 @@ GEM
     multi_json (1.0.4)
     multipart-post (1.1.2)
     nokogiri (1.5.0)
-    nori (1.0.2)
+    nori (1.1.0)
     om (1.5.1)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rack (1.4.1)
     rake (0.9.2.2)
-    rdf (0.3.4.1)
+    rdf (0.3.5)
       addressable (>= 2.2.6)
     rdf-rdfxml (0.3.5)
       nokogiri (>= 1.4.4)
@@ -85,7 +85,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    rubydora (0.5.2)
+    rubydora (0.5.3)
       activemodel
       activesupport
       fastercsv
@@ -93,14 +93,14 @@ GEM
       nokogiri
       rest-client
       savon
-    savon (0.9.7)
+    savon (0.9.9)
       akami (~> 1.0)
       builder (>= 2.1.2)
       gyoku (>= 0.4.0)
       httpi (~> 0.9)
       nokogiri (>= 1.4.0)
-      nori (~> 1.0)
-      wasabi (~> 2.0)
+      nori (~> 1.1)
+      wasabi (~> 2.1)
     solr-ruby (0.0.8)
     solrizer (1.2.0)
       daemons
@@ -118,7 +118,7 @@ GEM
       solr-ruby (>= 0.0.6)
       solrizer (>= 1.0.0)
     stomp (1.2.0)
-    wasabi (2.0.0)
+    wasabi (2.1.0)
       nokogiri (>= 1.4.0)
     xml-simple (1.1.1)
     yard (0.7.4)

data/History.txt

@@ -1,3 +1,13 @@
+3.3.2
+HYDRA-745 No need to require :url be present on external datastreams
+Initialize relationships graph to empty array
+HYDRA-668 ActiveFedora models do not need to be immediate descendants of ActiveFedora::Base
+Fix for camel cased classes in classname from uri
+HYDRA-746 Speed up find() by not hitting solr first
+Added description for active_fedora:load_fixtures task
+HYDRA-748 Allow setting versionable via has_metadata
+
+
 3.3.1
 Allow explicit setting of predicate config.
 Check for appropriate content before saving a datastream

data/active-fedora.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
-  s.add_dependency("rubydora", '~>0.5.2')
+  s.add_dependency("rubydora", '~>0.5.3')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml")
   s.add_development_dependency("yard")

data/lib/active_fedora/content_model.rb

@@ -53,7 +53,7 @@ module ActiveFedora
     # Returns false if no corresponding model can be found.
     def self.uri_to_model_class( uri )
       rc = Model.from_class_uri(uri)
-      if rc && rc.superclass == ActiveFedora::Base
+      if rc && (rc.superclass == ActiveFedora::Base || rc.ancestors.include?(ActiveFedora::Base))
         rc
       else
         false

data/lib/active_fedora/datastreams.rb

@@ -78,6 +78,7 @@ module ActiveFedora
       ds = ds_spec[:type].new(inner_object, name)
       ds.dsLabel = ds_spec[:label] if ds_spec[:label].present?
       ds.controlGroup = ds_spec[:control_group]
+      ds.versionable = ds_spec[:versionable]
       additional_attributes_for_external_and_redirect_control_groups(ds, ds_spec)
       ds
     end
@@ -226,12 +227,10 @@ module ActiveFedora
     # @param [Object] ds_config hash of options which may contain :disseminator and :url
     def additional_attributes_for_external_and_redirect_control_groups(ds,ds_config)
       if ds.controlGroup=='E'
-        raise "Must supply either :disseminator or :url if you specify :control_group => 'E'" if (ds_config[:disseminator].empty? && ds_config[:url].empty?)
-        if !ds_config[:disseminator] && ds_config[:url].present?
+        if !ds_config[:disseminator].present? && ds_config[:url].present?
           ds.dsLocation= ds_config[:url]
         end
       elsif ds.controlGroup=='R'
-        raise "Must supply a :url if you specify :control_group => 'R'" if (ds_config[:url].empty?)
         ds.dsLocation= ds_config[:url]
       end
     end
@@ -242,6 +241,16 @@ module ActiveFedora
       #args must include :name. Note that this method doesn't actually
       #execute the block, but stores it at the class level, to be executed
       #by any future instantiations.
+      #
+      # @param [Hash] args 
+      # @option args [Class] :type The class that will represent this datastream, should extend ``Datastream''
+      # @option args [String] :name the handle to refer to this datastream as
+      # @option args [String] :label sets the fedora label
+      # @option args [String] :control_group ('X') must be one of 'E', 'X', 'M', 'R'
+      # @option args [String] :disseminator Sets the disseminator location see {#add_disseminator_location_to_datastreams}
+      # @option args [String] :url 
+      # @option args [Boolean] :versionable (true) Should versioned datastreams be stored
+      # @yield block executed by some kinds of datastreams
       def has_metadata(args, &block)
         ds_specs[args[:name]]= {:type => args[:type], :label =>  args.fetch(:label,""), :control_group => args.fetch(:control_group,"X"), :disseminator => args.fetch(:disseminator,""), :url => args.fetch(:url,""),:block => block}
       end

data/lib/active_fedora/model.rb

@@ -15,7 +15,7 @@ module ActiveFedora
     def self.classname_from_uri(uri)
       local_path = uri.split('/')[1]
       parts = local_path.split(':')
-      return parts[-1].gsub('_','/').classify, parts[0]
+      return parts[-1].split(/_/).map(&:classify).join('::'), parts[0]
     end
 
     # Takes a Fedora URI for a cModel, and returns a 
@@ -108,21 +108,12 @@ module ActiveFedora
           return_multiple = true
           escaped_class_uri = SolrService.escape_uri_for_query(self.to_class_uri)
           q = "#{ActiveFedora::SolrService.solr_name(:has_model, :symbol)}:#{escaped_class_uri}"
-        elsif args.class == String
-          escaped_id = args.gsub(/(:)/, '\\:')
-          q = "#{SOLR_DOCUMENT_ID}:#{escaped_id}"
-        end
-        if return_multiple == true
           hits = SolrService.instance.conn.query(q, :rows=>opts[:rows]).hits 
-        else
-          hits = SolrService.instance.conn.query(q).hits 
-        end
-        if return_multiple
           return hits.map do |hit|
              RubydoraConnection.instance.find_model(hit[SOLR_DOCUMENT_ID], self)
           end
-        else
-          return RubydoraConnection.instance.find_model(hits.first[SOLR_DOCUMENT_ID], self) if hits.first
+        elsif args.class == String
+          return RubydoraConnection.instance.find_model(args, self)
         end
       end
 

data/lib/active_fedora/relationship_graph.rb

@@ -6,7 +6,7 @@ module ActiveFedora
 
     def initialize
       self.dirty = false
-      self.relationships = {}
+      self.relationships = Hash.new { |h, k| h[k] = [] }
     end
 
     def has_predicate?(predicate)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.3.1"
+    VERSION = "3.3.2"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -43,6 +43,7 @@ require 'rspec/core/rake_task'
     Dir.chdir("..")
   end
 
+  desc "Loads or refreshes the fixtures needed to run the tests"
   task :load_fixtures => :environment do
     ActiveFedora.init unless Thread.current[:repo]
     

data/spec/integration/base_spec.rb

@@ -384,7 +384,7 @@ describe ActiveFedora::Base do
       @test_object.remove_relationship(:has_part,@test_object2)
       @test_object.save
       @test_object = ActiveFedora::Base.load_instance(@pid)
-      @test_object.object_relations[:has_part].should be_nil
+      @test_object.object_relations[:has_part].should be_empty
     end
   end
 

data/spec/integration/model_spec.rb

@@ -14,13 +14,14 @@ describe ActiveFedora::Model do
   before(:each) do 
     module ModelIntegrationSpec
       
-      class Basic < ActiveFedora::Base
+      class Base < ActiveFedora::Base
         include ActiveFedora::Model
         def self.pid_namespace
           "foo"
         end
       end
-      
+      class Basic < Base
+      end
     end
 
     @test_instance = ModelIntegrationSpec::Basic.new

data/spec/unit/content_model_spec.rb

@@ -7,7 +7,10 @@ require 'mocha'
 describe ActiveFedora::ContentModel do
   
   before(:all) do
-    class SampleModel < ActiveFedora::Base
+    class BaseModel < ActiveFedora::Base
+    end
+    
+    class SampleModel < BaseModel
     end
 
     class GenericContent < ActiveFedora::Base

data/spec/unit/datastreams_spec.rb

@@ -9,6 +9,16 @@ describe ActiveFedora::Datastreams do
     ActiveFedora::Base.respond_to?(:has_metadata).should be_true
   end
 
+  describe "datastream_from_spec" do
+    it "should accept versionable" do
+      ds = @test_object.datastream_from_spec({:type=>ActiveFedora::Datastream, :versionable=>false}, 'test')
+      ds.versionable.should be_false
+      ds = @test_object.datastream_from_spec({:type=>ActiveFedora::Datastream, :versionable=>true}, 'test')
+      ds.versionable.should be_true
+    end
+
+  end
+
   describe "has_metadata" do
     @@last_pid = 0
     def increment_pid
@@ -98,19 +108,11 @@ describe ActiveFedora::Datastreams do
         stub_get(@this_pid)
         stub_add_ds(@this_pid, ['RELS-EXT', 'externalDisseminator', 'externalUrl'])
       end
-      before :all do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "E"
-        end
-      end
 
-      after(:all) do
+      after :each do
         # clean up test class
         Object.send(:remove_const, :MoreFooHistory)
       end
-      it "should raise an error without :disseminator or :url option" do
-        lambda { @n = MoreFooHistory.new }.should raise_exception
-      end
       
       it "should allow :control_group => 'E' with a :url option" do
         class MoreFooHistory < ActiveFedora::Base
@@ -119,17 +121,38 @@ describe ActiveFedora::Datastreams do
         stub_ingest(@this_pid)
         @n = MoreFooHistory.new
         @n.save
+        @n.datastreams['externalDisseminator'].dsLocation.should == "http://exampl.com/mypic.jpg"
       end
-      it "should raise an error if :url is malformed" do
+      
+      it "should allow :control_group => 'E' without a :url option" do
         class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type => ActiveFedora::NokogiriDatastream, :name=>"externalUrl", :url=>"my_rul", :control_group => "E"
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "E"
         end
-        client = mock_client.stubs(:[]).with do |params|
-          /objects\/#{@this_pid}\/datastreams\/externalUrl/.match(params)
+        stub_ingest(@this_pid)
+        @n = MoreFooHistory.new
+        @n.datastreams['externalDisseminator'].dsLocation.present?.should == false
+        @n.save
+      end
+      
+      it "should fail validation if a :url is not added before save" do
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "E"
         end
-        client.raises(RuntimeError, "Error adding datastream externalUrl for object changeme:4020. See logger for details")
+        stub_ingest(@this_pid)
         @n = MoreFooHistory.new
-        lambda {@n.save }.should raise_exception
+        @n.datastreams['externalDisseminator'].validate_content_present.should == false
+        @n.save
+      end
+      
+      it "should pass validation if a :url is added before save" do
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "E"
+        end
+        stub_ingest(@this_pid)
+        @n = MoreFooHistory.new
+        @n.datastreams['externalDisseminator'].dsLocation = "http://exampl.com/mypic.jpg"
+        @n.datastreams['externalDisseminator'].validate_content_present.should == true
+        @n.save
       end
     end
 
@@ -138,14 +161,12 @@ describe ActiveFedora::Datastreams do
         stub_get(@this_pid)
         stub_add_ds(@this_pid, ['RELS-EXT', 'externalDisseminator' ])
       end
-      it "should raise an error without :url option" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "R"
-        end
-        lambda { @n = MoreFooHistory.new }.should raise_exception
+      
+      after :each do
+        Object.send(:remove_const, :MoreFooHistory)
       end
       
-      it "should work with a valid  :url option" do
+      it "should allow :control_group => 'R' with a :url option" do
         stub_ingest(@this_pid)
         class MoreFooHistory < ActiveFedora::Base
           has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R", :url => "http://exampl.com/mypic.jpg"
@@ -153,21 +174,36 @@ describe ActiveFedora::Datastreams do
         @n = MoreFooHistory.new
         @n.save
       end
-      it "should not take a :disseminator option without a :url option" do
+    
+      it "should allow :control_group => 'R' without a :url option" do
         class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "R", :disseminator => "foo:s-def/hull-cModel:Foo"
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R"
         end
-        lambda { @n = MoreFooHistory.new }.should raise_exception
+        stub_ingest(@this_pid)
+        @n = MoreFooHistory.new
+        @n.datastreams['externalDisseminator'].dsLocation.present?.should == false
+        @n.save
       end
-      it "should raise an error if :url is malformed" do
+    
+      it "should fail validation if a :url is not added before save" do
         class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type => ActiveFedora::NokogiriDatastream, :name=>"externalUrl", :url=>"my_rul", :control_group => "R"
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R"
         end
-        client = mock_client.stubs(:[]).with do |params|
-          /objects\/#{@this_pid}\/datastreams\/externalUrl/.match(params)
+        stub_ingest(@this_pid)
+        @n = MoreFooHistory.new
+        @n.datastreams['externalDisseminator'].validate_content_present.should == false
+        @n.save
+      end
+    
+      it "should pass validation if a :url is added before save" do
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R"
         end
-        client.raises(RuntimeError, "Error adding datastream externalUrl for object changeme:4020. See logger for details")
-        lambda {MoreFooHistory.new }.should raise_exception
+        stub_ingest(@this_pid)
+        @n = MoreFooHistory.new
+        @n.datastreams['externalDisseminator'].dsLocation = "http://exampl.com/mypic.jpg"
+        @n.datastreams['externalDisseminator'].validate_content_present.should == true
+        @n.save
       end
     end
   end

data/spec/unit/model_spec.rb

@@ -110,28 +110,11 @@ describe ActiveFedora::Model do
     end
     
     it "(String) should query solr for an object with the given id and return that object" do
-      mock_solr = mock("SolrConnection")
-      mock_result = mock("MockResult")
-      mock_result.expects(:hits).returns([{"id" => "changeme:30"}])
-      mock_solr.expects(:query).with('id:changeme\:30').returns(mock_result)
-      ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
       ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object")
     
       SpecModel::Basic.find("changeme:30").should == "Fake Object"
     end
     
-    it 'should not call #new' do
-      mock_solr = mock("SolrConnection")
-      mock_result = mock("MockResult")
-      mock_result.expects(:hits).returns([{"id" => "changeme:30"}])
-      mock_solr.expects(:query).with('id:changeme\:30').returns(mock_result)
-      ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("fake object")
-
-      ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
-    
-      res = SpecModel::Basic.find("changeme:30")
-    end
-    
     describe"(:pid => xxx)" do 
       it "should pull the inner object from fedora if it already exists in fedora" do
         pending
@@ -202,4 +185,27 @@ describe ActiveFedora::Model do
       SpecModel::Basic.load_instance("_PID_")
     end
   end
+  
+  describe "URI translation" do
+    before :all do
+      module SpecModel
+        class CamelCased
+          include ActiveFedora::Model
+        end
+      end
+    end
+    
+    after :all do
+      SpecModel.send(:remove_const, :CamelCased)
+    end
+    
+    it "should turn a Model class name into an afmodel URI" do
+      SpecModel::CamelCased.to_class_uri.should == 'info:fedora/afmodel:SpecModel_CamelCased'
+    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']
+    end
+  end
+  
 end

data/spec/unit/relationship_graph_spec.rb

@@ -7,7 +7,18 @@ describe ActiveFedora::RelationshipGraph do
     @n1.stubs(:pid => 'foo:777')
   end
 
-  
+  describe "#relationships" do
+    it "should have hash accessors" do
+      @graph.should respond_to(:[])
+    end
+
+    it "should initialize new relation keys" do
+      @graph[:fictional_key].should be_empty
+      @graph[:fictional_key].should respond_to(:<<)
+    end
+
+  end
+
   it "should add relationships" do
     @n2 = ActiveFedora::Base.new
     @graph.add(:has_part, @n1)

data/spec/unit/solr_config_options_spec.rb

@@ -48,17 +48,7 @@ describe ActiveFedora do
       @test_object.to_solr[SOLR_DOCUMENT_ID.to_sym].should_not be_nil
       @test_object.to_solr[:id].should be_nil
     end
-    it "should be used by ActiveFedora::Base#find" do
-      mock_solr = mock("SolrConnection")
-      mock_result = mock("MockResult")
-      mock_result.expects(:hits).returns([{SOLR_DOCUMENT_ID => "changeme:30"}])
-      mock_solr.expects(:query).with(SOLR_DOCUMENT_ID + ':changeme\:30').returns(mock_result)
-      #Fedora::Repository.instance.expects(:find_model).with("changeme:30", SolrSpecModel::Basic).returns("fake object")
 
-      ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
-  
-      res = SolrSpecModel::Basic.find("changeme:30")
-    end
     it "should be used by ActiveFedora::Base#find_by_solr" do
       mock_solr = mock("SolrConnection")
       mock_response = mock("SolrResponse")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 3
-  - 1
-  version: 3.3.1
+  - 2
+  version: 3.3.2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-06 00:00:00 Z
+date: 2012-02-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -31,10 +31,10 @@ dependencies:
         - 0
         - 6
         version: 0.0.6
-  prerelease: false
   requirement: *id001
-  type: :runtime
   name: solr-ruby
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,10 +47,10 @@ dependencies:
         - 0
         - 12
         version: 1.0.12
-  prerelease: false
   requirement: *id002
-  type: :runtime
   name: xml-simple
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,10 +62,10 @@ dependencies:
         - 1
         - 16
         version: "1.16"
-  prerelease: false
   requirement: *id003
-  type: :runtime
   name: mime-types
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -78,10 +78,10 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  prerelease: false
   requirement: *id004
-  type: :runtime
   name: multipart-post
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -92,10 +92,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   requirement: *id005
-  type: :runtime
   name: nokogiri
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -108,10 +108,10 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  prerelease: false
   requirement: *id006
-  type: :runtime
   name: om
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -124,10 +124,10 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  prerelease: false
   requirement: *id007
-  type: :runtime
   name: solrizer
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -140,10 +140,10 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  prerelease: false
   requirement: *id008
-  type: :runtime
   name: activeresource
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -156,10 +156,10 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  prerelease: false
   requirement: *id009
-  type: :runtime
   name: activesupport
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -170,10 +170,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   requirement: *id010
-  type: :runtime
   name: mediashelf-loggable
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -184,26 +184,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   requirement: *id011
-  type: :runtime
   name: equivalent-xml
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
         - 5
-        - 2
-        version: 0.5.2
-  prerelease: false
+        - 3
+        version: 0.5.3
   requirement: *id012
-  type: :runtime
   name: rubydora
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
@@ -214,10 +214,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   requirement: *id013
-  type: :runtime
   name: rdf
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
@@ -228,10 +228,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   requirement: *id014
-  type: :runtime
   name: rdf-rdfxml
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
@@ -242,10 +242,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   requirement: *id015
-  type: :development
   name: yard
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
@@ -256,10 +256,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   requirement: *id016
-  type: :development
   name: RedCloth
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
@@ -270,10 +270,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   requirement: *id017
-  type: :development
   name: rake
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
@@ -286,10 +286,10 @@ dependencies:
         - 2
         - 3
         version: 1.2.3
-  prerelease: false
   requirement: *id018
-  type: :development
   name: solrizer-fedora
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
@@ -302,10 +302,10 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  prerelease: false
   requirement: *id019
-  type: :development
   name: jettywrapper
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
@@ -317,10 +317,10 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  prerelease: false
   requirement: *id020
-  type: :development
   name: rspec
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
@@ -333,10 +333,10 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  prerelease: false
   requirement: *id021
-  type: :development
   name: mocha
+  type: :development
+  prerelease: false
 description: ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.
 email: 
 - matt.zumwalt@yourmediashelf.com
@@ -581,7 +581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubyfedora
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A convenience libary for manipulating MODS (Metadata Object Description Schema) documents.