revs-utils 1.0.17 → 1.0.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTM3MDllNTdjMGNiNGI1MTEyNjA5MzRmNTQwZmQ2ZDIzNWY1Njc2ZQ==
+    OWU1YmRiOTA5YWE3ODU0NGIyZWVmMWQyZmI4NzI4MDBjOWY3NmNhNQ==
   data.tar.gz: !binary |-
-    YjhjMDdlZTJlMzY1ZWY1MWQ1NDcxN2Q2MDg1YTYzNGI0MjJlZDFlMg==
+    NWExZjZmYTQyMzIxMGUxMjg3YjI3MjM1NjI5Zjc5YjE3YWFhOTNiNg==
 SHA512:
   metadata.gz: !binary |-
-    Y2Q4YzUyMjQ3N2IyYTY3NzE5N2Q5MmM4NjkwNjMwMzUyNDAxMDA4MWE1NjNi
-    YWU0YWNlOGNhYmUwOTBkOWI5MmRiMzQ4ZjQ4NWJkYWU0ZjNmYTFhNzgzMzhj
-    NTBkMDgwODY4MjI4ZDdjOWVjOGUwZmRmOTEyMDdkYzEyZjk5Zjg=
+    ZmQxNmM3YjZhODQzYzJhYTNlN2ZkZmMwNDEyY2YwMmU0ZTVhMDZkYjMzN2Ux
+    ZWNlNzQ1YWI4OTBkNjg3OGViMjU3OWIzYWE0NjA0ZjIzZjcyZjFiOWNhYjBi
+    MWExZjMwMDFiNDJlODgzMTRkNjQzOTMyZmYzMzhhOTJjNTNkYWE=
   data.tar.gz: !binary |-
-    OGU0NGY2OTJkOWQwZjZiM2ZjM2M4NWY1OTcxYzkzM2YzMWY1M2YxYzEwOWMz
-    ZTA5MWY4NGRiZDJjYzgyYzQzYzQyNWQzYjU0N2IxMTdmNjk2OTY0MmIwMTgz
-    MTBiZTk3NDM2MGU1YWZmN2JhYjY0YzBlMTVjMWE1N2E3YTU2YWQ=
+    MDU3OTY1MTZkMzM3MGJlNmRiODVhODQ5M2VjYTQ5NmU0NWI2YzlmOTJhMTgx
+    YTBiMjBiYjhhZTUzMzgxN2JiOTdiMjE2MTNhYWE3MzY2ZDllNzQ2MmQ0MTIz
+    MDk3NmIyODgwZmI2MDJjZThjYjNkYzkyMDk3ODVlZTM4NjMxOTI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    revs-utils (1.0.15)
+    revs-utils (1.0.18)
       actionpack (~> 3)
       chronic
       countries (= 0.9.2)

data/lib/revs-utils/version.rb

@@ -1,5 +1,5 @@
 module Revs
   module Utils
-    VERSION = "1.0.17"
+    VERSION = "1.0.18"
   end
 end

data/lib/revs-utils.rb

@@ -72,7 +72,7 @@ module Revs
           file.each do |row|
             #Make sure the sourceid and filename are the same
             fname = row[get_manifest_section(REGISTER)['filename']].chomp(File.extname(row[get_manifest_section(REGISTER)['filename']]))
-            return false if row[get_manifest_section(REGISTER)['sourceid']] != fname
+            return false if ((row[get_manifest_section(REGISTER)['sourceid']] != fname) || ((/\s/ =~ row[get_manifest_section(REGISTER)['sourceid']].strip) != nil))  
             sources << row[get_manifest_section(REGISTER)['sourceid']]
           end         
         end
@@ -103,7 +103,7 @@ module Revs
             return false if header.downcase !='label' && row[header].blank? #Alternatively consider row[header].class != String or row[header].size <= 0
           end
           fname = row[get_manifest_section(REGISTER)['filename']].chomp(File.extname(row[get_manifest_section(REGISTER)['filename']]))
-          return false if row[get_manifest_section(REGISTER)['sourceid']] != fname
+          return false if ((row[get_manifest_section(REGISTER)['sourceid']] != fname) || ((/\s/ =~ row[get_manifest_section(REGISTER)['sourceid']].strip) != nil))  
           sources << row[get_manifest_section(REGISTER)['sourceid']]
         end
         return sources.uniq.size == sources.size

data/spec/revs-utils_spec.rb

@@ -297,7 +297,11 @@ describe "Revs-Utils" do
     sheets = [Dir.pwd + "/spec/sample-csv-files/malformed-sourceid.csv"]
     @revs.unique_source_ids(sheets).should == false
   end
-    
+
+  it "should return false when a sourceid has a space in it" do
+    sheets = [Dir.pwd + "/spec/sample-csv-files/space-sourceid.csv"]
+    @revs.unique_source_ids(sheets).should == false
+  end    
   
  
 end

data/spec/sample-csv-files/space-sourceid.csv

@@ -0,0 +1,3 @@
+format,sourceid,collection_name,filename,year,photographer,label,marque,model,model_year,people,location,event,description,inst_notes,prod_notes,has_more_metadata
+black-and-white negatives,2004-100CRAI-b1_1.0 _0001,Bruce R Craig Photograph Collection,2004-100CRAI-b1_1.0 _0001.tif,,Bruce R Craig,Rutherford Special,Rutherford Special,,,"Rutherford, Slim",,,"full car (rear), #62",,,
+black-and-white negatives,2004-100CRAI-b1_1.0_0002,Bruce R Craig Photograph Collection,2004-100CRAI-b1_1.0_0002.tif,,Bruce R Craig,City of Roses,City of Roses,,,"Sezekendy, Charley",,,"full car, #2",,,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revs-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Peter Mangiafico
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -147,6 +147,7 @@ files:
 - spec/sample-csv-files/no-blank-label.csv
 - spec/sample-csv-files/no-label-column.csv
 - spec/sample-csv-files/no-sourceid.csv
+- spec/sample-csv-files/space-sourceid.csv
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -186,5 +187,6 @@ test_files:
 - spec/sample-csv-files/no-blank-label.csv
 - spec/sample-csv-files/no-label-column.csv
 - spec/sample-csv-files/no-sourceid.csv
+- spec/sample-csv-files/space-sourceid.csv
 - spec/spec_helper.rb
 has_rdoc: