active-fedora 7.0.0.pre2 → 7.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4016c59a3c3f1110b5cb6a9eb82dc1ecc374e09
-  data.tar.gz: 17257166e62dd7dbdefbcdf8acc0913497a25d4b
+  metadata.gz: 326d249cd4fae27ff020852f7f76213ebc79f29f
+  data.tar.gz: 4a71080c33394383361845919afe864472eedf27
 SHA512:
-  metadata.gz: dc945c04a877bc385439846091a494cf098f229ee0a869106a8ad82d35975adec0eedb103e2a489f69c5b8b7cd03015f77525745279197856fafe37cfe9c193f
-  data.tar.gz: d7e48d90b96306a956bfac1731c6180d29b3e4cb0ff913ef86826fe150d97a4d42e207a5d0b08f5a5d9c60beb52e2d12baf858e7d3ea3bbe7546d02fd7c69c40
+  metadata.gz: 0191dcb8e84050abc5869f1ec0d5003195774421929e1ddb8e7f31d461eca505458af240f3ca9f4eefee323c62d819bf34b8cf9a12fdbf1c118ce4ab5c9040c2
+  data.tar.gz: 21202208679bb2bd1982377c60a597ab07bc70923d68bedeb31e45476e1b984b530e80e6d44357a2b567ffb83badc7a04bbd3f1a90079aa3be4ea5e340ac6fdb

data/.travis.yml

@@ -4,11 +4,6 @@ rvm:
   - 2.0.0
   - 1.9.3
 
-matrix:
-  allow_failures:
-    - rvm: 2.1.0
-
-
 gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
@@ -16,8 +11,6 @@ gemfile:
 notifications:
   irc: "irc.freenode.org#projecthydra"
 
-before_install:
-  - gem install bundler
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/active-fedora.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
   s.license = "APACHE2"
   s.required_ruby_version     = '>= 1.9.3'
 
-  s.add_dependency('rsolr')
+  s.add_dependency('rsolr', "~> 1.0.10.pre1")
   s.add_dependency('om', '~> 3.0.0')
   s.add_dependency('nom-xml', '>=0.5.1')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>1.7.0.pre1')
+  s.add_dependency("rubydora", '~>1.7.0')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>1.1.0')
   s.add_dependency("deprecation")

data/lib/active_fedora/associations/builder/belongs_to.rb

@@ -93,6 +93,7 @@ module ActiveFedora::Associations::Builder
         writer_name = "#{name}_id"
         model.find_or_create_defined_attribute(writer_name, 'RELS-EXT', {})
         mixin.redefine_method("#{writer_name}=") do |id|
+          raise "can't modify frozen #{self.class}" if self.frozen?
           association(name).id_writer(id)
         end
       end

data/lib/active_fedora/associations/has_many_association.rb

@@ -55,7 +55,6 @@ module ActiveFedora
                 inverse = reflection.inverse_of.name
                 records.each do |record|
                   if record.persisted?
-                    record.reload
                     assoc = record.association(inverse)
                     if assoc.reflection.collection?
                       # Remove from a has_and_belongs_to_many
@@ -64,7 +63,9 @@ module ActiveFedora
                       # Remove from a belongs_to
                       record.association(inverse).id_writer(nil)
                     end
-                    record.save!
+                    # Check to see if the object still exists (may be already deleted).
+                    # In Rails, they do this with an update_all to avoid callbacks and validations, we may need the same.
+                    record.save! if record.class.exists?(record.pid)
                   end
                 end
               end

data/lib/active_fedora/core.rb

@@ -85,6 +85,15 @@ module ActiveFedora
       new_object if new_object.save
     end
 
+    def freeze
+      datastreams.freeze
+      self
+    end
+
+    def frozen?
+      datastreams.frozen?
+    end
+
     def pretty_pid
       if self.pid == UnsavedDigitalObject::PLACEHOLDER
         nil

data/lib/active_fedora/datastream.rb

@@ -2,6 +2,7 @@ module ActiveFedora
 
   #This class represents a Fedora datastream
   class Datastream < Rubydora::Datastream
+    extend Deprecation
     attr_writer :digital_object
     attr_accessor :last_modified
 
@@ -73,6 +74,18 @@ module ActiveFedora
     def to_solr(solr_doc = Hash.new)
       solr_doc
     end
+
+    protected
+    # The string to prefix all solr fields with. Override this method if you want
+    # a prefix other than the default
+    def prefix
+      raise RuntimeError, "to_solr requires the dsid to be set" unless dsid
+      Deprecation.warn ActiveFedora::Datastream, "In active-fedora 8 the solr fields created by #{self.class} will be prefixed with \"#{dsid.underscore}__\".  If you want to maintain the existing behavior, you must override #{self.class}.#prefix to return an empty string"
+      # In ActiveFedora 8 return this:
+      #"#{dsid.underscore}__"
+      ""
+    end
+
   end
   
   class DatastreamConcurrencyException < Exception # :nodoc:

