concord_cacher 0.0.1 → 0.0.2

data.tar.gz.sig

@@ -1 +1,2 @@
-��j��oZ=y��/��A���d@��ǃ($��*]>Zv�r���	�&V�c��Csأ���n��f�
'���9�yw�d��G�������.��E�����âf�I�J�єe)V��N[1�
+#<�Ah��"�+�YQ��Z5��ɂ|���lI;�#���!+���k�&p$�t�~���-�5�Y�	�;�Q��Pq�{!��6�����*�4����M�����<Zv�d�ڄ2!��sv��S;�T�#��[�&��a���qF�
+F�z�m��H1X�&>&d�H)`O,���	�j@{tS��q%�3=w��ogePHtv`E�rb[N��w
�u�N��A4�֯K��h��qT5R��e�%����Yh3щ

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 require './lib/concord_cacher.rb'
 
 require 'echoe'
-Echoe.new('concord_cacher', '0.0.1') do |p|
+Echoe.new('concord_cacher', '0.0.2') do |p|
   p.description    = "concord_cacher provides support for locally caching a resource and all referenced resources in multiple different ways. It is intended for using with other Concord Consortium projects and not necessarily for outside projects."
   p.summary        = "Support for locally caching a resource and all referenced resources in multiple different ways"
   p.url            = "http://github.com/psndcsrv/concord_cacher"
@@ -26,7 +26,7 @@ namespace :hudson do
 
   namespace :setup do
     task :pre_ci do
-      ENV["CI_REPORTS"] = 'spec/reports/'
+      ENV["CI_REPORTS"] = 'hudson/reports/'
       gem 'ci_reporter'
       require 'ci/reporter/rake/rspec'
     end

data/concord_cacher.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{concord_cacher}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Unger"]

data/lib/concord/cacher.rb

@@ -158,7 +158,7 @@ class ::Concord::Cacher
         
         # skip downloading already existing files.
         # because we're working with sha1 hashes we can be reasonably certain the content is a complete match
-        if File.exist?(cache_dir + localFile)
+        if File.exists?(cache_dir + localFile)
           print 's' if @verbose
         else
           # if it's an otml/html file, we should parse it too (only one level down)
@@ -169,6 +169,7 @@ class ::Concord::Cacher
 							  recurse_further = true
 						  end
 							begin
+							  write_resource(cache_dir + localFile, "") # touch the file so that we avoid recursion
                 resource_content = parse_file(cache_dir + resourceFile, resource_content, cache_dir, resource_url, recurse_further)
 							rescue OpenURI::HTTPError => e
                 @errors[parent_url] ||= []

data/spec/diy_local_cacher_spec.rb

@@ -204,6 +204,24 @@ describe 'DIY Local Cacher' do
         file_content.should match(Regexp.new(url))
       end
     end
+    
+    it 'should not get stuck when handling circular loops' do
+      expected_files = []
+      expected_files << 'hash.otml' # recursion.otml
+      expected_files << ::Digest::SHA1.hexdigest(File.join(SPEC_ROOT,'data','resources','loop1.otml'))
+      expected_files << ::Digest::SHA1.hexdigest(File.join(SPEC_ROOT,'data','resources','delete.png'))
+      expected_files << ::Digest::SHA1.hexdigest(File.join(SPEC_ROOT,'data','resources','loop2.otml'))
+      expected_files << ::Digest::SHA1.hexdigest(File.join(SPEC_ROOT,'data','resources','chart_line.png'))
+      
+      lambda {
+        cache('recursive_loop.otml', :activity => mockup('recursive_loop.otml'))
+      }.should_not raise_error(SystemStackError)
+      
+      cache_size.should == 5
+      expected_files.each do |f|
+        exists?(f)
+      end
+    end
   end
   
   describe 'embedded nlogo files' do

data/spec/java_proxy_cacher_spec.rb

@@ -117,6 +117,27 @@ describe 'Java Proxy Cacher' do
         exists?(f)
       end
     end
+    
+    it 'should not get stuck when handling circular loops' do
+      expected_files = []
+      expected_files << '14a11cc1ba19ce76d651c93f8294009e3e46f0db' # recursive_loop.otml
+      expected_files << '2a564e6997c4a43bdfa3b0314e5bed7f9a5673ec' # resources/loop1.otml
+      expected_files << '8f0ebcb45d7ba71a541d4781329f4a6900c7ee65' # resources/delete.png
+      expected_files << '156b6f0a8885251ea5853cbebd1e9da5fedc00e0' # resources/loop2.otml
+      expected_files << 'd1cea238486aeeba9215d56bf71efc243754fe48' # resources/chart_line.png
+      expected_files << expected_files.collect{|f| f+".hdrs" } # headers for each file
+      expected_files.flatten!
+      expected_files << 'url_map.xml'
+      
+      lambda {
+        cache('recursive_loop.otml')
+      }.should_not raise_error(SystemStackError)
+      
+      cache_size.should == 11
+      expected_files.each do |f|
+        exists?(f)
+      end
+    end
   end
   
   describe 'embedded nlogo files' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Aaron Unger