active-fedora 4.3.0 → 4.4.0

data/Gemfile.lock

@@ -1,42 +1,38 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.3.0)
+    active-fedora (4.4.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
       mediashelf-loggable
-      mime-types (>= 1.16)
-      multipart-post
-      nokogiri
       om (~> 1.6.0)
       rdf
       rdf-rdfxml (~> 0.3.8)
       rsolr
-      rubydora (~> 0.5.9)
+      rubydora (~> 0.5.10)
       solrizer (~> 1.2.0)
-      xml-simple (>= 1.0.12)
 
 GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.8)
-    akami (1.1.0)
+    akami (1.2.0)
       gyoku (>= 0.4.0)
-      nokogiri (>= 1.5.2)
+      nokogiri (>= 1.4.0)
     backports (2.6.1)
     builder (3.0.0)
-    childprocess (0.3.2)
+    childprocess (0.3.3)
       ffi (~> 1.0.6)
     columnize (0.3.6)
     daemons (1.1.8)
@@ -45,12 +41,12 @@ GEM
       nokogiri (>= 1.4.3)
     fastercsv (1.5.5)
     ffi (1.0.11)
-    gyoku (0.4.5)
+    gyoku (0.4.6)
       builder (>= 2.1.2)
-    httpi (1.0.0)
+    httpi (1.1.0)
       rack
     i18n (0.6.0)
-    jettywrapper (1.2.1)
+    jettywrapper (1.3.0)
       activesupport (>= 3.0.0)
       childprocess
       i18n
@@ -61,21 +57,20 @@ GEM
     logger (1.2.8)
     mediashelf-loggable (0.4.9)
     metaclass (0.0.1)
-    mime-types (1.18)
+    mime-types (1.19)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.3.5)
-    multipart-post (1.1.2)
-    nokogiri (1.5.3)
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
     nori (1.1.0)
-    om (1.6.0)
+    om (1.6.1)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rack (1.4.1)
     rake (0.9.2.2)
     rbx-require-relative (0.0.9)
     rcov (1.0.0)
-    rdf (0.3.5.2)
+    rdf (0.3.7)
       addressable (>= 2.2.6)
     rdf-rdfxml (0.3.8)
       rdf (>= 0.3.4)
@@ -101,7 +96,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.5.9)
+    rubydora (0.5.10)
       activemodel
       activesupport
       fastercsv
@@ -109,14 +104,14 @@ GEM
       nokogiri
       rest-client
       savon
-    savon (0.9.14)
-      akami (~> 1.1)
+    savon (1.1.0)
+      akami (~> 1.2.0)
       builder (>= 2.1.2)
-      gyoku (>= 0.4.0)
-      httpi (~> 1.0)
+      gyoku (~> 0.4.5)
+      httpi (~> 1.1.0)
       nokogiri (>= 1.4.0)
-      nori (~> 1.1)
-      wasabi (~> 2.2)
+      nori (~> 1.1.0)
+      wasabi (~> 2.5.0)
     simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
@@ -130,11 +125,12 @@ GEM
       om (>= 1.5.0)
       stomp
       xml-simple
-    stomp (1.2.2)
-    wasabi (2.3.0)
+    stomp (1.2.4)
+    wasabi (2.5.0)
+      httpi (~> 1.0)
       nokogiri (>= 1.4.0)
     xml-simple (1.1.1)
-    yard (0.8.1)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby

data/History.txt

@@ -1,3 +1,11 @@
+4.4.0
+Updated gem dependencies
+Deprecated #find_by_solr()
+Added compatibility with Rubydora 0.5.10
+HYDRA-833 find_by_conditions should accept conditions as a string or a hash
+HYDRA-696 ActiveModel::Dirty to track @ng_xml
+HYDRA-830: Parsing has_model_s for model name
+
 4.3.0
 Added the #delegate_to method for easier delegation of multiple terms to the same datastream.
 Deprecated AF::Base#file_streams

data/active-fedora.gemspec

@@ -16,17 +16,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
 
   s.add_dependency('rsolr')
-  s.add_dependency('xml-simple', '>= 1.0.12')
-  s.add_dependency('mime-types', '>= 1.16')
-  s.add_dependency('multipart-post')
-  s.add_dependency('nokogiri')
   s.add_dependency('om', '~> 1.6.0')
   s.add_dependency('solrizer', '~>1.2.0')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
-  s.add_dependency("rubydora", '~>0.5.9')
+  s.add_dependency("rubydora", '~>0.5.10')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>0.3.8')
   s.add_development_dependency("yard")

data/lib/active_fedora/base.rb

@@ -102,7 +102,7 @@ module ActiveFedora
         ## Replace existing unchanged datastreams with the definitions found in this class if they have a different type.
         ## Any datastream that is deleted here will cause a reload from fedora, so avoid it whenever possible
         ds_specs.keys.each do |key|
-          if !@inner_object.datastreams[key].changed.include?(:content) && @inner_object.datastreams[key].class != self.class.ds_specs[key][:type]
+          if !@inner_object.datastreams[key].changed.include?('content') && @inner_object.datastreams[key].class != self.class.ds_specs[key][:type]
             @inner_object.datastreams.delete(key)
           end
         end
@@ -165,7 +165,6 @@ module ActiveFedora
       rels = Nokogiri::XML( rels_ext.content)
       rels.xpath("//rdf:Description/@rdf:about").first.value = new_object.internal_uri
       new_object.rels_ext.content = rels.to_xml
-      new_object.rels_ext.dirty = false
 
       datastreams.each do |k, v|
         next if k == 'RELS-EXT'
@@ -389,16 +388,17 @@ module ActiveFedora
     # be loaded and if needed you should use find instead.
     def self.load_instance_from_solr(pid,solr_doc=nil)
       if solr_doc.nil?
-        result = find_by_solr(pid)
-        raise ActiveFedora::ObjectNotFoundError, "Object #{pid} not found in solr" if result.nil?
+        result = find_with_conditions(:id=>pid)
+        raise ActiveFedora::ObjectNotFoundError, "Object #{pid} not found in solr" if result.empty?
         solr_doc = result.first
         #double check pid and id in record match
         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
-      klass = if class_str = solr_doc['active_fedora_model_s']
-        class_str.first.constantize
+      klass = if class_str = solr_doc['has_model_s']
+        # Parse RDF string "info:fedora/afmodel:ActiveFedora_Base"
+        class_str.first.split(/:/).last.gsub(/_/,"::").constantize
       else
         ActiveFedora::Base
       end

data/lib/active_fedora/datastream.rb

@@ -4,13 +4,12 @@ module ActiveFedora
   class Datastream < Rubydora::Datastream
     
     attr_writer :digital_object
-    attr_accessor :dirty, :last_modified, :fields
+    attr_accessor :last_modified, :fields
     before_create :add_mime_type, :add_ds_location, :validate_content_present
   
     def initialize(digital_object, dsid, options={})
       ## When you use the versions feature of rubydora (0.5.x), you need to have a 3 argument constructor
       self.fields={}
-      self.dirty = false
       super
     end
     
@@ -39,8 +38,23 @@ module ActiveFedora
     end
     
     # Test whether this datastream been modified since it was last saved
+    # Deprecated
     def dirty?
-      dirty || changed?
+      changed?
+    end
+    
+    # Deprecated
+    def dirty
+      changed?
+    end
+    
+    # Deprecated
+    def dirty=(value)
+      if value
+        lastModifiedDate_will_change! # an innocent hack to pretend something has changed
+      else
+        changed_attributes.clear
+      end
     end
 
     def new_object?
@@ -84,7 +98,6 @@ module ActiveFedora
     # @param [ActiveFedora::Datastream] tmpl the Datastream object that you are building
     # @param [Nokogiri::XML::Node] node the "foxml:datastream" node from a FOXML file
     def self.from_xml(tmpl, node)
-      tmpl.instance_variable_set(:@dirty, false)
       tmpl.controlGroup= node['CONTROL_GROUP']
       tmpl
     end

data/lib/active_fedora/model.rb

@@ -178,10 +178,9 @@ module ActiveFedora
       # Get a count of the number of objects from solr
       # Takes :conditions as an argument
       def count(args = {})
-          escaped_class_uri = SolrService.escape_uri_for_query(self.to_class_uri)
-          q = "#{ActiveFedora::SolrService.solr_name(:has_model, :symbol)}:#{escaped_class_uri}"
-          q << " AND #{args[:conditions]}" if args[:conditions]
-          SolrService.query(q, :raw=>true, :rows=>0)['response']['numFound']
+        q = search_model_clause
+        q << " AND #{args[:conditions]}"  if args[:conditions]
+        SolrService.query(q, :raw=>true, :rows=>0)['response']['numFound']
       end
 
       #@deprecated
@@ -191,7 +190,7 @@ module ActiveFedora
         SolrService.instance.conn.query(query, args)
       end
 
-
+      #  @deprecated
       #  If query is :all, this method will query Solr for all instances
       #  of self.type (based on active_fedora_model_s as indexed
       #  by Solr). If the query is any other string, this method simply does
@@ -203,6 +202,7 @@ module ActiveFedora
       #  Args is an options hash, which is passed into the SolrService 
       #  connection instance.
       def find_by_solr(query, args={})
+        ActiveSupport::Deprecation.warn("find_by_fields_by_solr is deprecated and will be removed in 5.0. Use find_with_conditions instead.")
         if query == :all
           escaped_class_name = self.name.gsub(/(:)/, '\\:')
           SolrService.query("#{ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}", args) 
@@ -229,7 +229,7 @@ module ActiveFedora
       #   :field_list       => array, defaults to ["*", "score"]
       #
       def find_by_fields_by_solr(query_fields,opts={})
-        ActiveSupport::Deprecation.warn("find_by_fields_by_solr is deprecated and will be removed in the next release")
+        ActiveSupport::Deprecation.warn("find_by_fields_by_solr is deprecated and will be removed in 5.0")
         #create solr_args from fields passed in, needs to be comma separated list of form field1=value1,field2=value2,...
         escaped_class_name = self.name.gsub(/(:)/, '\\:')
         query = "#{ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}" 
@@ -300,25 +300,46 @@ module ActiveFedora
       end
 
       # Returns a solr result matching the supplied conditions
-      # @param[Hash] conditions solr conditions to match
+      # @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 
+      # provided, this method will generate conditions based simple equality
+      # combined using the boolean AND operator.
       # @param[Hash] options 
       # @option opts [Array] :sort a list of fields to sort by 
       # @option opts [Array] :rows number of rows to return
       def find_with_conditions(conditions, opts={})
-        query = create_query(conditions)
         #set default sort to created date ascending
         unless opts.include?(:sort)
           opts[:sort]=[ActiveFedora::SolrService.solr_name(:system_create,:date)+' asc'] 
         end
-        SolrService.query(query, opts) 
+        SolrService.query(create_query(conditions), opts) 
       end
 
-      
+      def quote_for_solr(value)
+        '"' + value.gsub(/(:)/, '\\:').gsub(/"/, '\\"') + '"'
+      end
+    
+      # @deprecated
+      def class_fields
+        #create dummy object that is empty by passing in fake pid
+        object = self.new()#{:pid=>'FAKE'})
+        fields = object.fields
+        #reset id to nothing
+        fields[:id][:values] = []
+        return fields
+      end
+
+      private 
+
       # Returns a solr query for the supplied conditions
       # @param[Hash] conditions solr conditions to match
       def create_query(conditions)
-        escaped_class_uri = SolrService.escape_uri_for_query(self.to_class_uri)
-        clauses = ["#{ActiveFedora::SolrService.solr_name(:has_model, :symbol)}:#{escaped_class_uri}"]
+        return '' unless conditions
+        conditions.kind_of?(Hash) ? create_query_from_hash(conditions) : create_query_from_string(conditions)
+      end
+
+      def create_query_from_hash(conditions)
+        clauses = [search_model_clause]
         conditions.each_pair do |key,value|
           unless value.nil?
             if value.is_a? Array
@@ -333,24 +354,22 @@ module ActiveFedora
           end
         end
 
-        clauses.join(" AND ")
+        clauses.compact.join(" AND ")
       end
 
-      def quote_for_solr(value)
-        '"' + value.gsub(/(:)/, '\\:').gsub(/"/, '\\"') + '"'
+      def create_query_from_string(conditions)
+        model_clause = search_model_clause
+        model_clause ? "#{model_clause} AND (#{conditions})" : conditions
       end
 
-    
-      def class_fields
-        #create dummy object that is empty by passing in fake pid
-        object = self.new()#{:pid=>'FAKE'})
-        fields = object.fields
-        #reset id to nothing
-        fields[:id][:values] = []
-        return fields
+      # Return the solr clause that queries for this type of class
+      def search_model_clause
+        unless self == ActiveFedora::Base
+          escaped_class_uri = SolrService.escape_uri_for_query(self.to_class_uri)
+          return "#{ActiveFedora::SolrService.solr_name(:has_model, :symbol)}:#{escaped_class_uri}"
+        end
       end
 
-      private 
       # Retrieve the Fedora object with the given pid, explore the returned object, determine its model 
       # using #{ActiveFedora::ContentModel.known_models_for} and cast to that class.
       # Raises a ObjectNotFoundError if the object is not found.

data/lib/active_fedora/nokogiri_datastream.rb

@@ -41,7 +41,6 @@ module ActiveFedora
 
     def ng_xml 
       @ng_xml ||= begin
-      self.dirty = false
       self.xml_loaded = true
 
       if new?
@@ -54,8 +53,8 @@ module ActiveFedora
     end
     
     def ng_xml=(new_xml)
+      ng_xml_will_change!
       self.xml_loaded=true
-      self.dirty = true
       case new_xml 
       when Nokogiri::XML::Document
         @ng_xml = new_xml
@@ -68,6 +67,16 @@ module ActiveFedora
       end
     end
     
+    # don't want content eagerly loaded by proxy, so implementing methods that would be implemented by define_attribute_methods 
+    def ng_xml_will_change!
+      changed_attributes['ng_xml'] = nil
+    end
+    
+    # don't want content eagerly loaded by proxy, so implementing methods that would be implemented by define_attribute_methods 
+    def ng_xml_changed?
+      changed_attributes.has_key? 'ng_xml'
+    end
+    
     def content=(content)
       super
       self.xml_loaded=true
@@ -343,8 +352,8 @@ module ActiveFedora
       if @internal_solr_doc
         raise "No update performed, this object was initialized via Solr instead of Fedora and is therefore read-only.  Please utilize ActiveFedora::Base.find to first load object via Fedora instead."
       else
+        ng_xml_will_change!
         result = om_update_values(params)
-        self.dirty= true
         return result
       end
     end

data/lib/active_fedora/rels_ext_datastream.rb

@@ -13,6 +13,10 @@ module ActiveFedora
     def add_mime_type
       self.mimeType= 'application/rdf+xml'
     end
+    
+    def changed?
+      model.relationships_are_dirty or super
+    end
 
     def serialize!
       self.content = to_rels_ext() if model.relationships_are_dirty

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "4.3.0"
+  VERSION = "4.4.0"
 end

data/spec/integration/base_spec.rb

@@ -420,10 +420,10 @@ describe ActiveFedora::Base do
     
     it "should delete the object from Fedora and Solr" do
       @test_object.save
-      ActiveFedora::Base.find_by_solr(@test_object.pid).first["id"].should == @test_object.pid
+      ActiveFedora::Base.find_with_conditions(:id=>@test_object.pid).first["id"].should == @test_object.pid
       pid = @test_object.pid # store so we can access it after deletion
       @test_object.delete
-      ActiveFedora::Base.find_by_solr(pid).should be_empty
+      ActiveFedora::Base.find_with_conditions(:id=>pid).should be_empty
     end
 
     describe '#delete' do

data/spec/integration/full_featured_model_spec.rb

@@ -148,7 +148,7 @@ describe ActiveFedora::Base do
     
     @test_history.save
     
-    @solr_result = OralHistory.find_by_solr(@test_history.pid)[0]
+    @solr_result = OralHistory.find_with_conditions(:id=>@test_history.pid)[0]
     @properties_sample_values.each_pair do |field, value|
       next if field == :hard_copy_availability #FIXME HYDRA-824
       next if field == :location #FIXME HYDRA-825 
@@ -172,8 +172,8 @@ describe ActiveFedora::Base do
     
   end
   
-  it "should support #find_by_solr" do
-    solr_result = OralHistory.find(:all)
+  it "should support #find_with_conditions" do
+    solr_result = OralHistory.find_with_conditions({})
     solr_result.should_not be_nil
   end
   

data/spec/integration/nokogiri_datastream_spec.rb

@@ -19,7 +19,7 @@ describe ActiveFedora::NokogiriDatastream do
   describe '.term_values' do
     before do
       @pid = "hydrangea:fixture_mods_article1"
-      @test_solr_object = HydrangeaArticle2.load_instance_from_solr(@pid)
+      @test_solr_object = ActiveFedora::Base.load_instance_from_solr(@pid)
       @test_object = HydrangeaArticle2.find(@pid)
     end
 
@@ -52,4 +52,18 @@ describe ActiveFedora::NokogiriDatastream do
     end
   end
   
+  describe '.update_values' do
+    before do
+      @pid = "hydrangea:fixture_mods_article1"
+      @test_object = HydrangeaArticle2.find(@pid)
+    end
+
+    it "should not be dirty after .update_values is saved" do
+      @test_object.datastreams["descMetadata"].update_values([{:name=>0},{:role=>0},:text] =>"Funder")
+      @test_object.datastreams["descMetadata"].dirty?.should be_true
+      @test_object.save
+      @test_object.datastreams["descMetadata"].dirty?.should be_false
+      @test_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Funder"]
+    end    
+  end
 end

data/spec/integration/rels_ext_datastream_spec.rb

@@ -114,16 +114,16 @@ describe ActiveFedora::RelsExtDatastream do
       model_rel = MockAFRelsSolr.to_class_uri
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
       #get solr doc for @test_object2
-      solr_doc = MockAFRelsSolr.find_by_solr(@test_object2.pid).first
+      solr_doc = MockAFRelsSolr.find_with_conditions(:id=>@test_object2.pid).first
       test_from_solr_object2 = MockAFRelsSolr.new
       test_from_solr_object2.rels_ext.from_solr(solr_doc)
-      solr_doc = MockAFRelsSolr.find_by_solr(@test_object3.pid).first
+      solr_doc = MockAFRelsSolr.find_with_conditions(:id=>@test_object3.pid).first
       test_from_solr_object3 = MockAFRelsSolr.new
       test_from_solr_object3.rels_ext.from_solr(solr_doc)
-      solr_doc = MockAFRelsSolr.find_by_solr(@test_object4.pid).first
+      solr_doc = MockAFRelsSolr.find_with_conditions(:id=>@test_object4.pid).first
       test_from_solr_object4 = MockAFRelsSolr.new
       test_from_solr_object4.rels_ext.from_solr(solr_doc)
-      solr_doc = MockAFRelsSolr.find_by_solr(@test_object5.pid).first
+      solr_doc = MockAFRelsSolr.find_with_conditions(:id=>@test_object5.pid).first
       test_from_solr_object5 = MockAFRelsSolr.new
       test_from_solr_object5.rels_ext.from_solr(solr_doc)
       

data/spec/unit/datastream_spec.rb

@@ -18,7 +18,7 @@ describe ActiveFedora::Datastream do
   end
   
   it "should be inspectable" do
-    @test_datastream.inspect.should match /#<ActiveFedora::Datastream:-?\d+ @pid=\"__DO_NOT_USE__\" @dsid=\"abcd\" @controlGroup=\"M\" @dirty=\"false\" @mimeType=\"\" >/
+    @test_datastream.inspect.should match /#<ActiveFedora::Datastream:-?\d+ @pid=\"__DO_NOT_USE__\" @dsid=\"abcd\" @controlGroup=\"M\" @dirty=\"true\" @mimeType=\"\" >/
   end
 
   describe '#validate_content_present' do
@@ -86,7 +86,7 @@ describe ActiveFedora::Datastream do
   
   describe ".dirty?" do
     it "should return the value of the @dirty attribute or changed?" do
-      @test_datastream.expects(:changed?).returns(false)
+      @test_datastream.instance_variable_get(:@changed_attributes).clear
       @test_datastream.dirty?.should be_false  
       @test_datastream.dirty = "boo"
       @test_datastream.dirty?.should be_true   

data/spec/unit/model_spec.rb

@@ -177,8 +177,8 @@ describe ActiveFedora::Model do
             q.split(" AND ").include?("baz:\"quack\"")
         }.returns(mock_result)
       SpecModel::Basic.find_with_conditions(:foo=>'bar', :baz=>['quix','quack']).should == mock_result
-      
     end
+
     it "should escape quotes" do
       mock_result = stub('Result')
            ActiveFedora::SolrService.expects(:query).with() { |args|
@@ -191,7 +191,17 @@ describe ActiveFedora::Model do
             q.split(" AND ").include?('baz:"quack"')
         }.returns(mock_result)
       SpecModel::Basic.find_with_conditions(:foo=>'9" Nails', :baz=>['7" version','quack']).should == mock_result
-      
+    end
+
+    it "shouldn't use the class if it's called on AF:Base " do
+      mock_result = stub('Result')
+      ActiveFedora::SolrService.expects(:query).with('baz:"quack"', {:sort => ['system_create_dt asc']}).returns(mock_result)
+      ActiveFedora::Base.find_with_conditions(:baz=>'quack').should == mock_result
+    end
+    it "should use the query string if it's provided" do
+      mock_result = stub('Result')
+      ActiveFedora::SolrService.expects(:query).with('chunky:monkey', {:sort => ['system_create_dt asc']}).returns(mock_result)
+      ActiveFedora::Base.find_with_conditions('chunky:monkey').should == mock_result
     end
   end
   

data/spec/unit/nokogiri_datastream_spec.rb

@@ -215,8 +215,9 @@ describe ActiveFedora::NokogiriDatastream do
     it "should mark the datastream as dirty" do
       @test_ds2.dirty.should be_false 
       @test_ds2.ng_xml = @sample_raw_xml
-      @test_ds2.dirty.should be_true  #not the same as be_dirty
+      @test_ds2.ng_xml_changed?.should be_true
       @test_ds2.should be_dirty
+      @test_ds2.instance_variable_get(:@content).should be_nil
     end
   end
   

data/spec/unit/solr_config_options_spec.rb

@@ -19,12 +19,12 @@ describe ActiveFedora do
     @test_object = ActiveFedora::Base.new
   end
   
-  after(:all) do
-    # Revert to default mappings after running tests
-    ActiveFedora::SolrService.load_mappings
-  end
   
   describe "field name mappings" do
+    after(:all) do
+      # Revert to default mappings after running tests
+      ActiveFedora::SolrService.load_mappings
+    end
     it "should default to using the mappings for the current schema" do
       from_default_yml = YAML::load(File.open(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings.yml")))
       ActiveFedora::SolrService.mappings[:searchable].data_types[:date].opts[:suffix].should == from_default_yml["searchable"]["date"]    
@@ -49,11 +49,11 @@ describe ActiveFedora do
       @test_object.to_solr[:id].should be_nil
     end
 
-    it "should be used by ActiveFedora::Base#find_by_solr" do
+    it "should be used by ActiveFedora::Base#find_with_conditions" do
       mock_response = mock("SolrResponse")
-      ActiveFedora::SolrService.expects(:query).with(SOLR_DOCUMENT_ID + ':changeme\:30', {}).returns(mock_response)
+      ActiveFedora::SolrService.expects(:query).with("has_model_s:info\\:fedora/afmodel\\:SolrSpecModel_Basic AND " + SOLR_DOCUMENT_ID + ':"changeme\\:30"', {:sort => ['system_create_dt asc']}).returns(mock_response)
   
-      SolrSpecModel::Basic.find_by_solr("changeme:30").should equal(mock_response)
+      SolrSpecModel::Basic.find_with_conditions(:id=>"changeme:30").should equal(mock_response)
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -29,70 +29,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.12
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.12
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: multipart-post
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +132,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -204,7 +140,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 0.5.10
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -571,7 +507,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 801135923
+      hash: -160565939
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -580,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 801135923
+      hash: -160565939
 requirements: []
 rubyforge_project: rubyfedora
 rubygems_version: 1.8.24