concord_cacher 0.1.13 → 0.1.14

data/concord_cacher.gemspec

@@ -2,22 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{concord_cacher}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.required_ruby_version = '~> 1.8.7'
   s.authors = ["Aaron Unger"]
-  s.cert_chain = ["/Users/aunger/gem-public_cert.pem"]
-  s.date = %q{2010-11-04}
+  s.date = %q{2013-03-28}
   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", "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", "spec/data/urls_in_resourcelist.otml"]
-  s.homepage = %q{http://github.com/psndcsrv/concord_cacher}
+  s.homepage = %q{http://github.com/concord-consortium/concord_cacher}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Concord_cacher", "--main", "README.textile"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{concord_cacher}
   s.rubygems_version = %q{1.3.6}
-  s.signing_key = %q{/Users/aunger/gem-private_key.pem}
   s.summary = %q{Support for locally caching a resource and all referenced resources in multiple different ways}
 
   if s.respond_to? :specification_version then

data/lib/concord/cacher.rb

@@ -25,6 +25,10 @@ class ::Concord::Cacher
     relative_hosts = [] if relative_hosts.nil?
     relative_hosts = [relative_hosts] unless relative_hosts.kind_of? Array
     ::Concord::Resource.relative_hosts = relative_hosts 
+
+    custom_skips = opts.delete(:skip) || []
+    custom_skips = [custom_skips] unless custom_skips.kind_of?(Array)
+    ::Concord::Resource.custom_skips = custom_skips
     
     @main_resource = Concord::Resource.new
     @main_resource.url = opts.delete(:url)

data/lib/concord/resource.rb

@@ -55,6 +55,7 @@ class ::Concord::Resource
   @cacher = nil
   @filename_generator = ::Concord::FilenameGenerators::DefaultGenerator
   @relative_hosts = []
+  @custom_skips = []
   class << self
     attr_accessor :debug
     attr_accessor :verbose
@@ -66,6 +67,7 @@ class ::Concord::Resource
     attr_accessor :cacher
     attr_accessor :filename_generator
     attr_accessor :relative_hosts
+    attr_accessor :custom_skips
   end
   
   def self.map(k,v)
@@ -149,8 +151,11 @@ class ::Concord::Resource
     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) }
+  def skip?
+    return true if self.url.length < 1
+    return true if self.class.custom_skips.detect{|r| r.match(self.url) }
+    return true if ALWAYS_SKIP_REGEXES.detect{|r| r.match(self.url) }
+    return false
   end
   
   def remote_filename
@@ -227,7 +232,7 @@ class ::Concord::Resource
     resource.headers = {}
     _cleanup_uri(resource)
 
-    if resource.always_skip?
+    if resource.skip?
       print "S" if self.class.verbose
       throw :nextResource
     end

data/lib/concord_cacher.rb

@@ -1,6 +1,9 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__))) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+
+raise "concord_cacher is incompatible with your version of ruby (#{RUBY_VERSION})" unless RUBY_VERSION =~ /^1\.8\.[67]/
+
 module Concord
   require 'concord/filename_generators'
   require 'concord/diy_local_cacher'

data/spec/diy_local_cacher_spec.rb

@@ -17,14 +17,11 @@ describe 'DIY Local Cacher' do
     @klass = Concord::DiyLocalCacher
     @spec_root = File.expand_path(File.dirname(__FILE__))
     @cache = File.join(@spec_root, '..', 'tmp','diy_local')
+    rm_rf(@cache)
     mkdir_p(@cache)
     @cache += '/'
   end
   
-  after(:each) do
-    rm_rf(@cache)
-  end
-  
   def mockup(file)
     return mock('activity',{:uuid => 'hash', :url => file})
   end
@@ -286,7 +283,7 @@ describe 'DIY Local Cacher' do
       end
     end
     
-    it 'should correctly download resources referenced from within netlogo model files'
+    xit 'should correctly download resources referenced from within netlogo model files'
   end
   
   describe 'embedded mw files' do
@@ -323,8 +320,8 @@ describe 'DIY Local Cacher' do
       end
     end
     
-    it 'should correctly download images referenced from within mw cml files'
-    it 'should correctly download images referenced from within mml files'
+    xit 'should correctly download images referenced from within mw cml files'
+    xit 'should correctly download images referenced from within mml files'
   end
   
   describe 'never cache' do
@@ -338,8 +335,8 @@ describe 'DIY Local Cacher' do
   end
   
   describe 'recursion limits' do
-    it 'should only recurse html files once'
-    it 'should recurse otml,cml,mml and nlogo files forever'
+    xit 'should only recurse html files once'
+    xit 'should recurse otml,cml,mml and nlogo files forever'
   end
   
   describe 'special cases' do
@@ -374,11 +371,12 @@ describe 'DIY Local Cacher' do
 
     it 'should not include trailing </string> when url is part of resource list or map' do
       expected_files = []
+      expected_files << "hash.otml"
       expected_files << filename_for('http://portal.concord.org/images/icons/chart_line.png')
 
-      cache('urls_in_resource_list.otml', :activity => mockup('urls_in_resource_list.otml'))
+      cache('urls_in_resourcelist.otml', :activity => mockup('urls_in_resourcelist.otml'))
 
-      cache_size.should == 1
+      cache_size.should == 2
       expected_files.each do |f|
         exists?(f)
       end

data/spec/java_proxy_cacher_spec.rb

@@ -187,11 +187,11 @@ describe 'Java Proxy Cacher' do
   end
   
   describe 'embedded nlogo files' do