data/lib/active_fedora/datastream_attribute.rb

@@ -2,12 +2,12 @@ module ActiveFedora
   # Represents the mapping between a model attribute and a field in a datastream
   class DatastreamAttribute
     
-    attr_accessor :dsid, :field, :klass, :at, :reader, :writer, :multiple
+    attr_accessor :dsid, :field, :datastream_class, :at, :reader, :writer, :multiple
 
-    def initialize(field, dsid, klass, args={})
+    def initialize(field, dsid, datastream_class, args={})
       self.field = field
       self.dsid = dsid
-      self.klass = klass
+      self.datastream_class = datastream_class
       self.multiple = args[:multiple].nil? ? false : args[:multiple]
       self.at = args[:at]
 
@@ -17,18 +17,19 @@ module ActiveFedora
 
     # Gives the primary solr name for a column. If there is more than one indexer on the field definition, it gives the first 
     def primary_solr_name
-      if klass.respond_to?(:primary_solr_name)
-        klass.primary_solr_name(dsid, field)
+      @datastream ||= datastream_class.new(nil, dsid)
+      if @datastream.respond_to?(:primary_solr_name)
+        @datastream.primary_solr_name(field)
       else
-        raise IllegalOperation, "the class '#{klass}' doesn't respond to 'primary_solr_name'"
+        raise IllegalOperation, "the datastream '#{datastream_class}' doesn't respond to 'primary_solr_name'"
       end
     end
 
     def type
-      if klass.respond_to?(:type)
-        klass.type(field)
+      if datastream_class.respond_to?(:type)
+        datastream_class.type(field)
       else
-        raise IllegalOperation, "the class '#{klass}' doesn't respond to 'type'"
+        raise IllegalOperation, "the datastream '#{datastream_class}' doesn't respond to 'type'"
       end
     end
 

data/lib/active_fedora/datastream_hash.rb

@@ -18,5 +18,12 @@ module ActiveFedora
       @obj.inner_object.datastreams[key]=val# unless @obj.inner_object.new?
       super
     end 
+
+    def freeze
+      each do |k, v|
+        v.freeze
+      end
+      super
+    end
   end
 end

data/lib/active_fedora/datastreams.rb

@@ -175,7 +175,7 @@ module ActiveFedora
 
     module ClassMethods
       # @param [String] dsid the datastream id
-      # @returns [Class] the class of the datastream
+      # @return [Class] the class of the datastream
       def datastream_class_for_name(dsid)
         ds_specs[dsid] ? ds_specs[dsid].fetch(:type, ActiveFedora::Datastream) : ActiveFedora::Datastream
       end

data/lib/active_fedora/indexing.rb

@@ -69,8 +69,7 @@ module ActiveFedora
         solrizer = Solrizer::Fedora::Solrizer.new
         solrizer.solrize( self )
       else
-        SolrService.add(self.to_solr)
-        SolrService.commit
+        SolrService.add(self.to_solr, softCommit: true)
       end
     end
 

data/lib/active_fedora/om_datastream.rb

@@ -17,7 +17,7 @@ module ActiveFedora
     alias_method(:om_update_values, :update_values) unless method_defined?(:om_update_values)
     
     attr_accessor :internal_solr_doc
-    
+
     def self.default_attributes
       super.merge(:controlGroup => 'M', :mimeType => 'text/xml')
     end
@@ -168,6 +168,13 @@ module ActiveFedora
       @internal_solr_doc = solr_doc
     end
 
+    # Return a hash suitable for indexing in solr. Every field name is prefixed with the
+    # value returned by the +prefix+ method.
+    def to_solr(solr_doc = {})
+      prefix = self.prefix
+      super.each_with_object({}) { |(key, value), new| new[[prefix,key].join] = value }
+    end
+
 
     # ** Experimental **
     # This method is called by +get_values+ if this datastream has been initialized by calling from_solr method via
@@ -394,6 +401,7 @@ module ActiveFedora
     #   ds.update_values( {[{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"}, [{:person=>1}, :family_name]=>"Andronicus", [{"person"=>"1"},:given_name]=>["Titus"],[{:person=>1},:role,:text]=>["otherrole1","otherrole2"] } )
     #   => {"person_0_role_text"=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"}, "person_1_role_text"=>{"0"=>"otherrole1", "1"=>"otherrole2"}} 
     def update_values(params={})
+      raise "can't modify frozen #{self.class}" if frozen?
       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

data/lib/active_fedora/persistence.rb

