concord_cacher 0.1.10 → 0.1.11

data/Rakefile

@@ -5,19 +5,6 @@ require 'spec/rake/spectask'
 
 require './lib/concord_cacher.rb'
 
-require 'echoe'
-Echoe.new('concord_cacher', '0.1.10') 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"
-  p.author         = "Aaron Unger"
-  p.email          = "aunger @nospam@ concord.org"
-  p.ignore_pattern = ["tmp/*","pkg/*","hudson/*"]
-  p.development_dependencies = []
-  p.runtime_dependencies = []
-  p.clean_pattern = ["hudson/*", "tmp/*"]
-end
-
 task :default => :spec
 
 Spec::Rake::SpecTask.new do |t|

data/concord_cacher.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{concord_cacher}
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   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-08}
+  s.date = %q{2010-09-07}
   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"]

data/lib/concord/cacher.rb

@@ -16,10 +16,15 @@ class ::Concord::Cacher
     ::Concord::Resource.debug = opts.delete(:debug) || false
     
     create_map = opts.delete(:create_map)
-    ::Concord::Resource.create_map = create_map unless create_map == nil
+    ::Concord::Resource.create_map = create_map unless create_map.nil?
     
     cache_headers = opts.delete(:cache_headers)
-    ::Concord::Resource.cache_headers = cache_headers unless cache_headers == nil
+    ::Concord::Resource.cache_headers = cache_headers unless cache_headers.nil?
+    
+    relative_hosts = opts.delete(:relative)
+    relative_hosts = [] if relative_hosts.nil?
+    relative_hosts = [relative_hosts] unless relative_hosts.kind_of? Array
+    ::Concord::Resource.relative_hosts = relative_hosts 
     
     @main_resource = Concord::Resource.new
     @main_resource.url = opts.delete(:url)

data/lib/concord/resource.rb

@@ -54,6 +54,7 @@ class ::Concord::Resource
   @errors = {}
   @cacher = nil
   @filename_generator = ::Concord::FilenameGenerators::DefaultGenerator
+  @relative_hosts = []
   class << self
     attr_accessor :debug
     attr_accessor :verbose
@@ -64,6 +65,7 @@ class ::Concord::Resource
     attr_reader   :errors
     attr_accessor :cacher
     attr_accessor :filename_generator
+    attr_accessor :relative_hosts
   end
   
   def self.map(k,v)
@@ -160,7 +162,14 @@ class ::Concord::Resource
   
   def local_filename
     return @local_filename if @local_filename
-    @local_filename = self.class.filename_generator.generate_filename(self)
+    if (self.relativize_only?)
+      @local_filename = self.uri.path
+      @local_filename << "?#{self.uri.query}" if self.uri.query
+      @local_filename << "##{self.uri.fragment}" if self.uri.fragment
+    else
+      @local_filename = self.class.filename_generator.generate_filename(self)
+    end
+    return @local_filename
   end
   
   def recursable?
@@ -172,6 +181,11 @@ class ::Concord::Resource
     return false
   end
   
+  def relativize_only?
+    return true if ::Concord::Resource.relative_hosts.include?(self.uri.host.to_s)
+    return false
+  end
+  
   private
   
   def _line_matches(line)
@@ -221,6 +235,11 @@ class ::Concord::Resource
   	_try(resource, lambda {
       resource.load
     })
+    
+    if resource.relativize_only?
+      print 'r' if self.class.verbose
+      return
+    end
 
     # skip downloading already existing files.
     # because we're working with sha1 hashes we can be reasonably certain the content is a complete match

data/spec/diy_local_cacher_spec.rb

@@ -101,6 +101,16 @@ describe 'DIY Local Cacher' do
       file_content.should match(filename_for('http://portal.concord.org/images/icons/delete.png'))
       file_content.should match(filename_for('https://mail.google.com/mail/images/2/5/mountains/base/gmail_solid_white.png'))
     end
+    
+    it 'should make some urls relative' do
+      cache('standard_uri.otml', :activity => mockup('standard_uri.otml'), :relative => ['portal.concord.org'])
+      
+      file_content = File.read(File.join(@cache,'hash.otml'))
+      
+      file_content.should_not match(/http:/)
+      file_content.should match('/images/icons/delete.png')
+      file_content.should match(filename_for('https://mail.google.com/mail/images/2/5/mountains/base/gmail_solid_white.png'))
+    end
   end
   
   describe 'element references syntax' do
@@ -239,6 +249,18 @@ describe 'DIY Local Cacher' do
         exists?(f)
       end
     end
+    
+    it 'should not recurse relativized urls' do
+      unexpected_files = []
+      unexpected_files << filename_for('http://otrunk.concord.org/examples/LOOPS/models/statesofmatter/statesOfMatterPage1.cml')
+      unexpected_files << filename_for('http://otrunk.concord.org/examples/LOOPS/models/statesofmatter/statesOfMatterPage1$0.mml')
+      
+      cache('mw_model_absolute.otml', :activity => mockup('mw_model_absolute.otml'), :relative => ['otrunk.concord.org'])
+      
+      unexpected_files.each do |f|
+        does_not_exist?(f)
+      end
+    end
   end
   
   describe 'embedded nlogo files' do
@@ -337,5 +359,17 @@ describe 'DIY Local Cacher' do
 
       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
+    
+    it 'should not cause problems to specify one relative host as a string instead of an array' do
+      unexpected_files = []
+      unexpected_files << filename_for('http://otrunk.concord.org/examples/LOOPS/models/statesofmatter/statesOfMatterPage1.cml')
+      unexpected_files << filename_for('http://otrunk.concord.org/examples/LOOPS/models/statesofmatter/statesOfMatterPage1$0.mml')
+      
+      cache('mw_model_absolute.otml', :activity => mockup('mw_model_absolute.otml'), :relative => 'otrunk.concord.org')
+      
+      unexpected_files.each do |f|
+        does_not_exist?(f)
+      end
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Aaron Unger
@@ -35,7 +35,7 @@ cert_chain:
   8kT2T2VF
   -----END CERTIFICATE-----
 
-date: 2010-04-08 00:00:00 -04:00
+date: 2010-09-07 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -151,6 +151,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -158,6 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -168,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: concord_cacher
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Support for locally caching a resource and all referenced resources in multiple different ways