cul-fedora-arm 0.5.2 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/cul-fedora-arm.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{cul-fedora-arm}
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Stuart"]
-  s.date = %q{2009-10-24}
+  s.date = %q{2009-11-10}
   s.description = %q{Tools for dealing with Cul ARM specification}
   s.email = %q{tastyhat@jamesstuart.org}
   s.extra_rdoc_files = [
@@ -90,3 +90,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ruby-fedora>, [">= 0"])
   end
 end
+

data/lib/cul/fedora/arm/builder.rb

@@ -23,7 +23,7 @@ module Cul
         MANDATORY_COLUMNS = [:sequence, :target, :model_type]
         
         # list of columns which may have values
-        VALID_COLUMNS = [:sequence, :target, :model_type, :source, :template_type, :dc_format, :id, :pid, :action, :license]
+        VALID_COLUMNS = [:sequence, :target, :model_type, :source, :template_type, :dc_format, :title_attr, :mime, :id, :pid, :action, :license]
 
         FOXML_BUILDER = FoxmlBuilder.new()
         # array of individual hash: each hash corresponds to a metadata or resource.
@@ -128,6 +128,20 @@ module Cul
           task.post(@connector)
           task.response
         end
+        
+        def update_aggregator(value_hash)
+          self.purge(value_hash[:pid])
+          insert_aggregator(value_hash)
+        end
+        def update_metadata(value_hash)
+          self.purge(value_hash[:pid])
+          insert_metadata(value_hash)
+        end
+        def update_resource(value_hash)
+          self.purge(value_hash[:pid])
+          insert_resource(value_hash)
+        end
+        
        
         def reserve_pids(parts=@parts)
           assigned = []
@@ -182,7 +196,7 @@ module Cul
         def test_for_required_columns(value_hash)
           missing_values = REQUIRED_COLUMNS.select { |col| !value_hash.has_key?(col) || value_hash[col].nil? }
           if (value_hash.has_key?(:action) and value_hash[:action].eql?('update'))
-            raise "Update operations require a PID" unless (value_hash.has_key(:pid) and !value_hash[:pid].strip().eql?(''))
+            raise "Update operations require a PID" unless (value_hash.has_key?(:pid) and !value_hash[:pid].strip().eql?(''))
           end
           raise "Missing required values #{missing_values.join(",")}" unless missing_values.empty?
         end

data/lib/cul/fedora/arm/foxml_builder.rb

@@ -212,7 +212,7 @@ RESOURCE
           value_default_key = (template_type.downcase + "_" + model_type.downcase).intern
           subs = {}
           if(DEFAULTS.has_key?(value_default_key))
-            subs = value_hash.merge(DEFAULTS[value_default_key])
+            subs = DEFAULTS[value_default_key].merge(value_hash)
             now  = Time.now
             subs[:timestamp] = now.strftime("%Y-%m-%dT%H:%M:%S.000Z")
             subs[:rels] = build_rels(subs)
@@ -228,7 +228,13 @@ RESOURCE
                   subs[:metadata] = File.open(subs[:source]){|file| file.read() }
                   subs.merge!(parse_mods(subs[:metadata]))
                 end
-                subs[:source] = 'file:/' + Pathname.new(subs[:source]).realpath
+                realpath = ""
+                begin
+                  realpath = Pathname.new(subs[:source]).realpath
+                rescue
+                  realpath = subs[:source]
+                end
+                subs[:source] = 'file://' + realpath
                 subs[:datastream_type] = 'E'
               else
                 subs[:datastream_type] = 'M'

data/test/cul_fedora_arm_builder_test.rb

@@ -42,7 +42,7 @@ class CulFedoraArmBuilderTest < Test::Unit::TestCase
 
         assert_equal @builder_class::REQUIRED_COLUMNS, [:sequence]
         assert_equal @builder_class::MANDATORY_COLUMNS, [:sequence, :target, :model_type]
-        assert_equal @builder_class::VALID_COLUMNS, [:sequence, :target, :model_type, :source, :template_type, :dc_format, :id, :pid, :action, :license]
+        assert_equal @builder_class::VALID_COLUMNS, [:sequence, :target, :model_type, :source, :template_type, :dc_format, :title_attr, :mime, :id, :pid, :action, :license]
       end
 
       should "accept only options :template or :file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cul-fedora-arm
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - James Stuart
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-24 00:00:00 -04:00
+date: 2009-11-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency