concord_cacher 0.1.7 → 0.1.8

data/Manifest

@@ -1,6 +1,7 @@
 Manifest
 README.textile
 Rakefile
+concord_cacher.gemspec
 lib/concord/cacher.rb
 lib/concord/diy_local_cacher.rb
 lib/concord/filename_generators.rb
@@ -70,6 +71,8 @@ spec/data/resources/statesofmatter/waterZoom.gif
 spec/data/resources/text.txt
 spec/data/standard_uri.otml
 spec/data/url_with_space.otml
+spec/data/xml_entities.otml
 spec/diy_local_cacher_spec.rb
 spec/helpers/cache_helper.rb
 spec/java_proxy_cacher_spec.rb
+xml_entities.otml

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 require './lib/concord_cacher.rb'
 
 require 'echoe'
-Echoe.new('concord_cacher', '0.1.7') do |p|
+Echoe.new('concord_cacher', '0.1.8') 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,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{concord_cacher}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Unger"]
   s.cert_chain = ["/Users/aunger/gem-public_cert.pem"]
-  s.date = %q{2010-04-06}
+  s.date = %q{2010-04-08}
   s.description = %q{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.}
   s.email = %q{aunger @nospam@ concord.org}
   s.extra_rdoc_files = ["README.textile", "lib/concord/cacher.rb", "lib/concord/diy_local_cacher.rb", "lib/concord/filename_generators.rb", "lib/concord/filename_generators/default_generator.rb", "lib/concord/filename_generators/diy_generator.rb", "lib/concord/filename_generators/java_proxy_generator.rb", "lib/concord/helper.rb", "lib/concord/java_proxy_cacher.rb", "lib/concord/resource.rb", "lib/concord_cacher.rb"]
