active-fedora 6.0.0.pre7 → 6.0.0.pre8

data/Gemfile

@@ -3,7 +3,6 @@ source "http://rubygems.org"
 # Bundler will rely on active-fedora.gemspec for dependency information.
 
 gemspec
-
 group :development, :test do
   gem 'simplecov', :platform => :mri_19
   gem 'simplecov-rcov', :platform => :mri_19

data/History.txt

@@ -1,6 +1,11 @@
 6.0.0
 New solr schema with descriptive field suffixes
 Added support for RDF lists
+RDF does not index terms by default
+count is now a scoped query.
+
+5.5.2
+#25 When multiple has_many relationships share a predicate, the solr_query should use class_name to distinguish the sets.
 
 5.5.1
 #34 Allow passing RDF::URI to rdf_type

data/active-fedora.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
   s.add_dependency('rsolr')
   s.add_dependency('om', '~> 1.8.0')
   s.add_dependency('nom-xml', '>=0.5.1')
-  s.add_dependency('solrizer', '~>3.0.0.pre6')
+  s.add_dependency('solrizer', '~>3.0.0.pre7')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>1.2')
+  s.add_dependency("rubydora", '~>1.3')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>1.0.0')
   s.add_dependency("deprecation")

data/lib/active_fedora/nokogiri_datastream.rb

@@ -63,11 +63,12 @@ module ActiveFedora
     def ng_xml=(new_xml)
       case new_xml 
       when Nokogiri::XML::Document
-        @ng_xml = new_xml
+        self.content=new_xml.to_xml
       when  Nokogiri::XML::Node 
-        @ng_xml = Nokogiri::XML(new_xml.to_s) ## Cast a fragment to a document
+        ## Cast a fragment to a document
+        self.content=new_xml.to_s
       when String 
-        @ng_xml = Nokogiri::XML::Document.parse(new_xml)
+        self.content=new_xml
       else
         raise TypeError, "You passed a #{new_xml.class} into the ng_xml of the #{self.dsid} datastream. NokogiriDatastream.ng_xml= only accepts Nokogiri::XML::Document, Nokogiri::XML::Element, Nokogiri::XML::Node, or raw XML (String) as inputs."
       end
@@ -103,6 +104,7 @@ module ActiveFedora
     
     def content=(content)
       @ng_xml = Nokogiri::XML::Document.parse(content)
+      super(@ng_xml.to_s)
     end
 
     def content_changed?

data/lib/active_fedora/querying.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   module Querying
-    delegate :find, :first, :where, :limit, :order, :all, :delete_all, :destroy_all, :to=>:relation
+    delegate :find, :first, :where, :limit, :order, :all, :delete_all, :destroy_all, :count, :to=>:relation
     def relation
       Relation.new(self)
     end
@@ -39,6 +39,10 @@ module ActiveFedora
       end while docs.has_next? 
     end
 
+    def calculate(calculation, conditions, opts={})
+      SolrService.query(create_query(conditions), :raw=>true, :rows=>0)['response']['numFound']
+    end
+
     def default_sort_params
       [ActiveFedora::SolrService.solr_name(:system_create, :stored_sortable, type: :date)+' asc'] 
     end
@@ -65,14 +69,6 @@ module ActiveFedora
       !inner.new?
     end
 
-    # Get a count of the number of objects from solr
-    # Takes :conditions as an argument
-    def count(args = {})
-      q = search_model_clause ? [search_model_clause] : []
-      q << "#{args[:conditions]}"  if args[:conditions]
-      SolrService.query(q.join(' AND '), :raw=>true, :rows=>0)['response']['numFound']
-    end
-
     # Returns a solr result matching the supplied conditions
     # @param[Hash,String] conditions can either be specified as a string, or 
     # hash representing the query part of an solr statement. If a hash is 
@@ -129,7 +125,8 @@ module ActiveFedora
       unless value.nil?
         # if the key is a property name, turn it into a solr field
         if self.delegate_registry.include?(key.to_sym)
-          key = ActiveFedora::SolrService.solr_name(key, :searchable, type: :string)
+          # TODO Check to see if `key' is a possible solr field for this class, if it isn't try :searchable instead
+          key = ActiveFedora::SolrService.solr_name(key, :stored_searchable, type: :string)
         end
         if value.is_a? Array
           value.map { |val| "#{key}:#{quote_for_solr(val)}" }
@@ -143,7 +140,11 @@ module ActiveFedora
 
     def create_query_from_string(conditions)
       model_clause = search_model_clause
-      model_clause ? "#{model_clause} AND (#{conditions})" : conditions
+      if model_clause 
+        conditions ? "#{model_clause} AND (#{conditions})" : model_clause
+      else
+        conditions
+      end
     end
 
     # Return the solr clause that queries for this type of class

data/lib/active_fedora/rdf_datastream.rb

@@ -26,7 +26,6 @@ module ActiveFedora
       end
     end
 
-    attr_accessor :loaded
     def metadata?
       true
     end
@@ -37,25 +36,20 @@ module ActiveFedora
       return "#{pre}__#{name}".to_sym
     end
 
+    # Overriding so that one can call ds.content on an unsaved datastream and they will see the serialized format
     def content
       serialize
     end
 
     def content=(content)
-      self.loaded = true
       @graph = deserialize(content)
     end
 
     def content_changed?
-      return false if new? and !loaded
+      @content = serialize
       super
     end
 
-    def changed?
-      super || content_changed?
-    end
-
-
     def to_solr(solr_doc = Hash.new) # :nodoc:
       fields.each do |field_key, field_info|
         values = get_values(rdf_subject, field_key)
@@ -90,7 +84,6 @@ module ActiveFedora
 
     def graph
       @graph ||= begin
-        self.loaded = true
         deserialize
       end      
     end

data/lib/active_fedora/rdf_node.rb

@@ -167,7 +167,7 @@ module ActiveFedora
       class IndexObject
         attr_accessor :data_type, :behaviors
         def initialize
-          @behaviors = [:searchable]
+          @behaviors = []
           @data_type = :string
         end
         def as(*args)

data/lib/active_fedora/rdf_node/term_proxy.rb

@@ -3,7 +3,10 @@ module ActiveFedora
     class TermProxy
 
       attr_reader :graph, :subject, :predicate, :options
-      delegate :class, :to_s, :==, :kind_of?, :each, :map, :empty?, :as_json, :is_a?, :to => :values
+
+      delegate :class, :to_s, :==, :kind_of?, :each, :map, :empty?, :as_json, 
+               :is_a?, :to_ary, :inspect, :first, :last, :include?, :count, 
+               :to => :values
 
       # @param graph RDF::Graph
       # @param subject RDF::URI
@@ -51,14 +54,7 @@ module ActiveFedora
         
         values
       end
-      
-      def method_missing(method, *args, &block)
-        if values.respond_to? method
-          values.send(method, *args, &block)
-        else
-          super
-        end
-      end
+
     end
   end
 end

data/lib/active_fedora/relation.rb

@@ -149,6 +149,21 @@ module ActiveFedora
       @records
     end
 
+    # Get a count of the number of objects from solr
+    # Takes :conditions as an argument
+    def count(*args)
+      return apply_finder_options(args.first).count  if args.any?
+      opts = {}
+      opts[:rows] = @limit_value if @limit_value
+      opts[:sort] = @order_values if @order_values
+      
+      query = @where_values.present? ? @where_values : {}
+      @klass.calculate :count, query, opts
+
+    end
+
+
+
     def ==(other)
       case other
       when Relation
@@ -192,7 +207,7 @@ module ActiveFedora
       if conditions
         where(conditions).destroy_all
       else
-        to_a.each {|object| object.destroy }.tap { reset }
+        to_a.each {|object| object.destroy }.tap { reset }.size
       end
     end
 
@@ -200,7 +215,7 @@ module ActiveFedora
       if conditions
         where(conditions).delete_all
       else
-        to_a.each {|object| object.delete }.tap { reset }
+        to_a.each {|object| object.delete }.tap { reset }.size
       end
     end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.0.0.pre7"
+  VERSION = "6.0.0.pre8"
 end

data/spec/integration/base_spec.rb

@@ -20,7 +20,7 @@ describe "A base object with metadata" do
       obj = ActiveFedora::Base.find(@obj.pid, :cast=>true)
       obj.foo.should_not be_new
       obj.foo.person.should == ['bob']
-      person_field = ActiveFedora::SolrService.solr_name('person', :searchable, type: :string)
+      person_field = ActiveFedora::SolrService.solr_name('person', type: :string)
       ActiveFedora::SolrService.query("id:#{@obj.pid.gsub(":", "\\:")}", :fl=>"id #{person_field}").first.should == {"id"=>@obj.pid, person_field =>['bob']}
     end
   end
@@ -40,7 +40,7 @@ describe "A base object with metadata" do
       end
       it "should save the datastream." do
         MockAFBaseRelationship.find(@release.pid).foo.person.should == ['frank']
-        person_field = ActiveFedora::SolrService.solr_name('person', :searchable, type: :string)
+        person_field = ActiveFedora::SolrService.solr_name('person', type: :string)
         ActiveFedora::SolrService.query("id:#{@release.pid.gsub(":", "\\:")}", :fl=>"id #{person_field}").first.should == {"id"=>@release.pid, person_field =>['frank']}
       end
     end

