active-fedora 5.7.1 → 6.0.0.pre1

data/lib/active_fedora/fixture_loader.rb

@@ -14,7 +14,7 @@ module ActiveFedora
       begin
         ActiveFedora::Base.find(pid).delete
         1
-      rescue ActiveFedora::ObjectNotFoundError, (Rubydora::RecordNotFound rescue ActiveFedora::ObjectNotFoundError)
+      rescue ActiveFedora::ObjectNotFoundError
         logger.debug "The object #{pid} has already been deleted (or was never created)."
         0
       rescue Errno::ECONNREFUSED => e

data/lib/active_fedora/nokogiri_datastream.rb

@@ -13,8 +13,6 @@ module ActiveFedora
       end
     end
     
-      extend Deprecation
-  #  include MetadataDatastreamHelper
     include OM::XML::Document
     include Solrizer::XML::TerminologyBasedSolrizer # this adds support for calling .to_solr
     
@@ -63,17 +61,13 @@ module ActiveFedora
     end
     
     def ng_xml=(new_xml)
-      # before we set ng_xml, we load the datastream so we know if the new value differs.
-      local_or_remote_content(true)
-
       case new_xml 
       when Nokogiri::XML::Document
-        self.content=new_xml.to_xml
+        @ng_xml = new_xml
       when  Nokogiri::XML::Node 
-        ## Cast a fragment to a document
-        self.content=new_xml.to_s
+        @ng_xml = Nokogiri::XML(new_xml.to_s) ## Cast a fragment to a document
       when String 
-        self.content=new_xml
+        @ng_xml = Nokogiri::XML::Document.parse(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
@@ -98,43 +92,21 @@ module ActiveFedora
     def metadata?
       true
     end
-    
-    def local_or_remote_content(ensure_fetch = true)
-      @content = to_xml if ng_xml_changed? || autocreate?
-      super
-    end
 
-    def autocreate?
-      changed_attributes.has_key? :profile
+    def content
+      to_xml
     end
 
     def datastream_content
       @datastream_content ||= Nokogiri::XML(super).to_xml  {|config| config.no_declaration}.strip
     end
     
-    def content
-      to_xml
-    end
-
-    def content=(new_content)
-      if inline?
-        # inline datastreams may be transformed by fedora 3, so we test for equivalence instead of equality
-        if !EquivalentXml.equivalent?(datastream_content, new_content)
-          ng_xml_will_change! 
-          @ng_xml = Nokogiri::XML::Document.parse(new_content)
-          super(@ng_xml.to_s)
-        end
-      else
-        if datastream_content != new_content
-          ng_xml_will_change! 
-          @ng_xml = Nokogiri::XML::Document.parse(new_content)
-          super(@ng_xml.to_s)
-        end
-      end
+    def content=(content)
+      @ng_xml = Nokogiri::XML::Document.parse(content)
     end
 
     def content_changed?
-      return false if !xml_loaded
+      return false if new? and !xml_loaded
       super
     end
 
@@ -311,7 +283,7 @@ module ActiveFedora
     end
 
     def generate_solr_symbol(base, data_type)
-      ActiveFedora::SolrService.solr_name(base.to_sym, data_type)
+      ActiveFedora::SolrService.solr_name(base.to_sym, type: data_type)
     end
 
     # ** Experimental **
@@ -422,23 +394,9 @@ module ActiveFedora
       end
     end
 
-    # Deprecated methods left here for backwards compatibility
-    def ensure_xml_loaded; end
-    deprecation_deprecate :ensure_xml_loaded
-
-    def serialize!
-    end
-    
     def xml_loaded
       instance_variable_defined? :@ng_xml
     end
-
-    def reset_profile_attributes
-      super
-      if xml_loaded
-        @datastream_content = Nokogiri::XML(to_xml).to_xml  {|config| config.no_declaration}.strip
-      end
-    end
     
   end
 end

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -99,7 +99,7 @@ module ActiveFedora
       @fields.each do |field_key, field_info|
         things = send(field_key)
         if things 
-          field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
+          field_symbol = ActiveFedora::SolrService.solr_name(field_key, type: field_info[:type])
           things.val.each do |val|    
             ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )         
           end

data/lib/active_fedora/querying.rb

@@ -25,7 +25,7 @@ module ActiveFedora
       opts[:qt] = solr_query_handler
       #set default sort to created date ascending
       unless opts[:sort].present?
-        opts[:sort]=[ActiveFedora::SolrService.solr_name(:system_create,:date)+' asc'] 
+        opts[:sort]= default_sort_params
       end
 
       batch_size = opts.delete(:batch_size) || 1000
@@ -39,6 +39,10 @@ module ActiveFedora
       end while docs.has_next? 
     end
 
+    def default_sort_params
+      [ActiveFedora::SolrService.solr_name(:system_create, type: :date)+' asc'] 
+    end
+
     # Yields the found ActiveFedora::Base object to the passed block
     #
     # @param [Hash] conditions the conditions for the solr search to match
@@ -80,7 +84,7 @@ module ActiveFedora
     def find_with_conditions(conditions, opts={})
       #set default sort to created date ascending
       unless opts.include?(:sort)
-        opts[:sort]=[ActiveFedora::SolrService.solr_name(:system_create,:date)+' asc'] 
+        opts[:sort]=default_sort_params
       end
       SolrService.query(create_query(conditions), opts) 
     end
@@ -125,7 +129,7 @@ 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, :string, :searchable)
+          key = ActiveFedora::SolrService.solr_name(key, :searchable, type: :string)
         end
         if value.is_a? Array
           value.map { |val| "#{key}:#{quote_for_solr(val)}" }
@@ -145,7 +149,7 @@ module ActiveFedora
     # Return the solr clause that queries for this type of class
     def search_model_clause
       unless self == ActiveFedora::Base
-        return ActiveFedora::SolrService.construct_query_for_rel(:has_model => self.to_class_uri)
+        return ActiveFedora::SolrService.construct_query_for_rel(:has_model, self.to_class_uri)
       end
     end
   end

data/lib/active_fedora/rdf_datastream.rb

@@ -24,13 +24,9 @@ module ActiveFedora
 
         @subject_block ||= lambda { |ds| RDF::URI.new("info:fedora/#{ds.pid}") }
       end
-
-      def register_vocabularies(*vocabs)
-        Deprecation.warn(RDFDatastream, "register_vocabularies no longer has any effect and will be removed in active-fedora 6.0", caller)
-      end
-
     end
 
+    attr_accessor :loaded
     def metadata?
       true
     end
@@ -41,28 +37,32 @@ 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?
-      @content = serialize
+      return false if new? and !loaded
       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)
-        directive = Solrizer::Directive.new(field_info[:type], field_info[:behaviors])
         if values
           Array(values).each do |val|    
             val = val.to_s if val.kind_of? RDF::URI
-            self.class.create_and_insert_terms(prefix(field_key), val, directive, solr_doc)
+            self.class.create_and_insert_terms(prefix(field_key), val, field_info[:behaviors], solr_doc)
           end
         end
       end
@@ -90,6 +90,7 @@ module ActiveFedora
 
     def graph
       @graph ||= begin
+        self.loaded = true
         deserialize
       end      
     end

data/lib/active_fedora/rdf_node.rb

@@ -188,7 +188,7 @@ module ActiveFedora
 
       def rdf_type(uri_or_string=nil)
         if uri_or_string
-          uri = uri_or_string.kind_of?(RDF::URI) ? uri_or_string : RDF::URI.new(uri_or_string) 
+          uri = RDF::URI.new(uri_or_string) unless uri_or_string.kind_of? RDF::URI
           self.config[:type] = {predicate: RDF.type}
           @rdf_type = uri
         end

