filey-diff 1.0.1 → 1.0.2

data/changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.2
+
+* Remove the -number suffix from S3 ETags ([thanks
+  postmodern!](https://github.com/laurilehmijoki/filey-diff/pull/2))
+
 ## 1.0.1
 
 * Support S3 etags that are longer than 32 characters

data/filey-diff.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'filey-diff'
-  s.version           = '1.0.1'
+  s.version           = '1.0.2'
 
   s.summary     = "Compare two data sources that contain file-like objects"
   s.description =

data/lib/filey-diff/data-sources/aws_sdk_s3.rb

@@ -20,7 +20,7 @@ module Filey
           Filey.new(normalised_path,
                     name,
                     s3_object.last_modified,
-                    s3_object.etag.gsub(/"/, ''))
+                    s3_object.etag.gsub(/"/, '').split('-',2).first)
         }
       end
     end

data/lib/filey-diff/filey.rb

@@ -6,7 +6,7 @@ module Filey
       raise InvalidPathError unless path.match(/^\..*\/$/)
       raise InvalidTimeError unless last_modified.instance_of?(Time)
       raise InvalidNameError if     name.match(/\//)
-      raise InvalidMd5Error  unless md5.length >= 32
+      raise InvalidMd5Error  unless md5.length == 32
       @path = path
       @name = name
       @last_modified = last_modified

data/spec/filey_spec.rb

@@ -78,14 +78,16 @@ describe Filey::Filey do
       }.to raise_error(Filey::Filey::InvalidMd5Error)
     end
 
-    it 'accepts md5s longer than 31' do
+    it 'accepts md5s of length 32' do
         Filey::Filey.new('./ripley/', 'aliens.txt', Time.now,
                          'ca022be4a1c56c770b9700df99473d01')
     end
 
-    it 'accepts md5s longer than 31' do
+    it 'raises an error if the md5 hash longer than 32 characters' do
+      expect {
         Filey::Filey.new('./ripley/', 'aliens.txt', Time.now,
-                         'f392c1602cd1d9a0176853c41b366db5-5')
+                         'ca022be4a1c56c770b9700df99473d03-5')
+      }.to raise_error(Filey::Filey::InvalidMd5Error)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filey-diff
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake