revs-utils 2.0.8 → 2.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTk1MjU3MmRiNzgwMjNlNmRmMjRjMGQ2NmEwOTIxZTFiNTA3YjEyNQ==
+    OWFhMTQ0NGIwMjNhNDNhYTUxNjllMWRiZGI3MmJkMDg1NGNlM2U0ZQ==
   data.tar.gz: !binary |-
-    NzMzOWNmODZlYjU2NDE2ZmQyZWUwNjgxMjcwMjk5ZTNmYmU5OWQ2Nw==
+    YTBkM2ZlOWM2YjlkNGNiMzRkNjI5MzEwMjdhNTE1NzJjY2I5YzAzNA==
 SHA512:
   metadata.gz: !binary |-
-    OTkzOTQ5ZmEyNjYxMWJlZTNmOTZkOWZhMjBjOWNmYmI1OGQ4MzM5Y2IzZmE4
-    ZWNhNDI5M2Y2YTUxZmIwMDExM2Q3YWVkYmFjNDg5OTM1ZDVkMGVjOWRjODI3
-    YjM3ZjU3MTg4NWViMGZkODUwYjgyMWU1OWRkYTkzZTJiYmE1MGM=
+    MGQ1Yzk1NWY0YTVmOGIwOTE4Y2UwYjZiN2Y4MWJiMzllYjg4MzMzMzY2Zjkx
+    YmQ0NTZlODQ1ZjU5MGU2OWM5NmYzYjVhZDkwYmIyN2NhYTM4ZmIxOGM4NTYx
+    ZTdhMTUyODdjYjJmM2M3ZWQ4OWVkNjE0MWMzN2YyZWIwZWJkOTM=
   data.tar.gz: !binary |-
-    YTBmMjY5YzIyMzVhOWQ1NjA3NTkxYWNjNDUzZDA3MWIyODRhZmU5NDZhYmY0
-    MTUxZDcyNjlkNzFmNWZmNGJhNzU2OWYzYzRhM2QxNzVhZWUwNGVjM2NiODNk
-    ZDY1NzcxOGNjMWQ1ZDZlODM1YTJjYzgzM2FiZTg2NDE4NmQ4ZTg=
+    NTdlZDQ0MGVkZmUwMDVjNjgwNTNlMTQzZDk2MGIwNDZjNjVhZDMxN2IyMmE0
+    MzQ5Mjk3MjI2Y2M2MGJkNjRlMDlmNjA3N2U3NGRjMThhOTM5Y2U2ODE3MzU0
+    MjdiZGE4ZjgzMmZmOWM3NWU3ZDZlNWVhM2NkZTY3NTRlYzMwYzk=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    revs-utils (2.0.8)
+    revs-utils (2.0.9)
       actionpack (~> 4.1.6)
       chronic
       countries (= 0.9.2)
@@ -44,7 +44,7 @@ GEM
       rake (>= 0.8.7)
       rest-client
     mime-types (2.4.3)
-    minitest (5.5.1)
+    minitest (5.6.0)
     netrc (0.10.3)
     rack (1.5.2)
     rack-test (0.6.3)

data/lib/revs-utils/version.rb

@@ -1,5 +1,5 @@
 module Revs
   module Utils
-    VERSION = "2.0.8"
+    VERSION = "2.0.9"
   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

@@ -303,7 +303,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: 2.0.8
+  version: 2.0.9
 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: