concord_cacher 0.1.8 → 0.1.9

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 require './lib/concord_cacher.rb'
 
 require 'echoe'
-Echoe.new('concord_cacher', '0.1.8') do |p|
+Echoe.new('concord_cacher', '0.1.9') 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"

data/concord_cacher.gemspec

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

data/lib/concord/resource.rb

@@ -88,7 +88,7 @@ class ::Concord::Resource
       f.flush
     end
     write_property_map(self.cache_dir + self.local_filename + ".hdrs", self.headers) if self.class.cache_headers
-    ::Concord::Resource.map(self.url, self.local_filename) if self.class.create_map
+    ::Concord::Resource.map(self.uri_str, self.local_filename) if self.class.create_map
   end
   
   # Reserving the file will prohibit any further references to this same file to be skipped, this avoiding endlessly recursing references
@@ -105,7 +105,7 @@ class ::Concord::Resource
   end
   
   def load
-    open(self.uri.scheme == 'file' ? self.uri.path : self.uri.to_s) do |r|
+    open(self.uri_str) do |r|
       self.headers = r.respond_to?("meta") ? r.meta : {}
       self.headers['_http_version'] = "HTTP/1.1 #{r.respond_to?("status") ? r.status.join(" ") : "200 OK"}"
       self.content = r.read
@@ -134,6 +134,11 @@ class ::Concord::Resource
     self.content = processed_lines.join("\n")
   end
   
+  def uri_str
+    return nil unless self.uri
+    self.uri.scheme == 'file' ? self.uri.path : self.uri.to_s
+  end
+  
   def always_skip?
     return (self.url.length < 1) || ALWAYS_SKIP_REGEXES.detect{|r| r.match(self.url) }
   end
@@ -235,7 +240,7 @@ class ::Concord::Resource
   end
   
   def _recurse(resource)
-    puts "recursively parsing '#{resource.uri.to_s}'" if self.class.debug
+    puts "recursively parsing '#{resource.uri_str}'" if self.class.debug
 		_try(resource, lambda {
 		  resource.reserve # touch the file so that we know not to try to re-process the file we're currently processing
       resource.process
@@ -253,7 +258,7 @@ class ::Concord::Resource
     begin
       lam.call
     rescue => e
-      self.class.error(self.url,"Problem getting or writing file: #{resource.uri.to_s},   Error: #{e}")
+      self.class.error(self.url,"Problem getting or writing file: #{resource.uri_str},   Error: #{e}")
       print 'X' if self.class.verbose
       resource.release
       throw :nextResource

data/spec/java_proxy_cacher_spec.rb

@@ -230,4 +230,26 @@ describe 'Java Proxy Cacher' do
     end
     
   end
+  
+  describe 'url map' do
+    it 'should always use absolute urls as keys' do
+      data_dir = File.join(@spec_root, 'data')
+      expected_entries = []
+      expected_entries << {:val => '836ba09d9d7288cf735f555e7a9b9b314ad2f6ef', :key => File.expand_path('element_reference.otml',data_dir)}
+      expected_entries << {:val => '20e89b62dda582d80e1832050f4998d64c801c03', :key => 'http://www.concord.org/~aunger/'}
+      expected_entries << {:val => '4e9576a56db3d142113b8905d7aa93e31c9f441b', :key => 'http://portal.concord.org/images/icons/chart_bar.png'}
+      expected_entries << {:val => '41f082b7e69a399679a47acfdcd7e7a204e49745', :key => 'http://portal.concord.org/images/icons/chart_pie.png'}
+      expected_entries << {:val => 'cbe7ac86926fd3b8aa8659842a1d8c299d8966a7', :key => File.expand_path('resources/text.txt',data_dir)}
+      expected_entries << {:val => '8f0ebcb45d7ba71a541d4781329f4a6900c7ee65', :key => File.expand_path('resources/delete.png',data_dir)}
+      expected_entries << {:val => 'd1cea238486aeeba9215d56bf71efc243754fe48', :key => File.expand_path('resources/chart_line.png',data_dir)}
+      
+      cache('element_reference.otml')
+      
+      url_map_content = File.read(File.expand_path('url_map.xml', @cache))
+      
+      expected_entries.each do |e|
+        url_map_content.should match(Regexp.new("<entry key='#{e[:key]}'>#{e[:val]}</entry>"))
+      end
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Aaron Unger

metadata.gz.sig

@@ -1,2 +1,4 @@
-�s�ü�x
- �������#�c-?��t�
+��x��K��\��M7�_=?-�2^
+0�O8���l
�6|�O��((��3x)���z�/��nRb����Z�o6��7M#V��+�H�ǖ���ZT;'6����.uH"�`�*�߲�9���6S\c����|W���A��g]�Q�� ���_XW'�B�.�1N��w<%Nq��=m O[�%��[;B�)�4֌�	��{i���T
+�
+�k:�	�K{vN��G�&������<���&kȉ��(�[�u