data/lib/active_fedora/rdf_node/term_proxy.rb

@@ -3,10 +3,7 @@ module ActiveFedora
     class TermProxy
 
       attr_reader :graph, :subject, :predicate, :options
-
-      delegate :class, :to_s, :==, :kind_of?, :each, :each_with_index, :map,
-               :empty?, :as_json, :is_a?, :to_ary, :to_a, :inspect, :first,
-               :last, :include?, :count, :size, :join, :[], :to => :values
+      delegate :class, :to_s, :==, :kind_of?, :each, :map, :empty?, :as_json, :is_a?, :to => :values
 
       # @param graph RDF::Graph
       # @param subject RDF::URI
@@ -54,7 +51,14 @@ 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

@@ -94,8 +94,8 @@ module ActiveFedora
         options[:order] ||= sort if sort.present?
       end
 
+
       if options.present?
-        options = args.first unless args.empty?
         options = {conditions: options}
         apply_finder_options(options).all
       else

data/lib/active_fedora/rels_ext_datastream.rb

@@ -1,4 +1,3 @@
-require 'solrizer/field_name_mapper'
 require 'uri'
 require 'rdf/rdfxml'
 require 'active_fedora/rdf_xml_writer'
@@ -6,7 +5,6 @@ require 'active_fedora/rdf_xml_writer'
 module ActiveFedora
   class RelsExtDatastream < Datastream
     
-    include Solrizer::FieldNameMapper
     attr_accessor :model
 
    def self.default_attributes
@@ -42,11 +40,6 @@ module ActiveFedora
       model.relationships
     end
 
-    def to_xml(fields_xml) 
-      ActiveSupport::Deprecation.warn("to_xml is deprecated, use to_rels_ext")
-      to_rels_ext() 
-    end
-      
     # Populate a RelsExtDatastream object based on the "datastream" content 
     # Assumes that the datastream contains RDF XML from a Fedora RELS-EXT datastream 
     # @param [ActiveFedora::Datastream] tmpl the Datastream object that you are populating
@@ -115,7 +108,7 @@ module ActiveFedora
     # 
     # This is utilized by ActiveFedora::Base.load_instance_from_solr to load 
     # the relationships hash using the Solr document passed in instead of from the RELS-EXT datastream
-    # in Fedora.  Utilizes solr_name method (provided by Solrizer::FieldNameMapper) to map solr key to
+    # in Fedora.  Utilizes solr_name method (provided by Solrizer::FieldMapper) to map solr key to
     # relationship predicate. 
     #
     # ====Warning

data/lib/active_fedora/semantic_node.rb

@@ -69,41 +69,6 @@ module ActiveFedora
       return false
     end
 
-    # Create an RDF statement
-    # @param uri a string represending the subject
-    # @param predicate a predicate symbol
-    # @param target an object to store
-    def build_statement(uri, predicate, target, literal=false)
-      ActiveSupport::Deprecation.warn("ActiveFedora::Base#build_statement has been deprecated.")
-      raise "Not allowed anymore" if uri == :self
-      target = target.internal_uri if target.respond_to? :internal_uri
-      subject =  RDF::URI.new(uri)  #TODO cache
-      unless literal or target.is_a? RDF::Resource
-        begin
-          target_uri = (target.is_a? URI) ? target : URI.parse(target)
-          if target_uri.scheme.nil?
-            raise ArgumentError, "Invalid target \"#{target}\". Must have namespace."
-          end
-          if target_uri.to_s =~ /\A[\w\-]+:[\w\-]+\Z/
-            raise ArgumentError, "Invalid target \"#{target}\". Target should be a complete URI, and not a pid."
-          end
-        rescue URI::InvalidURIError
-          raise ArgumentError, "Invalid target \"#{target}\". Target must be specified as a literal, or be a valid URI."
-        end
-      end
-      if literal
-        object = RDF::Literal.new(target)
-      elsif target.is_a? RDF::Resource
-        object = target
-      else
-        object = RDF::URI.new(target)
-      end
-      RDF::Statement.new(subject, find_graph_predicate(predicate), object)
-    
-    end
-                  
-    
-
     #
     # Remove a Rels-Ext relationship from the Object.
     # @param predicate

data/lib/active_fedora/simple_datastream.rb

@@ -85,7 +85,7 @@ module ActiveFedora
         next if field_key == :location ## FIXME HYDRA-825
         things = send(field_key)
         if things 
-          field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
+          field_symbol = ActiveFedora::SolrService.solr_name(field_key, type: field_info[:type])
           things.val.each do |val|    
             ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val.to_s )         
           end

data/lib/active_fedora/solr_service.rb

@@ -3,7 +3,6 @@ require 'rsolr'
 module ActiveFedora
   class SolrService 
     
-    include Solrizer::FieldNameMapper
     include Loggable
     
     attr_reader :conn
@@ -67,18 +66,17 @@ module ActiveFedora
       query = "id:NEVER_USE_THIS_ID" if query.empty? || query == "id:"
       return query
     end
+
+    def self.solr_name(*args)
+      Solrizer.default_field_mapper.solr_name(*args)
+    end
     
     def self.escape_uri_for_query(uri)
       return uri.gsub(/(:)/, '\\:').gsub(/(\/)/, '\\/')
     end
     
-    # Create a query with a clause for each key, value
-    # @param [Hash] args key is the predicate, value is the target_uri
-    def self.construct_query_for_rel(args)
-      clauses = args.map do |predicate, target_uri|
-        "#{solr_name(predicate, :symbol)}:#{escape_uri_for_query(target_uri)}"
-      end
-      clauses.join(" AND ")
+    def self.construct_query_for_rel(predicate, target_uri)
+      "#{solr_name(predicate, :symbol)}:#{escape_uri_for_query(target_uri)}"
     end
 
     def self.query(query, args={})

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "5.7.1"
+  VERSION = "6.0.0.pre1"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -14,7 +14,7 @@ namespace :active_fedora do
 
     YARD::Rake::YardocTask.new(:doc) do |yt|
       yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + 
-                   [ '-', File.join(project_root, 'README.textile'), File.join(project_root,'CONSOLE_GETTING_STARTED.textile'), File.join(project_root,'NOKOGIRI_DATASTREAMS.textile') ]
+                   [ File.join(project_root, 'README.textile'),'-', File.join(project_root,'CONSOLE_GETTING_STARTED.textile'),'-', File.join(project_root,'NOKOGIRI_DATASTREAMS.textile') ]
       yt.options = ['--output-dir', doc_destination, '--readme', 'README.textile']
     end
   rescue LoadError
@@ -36,6 +36,13 @@ require 'rspec/core/rake_task'
     spec.rcov = true
   end
 
+  task :clean_jetty do
+    Dir.chdir("./jetty")
+    system("git clean -f -d")
+    system("git checkout .")
+    Dir.chdir("..")
+  end
+
   desc "Loads or refreshes the fixtures needed to run the tests"
   task :fixtures => :environment do
     ENV["pid"] = "hydrangea:fixture_mods_article1"
@@ -53,6 +60,7 @@ require 'rspec/core/rake_task'
 
   desc "Copies the default SOLR config for the bundled Testing Server"
   task :configure_jetty do
+    Rake::Task["active_fedora:clean_jetty"].invoke
     FileList['solr/conf/*'].each do |f|  
       cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
       cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
@@ -60,8 +68,8 @@ require 'rspec/core/rake_task'
   end
 
 
-desc "CI build"
-task :ci do
+desc "Hudson build"
+task :hudson do
   ENV['environment'] = "test"
   Rake::Task["active_fedora:configure_jetty"].invoke
   jetty_params = Jettywrapper.load_config