active-fedora 3.2.0 → 3.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.2.0)
+    active-fedora (3.2.2)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -13,7 +13,7 @@ PATH
       om (>= 1.4.4)
       rdf
       rdf-rdfxml
-      rubydora (~> 0.3.0)
+      rubydora (~> 0.4.1)
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
@@ -43,7 +43,7 @@ GEM
     diff-lcs (1.1.3)
     equivalent-xml (0.2.8)
       nokogiri (>= 1.4.3)
-    facets (2.9.2)
+    facets (2.9.3)
     fastercsv (1.5.4)
     ffi (1.0.11)
     gyoku (0.4.4)
@@ -74,7 +74,7 @@ GEM
     om (1.4.4)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
-    rack (1.3.5)
+    rack (1.4.0)
     rake (0.9.2.2)
     rbx-require-relative (0.0.5)
     rcov (0.9.11)
@@ -110,7 +110,7 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    rubydora (0.3.0)
+    rubydora (0.4.1)
       activemodel
       activesupport
       fastercsv

data/History.txt

@@ -1,3 +1,13 @@
+3.2.2
+Rubydora 0.4.1
+Fixed bugs where updating datastream properties would overwrite content.
+HYDRA-661: Changed namespaces and names or rake tasks according to HYDRA-661 with the exception that harvest was renamed export
+
+3.2.1
+Load rake tasks.
+Rubydora 0.4.0
+Added fixture exporter
+
 3.2.0
 
 Deprecate ContentModel.pid_from_ruby_class, use Model.to_class_uri instead

data/Rakefile

@@ -2,11 +2,12 @@ require 'rake/clean'
 require 'rubygems'
 require 'bundler'
 require "bundler/setup"
+require "active-fedora"
 
 Bundler::GemHelper.install_tasks
 
-# load rake tasks defined in lib/tasks
-Dir["lib/tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake)
+# load rake tasks defined in lib/tasks that are not loaded in lib/active_fedora.rb
+load "lib/tasks/active_fedora_dev.rake" if defined?(Rake)
 
 CLEAN.include %w[**/.DS_Store tmp *.log *.orig *.tmp **/*~]
 

data/active-fedora.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
   s.add_dependency("facets")
-  s.add_dependency("rubydora", '~>0.3.0')
+  s.add_dependency("rubydora", '~>0.4.1')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml")
   s.add_development_dependency("yard")

data/lib/active_fedora.rb

@@ -1,5 +1,4 @@
 require "loggable"
-require 'active_fedora/railtie' if defined? Rails
 require 'active_support'
 require 'active_fedora/solr_service'
 require 'active_fedora/rubydora_connection'
@@ -40,6 +39,7 @@ module ActiveFedora #:nodoc:
     autoload :SemanticNode
     autoload :NestedAttributes
     autoload :FixtureLoader
+    autoload :FixtureExporter
     autoload :DatastreamCollections
     autoload :NamedRelationships
     autoload :Predicates
@@ -294,3 +294,6 @@ module ActiveFedora
 
 end
 
+load File.join(File.dirname(__FILE__),"tasks/active_fedora.rake") if defined?(Rake)
+
+

data/lib/active_fedora/base.rb

@@ -22,13 +22,11 @@ module ActiveFedora
   #     end
   #   end
   #
-  # The above example creates a FedoraObject with a metadata datastream named "properties", which is composed of a 
+  # The above example creates a Fedora object with a metadata datastream named "properties", which is composed of a 
   # narrator and bio field.
   #
   # Datastreams defined with +has_metadata+ are accessed via the +datastreams+ member hash.
   #
-  # =Implementation
-  # This class is really a facade for a basic Fedora::FedoraObject, which is stored internally.
   class Base
     include SemanticNode
 

data/lib/active_fedora/datastream.rb

@@ -75,34 +75,6 @@ module ActiveFedora
       tmpl
     end
     
-    # # Callback.  Override this to insert behaviors after the save method.  By default, sets self.dirty = false
-    # def after_save
-    #   self.dirty = false
-    # end
-    
-    # returns a datetime in the standard W3C DateTime Format.  
-    # ie 2008-10-17T00:17:18.194Z
-    # def last_modified_in_repository
-    #   # A hack to get around the fact that you can't call getDatastreamHistory 
-    #   # or API-M getDatasreams on Fedora 3.0 REST API  
-    #   # grabs the CREATED attribute off of the last foxml:datastreamVersion 
-    #   # within the appropriate datastream node in the objectXML
-    #   if self.pid != nil
-    #     object_xml = Fedora::FedoraObject.object_xml(self.pid).gsub("\n     ","")
-    #     datastream_xml = REXML::Document.new(object_xml).root.elements["foxml:datastream[@ID='#{self.dsid}']"]
-    #     
-    #     if datastream_xml.length > 3
-    #       datastream_xml.elements.each do |el|
-    #         logger.debug el.inspect
-    #       end
-    #     end
-    #     
-    #     datastream_xml.elements[datastream_xml.length - 2].attributes["CREATED"]
-    #   else
-    #     return nil
-    #   end
-    # end
-    
     def check_concurrency # :nodoc:
       return true
     end

data/lib/active_fedora/datastreams.rb

@@ -204,7 +204,7 @@ module ActiveFedora
       ds.mimeType = opts[:mimeType] 
       ds.controlGroup = opts[:controlGroup] 
       ds.dsLabel = opts[:dsLabel] 
-      ds.dsLocation = opts[:dsLocation] 
+      ds.dsLocation = opts[:dsLocation] if opts[:dsLocation]
       blob = opts[:blob] 
       if blob 
         if !ds.mimeType.present? 
@@ -213,37 +213,13 @@ module ActiveFedora
         end
         if !ds.dsLabel.present? && blob.respond_to?(:path)
           ds.dsLabel = File.basename(blob.path)
-#          ds.dsLabel = blob.original_filename
         end
       end
 
-#      blob = blob.read if blob.respond_to? :read
       ds.content = blob || "" 
       ds
     end
 
-    # def configure_defined_datastreams
-    #   if self.class.ds_specs
-    #     self.class.ds_specs.each do |name,ds_config|
-    #       if self.datastreams.has_key?(name)
-    #         #attributes = self.datastreams[name].attributes
-    #       else
-    #         ds = ds_config[:type].new(inner_object, name)
-    #         ds.model = self if ds_config[:type] == RelsExtDatastream
-    #         ds.dsLabel = ds_config[:label] if ds_config[:label].present?
-    #         ds.controlGroup = ds_config[:control_group]
-    #         # If you called has_metadata with a block, pass the block into the Datastream class
-    #         if ds_config[:block].class == Proc
-    #           ds_config[:block].call(ds)
-    #         end
-    #         additional_attributes_for_external_and_redirect_control_groups(ds, ds_config)
-    #         self.add_datastream(ds)
-    #       end
-    #     end
-    #   end
-    # end
-
-
     # This method provides validation of proper options for control_group 'E' and 'R' and builds an attribute hash to be merged back into ds.attributes prior to saving
     #
     # @param [Object] ds The datastream

data/lib/active_fedora/delegating.rb

@@ -31,11 +31,11 @@ module ActiveFedora
         def create_delegate_accessor(field, args)
             define_method field do
               ds = self.send(args[:to])
-              val = if ds.kind_of? ActiveFedora::NokogiriDatastream 
+              val = if ds.kind_of? ActiveFedora::MetadataDatastream 
+                ds.send(:get_values, field)
+              else 
                 terminology = args[:at] || [field]
                 ds.send(:term_values, *terminology)
-              else 
-                ds.send(:get_values, field)
               end 
               args[:unique] ? val.first : val
                 
@@ -45,11 +45,11 @@ module ActiveFedora
         def create_delegate_setter(field, args)
             define_method "#{field}=".to_sym do |v|
               ds = self.send(args[:to])
-              if ds.kind_of? ActiveFedora::NokogiriDatastream 
+              if ds.kind_of? ActiveFedora::MetadataDatastream 
+                ds.send(:set_value, field, v)
+              else 
                 terminology = args[:at] || [field]
                 ds.send(:update_indexed_attributes, {terminology => v})
-              else 
-                ds.send(:set_value, field, v)
               end
             end
         end

data/lib/active_fedora/fixture_exporter.rb

@@ -0,0 +1,33 @@
+module ActiveFedora
+  module FixtureExporter
+
+    def self.export_to_path(pid, path, extra_params={})
+      foxml = export(pid, extra_params)
+      name = "#{pid.gsub(":","_")}.foxml.xml"
+      filename = File.join(path, name)
+      file = File.new(filename,"w")
+      file.syswrite(foxml)
+      filename
+    end
+
+    def self.export(pid, extra_params={})
+      extra_params = {:format=>:foxml, :context=>:archive}.merge!(extra_params)
+      if extra_params[:format].kind_of?(String)
+        format = extra_params[:format]
+      else
+        format = case extra_params[:format]
+          when :atom then "info:fedora/fedora-system:ATOM-1.1"
+          when :atom_zip then "info:fedora/fedora-system:ATOMZip-1.1"
+          when :mets then "info:fedora/fedora-system:METSFedoraExt-1.1"
+          when :foxml then "info:fedora/fedora-system:FOXML-1.1"
+          else "info:fedora/fedora-system:FOXML-1.1"
+        end
+      end
+
+      RubydoraConnection.instance.connection.export(:pid=>pid, :format=>format, :context=>extra_params[:context].to_s)
+    end
+
+
+  end
+end
+

data/lib/active_fedora/metadata_datastream.rb

@@ -6,11 +6,56 @@ module ActiveFedora
   #     <title>Foo</title>
   #     <author>Bar</author>
   #   </fields>
-  class MetadataDatastream < Datastream
+  class MetadataDatastream < NokogiriDatastream 
     
     # .to_solr (among other things) is provided by ActiveFedora::MetadataDatastreamHelper
     include ActiveFedora::MetadataDatastreamHelper
 
+    # def initialize(digital_object, dsid)
+    #   ActiveSupport::Deprecation.warn("MetadataDatastream is deprecated and will be removed in a future release. Create a NokogiriDatastream to structure your data")
+    #   super
+    # end
+    def to_solr(solr_doc = Hash.new) # :nodoc:
+      fields.each do |field_key, field_info|
+        if field_info.has_key?(:values) && !field_info[:values].nil?
+          field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
+          values = field_info[:values]
+          values = [values] unless values.respond_to? :each
+          values.each do |val|    
+            ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )         
+          end
+        end
+      end
+
+      return solr_doc
+    end
+  
+    # ** EXPERIMENTAL **
+    #
+    # This is utilized by ActiveFedora::Base.load_instance_from_solr to set 
+    # metadata values in this object using the Solr document passed in.
+    # Any keys in the solr document that map to a metadata field key within a MetadataDatastream object
+    # are set to the corresponding value.  Any others are ignored. ActiveFedora::SolrService.solr_name
+    # is used to map solr key to field key name.
+    #
+    # ====Warning
+    #  Solr must be synchronized with data in Fedora.
+    def from_solr(solr_doc)
+      fields.each do |field_key, field_info|
+        field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
+        value = (solr_doc[field_symbol].nil? ? solr_doc[field_symbol.to_s]: solr_doc[field_symbol]) 
+        unless value.nil?
+          if value.is_a? Array
+            update_attributes({field_key=>value})
+          else
+            update_indexed_attributes({field_key=>{0=>value}})
+          end
+        end
+      end
+    end
+  
+
+
 
     def update_attributes(params={},opts={})
       result = params.dup

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -32,48 +32,9 @@ module ActiveFedora::MetadataDatastreamHelper
   
   def serialize! # :nodoc:
     if dirty?
+      return unless xml_loaded 
       self.content = self.to_xml 
     end
   end
 
-  def to_solr(solr_doc = Hash.new) # :nodoc:
-    fields.each do |field_key, field_info|
-      if field_info.has_key?(:values) && !field_info[:values].nil?
-        field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
-        values = field_info[:values]
-        values = [values] unless values.respond_to? :each
-        values.each do |val|    
-          ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )         
-        end
-      end
-    end
-
-    return solr_doc
-  end
-  
-  # ** EXPERIMENTAL **
-  #
-  # This is utilized by ActiveFedora::Base.load_instance_from_solr to set 
-  # metadata values in this object using the Solr document passed in.
-  # Any keys in the solr document that map to a metadata field key within a MetadataDatastream object
-  # are set to the corresponding value.  Any others are ignored. ActiveFedora::SolrService.solr_name
-  # is used to map solr key to field key name.
-  #
-  # ====Warning
-  #  Solr must be synchronized with data in Fedora.
-  def from_solr(solr_doc)
-    fields.each do |field_key, field_info|
-      field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
-      value = (solr_doc[field_symbol].nil? ? solr_doc[field_symbol.to_s]: solr_doc[field_symbol]) 
-      unless value.nil?
-        if value.is_a? Array
-          update_attributes({field_key=>value})
-        else
-          update_indexed_attributes({field_key=>{0=>value}})
-        end
-      end
-    end
-  end
-  
-
 end

data/lib/active_fedora/model.rb

@@ -164,7 +164,7 @@ module ActiveFedora
       # Find all ActiveFedora objects for this model that match arguments
       # passed in by querying Solr.  Like find_by_solr this returns a solr result.
       #
-      # query_fields   a hash of object field names and values to filter on
+      # query_fields   a hash of object field names and values to filter on (query_fields must be the solr_field_name for non-MetadataDatastream derived datastreams)
       # opts           specifies options for the solr query
       #
       #   options may include:

data/lib/active_fedora/rubydora_connection.rb

@@ -35,6 +35,7 @@ module ActiveFedora
       return unless @connection.nil? or force
       allowable_options = [:url, :user, :password, :timeout, :open_timeout, :ssl_client_cert, :ssl_client_key]
       client_options = options.reject { |k,v| not allowable_options.include?(k) }
+      #puts "CLIENT OPTS #{client_options.inspect}"
       @connection = Rubydora.connect client_options
     end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.2.0"
+    VERSION = "3.2.2"
 end

data/lib/tasks/active_fedora.rake

@@ -1,21 +1,15 @@
 require "active-fedora"
 require "solrizer-fedora"
 require "active_support" # This is just to load ActiveSupport::CoreExtensions::String::Inflections
-namespace :af do
+namespace :repo do
   
+  desc "Delete and re-import the object identified by pid" 
+  task :refresh => [:delete,:load]
   
-  desc "Delete and re-import the fixture identified by pid" 
-  task :refresh_fixture => [:delete,:import_fixture]
-  
-  desc "Delete the object identified by pid. Example: rake fedora:delete pid=demo:12"
+  desc "Delete the object identified by pid. Example: rake repo:delete pid=demo:12"
   task :delete => :init do
-    # If a destination url has been provided, attampt to export from the fedora repository there.
-    if ENV["destination"]
-      Fedora::Repository.register(ENV["destination"])
-    end
-    
     if ENV["pid"].nil? 
-      puts "You must specify a valid pid.  Example: rake fedora:delete pid=demo:12"
+      puts "You must specify a valid pid.  Example: rake repo:delete pid=demo:12"
     else
       pid = ENV["pid"]
       begin
@@ -25,22 +19,19 @@ namespace :af do
       rescue Errno::ECONNREFUSED => e
         puts "Can't connect to Fedora! Are you sure jetty is running?"
       end
-      logger.info "Deleted '#{pid}' from #{ActiveFedora::RubydoraConnection.instance.options[:url]}"
+      puts "Deleted '#{pid}' from #{ActiveFedora.fedora_config[:url]}"
     end
   end
   
-  desc "Delete a range of objects in a given namespace.  ie 'rake fedora:purge_range[demo, 22, 50]' will delete demo:22 through demo:50"
-  task :purge_range => :init do |t, args|
-    # If Fedora Repository connection is not already initialized, initialize it using ActiveFedora defaults
-    # ActiveFedora.init unless Thread.current[:repo]
-    
+  desc "Delete a range of objects in a given namespace.  ie 'rake repo:delete_range namespace=demo start=22 stop=50' will delete demo:22 through demo:50"
+  task :delete_range => :init do |t, args|
     namespace = ENV["namespace"]
     start_point = ENV["start"].to_i
     stop_point = ENV["stop"].to_i
-    unless start_point < stop_point 
+    unless start_point <= stop_point 
       raise StandardError "start point must be less that end point."
     end
-    puts "Deleting #{stop_point - start_point} objects from #{namespace}:#{start_point.to_s} to #{namespace}:#{stop_point.to_s}"
+    puts "Deleting #{stop_point - start_point + 1} objects from #{namespace}:#{start_point.to_s} to #{namespace}:#{stop_point.to_s}"
     i = start_point
     while i <= stop_point do
       pid = namespace + ":" + i.to_s
@@ -49,68 +40,52 @@ namespace :af do
       rescue ActiveFedora::ObjectNotFoundError
         # The object has already been deleted (or was never created).  Do nothing.
       end
-      puts "Deleted '#{pid}' from #{ActiveFedora::RubydoraConnection.instance.options[:url]}"
+      puts "Deleted '#{pid}' from #{ActiveFedora.fedora_config[:url]}"
       i += 1
     end
   end
-  
-  desc "Export the object identified by pid into spec/fixtures. Example:rake fedora:harvest_fixture pid=druid:sb733gr4073 source=http://fedoraAdmin:fedoraAdmin@127.0.0.1:8080/fedora"
-  task :harvest_fixture => :init do
-        
-    # If a source url has been provided, attampt to export from the fedora repository there.
-    if ENV["source"]
-      #FIXME
-      raise "Not Implemented"
-      #Fedora::Repository.register(ENV["source"])
-    end
-    
+
+  desc "Export the object identified by pid into spec/fixtures. Example:rake repo:export pid=demo:12"
+  task :export => :init do
     if ENV["pid"].nil? 
-      puts "You must specify a valid pid.  Example: rake fedora:harvest_fixture pid=demo:12"
+      puts "You must specify a valid pid.  Example: rake repo:export pid=demo:12"
     else
       pid = ENV["pid"]
-      puts "Exporting '#{pid}' from #{ActiveFedora::RubydoraConnection.instance.options[:url]}"
-      #FIXME
-      raise "Not Implemented"
-      foxml = Fedora::Repository.instance.export(pid)
-      filename = File.join("spec","fixtures","#{pid.gsub(":","_")}.foxml.xml")
-      file = File.new(filename,"w")
-      file.syswrite(foxml)
+      puts "Exporting '#{pid}' from #{ActiveFedora.fedora_config[:url]}"
+      if !ENV["path"].nil?
+        path = ENV["path"]
+      else
+        path = File.join('spec', 'fixtures')
+      end
+      filename = ActiveFedora::FixtureExporter.export_to_path(pid, path)
       puts "The object has been saved as #{filename}"
     end
   end
   
-  desc "Import the fixture located at the provided path. Example: rake fedora:import_fixture fixture=spec/fixtures/demo_12.foxml.xml"
-  task :import_fixture => [:init, :environment] do
-        
-    # If a destination url has been provided, attampt to export from the fedora repository there.
-    if ENV["destination"]
-      #FIXME
-      raise "Not Implemented"
-      Fedora::Repository.register(ENV["destination"])
-    end
-        
-    if !ENV["fixture"].nil? 
-      filename = ENV["fixture"]
+  desc "Load the object located at the provided path or identified by pid. Example: rake repo:load path=spec/fixtures/demo_12.foxml.xml"
+  task :load => :init do
+    if !ENV["path"].nil? 
+      filename = ENV["path"]
     elsif !ENV["pid"].nil?
       pid = ENV["pid"]
       filename = File.join("spec","fixtures","#{pid.gsub(":","_")}.foxml.xml")
     else
-      puts "You must specify a path to the fixture or provide its pid.  Example: rake fedora:import_fixture fixture=spec/fixtures/demo_12.foxml.xml"
+      puts "You must specify a path to the object or provide its pid.  Example: rake repo:load path=spec/fixtures/demo_12.foxml.xml"
     end
     
     if !filename.nil?
-      puts "Importing '#{filename}' to #{ActiveFedora::RubydoraConnection.instance.options[:url]}"
+      puts "Loading '#{filename}' in #{ActiveFedora.fedora_config[:url]}"
       file = File.new(filename, "r")
-      result = foxml = ActiveFedora::RubydoraConnection.instance.connection.ingest(:file=>file.read)
-#      result = foxml = Fedora::Repository.instance.ingest(file.read)
+      result = ActiveFedora::RubydoraConnection.instance.connection.ingest(:file=>file.read)
       if result
-        puts "The fixture has been ingested as #{result.body}"
-        if !pid.nil?
-          solrizer = Solrizer::Fedora::Solrizer.new 
-          solrizer.solrize(pid) 
-        end    
+        puts "The object has been loaded as #{result.body}"
+	if pid.nil?
+          pid = result.body
+        end
+        solrizer = Solrizer::Fedora::Solrizer.new 
+        solrizer.solrize(pid) 
       else
-        puts "Failed to ingest the fixture."
+        puts "Failed to load the object."
       end
     end    
     

data/lib/tasks/active_fedora_dev.rake

@@ -2,20 +2,6 @@ APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
 
 require 'jettywrapper'
 
-desc "Hudson build"
-task :hudson do
-  ENV['environment'] = "test"
-  Rake::Task["active_fedora:doc"].invoke
-  Rake::Task["active_fedora:configure_jetty"].invoke
-  jetty_params = Jettywrapper.load_config
-  jetty_params[:startup_wait]= 30
-  error = Jettywrapper.wrap(jetty_params) do
-    Rake::Task["active_fedora:load_fixtures"].invoke
-    Rake::Task["active_fedora:rspec"].invoke
-  end
-  raise "test failures: #{error}" if error
-end
-
 namespace :active_fedora do
   require 'active-fedora'
 
@@ -73,6 +59,20 @@ require 'rspec/core/rake_task'
       cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
     end
   end
+
+
+desc "Hudson build"
+task :hudson do
+  ENV['environment'] = "test"
+  Rake::Task["active_fedora:doc"].invoke
+  Rake::Task["active_fedora:configure_jetty"].invoke
+  jetty_params = Jettywrapper.load_config
+  jetty_params[:startup_wait]= 30
+  error = Jettywrapper.wrap(jetty_params) do
+    Rake::Task["active_fedora:load_fixtures"].invoke
+    Rake::Task["active_fedora:rspec"].invoke
+  end
+  raise "test failures: #{error}" if error
 end
 
 # Provides an :environment task for use while working within a working copy of active-fedora
@@ -83,3 +83,6 @@ task :environment do
   require "#{APP_ROOT}/spec/samples/models/hydrangea_article"
   require 'active_fedora/samples'
 end
+
+end
+

data/script/console

@@ -3,8 +3,8 @@
 irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 ENV["RUBYLIB"] = "lib"
 libs =  " -r irb/completion"
+libs << " -r rubygems"
 libs << " -r #{File.dirname(__FILE__) + '/../spec/spec_helper'}"
-#libs << " -r rubygems"
 # libs << " -r #{File.dirname(__FILE__) + '/../lib/active_fedora.rb'}"
 
 # Perhaps use a console_lib to store any extra methods I may want available in the cosole

data/spec/integration/base_find_by_fields_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require "active_fedora/samples"
 
 class MockAFBaseQuerySolr < ActiveFedora::Base
   has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
@@ -13,15 +14,45 @@ class MockAFBaseQuerySolr < ActiveFedora::Base
     m.field "geography", :string, :xml_node => "geography"
     m.field "title", :string, :xml_node => "title"
   end
+
+  has_metadata :name=>'ng_metadata', :type=> Hydra::ModsArticleDatastream
 end
 
 describe ActiveFedora::Base do
   
-  before(:each) do
+  before(:all) do
     @test_object = ActiveFedora::Base.new
+    #get objects into fedora and solr
+    @test_object2 = MockAFBaseQuerySolr.new
+    attributes = {"holding_id"=>{0=>"Holding 1"},
+                  "language"=>{0=>"Italian"},
+                  "creator"=>{0=>"Linguist, A."},
+                  "geography"=>{0=>"Italy"},
+                  "title"=>{0=>"Italian and Spanish: A Comparison of Common Phrases"}}
+    @test_object2.update_indexed_attributes(attributes)
+    @test_object2.save
+    
+    @test_object3 = MockAFBaseQuerySolr.new
+    attributes = {"holding_id"=>{0=>"Holding 2"},
+                  "language"=>{0=>"Spanish;Latin"},
+                  "creator"=>{0=>"Linguist, A."},
+                  "geography"=>{0=>"Spain"},
+                  "title"=>{0=>"A study of the evolution of Spanish from Latin"}}
+    @test_object3.update_indexed_attributes(attributes)
+    @test_object3.save      
+
+    @test_object4 = MockAFBaseQuerySolr.new
+    attributes = {"holding_id"=>{0=>"Holding 3"},
+                  "language"=>{0=>"Spanish;Latin"},
+                  "creator"=>{0=>"Linguist, A."},
+                  "geography"=>{0=>"Spain"},
+                  "title"=>{0=>"An obscure look into early nomadic tribes of Spain"}}
+    @test_object4.update_indexed_attributes(attributes)
+    @test_object4.save
+      
   end
 
-  after(:each) do
+  after(:all) do
     begin
     @test_object.delete
     rescue
@@ -38,42 +69,10 @@ describe ActiveFedora::Base do
     @test_object4.delete
     rescue
     end
-    begin
-    @test_object5.delete
-    rescue
-    end
   end
 
   describe '#find_by_fields_by_solr' do
-    it 'should return fedora objects of the model of self that match the given solr query, queries the active_fedora solr instance' do
-      #get objects into fedora and solr
-      @test_object2 = MockAFBaseQuerySolr.new
-      attributes = {"holding_id"=>{0=>"Holding 1"},
-                    "language"=>{0=>"Italian"},
-                    "creator"=>{0=>"Linguist, A."},
-                    "geography"=>{0=>"Italy"},
-                    "title"=>{0=>"Italian and Spanish: A Comparison of Common Phrases"}}
-      @test_object2.update_indexed_attributes(attributes)
-      @test_object2.save
-      
-      @test_object3 = MockAFBaseQuerySolr.new
-      attributes = {"holding_id"=>{0=>"Holding 2"},
-                    "language"=>{0=>"Spanish;Latin"},
-                    "creator"=>{0=>"Linguist, A."},
-                    "geography"=>{0=>"Spain"},
-                    "title"=>{0=>"A study of the evolution of Spanish from Latin"}}
-      @test_object3.update_indexed_attributes(attributes)
-      @test_object3.save      
-
-      @test_object4 = MockAFBaseQuerySolr.new
-      attributes = {"holding_id"=>{0=>"Holding 3"},
-                    "language"=>{0=>"Spanish;Latin"},
-                    "creator"=>{0=>"Linguist, A."},
-                    "geography"=>{0=>"Spain"},
-                    "title"=>{0=>"An obscure look into early nomadic tribes of Spain"}}
-      @test_object4.update_indexed_attributes(attributes)
-      @test_object4.save
-      
+    it 'should return fedora objects of the correct class' do
       #query based on just model
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({})
       found_pids = []
@@ -82,7 +81,9 @@ describe ActiveFedora::Base do
       end
       
       found_pids.should == [@test_object2.pid,@test_object3.pid,@test_object4.pid]
+    end
       
+    it 'should match a query against multiple result fields' do
       #query on certain fields
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"language"=>"Latin"})
       found_pids = []
@@ -107,23 +108,10 @@ describe ActiveFedora::Base do
       end
       
       found_pids.should == [@test_object3.pid,@test_object4.pid]
+    end
       
+    it 'should  query against many fields' do
       #assume spaces removed at index time so query by 'Linguist,A.' instead of 'Linguist, A.'
-      results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."})
-      found_pids = []
-      results.hits.each do |hit|
-        found_pids.push(hit[SOLR_DOCUMENT_ID])
-      end
-      
-      found_pids.should == [@test_object2.pid,@test_object3.pid,@test_object4.pid]
-      
-      results = MockAFBaseQuerySolr.find_by_fields_by_solr({"geography"=>"Italy"})
-      found_pids = []
-      results.hits.each do |hit|
-        found_pids.push(hit[SOLR_DOCUMENT_ID])
-      end
-      
-      found_pids.should == [@test_object2.pid]
       
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A.","title"=>"latin"})
       found_pids = []
@@ -132,6 +120,9 @@ describe ActiveFedora::Base do
       end
       
       found_pids.should == [@test_object3.pid]
+    end
+
+    it 'should query by id' do
       
       #query with value with embedded ':' (pid)
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"id"=>@test_object3.pid})
@@ -141,9 +132,10 @@ describe ActiveFedora::Base do
       end
       
       found_pids.should == [@test_object3.pid]
-      
-      #query with different options
-      #sort defaults to system_create_date
+    end
+
+
+    it "should sort by default by system_create_date" do
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A.","language"=>"Spanish"})
       found_pids = []
       results.hits.each do |hit|
@@ -151,8 +143,9 @@ describe ActiveFedora::Base do
       end
       
       found_pids.should == [@test_object3.pid,@test_object4.pid]
-      
-      #change sort direction
+    end
+
+    it "should be able to change the sort direction" do 
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."},{:sort=>[{"system_create"=>"desc"}]})
       found_pids = []
       results.hits.each do |hit|
@@ -160,8 +153,9 @@ describe ActiveFedora::Base do
       end
       
       found_pids.should == [@test_object4.pid,@test_object3.pid,@test_object2.pid]
-      
-      #pass in sort without direction defined and make ascending by default
+    end
+
+    it "should default the sort direction to ascending" do
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."},{:sort=>["system_create"]})
       found_pids = []
       results.hits.each do |hit|
@@ -169,8 +163,10 @@ describe ActiveFedora::Base do
       end
       
       found_pids.should == [@test_object2.pid,@test_object3.pid,@test_object4.pid]
+    end
       
-      #sort on multiple fields
+
+    it "should sort by multiple fields" do
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."},{:sort=>["geography",{"system_create"=>"desc"}]})
       found_pids = []
       results.hits.each do |hit|
@@ -178,7 +174,9 @@ describe ActiveFedora::Base do
       end
       
       found_pids.should == [@test_object2.pid,@test_object4.pid,@test_object3.pid]
+    end
       
+    it "should transform system_modified_date" do
       #check appropriate logic for system_modified_date field name transformation
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."},{:sort=>["geography",{"system_mod"=>"desc"}]})
       found_pids = []
@@ -187,7 +185,9 @@ describe ActiveFedora::Base do
       end
       
       found_pids.should == [@test_object2.pid,@test_object4.pid,@test_object3.pid]
-      
+    end
+
+    it "should accept rows as a parameter" do 
       #check pass in rows values
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."},{:rows=>2})
       found_pids = []
@@ -196,16 +196,26 @@ describe ActiveFedora::Base do
       end
       
       found_pids.should == [@test_object2.pid,@test_object3.pid]
+    end
       
+    it "should accept a solr field (geography_t) that is not an object field name(e.g. geography)" do
       #check query with field mapping to solr field and with solr field that is not a field in object
       #should be able to query by either active fedora model field name or solr key name
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"geography_t"=>"Italy"})
-      found_pids = []
-      results.hits.each do |hit|
-        found_pids.push(hit[SOLR_DOCUMENT_ID])
-      end
-      
+      found_pids = results.hits.map{|h| h[SOLR_DOCUMENT_ID]}
       found_pids.should == [@test_object2.pid]
     end
+
+    describe "with Nokogiri based datastreams" do
+      before do
+        @test_object2.ng_metadata.journal_title = "foo"
+        @test_object2.save
+      end
+      it "should query Nokogiri based datastreams if you use the solr field names (doesn't do mapping)" do
+        results = MockAFBaseQuerySolr.find_by_fields_by_solr({"journal_title_t" => "foo"})
+        found_pids = results.hits.map{|h| h[SOLR_DOCUMENT_ID]}
+        found_pids.should == [@test_object2.pid]
+      end
+    end
   end
 end

data/spec/integration/datastream_collections_spec.rb

@@ -15,7 +15,6 @@ describe ActiveFedora::DatastreamCollections do
   describe '#add_named_datastream' do
     it 'should add a datastream with the given name to the object in fedora' do
       @test_object2 = MockAFBaseDatastream.new
-#      @test_object2.new_object = true
       f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
       f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
       f2.stubs(:original_filename).returns("dino.jpg")

data/spec/integration/metadata_datastream_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe ActiveFedora::MetadataDatastream do
+
+  describe "changing the controlGroup of a datastream" do
+    before :all do
+      class Foo < ActiveFedora::Base
+        has_metadata :name => "stuff", :type => ActiveFedora::MetadataDatastream do |m|
+          m.field "alt_title", :string
+        end
+      end
+      obj = Foo.new()
+      obj.stuff.update_indexed_attributes({ [:alt_title] => {"0" => "Title"}} ) 
+      obj.save
+
+      #Update the object
+      obj2 = Foo.find(obj.pid)
+      obj2.stuff.controlGroup = 'M'
+      obj2.save
+
+      @obj = Foo.find(obj.pid)
+    end
+
+    after :all do
+      Object.send(:remove_const, :Foo)
+    end
+
+    it "should not change the datastream content" do
+      @obj.stuff.alt_title_values.should == ['Title']
+    end
+  end
+  describe "updating a datastream's content" do
+    before :all do
+      class Foo < ActiveFedora::Base
+        has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
+          m.field "field1",  :string
+        end
+        has_metadata :name => "stuff", :type => ActiveFedora::MetadataDatastream do |m|
+          m.field "alt_title", :string
+        end
+      end
+      obj = Foo.new()
+      obj.properties.update_indexed_attributes({ [:field1] => {"0" => "test value"}} ) 
+      obj.stuff.update_indexed_attributes({ [:alt_title] => {"0" => "Title"}} ) 
+      obj.save
+
+      #Update the object
+      obj2 = Foo.find(obj.pid)
+      obj2.stuff.update_indexed_attributes({ [:alt_title] => {"0" => "Moo Cow"}} )
+      obj2.save
+
+      @obj = Foo.find(obj.pid)
+    end
+
+    after :all do
+      Object.send(:remove_const, :Foo)
+    end
+
+    it "should have updated the one datastream" do
+      @obj.stuff.alt_title_values.should == ['Moo Cow']
+    end
+    it "should not have changed the other datastream" do
+      @obj.properties.field1_values.should == ['test value']
+    end
+  end
+end

data/spec/unit/base_spec.rb

@@ -538,6 +538,11 @@ describe ActiveFedora::Base do
       ds.dsLabel.should == nil
       ds.mimeType.should == "application/octet-stream"
     end
+
+    it 'should not set dsLocation if dsLocation is nil' do
+      ActiveFedora::Datastream.any_instance.expects(:dsLocation=).never
+      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:dsLocation=>nil})
+    end
   end
 
   describe ".add_file_datastream" do

data/spec/unit/datastream_spec.rb

@@ -87,7 +87,7 @@ describe ActiveFedora::Datastream do
       EOS
       @test_datastream.expects(:repository).returns(@mock_repo)
       @mock_repo.expects(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid).returns(ds_profile)
-      @test_datastream.size.should == "9999"
+      @test_datastream.size.should == 9999
     end
 
     it "should default to an empty string if ds has not been saved" do

data/spec/unit/metadata_datastream_spec.rb

@@ -21,6 +21,7 @@ describe ActiveFedora::MetadataDatastream do
     mock_inner = mock('inner object')
     @test_object = ActiveFedora::Base.new
     @mock_repo = mock('repository')
+    @mock_repo.stubs(:datastream)
     @mock_repo.stubs(:datastream_dissemination=>'My Content')
     mock_inner.stubs(:repository).returns(@mock_repo)
     mock_inner.stubs(:pid)
@@ -40,14 +41,17 @@ describe ActiveFedora::MetadataDatastream do
   
   describe '.save' do
     it "should persist the product of .to_xml in fedora" do
-      @test_ds.expects(:new?).returns(true).twice
+      @test_ds.field('coverage', :string)
+      @test_ds.expects(:new?).returns(true).times(3)
       @mock_repo.expects(:datastream).with(:pid => nil, :dsid => 'mdDs')
-      @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'mdDs', :checksumType => 'DISABLED', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A', :mimeType=>'text/xml')
-      @test_ds.expects(:to_xml).returns("fake xml")
+      @mock_repo.expects(:add_datastream)
+      #@test_ds.expects(:to_xml).returns("fake xml")
       @test_ds.expects(:dirty?).returns(true)
+      @test_ds.update_attributes(:coverage=>"Hat")
       @test_ds.serialize!
       @test_ds.save
       @test_ds.mimeType.should == 'text/xml'
+      @test_ds.content.should == "<?xml version=\"1.0\"?>\n<fields>\n  <coverage>Hat</coverage>\n</fields>\n"
     end
   end
   

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -1,10 +1,5 @@
 require 'spec_helper'
 
-require 'active_fedora'
-require 'xmlsimple'
-require 'nokogiri'
-require 'equivalent-xml'
-
 describe ActiveFedora::QualifiedDublinCoreDatastream do
 
   before(:all) do
@@ -128,6 +123,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   describe 'serialize!' do
     it "should call .content= with to_dc_xml" do
       result = @test_ds.to_dc_xml
+      @test_ds.ensure_xml_loaded
       @test_ds.expects(:content=).with(result)
       @test_ds.expects(:dirty?).returns(true)
       @test_ds.serialize!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 3
   - 2
-  - 0
-  version: 3.2.0
+  - 2
+  version: 3.2.2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 -06:00
+date: 2012-01-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -212,12 +212,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 13
         segments: 
         - 0
-        - 3
-        - 0
-        version: 0.3.0
+        - 4
+        - 1
+        version: 0.4.1
   requirement: *id013
 - !ruby/object:Gem::Dependency 
   name: rdf
@@ -569,8 +569,8 @@ files:
 - lib/active_fedora/datastreams.rb
 - lib/active_fedora/delegating.rb
 - lib/active_fedora/digital_object.rb
-- lib/active_fedora/fedora_object.rb
 - lib/active_fedora/file_management.rb
+- lib/active_fedora/fixture_exporter.rb
 - lib/active_fedora/fixture_loader.rb
 - lib/active_fedora/metadata_datastream.rb
 - lib/active_fedora/metadata_datastream_helper.rb
@@ -582,7 +582,6 @@ files:
 - lib/active_fedora/predicates.rb
 - lib/active_fedora/property.rb
 - lib/active_fedora/qualified_dublin_core_datastream.rb
-- lib/active_fedora/railtie.rb
 - lib/active_fedora/rdf_xml_writer.rb
 - lib/active_fedora/reflection.rb
 - lib/active_fedora/relationship.rb
@@ -639,6 +638,7 @@ files:
 - spec/integration/datastream_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/metadata_datastream_helper_spec.rb
+- spec/integration/metadata_datastream_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb
@@ -783,6 +783,7 @@ test_files:
 - spec/integration/datastream_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/metadata_datastream_helper_spec.rb
+- spec/integration/metadata_datastream_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb

data/lib/active_fedora/fedora_object.rb

@@ -1,78 +0,0 @@
-module ActiveFedora
-  
-  #
-  # This is a module replacing the ActiveFedora::Base class.
-  #
-  module FedoraObject
-    def initialize
-      @inner_object = Fedora::FedoraObject.new
-      Fedora::Repository.instance.save @inner_object
-    end
-
-    def save
-      Fedora::Repository.instance.save(@inner_object)
-    end
-
-    def delete
-      Fedora::Repository.instance.delete(@inner_object)
-    end
-
-    def datastreams
-      datastreams = {}
-      self.datastreams_xml['datastream'].each do |ds|
-        ds.merge!({:pid => self.pid, :dsID => ds["dsid"]})
-        datastreams.merge!({ds["dsid"] => ActiveFedora::Datastream.new(ds)})
-      end
-      return datastreams
-    end
-
-    def datastreams_xml
-      datastreams_xml = XmlSimple.xml_in(Fedora::Repository.instance.fetch_custom(self.pid, :datastreams))
-    end
-
-    # Adds datastream to the object.  Saves the datastream to fedora upon adding.
-    def add_datastream(datastream)
-      datastream.pid = self.pid
-      datastream.save
-    end
-
-    # DC Datastream
-    def dc
-      #dc = REXML::Document.new(datastreams["DC"].content)
-      return datastreams["DC"]
-    end
-
-    # RELS-EXT Datastream
-    def rels_ext
-      if !datastreams.has_key?("RELS-EXT")
-        add(ActiveFedora::RelsExtDatastream.new)
-      end
-        
-      return datastreams["RELS-EXT"]
-    end
-
-    def inner_object
-      @inner_object
-    end
-
-    def pid
-      @inner_object.pid
-    end
-
-    def state
-      @inner_object.state
-    end
-
-    def owner_id
-      @inner_object.owner_id
-    end
-
-    def errors
-      @inner_object.errors
-    end
-
-  end
-
-
-
-end

data/lib/active_fedora/railtie.rb

@@ -1,10 +0,0 @@
-require 'active-fedora'
-require 'rails'
-
-module ActiveFedora
-  # class Railtie < Rails::Railtie
-  #   initializer "active-fedora.configure_rails_initialization" do
-  #     ActiveFedora.init
-  #   end
-  # end
-end