openurl 0.5.0 → 0.6.0

data/lib/openurl.rb

@@ -12,6 +12,8 @@ require 'openurl/context_object'
 require 'openurl/context_object_entity'
 require 'openurl/transport'
 
+require 'scrub_rb'
+
 Dir.open(File.dirname(File.expand_path(__FILE__))+'/openurl/metadata_formats').each do | file |
   next if file.match(/^\./)
   class_name = file.sub(/\.rb$/,'')

data/lib/openurl/context_object.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'ensure_valid_encoding'
+require 'scrub_rb' # backfill of String#scrub to ruby 1.9.3 and 2.0
 
 module OpenURL
 
@@ -35,9 +35,7 @@ module OpenURL
   # == Serialize a ContextObject to kev or XML :
   # ctx.kev
   # ctx.xml
-  class ContextObject    
-    include EnsureValidEncoding
-    
+  class ContextObject
     attr_reader :admin, :referent, :referringEntity, :requestor, :referrer, 
       :serviceType, :resolver
     attr_accessor :foreign_keys, :openurl_ver
@@ -241,7 +239,7 @@ module OpenURL
     def import_xml(xml)			
       if xml.is_a?(String)        
         xml.force_encoding("UTF-8") if xml.respond_to? :force_encoding
-        ensure_valid_encoding!(xml, :invalid => :replace)
+        xml.scrub!
         doc = REXML::Document.new xml.gsub(/>[\s\t]*\n*[\s\t]*</, '><').strip
       elsif xml.is_a?(REXML::Document)
         doc = xml
@@ -305,7 +303,7 @@ module OpenURL
         [values].flatten.compact.each do | v |
             v.force_encoding(source_encoding)
             if source_encoding == "UTF-8"
-              ensure_valid_encoding!(v, :invalid => :replace )
+              v.scrub!
             else
               # transcode, replacing any bad chars. 
               v.encode!("UTF-8", :invalid => :replace, :undef => :replace )

data/lib/openurl/metadata_formats/scholarly_common.rb

@@ -32,7 +32,7 @@ module OpenURL
       end      
     end
     
-    def respond_to?(message)
+    def respond_to?(message, include_all=false)
       # make it match method_messing
       key = message.to_s.sub(/=$/,'')
       super || (@author_keys+@metadata_keys).index(key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openurl
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marc
@@ -29,7 +29,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ensure_valid_encoding
+  name: scrub_rb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: