gepub 0.6.4.3 → 0.6.4.4

data/lib/gepub/book.rb

@@ -174,23 +174,6 @@ module GEPUB
                                       toc.push(:item => item, :text => text, :id => id)
                                       item
                      })
-      item.push_content_callback {
-        |i|
-        if File.extname(i.href) =~ /.x?html/
-          parsed = Nokogiri::XML::Document.parse(i.content)
-          ns_prefix =  parsed.namespaces.invert['http://www.w3.org/1999/xhtml']
-          if ns_prefix.nil?
-            prefix = ''
-          else
-            prefix = "#{ns_prefix}:"
-          end
-          videos = parsed.xpath("//#{prefix}video[starts-with(@src,'http')]")
-          audios = parsed.xpath("//#{prefix}audio[starts-with(@src,'http')]")
-          if videos.size > 0 || audios.size > 0
-            i.add_property('remote-resources')
-          end
-        end
-      }
       item.add_content io_or_filename unless io_or_filename.nil?
       item
     end
@@ -257,16 +240,16 @@ module GEPUB
       epub.put_next_entry('mimetype', '', '', Zip::ZipEntry::STORED)
       epub << "application/epub+zip"
       epub.put_next_entry('META-INF/container.xml')
-      epub << container_xml
+      epub << container_xml.force_encoding('us-ascii')
 
       epub.put_next_entry(@package.path)
-      epub << opf_xml
+      epub << opf_xml.force_encoding('us-ascii')
 
       @package.manifest.item_list.each {
         |k, item|
         if item.content != nil
           epub.put_next_entry(@package.contents_prefix + item.href)
-          epub << item.content
+          epub << item.content.force_encoding('us-ascii')
         end
       }
     end

data/lib/gepub/item.rb

@@ -69,10 +69,20 @@ module GEPUB
       end
       io.binmode
       @content = io.read
-      @content_callback.each {
-        |p|
-        p.call self
-      }
+      if File.extname(self.href) =~ /.x?html/
+        parsed = Nokogiri::XML::Document.parse(@content)
+        ns_prefix =  parsed.namespaces.invert['http://www.w3.org/1999/xhtml']
+          if ns_prefix.nil?
+            prefix = ''
+          else
+            prefix = "#{ns_prefix}:"
+          end
+          videos = parsed.xpath("//#{prefix}video[starts-with(@src,'http')]")
+          audios = parsed.xpath("//#{prefix}audio[starts-with(@src,'http')]")
+          if videos.size > 0 || audios.size > 0
+            self.add_property('remote-resources')
+          end
+      end
       self
     end
 

data/lib/gepub/version.rb

@@ -1,3 +1,3 @@
 module GEPUB
-  VERSION = "0.6.4.3"
+  VERSION = "0.6.4.4"
 end

data/lib/gepub.rb

@@ -1,9 +1,15 @@
-if !({}.respond_to? 'key')
+if RUBY_VERSION < '1.9'
+  # hash.key
   class Hash
     def key(x)
       index(x)
     end
   end
+  class String
+    def force_encodeing(x)
+      self
+    end
+  end
 end
 
 require 'gepub/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gepub
 version: !ruby/object:Gem::Version
-  version: 0.6.4.3
+  version: 0.6.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70156488640380 !ruby/object:Gem::Requirement
+  requirement: &70303996984220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70156488640380
+  version_requirements: *70303996984220
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70156487814240 !ruby/object:Gem::Requirement
+  requirement: &70303993293180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70156487814240
+  version_requirements: *70303993293180
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70156487813160 !ruby/object:Gem::Requirement
+  requirement: &70303993291280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70156487813160
+  version_requirements: *70303993291280
 description: gepub is a generic EPUB parser/generator. Generates and parse EPUB2 and
   EPUB3
 email: