active-fedora 7.3.1 → 8.0.0.rc1

data/lib/active_fedora/rdf/identifiable.rb

@@ -7,7 +7,7 @@
 #   subject.descMetadata.set = base
 #   subject.descMetadata.set # => <ActiveFedora::Base>
 #   subject.descMetadata.set.title # => 'test'
-module ActiveFedora::Rdf::Identifiable
+module ActiveFedora::RDF::Identifiable
   extend ActiveSupport::Concern
   delegate :parent, :dump, :query, :rdf_type, :to => :resource
 
@@ -17,7 +17,9 @@ module ActiveFedora::Rdf::Identifiable
   # If there is no RdfResource, make a dummy one and freeze its graph.
   def resource
     return self.send(self.class.resource_datastream).resource unless self.class.resource_datastream.nil?
-    ActiveFedora::Rdf::ObjectResource.new(self.pid).freeze
+    klass = Class.new(ActiveTriples::Resource)
+    klass.send(:include, ActiveFedora::RDF::Persistence)
+    klass.new(ActiveFedora::RDF::Persistence::BASE_URI + self.pid).freeze
   end
 
   module ClassMethods
@@ -56,7 +58,8 @@ module ActiveFedora::Rdf::Identifiable
     # for URI configurations not of form base_uri + pid
     # @param [RDF::URI] uri URI to convert to pid
     def pid_from_subject(uri)
-      base_uri = resource_datastream ? self.ds_specs[resource_datastream.to_s][:type].resource_class.base_uri : ActiveFedora::Rdf::ObjectResource.base_uri
+      base_uri = self.ds_specs[resource_datastream.to_s][:type].resource_class.base_uri if resource_datastream
+      base_uri = base_uri || ActiveFedora::RDF::Persistence::BASE_URI
       uri.to_s.gsub(base_uri, "")
     end
   end

data/lib/active_fedora/rdf/indexing.rb

@@ -1,24 +1,17 @@
 module ActiveFedora
-  module Rdf
+  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)
-        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)
+        prefix + name.to_s
       end
 
       def to_solr(solr_doc = Hash.new) # :nodoc:
         fields.each do |field_key, field_info|
           values = resource.get_values(field_key)
           Array(values).each do |val|
-            if val.kind_of? RDF::URI
+            if val.kind_of? ::RDF::URI
               val = val.to_s 
             elsif val.kind_of? ActiveTriples::Resource
               val = val.solrize
@@ -43,11 +36,6 @@ module ActiveFedora
       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 datatype for a column.
         def type(field)
           config_for_term_or_uri(field).type

data/lib/active_fedora/rdf/persistence.rb

@@ -0,0 +1,33 @@
+module ActiveFedora
+  module RDF
+    #
+    # Mixin for adding datastream persistence to an ActiveTriples::Resource 
+    # descendant so that it may be used to back an ActiveFedora::RDFDatastream.
+    #
+    # @see ActiveFedora::RDFDatastream.resource_class
+    # @see ActiveFedora::Rdf::ObjectResource
+    #
+    module Persistence
+      extend ActiveSupport::Concern
+
+      BASE_URI = 'info:fedora/'
+
+      included do
+        configure :base_uri => BASE_URI unless base_uri
+        attr_accessor :datastream
+      end
+     
+      # Overrides ActiveTriples::Resource
+      def persist!
+        return false unless datastream and datastream.respond_to? :digital_object
+        @persisted ||= datastream.digital_object.save
+      end
+
+      # Overrides ActiveTriples::Resource
+      def persisted?
+        @persisted ||= (not datastream.new?)
+      end
+
+    end
+  end
+end

data/lib/active_fedora/rdf/project_hydra.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'rdf'
+class ActiveFedora::RDF::ProjectHydra < ::RDF::StrictVocabulary("http://projecthydra.org/ns/relations#")
+  property :hasProfile,
+    label: "Has Profile".freeze,
+    subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+    type: "rdf:Property".freeze
+  property :isGovernedBy,
+    label: "Is Governed By".freeze,
+    subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+    type: "rdf:Property".freeze
+end

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -2,8 +2,9 @@ module ActiveFedora
   class RDFDatastream < ActiveFedora::Datastream
     include Solrizer::Common
     include ActiveTriples::NestedAttributes
-    include Rdf::Indexing
-    extend ActiveTriples::Properties
+    include RDF::Indexing
+    include ActiveTriples::Properties
+    include ActiveTriples::Reflection
 
     delegate :rdf_subject, :set_value, :get_values, :attributes=, :to => :resource
 
@@ -16,11 +17,23 @@ module ActiveFedora
         @subject_block ||= lambda { |ds| ds.pid }
       end
 
-      # Utility method which can be overridden to determine the object
-      # resource that is created.
-      def resource_class
-        Rdf::ObjectResource
-      end
+      ##
+      # @param [Class] an object to set as the resource class, Must be a descendant of 
+      # ActiveTriples::Resource and include ActiveFedora::Rdf::Persistence.
+      #
+      # @return [Class] the object resource class
+      def resource_class(klass=nil)
+        if klass
+          raise ArgumentError, "#{self} already has a resource_class #{@resource_class}, cannot redefine it to #{klass}" if @resource_class and klass != @resource_class
+          raise ArgumentError, "#{klass} must be a subclass of ActiveTriples::Resource" unless klass < ActiveTriples::Resource
+        end
+        
+        @resource_class ||= begin
+                              klass = Class.new(klass || ActiveTriples::Resource)
+                              klass.send(:include, RDF::Persistence)
+                              klass
+                            end
+      end                                                    
     end
 
     before_save do
@@ -62,13 +75,18 @@ module ActiveFedora
     # set_value, get_value, and property accessors are delegated to this object.
     def resource
       @resource ||= begin
-                      r = self.singleton_class.resource_class.new(digital_object ? self.class.rdf_subject.call(self) : nil)
-                      r.singleton_class.properties = self.class.properties
-                      r.singleton_class.properties.keys.each do |property|
-                        r.singleton_class.send(:register_property, property)
+                      klass = self.class.resource_class
+                      klass.properties.merge(self.class.properties).each do |prop, config|
+                        klass.property(config.term, 
+                                       predicate: config.predicate, 
+                                       class_name: config.class_name, 
+                                       multivalue: config.multivalue)
                       end
+                      klass.accepts_nested_attributes_for(*nested_attributes_options.keys) unless nested_attributes_options.blank?
+                      uri_stub = digital_object ? self.class.rdf_subject.call(self) : nil
+
+                      r = klass.new(uri_stub)
                       r.datastream = self
-                      r.singleton_class.accepts_nested_attributes_for(*nested_attributes_options.keys) unless nested_attributes_options.blank?
                       r << deserialize
                       r
                     end
@@ -99,7 +117,7 @@ module ActiveFedora
     end
 
     def deserialize(data=nil)
-      return RDF::Graph.new if new? && data.nil?
+      return ::RDF::Graph.new if new? && data.nil?
 
       if data.nil?
         data = datastream_content
@@ -108,10 +126,10 @@ module ActiveFedora
       end
 
       # Because datastream_content can return nil, we should check that here.
-      return RDF::Graph.new if data.nil?
+      return ::RDF::Graph.new if data.nil?
 
       data.force_encoding('utf-8')
-      RDF::Graph.new << RDF::Reader.for(serialization_format).new(data)
+      ::RDF::Graph.new << ::RDF::Reader.for(serialization_format).new(data)
     end
 
     def serialization_format

data/lib/active_fedora/rdf_xml_writer.rb

@@ -5,7 +5,7 @@ module ActiveFedora
 # with an rdf:Description container for the properties
 # the default behavior for RDF:RDFXML::Writer is to change that element if
 # an rdf:type assertion is present; this is incompatible with Fedora 3
-  class RDFXMLWriter < RDF::RDFXML::Writer
+  class RDFXMLWriter < ::RDF::RDFXML::Writer
     # Display a subject.
     #
     # If the Haml template contains an entry matching the subject's rdf:type URI, that entry will be used as the template for this subject and it's properties.
@@ -32,7 +32,7 @@ module ActiveFedora
       subject_done(subject)
 
       properties = properties_for_subject(subject)
-      typeof = type_of(properties[RDF.type.to_s], subject)
+      typeof = type_of(properties[::RDF.type.to_s], subject)
       prop_list = order_properties(properties)
 
       add_debug {"subject: #{curie.inspect}, typeof: #{typeof.inspect}, props: #{prop_list.inspect}"}

data/lib/active_fedora/relationship_graph.rb

@@ -17,7 +17,7 @@ module ActiveFedora
       unless has_predicate? uri
         relationships[uri] = []
       end
-      object = RDF::Literal.new(object) if literal
+      object = ::RDF::Literal.new(object) if literal
       unless relationships[uri].include?(object)
         @dirty = true
         relationships[uri] << object
@@ -54,8 +54,8 @@ module ActiveFedora
     
     def to_graph(subject_uri)
       # need to destroy relationships and rewrite it.
-      subject =  RDF::URI.new(subject_uri)
-      graph = RDF::Graph.new
+      subject =  ::RDF::URI.new(subject_uri)
+      graph = ::RDF::Graph.new
       relationships.each do |predicate, values|
         values.each do |object|
           graph.insert build_statement(subject,  predicate, object)
