active-fedora 6.0.0.rc1 → 6.0.0.rc2

data/Gemfile

@@ -5,8 +5,8 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'simplecov', :platform => :mri_19
-  gem 'simplecov-rcov', :platform => :mri_19
+  gem 'simplecov', :platforms => [:mri_19, :mri_20]
+  gem 'simplecov-rcov', :platforms => [:mri_19, :mri_20]
 end
 
 gem 'jruby-openssl', :platform=> :jruby

data/active-fedora.gemspec

@@ -23,10 +23,11 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>1.3')
+  s.add_dependency("rubydora", '~>1.4')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>1.0.0')
   s.add_dependency("deprecation")
+  s.add_development_dependency("rdoc")
   s.add_development_dependency("yard")
   s.add_development_dependency("RedCloth") # for RDoc formatting
   s.add_development_dependency("rake")

data/config/jetty.yml

@@ -1,4 +1,5 @@
 default:
+  startup_wait: 45
   jetty_port: 8983
   java_opts:
     - "-Xmx256m" 

data/lib/active_fedora/associations/association_collection.rb

@@ -181,7 +181,7 @@ module ActiveFedora
 
         def construct_query
           clauses = {@reflection.options[:property] => @owner.internal_uri}
-          clauses[:has_model] = @reflection.class_name.constantize.to_class_uri if @reflection.class_name
+          clauses[:has_model] = @reflection.class_name.constantize.to_class_uri if @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base'
           @counter_query = @finder_query = ActiveFedora::SolrService.construct_query_for_rel(clauses)
         end
 

data/lib/active_fedora/attributes/serializers.rb

@@ -3,7 +3,7 @@ module ActiveFedora
     module Serializers
 
       ## This allows you to use date_select helpers in rails views 
-      # @param [Hash] parms parameters hash
+      # @param [Hash] params parameters hash
       # @return [Hash] a parameters list with the date select parameters replaced with dates
       def deserialize_dates_from_form(params)
         dates = {}

data/lib/active_fedora/base.rb

@@ -214,8 +214,8 @@ module ActiveFedora
         credentials = ActiveFedora.config.credentials
       end
       fedora_connection[0] ||= ActiveFedora::RubydoraConnection.new(credentials)
-      d = REXML::Document.new( fedora_connection[0].connection.next_pid(args))
-      pid =d.elements['//pid'].text
+      d = Nokogiri::XML( fedora_connection[0].connection.next_pid(args))
+      pid = d.xpath('//fedora:pid', 'fedora' => 'http://www.fedora.info/definitions/1/0/management/').text
       pid
     end
 

data/lib/active_fedora/nokogiri_datastream.rb

@@ -1,10 +1,12 @@
 #this class represents a xml metadata datastream
 module ActiveFedora
   class NokogiriDatastream < OmDatastream
+    extend Deprecation
     def initialize(digital_object=nil, dsid=nil, options={})
-      Deprecation.warn("NokogiriDatastream is deprecated and will be removed in active-fedora 7.0, use OmDatastream instead", caller)
       super
     end
+    self.deprecation_horizon= "hydra-head 7.0"
+    deprecation_deprecate :initialize
   end
 end
 

data/lib/active_fedora/rdf_node.rb

@@ -100,7 +100,7 @@ module ActiveFedora
       end
     end
 
-    # @param [Symbol, RDF::URI] predicate  the predicate to insert into the graph
+    # @param [Symbol, RDF::URI] term predicate  the predicate to insert into the graph
     def find_predicate(term)
       conf = config_for_term_or_uri(term)
       conf ? conf[:predicate] : nil

data/lib/active_fedora/relation.rb

@@ -79,9 +79,8 @@ module ActiveFedora
     # called on
     #
     # @param[String,Symbol,Hash] args either a pid or :all or a hash of conditions
-    # @param [Hash] opts the options to create a message with.
-    # @option opts [Integer] :rows when :all is passed, the maximum number of rows to load from solr
-    # @option opts [Boolean] :cast when true, examine the model and cast it to the first known cModel
+    # @option args [Integer] :rows when :all is passed, the maximum number of rows to load from solr
+    # @option args [Boolean] :cast when true, examine the model and cast it to the first known cModel
     def find(*args)
       return to_a.find { |*block_args| yield(*block_args) } if block_given?
       options = args.extract_options!