data/spec/integration/ntriples_datastream_spec.rb

@@ -5,11 +5,11 @@ describe ActiveFedora::NtriplesRDFDatastream do
     class MyDatastream < ActiveFedora::NtriplesRDFDatastream
       map_predicates do |map|
         map.title(:in => RDF::DC) do |index|
-          index.as :searchable, :facetable, :displayable
+          index.as :stored_searchable, :facetable
         end
         map.date_uploaded(:to => "dateSubmitted", :in => RDF::DC) do |index|
           index.type :date
-          index.as :searchable, :displayable, :sortable
+          index.as :stored_searchable, :sortable
         end
         map.part(:to => "hasPart", :in => RDF::DC)
         map.based_near(:in => RDF::FOAF)
@@ -74,7 +74,6 @@ describe ActiveFedora::NtriplesRDFDatastream do
   it "should produce a solr document" do
     @subject = RdfTest.new(title: "War and Peace")
     solr_document = @subject.to_solr
-    solr_document[ActiveFedora::SolrService.solr_name('rdf__title', :displayable)].should == ["War and Peace"]
     solr_document[ActiveFedora::SolrService.solr_name('rdf__title', :facetable)].should == ["War and Peace"]
     solr_document[ActiveFedora::SolrService.solr_name('rdf__title', type: :string)].should == ["War and Peace"]
   end

data/spec/integration/om_datastream_spec.rb

@@ -26,7 +26,6 @@ describe ActiveFedora::OmDatastream do
       @test_object = HydrangeaArticle2.find(@pid)
 
       @test_object.descMetadata.ng_xml = @test_object.descMetadata.ng_xml
-
       @test_object.descMetadata.should_not be_changed
     end
 

data/spec/integration/scoped_query_spec.rb

@@ -81,9 +81,13 @@ describe ActiveFedora::Model do
       ModelIntegrationSpec::Basic.limit(1).should == [@test_instance1]
     end
 
-    it "should chain them" do
+    it "should chain queries" do
       ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' asc').limit(1).should == [@test_instance2]
     end
+
+    it "should chain count" do
+      ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').count.should == 2 
+    end
   end
 end
 

data/spec/samples/hydra-mods_article_datastream.rb

@@ -54,12 +54,12 @@ module Hydra
         t.computing_id
       }
       # lookup :person, :first_name        
-      t.person(:ref=>:name, :attributes=>{:type=>"personal"}, :index_as=>[:facetable, :searchable])
+      t.person(:ref=>:name, :attributes=>{:type=>"personal"}, :index_as=>[:facetable, :stored_searchable])
       t.department(:proxy=>[:person,:description],:index_as=>[:facetable])
       t.organization(:ref=>:name, :attributes=>{:type=>"corporate"}, :index_as=>[:facetable])
       t.conference(:ref=>:name, :attributes=>{:type=>"conference"}, :index_as=>[:facetable])
-      t.role(:index_as=>[:searchable]) {
-        t.text(:path=>"roleTerm",:attributes=>{:type=>"text"}, :index_as=>[:searchable])
+      t.role(:index_as=>[:stored_searchable]) {
+        t.text(:path=>"roleTerm",:attributes=>{:type=>"text"}, :index_as=>[:stored_searchable])
         t.code(:path=>"roleTerm",:attributes=>{:type=>"code"})
       }
       t.journal(:path=>'relatedItem', :attributes=>{:type=>"host"}) {
@@ -80,7 +80,7 @@ module Hydra
           }
           t.start_page(:proxy=>[:pages, :start])
           t.end_page(:proxy=>[:pages, :end])
-          t.publication_date(:path=>"date", :type=>:date, :index_as=>[:searchable])
+          t.publication_date(:path=>"date", :type=>:date, :index_as=>[:stored_searchable])
         }
       }
       t.note

data/spec/unit/ntriples_datastream_spec.rb

@@ -138,18 +138,18 @@ describe ActiveFedora::NtriplesRDFDatastream do
             index.type :date
           end
           map.title(:in => RDF::DC) do |index|
-            index.as :searchable, :displayable, :sortable
+            index.as :stored_searchable, :sortable
             index.type :text 
           end
           map.publisher(:in => RDF::DC) do |index| 
-            index.as :facetable, :sortable, :searchable, :displayable
+            index.as :facetable, :sortable, :stored_searchable
           end
           map.based_near(:in => RDF::FOAF) do |index|
-            index.as :displayable, :facetable, :searchable 
+            index.as :facetable, :stored_searchable 
             index.type :text
           end
           map.related_url(:to => "seeAlso", :in => RDF::RDFS) do |index|
-            index.defaults
+            index.as :stored_searchable
           end
           map.rights(:in => RDF::DC)
         end
@@ -175,16 +175,13 @@ describe ActiveFedora::NtriplesRDFDatastream do
       solr_doc = @subject.to_solr
       solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", type: :string)].should == ["publisher1"]
       solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :sortable)].should == ["publisher1"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :displayable)].should == ["publisher1"]
       solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :facetable)].should == ["publisher1"]
       solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", type: :string)].should == ["coverage1", "coverage2"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :displayable)].should == ["coverage1", "coverage2"]
       solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :facetable)].should == ["coverage1", "coverage2"]
       solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__created", :sortable)].should == ["2009-10-10"]
       solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__created", :displayable)].should == ["2009-10-10"]
       solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__title", type: :string)].should == ["fake-title"]
       solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__title", :sortable)].should == ["fake-title"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__title", :displayable)].should == ["fake-title"]
       solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__related_url", type: :string)].should == ["http://example.org/"]
     end
 
@@ -232,16 +229,13 @@ describe ActiveFedora::NtriplesRDFDatastream do
           @obj.to_solr.keys.should include(ActiveFedora::SolrService.solr_name("solr_rdf__related_url", type: :string),
                 ActiveFedora::SolrService.solr_name("solr_rdf__publisher", type: :string),
                 ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :sortable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :displayable),
                 ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :facetable), 
                 ActiveFedora::SolrService.solr_name("solr_rdf__created", :sortable),
                 ActiveFedora::SolrService.solr_name("solr_rdf__created", :displayable), 
                 ActiveFedora::SolrService.solr_name("solr_rdf__title", type: :string),
                 ActiveFedora::SolrService.solr_name("solr_rdf__title", :sortable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__title", :displayable),
                 ActiveFedora::SolrService.solr_name("solr_rdf__based_near", type: :string),
-                ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :facetable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :displayable))
+                ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :facetable))
 
         end
 

data/spec/unit/om_datastream_spec.rb

@@ -182,7 +182,7 @@ describe ActiveFedora::OmDatastream do
     end
   end
   
-  describe '.content=' do
+  describe 'setting content' do
     subject { ActiveFedora::OmDatastream.new(@mock_inner, "descMetadata") }
     it "should update the content" do
       subject.stub(:new? => false )
@@ -225,7 +225,6 @@ describe ActiveFedora::OmDatastream do
       @test_ds2.should_not be_changed 
       @test_ds2.ng_xml = @sample_raw_xml
       @test_ds2.should be_changed
-      @test_ds2.instance_variable_get(:@content).should be_nil
     end
   end
   

data/spec/unit/query_spec.rb

@@ -178,7 +178,7 @@ describe ActiveFedora::Base do
     end
     it "should allow conditions" do
       mock_result = {'response'=>{'numFound'=>7}}
-      ActiveFedora::SolrService.should_receive(:query).with("#{@model_query} AND foo:bar", :rows=>0, :raw=>true).and_return(mock_result)
+      ActiveFedora::SolrService.should_receive(:query).with("#{@model_query} AND (foo:bar)", :rows=>0, :raw=>true).and_return(mock_result)
       SpecModel::Basic.count(:conditions=>'foo:bar').should == 7
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre7
+  version: 6.0.0.pre8
   prerelease: 6
 platform: ruby
 authors:
@@ -11,14 +11,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -26,7 +26,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -34,7 +34,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
@@ -42,7 +42,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
@@ -50,7 +50,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
@@ -58,7 +58,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
@@ -66,23 +66,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre6
+        version: 3.0.0.pre7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre6
+        version: 3.0.0.pre7
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
@@ -90,7 +90,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -98,7 +98,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
@@ -106,7 +106,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -114,7 +114,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
@@ -122,7 +122,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -130,7 +130,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -138,7 +138,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -146,23 +146,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -170,7 +170,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -178,7 +178,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
@@ -186,7 +186,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -194,7 +194,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -202,7 +202,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -210,7 +210,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -218,7 +218,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -226,7 +226,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -234,7 +234,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -242,7 +242,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -250,7 +250,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -258,7 +258,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
@@ -266,7 +266,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
@@ -274,7 +274,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
@@ -282,7 +282,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.9.0
 - !ruby/object:Gem::Dependency
@@ -290,7 +290,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -298,7 +298,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ActiveFedora provides for creating and managing objects in the Fedora
@@ -311,8 +311,8 @@ extra_rdoc_files:
 - LICENSE
 - README.textile
 files:
-- .gitignore
-- .gitmodules
+- ".gitignore"
+- ".gitmodules"
 - CONSOLE_GETTING_STARTED.textile
 - Gemfile
 - History.txt
@@ -548,18 +548,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: rubyfedora
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A convenience libary for manipulating documents in the Fedora Repository.