@@ -72,8 +72,8 @@ module ActiveFedora
     def build_statement(uri, predicate, target)
       raise "Not allowed anymore" if uri == :self
       target = target.internal_uri if target.respond_to? :internal_uri
-      subject =  RDF::URI.new(uri)  #TODO cache
-      if target.is_a? RDF::Literal or target.is_a? RDF::Resource
+      subject =  ::RDF::URI.new(uri)  #TODO cache
+      if target.is_a? ::RDF::Literal or target.is_a? ::RDF::Resource
         object = target
       else
         begin
@@ -87,14 +87,14 @@ module ActiveFedora
         rescue URI::InvalidURIError
           raise ArgumentError, "Invalid target \"#{target}\". Target must be specified as a literal, or be a valid URI."
         end
-        object = RDF::URI.new(target)
+        object = ::RDF::URI.new(target)
       end
-      RDF::Statement.new(subject, uri_predicate(predicate), object)
+      ::RDF::Statement.new(subject, uri_predicate(predicate), object)
     
     end
 
     def uri_predicate(predicate)
-      return predicate if predicate.kind_of? RDF::URI
+      return predicate if predicate.kind_of? ::RDF::URI
       ActiveFedora::Predicates.find_graph_predicate(predicate)
     end
   end

data/lib/active_fedora/semantic_node.rb

@@ -1,7 +1,6 @@
 module ActiveFedora
   module SemanticNode 
     extend ActiveSupport::Concern
-    extend Deprecation
 
     attr_accessor :relationships_loaded
     attr_accessor :load_from_solr, :subject
@@ -30,9 +29,9 @@ module ActiveFedora
     end
 
     def relationships=(xml)
-      RDF::RDFXML::Reader.new(xml) do |reader|
+      ::RDF::RDFXML::Reader.new(xml) do |reader|
         reader.each_statement do |statement|
-          literal = statement.object.kind_of?(RDF::Literal)
+          literal = statement.object.kind_of?(::RDF::Literal)
           object = literal ? statement.object.value : statement.object.to_str
           object_relations.add(statement.predicate, object, literal)
         end
@@ -121,7 +120,7 @@ module ActiveFedora
 
     def ids_for_outbound(predicate)
       (object_relations[predicate] || []).map do |o|
-        o = o.to_s if o.kind_of? RDF::Literal
+        o = o.to_s if o.kind_of? ::RDF::Literal
         o.kind_of?(String) ? self.class.pid_from_uri(o) : o.pid
       end
     end
@@ -132,17 +131,6 @@ module ActiveFedora
     end
 
     module ClassMethods
-      # @param [String,Array] uris a single uri (as a string) or a list of uris to convert to pids
-      # @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
-          pid_from_uri(uris)
-        else
-          Array(uris).map {|uri| pid_from_uri(uri)}
-        end
-      end
-
       # Returns a suitable uri object for :has_model
       # Should reverse Model#from_class_uri
       def to_class_uri(attrs = {})

data/lib/active_fedora/solr_digital_object.rb

@@ -47,10 +47,10 @@ module ActiveFedora
       attribute = original_class.defined_attributes[field]
       field_name = attribute.primary_solr_name
       raise KeyError, "Tried to fetch `#{field}' from solr, but it isn't indexed." unless field_name
-      val = solr_doc.fetch field_name, default
+      val = Array(solr_doc.fetch(field_name, default))
       case attribute.type
       when :date
-        val.is_a?(Array) ? val.map{|v| Date.parse v} : Date.parse(val)
+        val.map{|v| Date.parse v}
       else
         val
       end

data/lib/active_fedora/solr_service.rb

@@ -2,7 +2,6 @@ require 'rsolr'
 
 module ActiveFedora
   class SolrService 
-    extend Deprecation
     
     attr_reader :conn
 
@@ -63,7 +62,6 @@ module ActiveFedora
           model_value = Model.from_class_uri(value)
 
           if model_value
-
             # Set as the first model in case opts[:class] was nil
             best_model_match ||= model_value
 
@@ -98,12 +96,7 @@ module ActiveFedora
       def solr_name(*args)
         Solrizer.default_field_mapper.solr_name(*args)
       end
-      
-      def escape_uri_for_query(uri)
-        Deprecation.warn SolrService, "escape_uri_for_query is deprecated and will be removed in active-fedora 8.0.0. Use RSolr.escape instead."
-        RSolr.escape(uri)
-      end
-      
+            
       # Create a query with a clause for each key, value
       # @param [Hash, Array<Array<String>>] args key is the predicate, value is the target_uri
       # @param [String] join_with ('AND') the value we're joining the clauses with

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "7.3.1"
+  VERSION = "8.0.0.rc1"
 end

data/lib/generators/active_fedora/config/fedora/templates/fedora.yml

@@ -2,13 +2,37 @@ development:
   user: fedoraAdmin
   password: fedoraAdmin
   url: http://127.0.0.1:8983/fedora
+  ########
+  # optional parameters available for active fedora uncomment to send values
+  ########
+  # timeout: 60
+  # open_timeout: nil
+  # ssl_client_cert: <ssl certificate>
+  # ssl_client_key:  <ssl key>
+  # validateChecksum: false
 test: &TEST  
   user: fedoraAdmin
   password: fedoraAdmin
   url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/fedora-test" %>
+  ########
+  # optional parameters available for active fedora uncomment to send values
+  ########
+  # timeout: 60
+  # open_timeout: nil
+  # ssl_client_cert: <ssl certificate>
+  # ssl_client_key:  <ssl key>
+  # validateChecksum: false
 production:
   user: fedoraAdmin
   password: fedoraAdmin
   url: http://your.production.server:8080/fedora
+  ########
+  # optional parameters available for active fedora uncomment to send values
+  ########
+  # timeout: 60
+  # open_timeout: nil
+  # ssl_client_cert: <ssl certificate>
+  # ssl_client_key:  <ssl key>
+  # validateChecksum: false
 cucumber:
   <<: *TEST

data/lib/tasks/active_fedora_dev.rake

@@ -1,7 +1,7 @@
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
 
 require 'jettywrapper'
-JETTY_ZIP_BASENAME = 'v7.3.0'
+JETTY_ZIP_BASENAME = 'master'
 Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
 
 namespace :active_fedora do

data/spec/integration/belongs_to_association_spec.rb

@@ -45,11 +45,6 @@ describe ActiveFedora::Base do
       book[:library_id] = library.id
       book.library_id.should == library.id
     end
-
-    it "safely handles invalid data" do
-      book[:library_id] = 'bad:identifier'
-      book.library.should be_nil
-    end
   end
 
   describe "getting the id property" do

data/spec/integration/json_serialization_spec.rb

@@ -19,7 +19,7 @@ describe "Objects should be serialized to JSON" do
     after do
       Object.send(:remove_const, :Foo)
     end
-    subject { Foo.new(foo: "baz", bar: 'quix') }
+    subject { Foo.new(foo: ["baz"], bar: 'quix') }
     before { subject.stub(pid: 'test:123') }
     it "should have to_json" do
       json = JSON.parse(subject.to_json)

data/spec/integration/load_from_solr_spec.rb

@@ -10,6 +10,10 @@ describe "Loading from solr" do
         index.type :date
         index.as :stored_searchable, :sortable
       end
+      property :date_modified, predicate: RDF::DC.date do |index|
+        index.type :date
+        index.as :stored_sortable
+      end
       property :identifier, predicate: RDF::DC.identifier do |index|
         index.type :integer
         index.as :stored_searchable, :sortable
@@ -28,13 +32,15 @@ describe "Loading from solr" do
       has_metadata 'rdf', type: MyRdfDatastream
       has_metadata 'om', type: MyOmDatastream
       has_attributes :based_near, :related_url, :part, :date_uploaded, datastream: 'rdf', multiple: true
+      has_attributes :date_modified, datastream: 'rdf', multiple: false
       has_attributes :title, :identifier, datastream: 'rdf', multiple: false
       has_attributes :duck, datastream: 'om', multiple: false
     end
   end
 
   let!(:original) { RdfTest.create!(title: "PLAN 9 FROM OUTER SPACE",
-                                    date_uploaded: Date.parse('1959-01-01'),
+                                    date_uploaded: [Date.parse('1959-01-01')],
+                                    date_modified: Date.parse('1999-01-01'),
                                     duck: "quack",
                                    identifier: 12345) }
 
@@ -50,6 +56,7 @@ describe "Loading from solr" do
     obj = RdfTest.load_instance_from_solr original.pid
     expect(obj.title).to eq "PLAN 9 FROM OUTER SPACE"
     expect(obj.date_uploaded).to eq [Date.parse('1959-01-01')]
+    expect(obj.date_modified).to eq Date.parse('1999-01-01')
     expect(obj.identifier).to eq 12345
     expect{obj.part}.to raise_error KeyError, "Tried to fetch `part' from solr, but it isn't indexed."
     expect(ActiveFedora::Base.logger).to receive(:info).with "Couldn't get duck out of solr, because the datastream 'MyOmDatastream' doesn't respond to 'primary_solr_name'. Trying another way."