data/lib/active_fedora/rels_ext_datastream.rb

@@ -42,8 +42,8 @@ module ActiveFedora
 
     # 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 
     # @param [ActiveFedora::Datastream] tmpl the Datastream object that you are populating
-    # @param [String] the "rdf" node 
     def self.from_xml(xml, tmpl) 
       if (xml.nil?)
         ### maybe put the template here?

data/lib/active_fedora/semantic_node.rb

@@ -26,7 +26,7 @@ module ActiveFedora
 
     # Add a relationship to the Object.
     # @param predicate
-    # @param object Either a string URI or an object that is a kind of ActiveFedora::Base 
+    # @param target Either a string URI or an object that is a kind of ActiveFedora::Base 
     def add_relationship(predicate, target, literal=false)
       object_relations.add(predicate, target, literal)
       rels_ext.content_will_change! if object_relations.dirty
@@ -47,7 +47,7 @@ module ActiveFedora
     #   2. kind_of? returns true for the model passed in
     # This method can most often be used to detect if an object from Fedora that was created
     # with a different model was then used to populate this object.
-    # @param [Class] the model class name to check if an object conforms_to that model
+    # @param [Class] model_class the model class name to check if an object conforms_to that model
     # @return [Boolean] true if this object conforms to the given model name
     def conforms_to?(model_class)
       if self.kind_of?(model_class)
@@ -72,7 +72,7 @@ module ActiveFedora
     #
     # Remove a Rels-Ext relationship from the Object.
     # @param predicate
-    # @param object Either a string URI or an object that responds to .pid 
+    # @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

data/lib/active_fedora/solr_service.rb

@@ -94,7 +94,7 @@ module ActiveFedora
 
     # Get the count of records that match the query
     # @param [String] query a solr query 
-    # @returns [Integer] number of records matching
+    # @return [Integer] number of records matching
     def self.count(query)
         SolrService.query(query, :raw=>true, :rows=>0)['response']['numFound'].to_i
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.0.0.rc1"
+  VERSION = "6.0.0.rc2"
 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

data/spec/integration/has_many_associations_spec.rb

@@ -4,7 +4,7 @@ describe "When two or more relationships share the same property" do
   before do
     class Book < ActiveFedora::Base 
       has_many :collections, :property=>:is_part_of, :class_name=>'Collection'
-      has_many :people, :property=>:is_part_of#, :class_name=>'Person'
+      has_many :people, :property=>:is_part_of
     end
 
     class Person < ActiveFedora::Base
@@ -15,7 +15,7 @@ describe "When two or more relationships share the same property" do
       belongs_to :book, :property=>:is_part_of
     end
 
-    @book = Book.create!#(:collections=>[@collection1, @collection2], :people=>[@person1, @person2])
+    @book = Book.create!
     @person1 = Person.create!(:book=>@book)
     @person2 = Person.create!(:book=>@book)
   end
@@ -31,3 +31,34 @@ describe "When two or more relationships share the same property" do
     @book.collections.should == []
   end
 end
+
+describe "When relationship is restricted to AF::Base" do
+  before do
+    class Email < ActiveFedora::Base 
+      has_many :attachments, :property=>:is_part_of, :class_name=>'ActiveFedora::Base'
+    end
+
+    class Image < ActiveFedora::Base
+      belongs_to :email, :property=>:is_part_of
+    end
+
+    class PDF < ActiveFedora::Base
+      belongs_to :email, :property=>:is_part_of
+    end
+
+    @book = Email.create!
+    @image = Image.create!(:email=>@book)
+    @pdf = PDF.create!(:email=>@book)
+  end
+  after do
+      Object.send(:remove_const, :Image)
+      Object.send(:remove_const, :PDF)
+      Object.send(:remove_const, :Email)
+  end
+
+
+  it "Should not restrict relationships " do
+    @book.reload
+    @book.attachments.should == [@image, @pdf]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc1
+  version: 6.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -148,7 +148,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement