active-fedora 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,11 @@
+1.1.1 2010-03-22
+
+Bug: .load_objects wipes out datastream attributes from model-defined datastreams (ie. label and mimeType)
+
+1.1.0 2010-03-20
+
+Feature #822: Export & Ingest Fedora Objects
+
 1.0.9 2010-03-10
 
 !! Requires a new Solr schema by default.  We recommend updating solr with the schema.xml located at http://bitbucket.org/mediashelf/active_fedora/src/tip/solr/config/schema.xml.  If you want to keep using the old schema.xml, you must save the solr mappings file from http://bitbucket.org/mediashelf/active_fedora/src/tip/config/solr_mappings_af_0.1.yml as config/solr_mappings.yml in your application(s).

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
-  s.date = %q{2010-03-21}
+  s.date = %q{2010-03-22}
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [
@@ -214,12 +214,12 @@ Gem::Specification.new do |s|
      "solr/config/schema-1.5.xml",
      "solr/config/schema.xml",
      "solr/config/solrconfig-1.5.xml",
-     "spec/active_fedora_spec.rb",
      "spec/fixtures/changeme155.xml",
      "spec/fixtures/dino.jpg",
      "spec/fixtures/minivan.jpg",
      "spec/fixtures/test_12.foxml.xml",
      "spec/integration/base_file_management_spec.rb",
+     "spec/integration/base_loader_spec.rb",
      "spec/integration/base_spec.rb",
      "spec/integration/bug_spec.rb",
      "spec/integration/datastream_spec.rb",
@@ -248,7 +248,6 @@ Gem::Specification.new do |s|
      "spec/unit/base_datastream_management_spec.rb",
      "spec/unit/base_extra_spec.rb",
      "spec/unit/base_file_management_spec.rb",
-     "spec/unit/base_loader_spec.rb",
      "spec/unit/base_spec.rb",
      "spec/unit/connection_spec.rb",
      "spec/unit/content_model_spec.rb",
@@ -277,8 +276,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{A convenience libary for manipulating MODS (Metadata Object Description Schema) documents.}
   s.test_files = [
-    "spec/active_fedora_spec.rb",
-     "spec/integration/base_file_management_spec.rb",
+    "spec/integration/base_file_management_spec.rb",
+     "spec/integration/base_loader_spec.rb",
      "spec/integration/base_spec.rb",
      "spec/integration/bug_spec.rb",
      "spec/integration/datastream_spec.rb",
@@ -303,7 +302,6 @@ Gem::Specification.new do |s|
      "spec/unit/base_datastream_management_spec.rb",
      "spec/unit/base_extra_spec.rb",
      "spec/unit/base_file_management_spec.rb",
-     "spec/unit/base_loader_spec.rb",
      "spec/unit/base_spec.rb",
      "spec/unit/connection_spec.rb",
      "spec/unit/content_model_spec.rb",

data/lib/active_fedora/base.rb

@@ -335,7 +335,7 @@ module ActiveFedora
         doc.elements.each("//foxml:datastream[@ID='#{name}']") do |el|
           # datastreams remain marked as new if the foxml doesn't have an entry for that datastream
           ds.new_object = false
-          proto.datastreams[name]=ds.class.from_xml(ds, el)
+          proto.datastreams[name]=ds.class.from_xml(ds, el)          
         end
       end
       proto.inner_object.new_object = false
@@ -492,8 +492,14 @@ module ActiveFedora
     def configure_defined_datastreams
       if self.class.ds_specs
         self.class.ds_specs.each do |name,ar|
+          if self.datastreams.has_key?(name)
+            attributes = self.datastreams[name].attributes
+          else
+            attributes = {:label=>""}
+          end
           ds = ar.first.new(:dsid=>name)
           ar.last.call(ds)
+          ds.attributes = attributes.merge(ds.attributes)
           self.add_datastream(ds)
         end
       end

data/lib/active_fedora/model.rb

@@ -56,7 +56,7 @@ module ActiveFedora
       def find(args)
         if args == :all
           escaped_class_name = self.name.gsub(/(:)/, '\\:')
-          q = "active_fedora_model_s:#{escaped_class_name}"
+          q = "#{solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}"
         elsif args.class == String
           escaped_id = args.gsub(/(:)/, '\\:')
           q = "#{SOLR_DOCUMENT_ID}:#{escaped_id}"
@@ -89,7 +89,7 @@ module ActiveFedora
       def find_by_solr(query, args={})
         if query == :all
           escaped_class_name = self.name.gsub(/(:)/, '\\:')
-          SolrService.instance.conn.query("active_fedora_model_s:#{escaped_class_name}", args)
+          SolrService.instance.conn.query("#{solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}", args)
         elsif query.class == String
           escaped_id = query.gsub(/(:)/, '\\:')          
           SolrService.instance.conn.query("#{SOLR_DOCUMENT_ID}:#{escaped_id}", args)

data/lib/active_fedora/rels_ext_datastream.rb

@@ -3,6 +3,8 @@ module ActiveFedora
   class RelsExtDatastream < Datastream
     
     include ActiveFedora::SemanticNode
+    include ActiveFedora::SolrMapper
+    
     
     def initialize(attrs=nil)
       super
@@ -43,7 +45,7 @@ module ActiveFedora
         if subject == :self || subject == "info:fedora/#{self.pid}"
           predicates.each_pair do |predicate, values|
             values.each do |val|
-              solr_doc << Solr::Field.new("#{predicate}_s" => val)
+              solr_doc << Solr::Field.new(solr_name(predicate, :symbol) => val)
             end
           end
         end

data/lib/active_fedora/solr_mapper.rb

@@ -4,7 +4,7 @@ module ActiveFedora
   module SolrMapper
     
     # Generates solr field names from settings in solr_mappings
-    def solr_name(field_name, field_type)
+    def self.solr_name(field_name, field_type)
       name = field_name.to_s + ActiveFedora::SolrService.mappings[field_type.to_s].to_s
       if field_name.kind_of?(Symbol)
         return name.to_sym
@@ -13,5 +13,9 @@ module ActiveFedora
       end
     end
     
+    def solr_name(field_name, field_type)
+      ActiveFedora::SolrMapper.solr_name(field_name, field_type)
+    end
+    
   end
 end

data/lib/active_fedora/solr_service.rb

@@ -1,6 +1,8 @@
 require 'solr'
+require "active_fedora/solr_mapper"
 module ActiveFedora 
   class SolrService
+      
     @@mappings = {}
     attr_reader :conn
         
@@ -25,7 +27,7 @@ module ActiveFedora
       end
       results = []
       solr_result.hits.each do |hit|
-        model_value = hit["active_fedora_model_s"].first
+        model_value = hit[ActiveFedora::SolrMapper.solr_name("active_fedora_model", :symbol)].first
         if model_value.include?("::")
           classname = eval(model_value)
         else

data/spec/fixtures/test_12.foxml.xml

@@ -57,65 +57,4 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
 </foxml:xmlContent>
 </foxml:datastreamVersion>
 </foxml:datastream>
-</foxml:digitalObject>
-<?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject VERSION="1.1" PID="demo:12"
-xmlns:foxml="info:fedora/fedora-system:def/foxml#"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-<foxml:objectProperties>
-<foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Service Definition Object for Document Transform Demo"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2008-07-02T05:09:42.015Z"/>
-<foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2009-07-07T23:37:13.950Z"/>
-</foxml:objectProperties>
-<foxml:datastream ID="AUDIT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="false">
-<foxml:datastreamVersion ID="AUDIT.0" LABEL="Audit Trail for this object" CREATED="2008-07-02T05:09:42.015Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit">
-<foxml:xmlContent>
-<audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-<audit:record ID="AUDREC1">
-<audit:process type="Fedora API-M"/>
-<audit:action>ingest</audit:action>
-<audit:componentID></audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-07-07T23:37:13.950Z</audit:date>
-<audit:justification>Ingested from local file /Volumes/fedora-solr-testing/fedora/client/demo/foxml/local-server-demos/document-transform-demo/sdef_demo_12.xml</audit:justification>
-</audit:record>
-</audit:auditTrail>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2008-07-02T05:09:42.515Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="413">
-<foxml:xmlContent>
-<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-  <dc:title>Service Definition Object for Document Transform Demo</dc:title>
-  <dc:identifier>demo:12</dc:identifier>
-</oai_dc:dc>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="RELS-EXT1.0" LABEL="RDF Statements about this object" CREATED="2008-07-02T05:09:42.578Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="356">
-<foxml:xmlContent>
-<rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/demo:12">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"></fedora-model:hasModel>
-          </rdf:Description>
-        </rdf:RDF>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="METHODMAP" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="METHODMAP1.0" LABEL="Abstract Method Map" CREATED="2008-07-02T05:09:42.515Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraSDefMethodMap-1.0" SIZE="293">
-<foxml:xmlContent>
-<fmm:MethodMap xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap" name="Fedora MethodMap for NSDL Exhibit (Style 1)">
-          <fmm:Method operationName="getDocumentStyle1"></fmm:Method>
-          <fmm:Method operationName="getDocumentStyle2"></fmm:Method>
-        </fmm:MethodMap>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-</foxml:digitalObject>
-foo
+</foxml:digitalObject>

data/spec/{unit → integration}/base_loader_spec.rb

@@ -10,9 +10,9 @@ require File.join( File.dirname(__FILE__), "..","samples","oral_history_sample_m
 
 describe ActiveFedora::Base do
   
-  # before(:all) do
-  #   require File.join( File.dirname(__FILE__), "..","samples","oral_history" )
-  # end
+  before(:all) do
+    ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
+  end
 
   before(:each) do
     @test_object = OralHistorySampleModel.new
@@ -39,5 +39,20 @@ describe ActiveFedora::Base do
       result.datastreams_in_memory["sensitive_passages"].new_object?.should be_true
     end
   end
+  describe "load_instance" do
+    it "should retain all datastream attributes pulled from fedora" do
+      # raw_object = Fedora::Repository.instance.find_objects("pid=#{@test_object.pid}").first
+      raw_object = ActiveFedora::Base.new(:pid=>@test_object.pid, :new_object=>false)
+      loaded = OralHistorySampleModel.load_instance(@test_object.pid)
+      raw_datastreams = raw_object.datastreams
+      loaded_datastreams = loaded.datastreams
+      raw_datastreams.each_pair do |k,v|
+        v.attributes.each_pair do |attr_name, attr_value|
+          loaded_datastreams[k].attributes.should have_key(attr_name)
+          loaded_datastreams[k].attributes[attr_name].should == attr_value
+        end
+      end
+    end
+  end
 
 end

data/spec/integration/base_spec.rb

@@ -2,6 +2,10 @@ require File.join( File.dirname(__FILE__), "../spec_helper" )
 
 describe ActiveFedora::Base do
   
+  before(:all) do
+    ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
+  end
+  
   before(:each) do
     @test_object = ActiveFedora::Base.new
     @test_object.save

data/spec/unit/base_extra_spec.rb

@@ -90,7 +90,7 @@ describe ActiveFedora::Base do
     it "should delete object from repository and index" do
       @test_object.expects(:pid).returns("foo")
       ActiveFedora::SolrService.instance.conn.expects(:delete).with("foo")      
-      Fedora::Repository.any_instance.stubs(:delete).with(@test_object.inner_object)
+      Fedora::Repository.instance.stubs(:delete).with(@test_object.inner_object)
       @test_object.delete
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 -05:00
+date: 2010-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -318,12 +318,12 @@ files:
 - solr/config/schema-1.5.xml
 - solr/config/schema.xml
 - solr/config/solrconfig-1.5.xml
-- spec/active_fedora_spec.rb
 - spec/fixtures/changeme155.xml
 - spec/fixtures/dino.jpg
 - spec/fixtures/minivan.jpg
 - spec/fixtures/test_12.foxml.xml
 - spec/integration/base_file_management_spec.rb
+- spec/integration/base_loader_spec.rb
 - spec/integration/base_spec.rb
 - spec/integration/bug_spec.rb
 - spec/integration/datastream_spec.rb
@@ -352,7 +352,6 @@ files:
 - spec/unit/base_datastream_management_spec.rb
 - spec/unit/base_extra_spec.rb
 - spec/unit/base_file_management_spec.rb
-- spec/unit/base_loader_spec.rb
 - spec/unit/base_spec.rb
 - spec/unit/connection_spec.rb
 - spec/unit/content_model_spec.rb
@@ -405,8 +404,8 @@ signing_key:
 specification_version: 3
 summary: A convenience libary for manipulating MODS (Metadata Object Description Schema) documents.
 test_files: 
-- spec/active_fedora_spec.rb
 - spec/integration/base_file_management_spec.rb
+- spec/integration/base_loader_spec.rb
 - spec/integration/base_spec.rb
 - spec/integration/bug_spec.rb
 - spec/integration/datastream_spec.rb
@@ -431,7 +430,6 @@ test_files:
 - spec/unit/base_datastream_management_spec.rb
 - spec/unit/base_extra_spec.rb
 - spec/unit/base_file_management_spec.rb
-- spec/unit/base_loader_spec.rb
 - spec/unit/base_spec.rb
 - spec/unit/connection_spec.rb
 - spec/unit/content_model_spec.rb

data/spec/active_fedora_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "ActiveFedora" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end