@@ -20,7 +20,7 @@ module ActiveFedora
 
     ## Required by associations
     def new_record?
-      inner_object.new?
+      inner_object.new_record?
     end
 
     def persisted?
@@ -73,8 +73,6 @@ module ActiveFedora
         end
       end
 
-      
-      #Fedora::Repository.instance.delete(@inner_object)
       pid = self.pid ## cache so it's still available after delete
       begin
         @inner_object.delete
@@ -83,8 +81,7 @@ module ActiveFedora
       end
       if ENABLE_SOLR_UPDATES
         solr = ActiveFedora::SolrService.instance.conn
-        solr.delete_by_id(pid) 
-        solr.commit
+        solr.delete_by_id(pid, params: {'softCommit' => true}) 
       end
       @destroyed = true
       freeze

data/lib/active_fedora/querying.rb

@@ -1,5 +1,8 @@
 module ActiveFedora
   module Querying
+    extend Deprecation
+    self.deprecation_horizon = 'active-fedora version 8.0.0'
+
     delegate :find, :first, :exists?, :where, :limit, :order, :delete_all, 
       :destroy_all, :count, :last, :find_with_conditions, :find_in_batches, :find_each, :to=>:all
 
@@ -13,7 +16,8 @@ module ActiveFedora
     end
 
     def quote_for_solr(value)
-      '"' + value.gsub(/(:)/, '\\:').gsub(/(\/)/, '\\/').gsub(/"/, '\\"') + '"'
+      RSolr.escape(value)
     end
+    deprecation_deprecate :quote_for_solr
   end
 end

data/lib/active_fedora/rdf/indexing.rb

@@ -1,10 +1,17 @@
 module ActiveFedora
   module Rdf
     module Indexing
+      extend Deprecation
       extend ActiveSupport::Concern
 
+      # In active_fedora 8, we can get the prefix part from Datastream.prefix
+      def apply_prefix(name)
+        "#{dsid.underscore}__#{name}"
+      end
+
       def prefix(name)
-        self.class.prefix(dsid, name)
+        Deprecation.warn Indexing, "prefix is deprecated. Use apply_prefix instead. In active-fedora 8, the prefix method will just return the prefix to be applied, and will not do the applying.  This will enable conformity between OmDatastream and RdfDatastream"
+        apply_prefix(name)
       end
 
       def to_solr(solr_doc = Hash.new) # :nodoc:
@@ -12,26 +19,27 @@ module ActiveFedora
           values = get_values(rdf_subject, field_key)
           Array(values).each do |val|    
             val = val.to_s if val.kind_of? RDF::URI
-            Solrizer.insert_field(solr_doc, prefix(field_key), val, *field_info[:behaviors])
+            Solrizer.insert_field(solr_doc, apply_prefix(field_key), val, *field_info[:behaviors])
           end
         end
         solr_doc
       end
 
+      # Gives the primary solr name for a column. If there is more than one indexer on the field definition, it gives the first 
+      def primary_solr_name(field)
+        config = self.class.config_for_term_or_uri(field)
+        if behaviors = config.behaviors
+          ActiveFedora::SolrService.solr_name(apply_prefix(field), behaviors.first, type: config.type)
+        end
+      end
+
 
       module ClassMethods
         def prefix(dsid, name)
+          Deprecation.warn Indexing, "prefix is deprecated and will be removed in active-fedora 8.0.0.", caller
           "#{dsid.underscore}__#{name}".to_sym
         end
 
-        # Gives the primary solr name for a column. If there is more than one indexer on the field definition, it gives the first 
-        def primary_solr_name(dsid, field)
-          config = config_for_term_or_uri(field)
-          if behaviors = config.behaviors
-            ActiveFedora::SolrService.solr_name(prefix(dsid, field), behaviors.first, type: config.type)
-          end
-        end
-
         # Gives the datatype for a column.
         def type(field)
           config_for_term_or_uri(field).type

data/lib/active_fedora/relation/finder_methods.rb

@@ -151,8 +151,9 @@ module ActiveFedora
       if where_values.empty?
         load_from_fedora(pid, cast)
       else
-        query = ActiveFedora::SolrService.construct_query_for_rel(where_values)
-        query += " AND _query_:\"{!raw f=id}#{pid}\""
+        query = [ActiveFedora::SolrService.construct_query_for_rel(where_values),
+                 ActiveFedora::SolrService.raw_query(SOLR_DOCUMENT_ID, pid)].
+                join(" AND ".freeze)
         to_enum(:find_each, query, {}).to_a.first
       end
     end
@@ -218,11 +219,10 @@ module ActiveFedora
         if value.empty?
           "-#{key}:['' TO *]"
         elsif value.is_a? Array
-          value.map { |val| "#{key}:#{@klass.quote_for_solr(val)}" }
+          value.map { |val| "#{key}:#{RSolr.escape(val)}" }
         else
           key = SOLR_DOCUMENT_ID if (key === :id || key === :pid)
-          escaped_value = @klass.quote_for_solr(value)
-          key.to_s.eql?(SOLR_DOCUMENT_ID) ? "#{key}:#{escaped_value}" : "#{key}:#{escaped_value}"
+          "#{key}:#{RSolr.escape(value)}"
         end
       end
     end

data/lib/active_fedora/rels_ext_datastream.rb

@@ -13,7 +13,7 @@ module ActiveFedora
     end
     
     def changed?
-      relationships_are_dirty? or super
+      model.relationships_are_dirty? or super
     end
 
     def metadata?
@@ -21,22 +21,10 @@ module ActiveFedora
     end
 
     def serialize!
-      self.content = to_rels_ext() if relationships_are_dirty?
-      model.relationships_are_dirty = false
+      self.content = to_rels_ext() if model.relationships_are_dirty?
+      model.relationships_are_not_dirty!
     end
     
-    def relationships_are_dirty?
-      model.relationships_are_dirty if model
-    end
-
-    def relationships_are_dirty!
-      model.relationships_are_dirty = true
-    end
-
-    def relationships_are_not_dirty!
-      model.relationships_are_dirty = false
-    end
-
     # Populate a RelsExtDatastream object based on the "datastream" content 
     # Assumes that the datastream contains RDF XML from a Fedora RELS-EXT datastream 
     # @param [String] xml the "rdf" node 
@@ -46,15 +34,7 @@ module ActiveFedora
         ### maybe put the template here?
       else
         ensure_predicates_exist!(xml)
-        RDF::RDFXML::Reader.new(xml) do |reader|
-          reader.each_statement do |statement|
-            literal = statement.object.kind_of?(RDF::Literal)
-            object = literal ? statement.object.value : statement.object.to_str
-            tmpl.model.add_relationship(statement.predicate, object, literal)
-          end
-        end
-        tmpl.relationships_are_not_dirty!
-        tmpl.changed_attributes.clear
+        tmpl.model.relationships = xml
         tmpl
       end
     end

data/lib/active_fedora/semantic_node.rb

@@ -19,12 +19,27 @@ module ActiveFedora
       load_relationships if !relationships_loaded
       @object_relations ||= RelationshipGraph.new
     end
-    
-    def relationships_are_dirty
+
+    def relationships_are_dirty?
       object_relations.dirty
     end
-    def relationships_are_dirty=(val)
-      object_relations.dirty = val
+    alias relationships_are_dirty relationships_are_dirty?
+
+    def relationships_are_not_dirty!
+      object_relations.dirty = false
+    end
+
+    def relationships=(xml)
+      RDF::RDFXML::Reader.new(xml) do |reader|
+        reader.each_statement do |statement|
+          literal = statement.object.kind_of?(RDF::Literal)
+          object = literal ? statement.object.value : statement.object.to_str
+          object_relations.add(statement.predicate, object, literal)
+        end
+      end
+      # Adding the relationships to the graph causes the graph to be marked as dirty,
+      # so now we assert that the graph is in sync
+      relationships_are_not_dirty!
     end
 
     # Add a relationship to the Object.
@@ -80,7 +95,7 @@ module ActiveFedora
     # @param obj Either a string URI or an object that responds to .pid 
     def remove_relationship(predicate, obj, literal=false)
       object_relations.delete(predicate, obj)
-      self.relationships_are_dirty = true
+      object_relations.dirty = true
       rels_ext.content_will_change!
     end
 
@@ -111,14 +126,14 @@ module ActiveFedora
       end
     end
 
-    # @returns [String] the internal fedora URI
+    # @return [String] the internal fedora URI
     def internal_uri
       self.class.internal_uri(pid)
     end
 
     module ClassMethods
       # @param [String,Array] uris a single uri (as a string) or a list of uris to convert to pids
-      # @returns [String] the pid component of the URI
+      # @return [String] the pid component of the URI
       def pids_from_uris(uris) 
         Deprecation.warn(SemanticNode, "pids_from_uris has been deprecated and will be removed in active-fedora 8.0.0", caller)
         if uris.kind_of? String
@@ -145,13 +160,13 @@ module ActiveFedora
       end
 
       # @param [String] pid the fedora object identifier
-      # @returns [String] a URI represented as a string
+      # @return [String] a URI represented as a string
       def internal_uri(pid)
         "info:fedora/#{pid}"
       end
 
       # @param [String] uri a uri (as a string)
-      # @returns [String] the pid component of the URI
+      # @return [String] the pid component of the URI
       def pid_from_uri(uri)
         uri.gsub("info:fedora/", "")
       end