concord_cacher 0.1.11 → 0.1.12

data/Rakefile

@@ -1,8 +1,9 @@
-require 'rubygems'
+require "rubygems"
+require "bundler"
+Bundler.setup(:test, :ci)
 
 require 'rake'
 require 'spec/rake/spectask'
-
 require './lib/concord_cacher.rb'
 
 task :default => :spec

data/concord_cacher.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{concord_cacher}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   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

@@ -258,7 +258,7 @@ class ::Concord::Resource
     _try(resource, lambda {
       # strip whitespace from the end of the match url, but don't alter the url so that when
       # we replace the url later, we can, in essence, fix the malformed url 
-      resource.uri = URI.parse(CGI.unescapeHTML(resource.url.sub(/\s+$/,'')))
+      resource.uri = URI.parse(CGI.unescapeHTML(resource.url.strip))
     })
     if (resource.uri.relative?)
       # relative URL's need to have their parent document's codebase appended before trying to download

data/lib/concord_cacher.rb

@@ -1,4 +1,4 @@
-$:.unshift(File.dirname(__FILE__)) unless
+$:.unshift(File.expand_path(File.dirname(__FILE__))) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Concord

data/spec/data/url_with_space.otml

@@ -6,9 +6,9 @@
     <OTSystem local_id="system">
       <root>
         <OTText>
-          <img src='http://portal.concord.org/images/icons/chart_line.png ' />
+          <img src=' http://portal.concord.org/images/icons/chart_line.png '/>
         </OTText>
       </root>
     </OTSystem>
   </objects>
-</otrunk>
+</otrunk>

data/spec/diy_local_cacher_spec.rb

@@ -1,10 +1,10 @@
 begin
   require 'concord_cacher'
 rescue LoadError
-  require File.join(File.dirname(__FILE__), '..','lib','concord.rb')
+  require File.expand_path(File.join(File.dirname(__FILE__), '..','lib','concord.rb'))
 end
 
-require File.join(File.dirname(__FILE__),'helpers','cache_helper.rb')
+require File.expand_path(File.join(File.dirname(__FILE__),'helpers','cache_helper.rb'))
 
 require 'fileutils'
 

data/spec/java_proxy_cacher_spec.rb

@@ -1,10 +1,10 @@
 begin
   require 'concord_cacher'
 rescue LoadError
-  require File.join(File.dirname(__FILE__), '..','lib','concord.rb')
+  require File.expand_path(File.join(File.dirname(__FILE__), '..','lib','concord.rb'))
 end
 
-require File.join(File.dirname(__FILE__),'helpers','cache_helper.rb')
+require File.expand_path(File.join(File.dirname(__FILE__),'helpers','cache_helper.rb'))
 
 require 'fileutils'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Aaron Unger