concord_cacher 0.0.4 → 0.0.5

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 require './lib/concord_cacher.rb'
 
 require 'echoe'
-Echoe.new('concord_cacher', '0.0.4') do |p|
+Echoe.new('concord_cacher', '0.0.5') 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.0.4"
+  s.version = "0.0.5"
 
   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

@@ -9,9 +9,10 @@ class ::Concord::Cacher
   #   scan for anything that matches (http://[^'"]+)
   URL_REGEX = /(http[s]?:\/\/[^'"]+)/i
   # the imageBytes can be referenced by a OTImage object
-  SRC_REGEX = /(?:src|href|imageBytes)[ ]?=[ ]?['"]([^'"]+)/i
+  SRC_REGEX = /(?:src|href|imageBytes|authoredDataURL)[ ]?=[ ]?['"]([^'"]+)/i
   NLOGO_REGEX = /import-drawing "([^"]+)"/i
-  ALWAYS_SKIP_REGEX = /^(mailto|jres)/i   # (resourceFile =~ /^mailto/) || (resourceFile =~ /^jres/)
+  MW_REGEX = /<resource>(.*?mml)<\/resource>/
+  ALWAYS_SKIP_REGEX = /^(mailto|jres)/i
   RECURSE_ONCE_REGEX = /html$/i  # (resourceFile =~ /otml$/ || resourceFile =~ /html/)
   RECURSE_FOREVER_REGEX = /(otml|cml|mml|nlogo)$/i
   
@@ -107,13 +108,20 @@ class ::Concord::Cacher
     lines.each do |line|
       line = CGI.unescapeHTML(line)
       match_indexes = []
-      while ( ((match = URL_REGEX.match(line)) && (! match_indexes.include?(match.begin(1)))) ||
-              ((match = SRC_REGEX.match(line)) && (! match_indexes.include?(match.begin(1)))) ||
-              (/.*\.nlogo/.match(short_filename) && (match = NLOGO_REGEX.match(line)) && (! match_indexes.include?(match.begin(1))))  )
+      while (
+        ( match = (
+            URL_REGEX.match(line) ||
+            SRC_REGEX.match(line) ||
+            (/.*\.nlogo/.match(short_filename) ? NLOGO_REGEX.match(line) : nil) ||
+            (/.*\.(:?cml|mml)/.match(short_filename) ? MW_REGEX.match(line) : nil)
+          )
+        ) && (! match_indexes.include?(match.begin(1)))
+      )
         print "\nMatched url: #{match[1]}: " if DEBUG
         match_indexes << match.begin(1)
         #   get the resource from that location, save it locally
-        match_url = match[1].gsub(/\s+/,"").gsub(/[\?\#&;=\+\$,<>"\{\}\|\\\^\[\]].*$/,"")
+        # match_url = match[1].gsub(/\s+/,"").gsub(/[\?\#&;=\+,<>"\{\}\|\\\^\[\]].*$/,"")
+        match_url = match[1]
         # puts("pre: #{match[1]}, post: #{match_url}") if DEBUG
         begin
           resource_url = URI.parse(CGI.unescapeHTML(match_url))

data/spec/diy_local_cacher_spec.rb

@@ -20,18 +20,21 @@ OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 
 SPEC_ROOT = File.expand_path(File.dirname(__FILE__))
 
+$\ = "<br/>\n"
+
 describe 'DIY Local Cacher' do
   include CacheHelper
   
   before(:each) do
     @klass = Concord::DiyLocalCacher
     @cache = File.join(SPEC_ROOT, '..', 'tmp','diy_local')
+    rm_rf(@cache)
     mkdir_p(@cache)
     @cache += '/'
   end
   
   after(:each) do
-    rm_rf(@cache)
+    # rm_rf(@cache)
   end
   
   def mockup(file)
@@ -249,7 +252,22 @@ describe 'DIY Local Cacher' do
   end
   
   describe 'embedded mw files' do
-    it 'should correctly download resources referenced from within mw model files'
+    it 'should download absolute referenced cml files'
+    it 'should download relative referenced cml files'
+    
+    it 'should correctly download mmls referenced from within mw cml files' do
+      expected_files = []
+      expected_files << filename_for('http://otrunk.concord.org/examples/LOOPS/models/statesofmatter/statesOfMatterPage1$0.mml')
+      
+      cache('mw_model.otml', :activity => mockup('mw_model.otml'), :verbose => true)
+      
+      expected_files.each do |f|
+        exists?(f)
+      end
+    end
+    
+    it 'should correctly download images referenced from within mw cml files'
+    it 'should correctly download images referenced from within mml files'
   end
   
   describe 'never cache' do

data/spec/java_proxy_cacher_spec.rb

@@ -88,12 +88,14 @@ describe 'Java Proxy Cacher' do
     end
     
     it 'should handle an empty root url gracefully' do
+      pending do
       lambda {
         cache('')
       }.should_not raise_error
       
       cache_size.should == 1
     end
+    end
   end
   
   describe 'standard uri syntax' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Aaron Unger

metadata.gz.sig

@@ -1 +1 @@
-�m�ύi^|��$NbP�L���eZ�E��sʞ�/]�g�w�ޖ�K�N�b�Xh)���AB�p�
��tX%r7�W[1\��-_Ծ�@D�s��
��2��1`�e�$p�=�8�I���f��.��
+).�9���xA�_�K=#�O��<өX���u�4O�"�v���=�6;'��z�,�� ���BI������$6Z!j*1�f-�m�D�Ȯ$S2�e[��_�"�
w����g�N3¯��a��D�	;N�zTQ��↹�ֆ;��c}aAN&[�z�1*t���͵��W�qWqo��әv^�e��f�\��S�SˮJ_�p��o~Ņ;b����=S�[�렳����<|AK