tastyhat-cul-fedora-arm 0.1.2 → 0.1.3

data/Rakefile

@@ -13,6 +13,8 @@ begin
     gem.add_development_dependency "thoughtbot-shoulda"
     gem.add_development_dependency "thoughtbot-factory_girl"
     gem.add_dependency "activesupport"
+    gem.add_dependency "ruby-fedora"
+
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/cul-fedora-arm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cul-fedora-arm}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Stuart"]
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
      "lib/cul/fedora/arm/builder.rb",
      "test/cul_fedora_arm_builder_test.rb",
      "test/factories.rb",
-     "test/factories/cul_fedora_arm_builder_factory.rb",
+     "test/fixtures/case1/builder-template-noheader.txt",
      "test/fixtures/case1/builder-template.txt",
      "test/helpers/template_builder.rb",
      "test/test_helper.rb"
@@ -40,7 +40,6 @@ Gem::Specification.new do |s|
   s.summary = %q{Tools for dealing with Cul ARM specification}
   s.test_files = [
     "test/cul_fedora_arm_builder_test.rb",
-     "test/factories/cul_fedora_arm_builder_factory.rb",
      "test/factories.rb",
      "test/helpers/template_builder.rb",
      "test/test_helper.rb"
@@ -54,14 +53,17 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-factory_girl>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby-fedora>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<thoughtbot-factory_girl>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<ruby-fedora>, [">= 0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<thoughtbot-factory_girl>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<ruby-fedora>, [">= 0"])
   end
 end

data/lib/cul-fedora-arm.rb

@@ -1,2 +1,3 @@
 require "cul/fedora/arm/builder"
-require "activesupport"
+require "activesupport"
+require "ruby-fedora"

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

@@ -33,6 +33,7 @@ module Cul
 
         # creates a Builder object. Can be used with no arguments, or with ONE of the following options
         # [:template]:: builds parts based on an enumerable list of strings (for example, the result of File.open) 
+        # [:header]:: designates for a template whether a header is specified
         def initialize(*args)
           options = args.extract_options!
 
@@ -40,11 +41,20 @@ module Cul
 
           # TODO: add file option to avoid :template => File.open(file_name,"r")
           
-          if template = options.delete(:template)
-            parse_template(template)
+          if (template = options.delete(:template)) || (file = options.delete(:file))
+            template ||= File.open(file,"r")
+
+            header = options.delete(:header) 
+            header = true if header.nil?
+
+            raise ArgumentError, "arguments should only include one of the following: :template, :file" unless options.empty?
+            
+            parse_template(template, header)
+          else
+            
+            raise ArgumentError, "arguments should only include one of the following: :template, :file" unless options.empty?
           end
           
-          raise ArgumentError, "arguments should only include one of the following: :template" unless options.empty?
         end
 
         # adds one part to the parts array
@@ -83,27 +93,17 @@ module Cul
         
         # parses an enumerable of strings to build parts
         # an optional header row specifies the columns, however sequence must be included and must be first
-        def parse_template(template)
-          header_columns = []     # list of columns
-          custom_header = false   # indicates whether a header_row was used
+        # TODO: fix this to include a header option
+        def parse_template(template, has_header_row)
+          header_columns = DEFAULT_TEMPLATE_HEADER     # list of columns
           
           
           template.each_with_index do |line, i|
           
             # if first row, check for header
             if i == 0
-          
-              # assumes that if the first character is a letter, this is a header row, otherwise, use default_columns
-              case line.to_s
-              when /^[0-9]/
-                header_columns = DEFAULT_TEMPLATE_HEADER
-              when /^\w/
-                custom_header = true
-                header_columns = line.split("\t").collect { |cn| cn.strip.underscore.to_sym }
-                raise "First column of custom designed headers must be sequence" unless header_columns[0] == :sequence
-              end
+              header_columns = line.split("\t").collect { |cn| cn.strip.underscore.to_sym } if has_header_row
               
-
               # check to make sure all mandatory columns are in the template
               missing_mandatory_columns = MANDATORY_COLUMNS.select { |c| !header_columns.include?(c) }
               raise "Missing mandatory column(s) found: #{missing_mandatory_columns.join(",")}" unless missing_mandatory_columns.empty?
@@ -111,7 +111,7 @@ module Cul
               test_for_invalid_columns(header_columns)
 
               # skip header_row
-              next if custom_header
+              next if has_header_row
 
             end
             

data/test/cul_fedora_arm_builder_test.rb

@@ -25,17 +25,34 @@ class CulFedoraArmBuilderTest < Test::Unit::TestCase
     
     
     should "have a list of mandatory, valid, and required columns" do
+      assert_instance_of  Array, @builder_class::REQUIRED_COLUMNS
+
       assert_equal @builder_class::REQUIRED_COLUMNS, [:sequence]
       assert_equal @builder_class::MANDATORY_COLUMNS, [:sequence, :aggregate_under, :metadata]
       assert_equal @builder_class::VALID_COLUMNS, [:sequence, :aggregate_under, :metadata, :metadata_type, :content, :content_type, :id, :license]
     end
     
-    should "accept only options :template" do
+    should "accept only options :template or :file" do
+      assert_instance_of @builder_class, @builder_class.new(:template => nil)
+      assert_instance_of @builder_class, @builder_class.new(:file => nil)
+
       assert_raise(ArgumentError) do
         @builder_class.new(:template => nil, :invalid => true)
       end
+
+      assert_raise(ArgumentError) do
+        @builder_class.new(:template => "test", :file => "test")
+      end
+
     end
 
+    should "not accept :header without :template" do
+      assert_raise(ArgumentError) do
+        @builder_class.new(:header => true)
+      end
+    end
+
+
     context "given a blank builder" do
       setup do
         @builder = @builder_class.new        
@@ -56,11 +73,12 @@ class CulFedoraArmBuilderTest < Test::Unit::TestCase
       end
       
       should "not add parts with the same sequence id" do
-
+        
         assert_raise(RuntimeError, "Sequence ID already taken") do
           @builder.add_part(:sequence => "2", :metadata => "/test-0001.xml")
-          @builder.add_part(:sequence => "2", :metadata => "/test-0001.xml")
+          @builder.add_part(:sequence => "2", :metadata => "/test-0002.xml")
         end
+        
       end
     end
 
@@ -82,12 +100,6 @@ class CulFedoraArmBuilderTest < Test::Unit::TestCase
         end
       end
       
-      should "insist on sequence being the first column" do
-        assert_raise RuntimeError, "First column of custom designed headers must be sequence" do
-          @builder_class.new(:template => template_builder(@sequence_not_first))
-        end
-      end
-      
       should "reject invalid column names" do
         assert_raise RuntimeError, "Invalid column name: random"  do
           @builder_class.new(:template => template_builder(@invalid_column))
@@ -103,14 +115,26 @@ class CulFedoraArmBuilderTest < Test::Unit::TestCase
     
     context "with an example template with header" do
       setup do
-        @builder = @builder_class.new(:template => File.open("test/fixtures/case1/builder-template.txt", "r"))
+        @builder = @builder_class.new(:file => "test/fixtures/case1/builder-template.txt")
+        @builder_via_template_option = @builder_class.new(:template => File.open("test/fixtures/case1/builder-template.txt", "r"))
+        @builder_no_header = @builder_class.new(:file => "test/fixtures/case1/builder-template-noheader.txt", :header => false)
       end
       
       should "load successfully" do
         assert_instance_of @builder_class, @builder
+        assert_instance_of @builder_class, @builder_no_header
       end
       
-      should "ignore the header and load template data successfully" do
+      should "have equivalent results for header and no_header instances of the default column set" do
+        assert_equal @builder.parts, @builder_no_header.parts
+      end
+
+      should "have equivalent results for opening via template and file" do
+        assert_equal @builder.parts, @builder_via_template_option.parts
+      end
+
+      
+      should "ignore the header row and load template data successfully" do
         assert_equal @builder.parts.length, 4
         assert_equal @builder.parts[0][:metadata],  "/test-0001.xml"
         assert_equal @builder.parts[3][:license],  "http://creativecommons.org/licenses/by-nc-nd/3.0/us/"
@@ -121,6 +145,7 @@ class CulFedoraArmBuilderTest < Test::Unit::TestCase
         assert_equal @builder.parts[3], @builder.part_by_sequence("5")
       end
     end
+    
   end
   
   

data/test/fixtures/case1/builder-template-noheader.txt

@@ -0,0 +1,4 @@
+0	collection:1;ac:5	/test-0001.xml	MODS		ContentAggregator	AC:P:5001	
+1	0			/01-Northover_IPD_SovDebt_Working_Paper.pdf	Resource		http://creativecommons.org/licenses/by-nc-nd/3.0/us/
+4	collection:1;ac:5	/test-0002.xml	MODS		ContentAggregator	AC:P:5002	
+5	4			/02-851.pdf	Resource		http://creativecommons.org/licenses/by-nc-nd/3.0/us/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tastyhat-cul-fedora-arm
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - James Stuart
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-fedora
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Tools for dealing with Cul ARM specification
 email: tastyhat@jamesstuart.org
 executables: []
@@ -63,7 +73,7 @@ files:
 - lib/cul/fedora/arm/builder.rb
 - test/cul_fedora_arm_builder_test.rb
 - test/factories.rb
-- test/factories/cul_fedora_arm_builder_factory.rb
+- test/fixtures/case1/builder-template-noheader.txt
 - test/fixtures/case1/builder-template.txt
 - test/helpers/template_builder.rb
 - test/test_helper.rb
@@ -96,7 +106,6 @@ specification_version: 3
 summary: Tools for dealing with Cul ARM specification
 test_files: 
 - test/cul_fedora_arm_builder_test.rb
-- test/factories/cul_fedora_arm_builder_factory.rb
 - test/factories.rb
 - test/helpers/template_builder.rb
 - test/test_helper.rb

data/test/factories/cul_fedora_arm_builder_factory.rb

@@ -1,3 +0,0 @@
-Factory.define :builder, :class => Cul::Fedora::Arm::Builder do |f|
-  
-end