checksummer 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/checksummer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{checksummer}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]

data/lib/checksummer_file.rb

@@ -1,6 +1,7 @@
 require "time"
 require "fileutils"
 require "pathname"
+require "digest/md5"
 
 class ChecksummerFile
   attr_accessor :modified_at, :size, :type, :path, :original_path, :original_line
@@ -17,17 +18,7 @@ class ChecksummerFile
   end
   
   def md5
-    @md5 ||= md5_module.file(path).to_s
-  end
-  
-  def md5_module
-    if RUBY_VERSION.match(/^1\.9/)
-      require "digest/md5"
-      Digest::MD5
-    else
-      require "md5"
-      MD5
-    end
+    @md5 ||= Digest::MD5.file(path).to_s
   end
   
   def self.from_line(line)
@@ -63,11 +54,16 @@ class ChecksummerFile
       FileUtils.touch(path, :mtime => mtime)
     else
       status[:status] = :was_symlink
-      status.merge!(:status => :was_symlink, :realpath => Pathname.new(path).realpath)
+      status[:realpath] = Pathname.new(path).realpath
+      status[:checksum] = File.basename(status[:realpath]) if valid_checksum?(File.basename(status[:realpath]))
     end
     status
   end
   
+  def valid_checksum?(checksum)
+    !checksum.to_s.match(/^[0-9a-f]{32}$/).nil?
+  end
+  
   def md5_path(checksum_dir)
     "#{checksum_dir}/#{md5.split("")[0,4].join("/")}/#{md5}"
   end

data/spec/checksummer_file_spec.rb

@@ -162,9 +162,11 @@ describe ChecksummerFile do
     end
     
     describe "with the file being a symlink" do
+      let(:pathname) { double("rp", :realpath => "/some/real/path") }
       before(:each) do
         File.stub(:symlink?).with("/some/text.csv").and_return true
         File.stub!(:realpath).and_return "/some/real/path"
+        Pathname.stub!(:new).with("/some/text.csv").and_return pathname
       end
       
       it "does not copy the file when already exists" do
@@ -182,15 +184,12 @@ describe ChecksummerFile do
         file.checksum_to!("/tmp/data")
       end
       
-      it "calls File.realpath with path" do
-        rp = double("rp", :realpath => "/real_path")
-        Pathname.stub!(:new).with("/some/text.csv").and_return rp
+      it "calls Pathname#realpath with path" do
+        pathname.should_receive(:realpath).and_return "/real_path"
         file.checksum_to!("/tmp/data")
       end
       
       it "sets the realpath" do
-        rp = double("rp", :realpath => "/some/real/path")
-        Pathname.stub!(:new).with("/some/text.csv").and_return rp
         file.checksum_to!("/tmp/data")[:realpath].should == "/some/real/path"
       end
       
@@ -202,6 +201,18 @@ describe ChecksummerFile do
         FileUtils.should_not_receive(:touch)
         file.checksum_to!("/tmp/data")
       end
+      
+      it "sets the checksum when pointing to a checksummed file" do
+        pathname.stub!(:realpath).and_return "/tmp/data/fde8dad8ea43640b00cdd1e92e532ca9"
+        file.should_receive(:valid_checksum?).with("fde8dad8ea43640b00cdd1e92e532ca9").and_return true
+        file.checksum_to!("/tmp/data")[:checksum].should == "fde8dad8ea43640b00cdd1e92e532ca9"
+      end
+      
+      it "does not set the checksum when not pointing to a checksummed path" do
+        pathname.stub!(:realpath).and_return "/data/fde8dad8ea43640b00cdd1e92e532ca"
+        file.should_receive(:valid_checksum?).with("fde8dad8ea43640b00cdd1e92e532ca").and_return false
+        file.checksum_to!("/tmp/data").should_not have_key(:checksum)
+      end
     end
     
     describe "with the file not existing" do
@@ -211,23 +222,33 @@ describe ChecksummerFile do
     end
   end
   
+  describe "valid_checksum?" do
+    { 
+      "fde8dad8ea43640b00cdd1e92e532ca9" => true, "fde8dad8ea43640b00cdd1e92e532ca" => false, 
+      "fde8dad8ea43640b00cdd1e92e532cax" => false
+    }.each do |checksum, result|
+      it "returns #{result} for #{checksum}" do
+        ChecksummerFile.new.valid_checksum?(checksum).should == result
+      end
+    end
+  end
+  
   describe "#md5" do
     let(:md5_module) { double("md5 module", :file => "sometest") }
     let(:file) do
       file = ChecksummerFile.new(:path => "/some/path")
-      file.stub!(:md5_module).and_return md5_module
       file
     end
     
     
     it "calls md5_module with correct file_path when no md5 set" do
-      md5_module.should_receive(:file).with("/some/path")
+      Digest::MD5.should_receive(:file).with("/some/path")
       file.md5
     end
     
     it "saves the md5 in instance variable" do
       checksum = double("checksum", :to_s => "the checksum")
-      md5_module.stub(:file).and_return checksum
+      Digest::MD5.stub(:file).and_return checksum
       file.md5
       file.instance_variable_get(:@md5).should == "the checksum"
     end
@@ -239,12 +260,6 @@ describe ChecksummerFile do
     end
   end
   
-  describe "#md5_module" do
-    it "returns Digest::MD5 for Ruby 1.9" do
-      ChecksummerFile.new.md5_module.should == Digest::MD5
-    end
-  end
-  
   describe "#path=" do
     it "sets the correct path" do
       file = ChecksummerFile.new

metadata

@@ -2,7 +2,7 @@
 name: checksummer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2964293804353679217
+      hash: -2535468748837297976
       segments: 
       - 0
       version: "0"