rhcf-utils 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf241e04517574674c112b8ae6e7112c754f795
-  data.tar.gz: f86503515dfd584020a03e45e1117cced9d73e55
+  metadata.gz: 9909d07e5aa545cbf9b72db81d6149001d00e90a
+  data.tar.gz: eae25b18c3232384492b5cae2e580680e360f99e
 SHA512:
-  metadata.gz: 0342944c6a84423d3ac5393db024a4acdd5c39e647577fb792c302c8c705dcee2b1f3a26fee1954bfdb3c3d93c1e8df8a9137aa11bfd23ba726a088f2bd0b076
-  data.tar.gz: 145efcdaf360f62ee412272e72bf9cc7fdccdeaac7a6efbadde7fb27e296976608fa671a48d63f8514d2f03b25120cb9c920b31106094fe51fba4158aa682eda
+  metadata.gz: 811297382e1341960a989f99da58968501a9c3efca6966fb0abb34d07f309f483d759af9ce2acbac0a5866ee9a14767cba60ebc61a2f87b1eca70c3e06e9a812
+  data.tar.gz: 9f1e833fd8bd6acf277febc0cde75fe934ba2918f79e533dbe0e6936a1677585eaffa7f928c83e73201609a8816eda14e4eabfeeca5e807db725c0b9fa40f517

data/lib/rhcf/utils/download_cache.rb

@@ -18,18 +18,13 @@ module Rhcf
         outfile = filename_for(url)
         return outfile if self.class.hit_fname?(outfile, @ttl) # here goes the cache
         download!(url, outfile)
-      rescue 
-        if File.exist?(outfile)
-          File.unlink(outfile) 
-        end
-        raise
       end
  
 
       def download!(url, outfile)
-        mkdir_p(File.dirname(outfile))
-        File.open(outfile, 'wb') do |fd|
-          open(url, "rb") do |down|
+        open(url, "rb") do |down|
+          mkdir_p(File.dirname(outfile))
+          File.open(outfile, 'wb') do |fd|
             fd.write(down.read)
           end
         end
@@ -58,7 +53,11 @@ module Rhcf
         hash =  Digest::MD5.hexdigest(url)
         uri = URI(url)
         basename = File.basename(uri.path)
-        File.join(@root_path, @cache_id, hash, basename) 
+        File.join(@root_path, @cache_id, hash_tree(hash), basename) 
+      end
+
+      def hash_tree(hash)
+        [*(hash[0,3].split('')) ,hash].join('/')
       end
 
     end

data/lib/rhcf/utils/version.rb

@@ -1,5 +1,5 @@
 module Rhcf
   module Utils
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/lib/rhcf/utils/download_cache_spec.rb

@@ -30,12 +30,12 @@ describe Rhcf::Utils::DownloadCache do
 
   describe "#hit?" do
     before(:each) do
-      FileUtils.rm_rf "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/aea455b4b37a2d4240a6b054ca0b0d5f8"
-      FileUtils.mkdir_p "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e7fb5389b6646ebb89aaa5502b75a440"
-      FileUtils.touch "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg"
+      FileUtils.rm_rf "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/a/e/a/aea455b4b37a2d4240a6b054ca0b0d5f8"
+      FileUtils.mkdir_p "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e/7/f/e7fb5389b6646ebb89aaa5502b75a440"
+      FileUtils.touch "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e/7/f/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg"
     end
     it "should return true if file downloaded and ttl is null" do
-      cache_of_30s.filename_for(img_url).should == '/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg'
+      cache_of_30s.filename_for(img_url).should == '/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e/7/f/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg'
       cache_of_30s.hit?(img_url).should be_true
     end 
     it "should return true if file downloaded and newer then ttl" do
@@ -47,7 +47,7 @@ describe Rhcf::Utils::DownloadCache do
       end
     end 
     it "should return false if doesn't exist" do
-      FileUtils.rm "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg"
+      FileUtils.rm "/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e/7/f/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg"
       cache_of_30s.hit?(img_url).should be_false
     end 
 
@@ -56,7 +56,7 @@ describe Rhcf::Utils::DownloadCache do
 
   describe "#filename_for" do
     it "should return a path with cache id , file name hash and file hash component" do
-      subject.filename_for(img_url).should == '/tmp/Rhcf::Utils::DownloadCache/default/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg'
+      subject.filename_for(img_url).should == '/tmp/Rhcf::Utils::DownloadCache/default/e/7/f/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg'
     end
   end
 
@@ -77,8 +77,8 @@ describe Rhcf::Utils::DownloadCache do
   end
 
   describe "#get" do
-    let(:expected_path){ '/tmp/Rhcf::Utils::DownloadCache/default/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg' }
-    let(:expected_30s_path){ '/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg' }
+    let(:expected_path){ '/tmp/Rhcf::Utils::DownloadCache/default/e/7/f/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg' }
+    let(:expected_30s_path){ '/tmp/Rhcf::Utils::DownloadCache/cache_of_30s/e/7/f/e7fb5389b6646ebb89aaa5502b75a440/imagens-do-dia-20131023-04-original.jpg' }
     before(:each) do
       File.unlink(expected_path) rescue nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhcf-utils
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Romeu Fonseca