-    it 'should correctly download resources referenced from within netlogo model files'
+    xit 'should correctly download resources referenced from within netlogo model files'
   end
   
   describe 'embedded mw files' do
-    it 'should correctly download resources referenced from within mw model files'
+    xit 'should correctly download resources referenced from within mw model files'
   end
   
   describe 'never cache' do
@@ -201,11 +201,29 @@ describe 'Java Proxy Cacher' do
       cache('always_skip.otml')
       cache_size.should == 3
     end
+
+    it 'should skip files when instructed to' do
+      expected_files = []
+      expected_files << 'dbbd46b446a205047cfbf32e7af350a73c38848d' # recursion.otml
+      expected_files << 'cdc3d425b0ac9c3e89e1b79e0ad8a07c09bcedbd' # resources/recurse1.otml
+      expected_files << '8f0ebcb45d7ba71a541d4781329f4a6900c7ee65' # resources/delete.png
+      expected_files << expected_files.collect{|f| f+".hdrs" } # headers for each file
+      expected_files.flatten!
+      expected_files << 'url_map.xml'
+
+      cache('recursion.otml', :skip => [/recurse2\.otml$/])
+
+      cache_size.should == 7
+      expected_files.each do |f|
+        exists?(f)
+      end
+    end
+
   end
   
   describe 'recursion limits' do
-    it 'should only recurse html files once'
-    it 'should recurse otml,cml,mml and nlogo files forever'
+    xit 'should only recurse html files once'
+    xit 'should recurse otml,cml,mml and nlogo files forever'
   end
   
   describe 'special cases' do

metadata

@@ -1,51 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: concord_cacher
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 13
-  version: 0.1.13
+version: !ruby/object:Gem::Version
+  version: 0.1.14
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Aaron Unger
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDMjCCAhqgAwIBAgIBADANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZhdW5n
-  ZXIxFzAVBgoJkiaJk/IsZAEZFgdjb25jb3JkMRMwEQYKCZImiZPyLGQBGRYDb3Jn
-  MB4XDTEwMDMyNTE1NDM0MloXDTExMDMyNTE1NDM0MlowPzEPMA0GA1UEAwwGYXVu
-  Z2VyMRcwFQYKCZImiZPyLGQBGRYHY29uY29yZDETMBEGCgmSJomT8ixkARkWA29y
-  ZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcObwOz2qlPRc/6PVHq
-  7rrPxt+Ltc9shUtXrIjD0mQMqZtln6TkFnilPAXUd/NbxLrvZqrpPL5GeE5SlKA6
-  Hy2J5cj1A0c3qHmskaPnVma6NpnHmlWkIj1u//yCjz2ktaFYV7dHN2IlRK9M8t7F
-  Wt8DeVclSOeq3jOhjoOsSX5rIN8/MsWZcq42deHHiHQ0R5htLb1rmZTFKJynKA+m
-  Is6vytLGO/2iDeuiW8FQxBUwDEc7LNpfANCNk4WudUGi6K1WeteqTpyzJcso2yVZ
-  aMLpviD8WUxUZahz226ThwVLoTJB70GM8BVOFXApNdvbM0b45d1neyeHyU2f2ZeF
-  9g8CAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGQn
-  5Lsh1f/5AryTzU2cmoKsh6XqMA0GCSqGSIb3DQEBBQUAA4IBAQAfrvFWSUZPQnWg
-  5JxdAaHDMdVRlJGOTTpL/2L9GcDr8jaG32AOMcRDzhcCwKE5oBQZixUCidcvlh1y
-  8diuKpwKZrFtZT3RVwZm3wNHk9TaSprCJkhjhATLWZ2h9bGoTA2FH7VLpacUcG9r
-  L7W8Y8jL7G4+TZYCLcnH5O3XQ7AkAYVYogt4DLYN9Ma7xwN3MAFfuCRJhY49XLYd
-  Wv+hK/ewN+n0Uub+jPpW1Ahi7Ah67RVIRpsWfNpEjx+CB4hPY2GwjpmIKhgt4Fyg
-  c90zsqVWrMWBRgRiSl0yYsmuGSPmllNn2m9Vq4ZAHpjCBv5E0AObBv0g/WQgiMjX
-  8kT2T2VF
-  -----END CERTIFICATE-----
-
-date: 2010-11-04 00:00:00 -04:00
-default_executable: 
+cert_chain: []
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies: []
-
-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.
+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.
 email: aunger @nospam@ concord.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
 - lib/concord/cacher.rb
 - lib/concord/diy_local_cacher.rb
@@ -57,7 +29,7 @@ extra_rdoc_files:
 - lib/concord/java_proxy_cacher.rb
 - lib/concord/resource.rb
 - lib/concord_cacher.rb
-files: 
+files:
 - Manifest
 - README.textile
 - Rakefile
@@ -137,43 +109,35 @@ files:
 - spec/java_proxy_cacher_spec.rb
 - xml_entities.otml
 - spec/data/urls_in_resourcelist.otml
-has_rdoc: true
-homepage: http://github.com/psndcsrv/concord_cacher
+homepage: http://github.com/concord-consortium/concord_cacher
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Concord_cacher
 - --main
 - README.textile
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ~>
+    - !ruby/object:Gem::Version
+      version: 1.8.7
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: concord_cacher
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Support for locally caching a resource and all referenced resources in multiple different ways
+summary: Support for locally caching a resource and all referenced resources in multiple
+  different ways
 test_files: []
-

metadata.gz.sig

@@ -1 +0,0 @@
-!�@�X��$�f�$LDUZ*���|������
sn��_jP=έd8-��