-  s.files = ["Manifest", "README.textile", "Rakefile", "lib/concord/cacher.rb", "lib/concord/diy_local_cacher.rb", "lib/concord/filename_generators.rb", "lib/concord/filename_generators/default_generator.rb", "lib/concord/filename_generators/diy_generator.rb", "lib/concord/filename_generators/java_proxy_generator.rb", "lib/concord/helper.rb", "lib/concord/java_proxy_cacher.rb", "lib/concord/resource.rb", "lib/concord_cacher.rb", "spec/data/always_skip.otml", "spec/data/bad_url.otml", "spec/data/codebase.otml", "spec/data/element_reference.otml", "spec/data/empty.otml", "spec/data/empty_url.otml", "spec/data/mw_model_absolute.otml", "spec/data/mw_model_relative.otml", "spec/data/nlogo_absolute.otml", "spec/data/nlogo_relative.otml", "spec/data/recursion.otml", "spec/data/recursive_loop.otml", "spec/data/resources/chart_line.png", "spec/data/resources/delete.png", "spec/data/resources/loop1.otml", "spec/data/resources/loop2.otml", "spec/data/resources/nlogo/SpaceRescue.Practice1.nlogo", "spec/data/resources/recurse1.otml", "spec/data/resources/recurse2.otml", "spec/data/resources/statesofmatter/bench.gif", "spec/data/resources/statesofmatter/downHighlightMol1.gif", "spec/data/resources/statesofmatter/downHighlightMol2.gif", "spec/data/resources/statesofmatter/eightBall.gif", "spec/data/resources/statesofmatter/eightBall.html", "spec/data/resources/statesofmatter/eightBall.mml", "spec/data/resources/statesofmatter/eightBallZoom.gif", "spec/data/resources/statesofmatter/gold.gif", "spec/data/resources/statesofmatter/gold.html", "spec/data/resources/statesofmatter/gold.mml", "spec/data/resources/statesofmatter/goldZoom.gif", "spec/data/resources/statesofmatter/helium.gif", "spec/data/resources/statesofmatter/helium.html", "spec/data/resources/statesofmatter/helium.mml", "spec/data/resources/statesofmatter/heliumZoom.gif", "spec/data/resources/statesofmatter/hydrogen.gif", "spec/data/resources/statesofmatter/hydrogen.html", "spec/data/resources/statesofmatter/hydrogen.mml", "spec/data/resources/statesofmatter/hydrogenZoom.gif", "spec/data/resources/statesofmatter/rootBeer.gif", "spec/data/resources/statesofmatter/rootBeer.html", "spec/data/resources/statesofmatter/rootBeer.mml", "spec/data/resources/statesofmatter/rootBeerZoom.gif", "spec/data/resources/statesofmatter/statesOfMatter$0.mml", "spec/data/resources/statesofmatter/statesOfMatter.cml", "spec/data/resources/statesofmatter/statesOfMatterPage1$0.mml", "spec/data/resources/statesofmatter/statesOfMatterPage1.cml", "spec/data/resources/statesofmatter/unknown.gif", "spec/data/resources/statesofmatter/unknown.html", "spec/data/resources/statesofmatter/unknown.mml", "spec/data/resources/statesofmatter/unknownZoom.gif", "spec/data/resources/statesofmatter/upHighlightMol1.gif", "spec/data/resources/statesofmatter/upHighlightMol2.gif", "spec/data/resources/statesofmatter/water.gif", "spec/data/resources/statesofmatter/water.html", "spec/data/resources/statesofmatter/water.mml", "spec/data/resources/statesofmatter/waterZoom.gif", "spec/data/resources/text.txt", "spec/data/standard_uri.otml", "spec/data/url_with_space.otml", "spec/diy_local_cacher_spec.rb", "spec/helpers/cache_helper.rb", "spec/java_proxy_cacher_spec.rb", "concord_cacher.gemspec"]
+  s.files = ["Manifest", "README.textile", "Rakefile", "concord_cacher.gemspec", "lib/concord/cacher.rb", "lib/concord/diy_local_cacher.rb", "lib/concord/filename_generators.rb", "lib/concord/filename_generators/default_generator.rb", "lib/concord/filename_generators/diy_generator.rb", "lib/concord/filename_generators/java_proxy_generator.rb", "lib/concord/helper.rb", "lib/concord/java_proxy_cacher.rb", "lib/concord/resource.rb", "lib/concord_cacher.rb", "spec/data/always_skip.otml", "spec/data/bad_url.otml", "spec/data/codebase.otml", "spec/data/element_reference.otml", "spec/data/empty.otml", "spec/data/empty_url.otml", "spec/data/mw_model_absolute.otml", "spec/data/mw_model_relative.otml", "spec/data/nlogo_absolute.otml", "spec/data/nlogo_relative.otml", "spec/data/recursion.otml", "spec/data/recursive_loop.otml", "spec/data/resources/chart_line.png", "spec/data/resources/delete.png", "spec/data/resources/loop1.otml", "spec/data/resources/loop2.otml", "spec/data/resources/nlogo/SpaceRescue.Practice1.nlogo", "spec/data/resources/recurse1.otml", "spec/data/resources/recurse2.otml", "spec/data/resources/statesofmatter/bench.gif", "spec/data/resources/statesofmatter/downHighlightMol1.gif", "spec/data/resources/statesofmatter/downHighlightMol2.gif", "spec/data/resources/statesofmatter/eightBall.gif", "spec/data/resources/statesofmatter/eightBall.html", "spec/data/resources/statesofmatter/eightBall.mml", "spec/data/resources/statesofmatter/eightBallZoom.gif", "spec/data/resources/statesofmatter/gold.gif", "spec/data/resources/statesofmatter/gold.html", "spec/data/resources/statesofmatter/gold.mml", "spec/data/resources/statesofmatter/goldZoom.gif", "spec/data/resources/statesofmatter/helium.gif", "spec/data/resources/statesofmatter/helium.html", "spec/data/resources/statesofmatter/helium.mml", "spec/data/resources/statesofmatter/heliumZoom.gif", "spec/data/resources/statesofmatter/hydrogen.gif", "spec/data/resources/statesofmatter/hydrogen.html", "spec/data/resources/statesofmatter/hydrogen.mml", "spec/data/resources/statesofmatter/hydrogenZoom.gif", "spec/data/resources/statesofmatter/rootBeer.gif", "spec/data/resources/statesofmatter/rootBeer.html", "spec/data/resources/statesofmatter/rootBeer.mml", "spec/data/resources/statesofmatter/rootBeerZoom.gif", "spec/data/resources/statesofmatter/statesOfMatter$0.mml", "spec/data/resources/statesofmatter/statesOfMatter.cml", "spec/data/resources/statesofmatter/statesOfMatterPage1$0.mml", "spec/data/resources/statesofmatter/statesOfMatterPage1.cml", "spec/data/resources/statesofmatter/unknown.gif", "spec/data/resources/statesofmatter/unknown.html", "spec/data/resources/statesofmatter/unknown.mml", "spec/data/resources/statesofmatter/unknownZoom.gif", "spec/data/resources/statesofmatter/upHighlightMol1.gif", "spec/data/resources/statesofmatter/upHighlightMol2.gif", "spec/data/resources/statesofmatter/water.gif", "spec/data/resources/statesofmatter/water.html", "spec/data/resources/statesofmatter/water.mml", "spec/data/resources/statesofmatter/waterZoom.gif", "spec/data/resources/text.txt", "spec/data/standard_uri.otml", "spec/data/url_with_space.otml", "spec/data/xml_entities.otml", "spec/diy_local_cacher_spec.rb", "spec/helpers/cache_helper.rb", "spec/java_proxy_cacher_spec.rb", "xml_entities.otml"]
   s.homepage = %q{http://github.com/psndcsrv/concord_cacher}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Concord_cacher", "--main", "README.textile"]
   s.require_paths = ["lib"]

data/lib/concord/resource.rb

@@ -109,7 +109,7 @@ class ::Concord::Resource
       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
-      self.remove_codebase
+      self.remove_codebase if self.class.rewrite_urls
     end
   end
   
@@ -179,6 +179,7 @@ class ::Concord::Resource
   end
   
   def _process_line(line)
+    orig_line = line
     line = CGI.unescapeHTML(line)
     match_indexes = []
     while ( match = _line_matches(line) ) && (! match_indexes.include?(match.begin(1)))
@@ -189,10 +190,10 @@ class ::Concord::Resource
       resource.cache_dir = self.cache_dir
       catch :nextResource do
         _handle_resource(resource)
-        line.sub!(resource.url,resource.local_filename.to_s) if self.class.rewrite_urls
+        orig_line.sub!(resource.url,resource.local_filename.to_s) if self.class.rewrite_urls
       end
     end
-    return line
+    return orig_line
   end
   
   def _handle_resource(resource)

data/spec/data/xml_entities.otml

@@ -0,0 +1,12 @@
+<otrunk id="6b230c1d-8816-4ef3-9c7a-b84a0da0b35f">
+  <imports>
+    <import class="org.concord.otrunk.OTSystem" />
+  </imports>
+  <objects>  
+    <OTSystem local_id="system">
+      <root>
+        <OTText text="&lt;img src=&quot;http://portal.concord.org/images/icons/chart_line.png&quot; /&gt;" />
+      </root>
+    </OTSystem>
+  </objects>
+</otrunk>

data/spec/diy_local_cacher_spec.rb

@@ -318,4 +318,23 @@ describe 'DIY Local Cacher' do
     it 'should only recurse html files once'
     it 'should recurse otml,cml,mml and nlogo files forever'
   end
+  
+  describe 'special cases' do
+    it 'should not unencode xml entities that are not part of a url' do
+      expected_files = []
+      expected_files << "hash.otml" # xml_entities.otml
+      expected_files << filename_for("http://portal.concord.org/images/icons/chart_line.png")
+      
+      cache('xml_entities.otml', :activity => mockup('xml_entities.otml'))
+
+      cache_size.should == 2
+      expected_files.each do |f|
+        exists?(f)
+      end
+      
+      file_content = File.read(File.join(@cache,'hash.otml'))
+
+      file_content.should match(Regexp.new("<OTText text=\"&lt;img src=&quot;#{filename_for("http://portal.concord.org/images/icons/chart_line.png")}&quot; /&gt;\" />"))      
+    end
+  end
 end

data/spec/java_proxy_cacher_spec.rb

@@ -207,4 +207,27 @@ describe 'Java Proxy Cacher' do
     it 'should only recurse html files once'
     it 'should recurse otml,cml,mml and nlogo files forever'
   end
+  
+  describe 'special cases' do
+    it 'should not unencode xml entities that are not part of a url' do
+      expected_files = []
+      expected_files << "b3dd880c1368ff9ed70cba3df3b81cd04bf77bdf" # xml_entities.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'
+      
+      cache('xml_entities.otml')
+
+      cache_size.should == 5
+      expected_files.each do |f|
+        exists?(f)
+      end
+      
+      file_content = File.read(File.join(@cache,'b3dd880c1368ff9ed70cba3df3b81cd04bf77bdf'))
+
+      file_content.should match(Regexp.new('<OTText text="&lt;img src=&quot;http://portal.concord.org/images/icons/chart_line.png&quot; /&gt;" />'))      
+    end
+    
+  end
 end

data/xml_entities.otml

@@ -0,0 +1,12 @@
+<otrunk id="6b230c1d-8816-4ef3-9c7a-b84a0da0b35f">
+  <imports>
+    <import class="org.concord.otrunk.OTSystem" />
+  </imports>
+  <objects>  
+    <OTSystem local_id="system">
+      <root>
+        <OTText text="<img src="http://portal.concord.org/images/icons/chart_line.png" />" />
+      </root>
+    </OTSystem>
+  </objects>
+</otrunk>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Aaron Unger
@@ -35,7 +35,7 @@ cert_chain:
   8kT2T2VF
   -----END CERTIFICATE-----
 
-date: 2010-04-06 00:00:00 -04:00
+date: 2010-04-08 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -61,6 +61,7 @@ files:
 - Manifest
 - README.textile
 - Rakefile
+- concord_cacher.gemspec
 - lib/concord/cacher.rb
 - lib/concord/diy_local_cacher.rb
 - lib/concord/filename_generators.rb
@@ -130,10 +131,11 @@ files:
 - spec/data/resources/text.txt
 - spec/data/standard_uri.otml
 - spec/data/url_with_space.otml
+- spec/data/xml_entities.otml
 - spec/diy_local_cacher_spec.rb
 - spec/helpers/cache_helper.rb
 - spec/java_proxy_cacher_spec.rb
-- concord_cacher.gemspec
+- xml_entities.otml
 has_rdoc: true
 homepage: http://github.com/psndcsrv/concord_cacher
 licenses: []