gepub 0.6.8.9 → 0.6.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0842819d24c9387921014eea4c75e30a5ecbd28
-  data.tar.gz: 3210ee8a74fb4e95e00fe82798dddbcd5b12f5f5
+  metadata.gz: 2840238e6aba48557afd114e5aa9fe928429a821
+  data.tar.gz: abe8e9d1089ebe5c49f6b1ba33244a15477d816c
 SHA512:
-  metadata.gz: 6953ffea49755dda0d1529398ffacdfeadfd1b33085a1e25763e4e569e8fe2d3f50f5180ae7922c1a2e72d1406ef120c49be3cbf0aac63a57b85ce75f69efeca
-  data.tar.gz: ad37f2937b7e8cea8ee11259dc2edc074ef3c52ffcf401f22a4f24268063a7b0029a15085368aeb2735710f3aeb18cf38fc65a1f06d1f942ff0a13456e3bc520
+  metadata.gz: f0996df2489524bfcfbeaf277328d959545ed6ab9a8fa532228cdda0e57a7f38c9e87ddb2778a5a5d54811de5c9200a751f35797a3f1b2d6cc5792693bc5b0ed
+  data.tar.gz: 7160c790cb89236d70c467a2df05fe106894c4df43e2d32b06e16c8f23bff7bd0335a264ce463df0faa7ddb13c8b8802dfc2c0a92bc19843abe252da34b010c3

data/lib/gepub/builder.rb

@@ -265,7 +265,10 @@ module GEPUB
       raise assert unless ['rtl', 'ltr', 'default'].member? val
       @book.page_progression_direction = val
     end
-    
+    # specify version for ibooks
+    def ibooks_version(val)
+      @book.ibooks_version=val
+    end
     # set optional file.
     # val should be String or Hash.
     # if val is String, file is read from the File specified by string and stored in EPUB to the path specified by string.

data/lib/gepub/metadata.rb

@@ -46,7 +46,10 @@ module GEPUB
               @orientation = metanode
             when 'rendition:spread'
               @spread = metanode
+            when 'ibooks:version'
+              @ibooks_version = metanode
             end
+
           }
         }
       }
@@ -62,10 +65,11 @@ module GEPUB
       @namespaces['xmlns:opf'] = OPF_NS if @opf_version.to_f < 3.0
       @default_layout = 'reflowable'
       @default_orientation = 'auto'
-      @spread = 'auto'
+      @default_spread = 'auto'
       @layout = NilContent
       @orientation = NilContent
       @spread = NilContent
+      @ibooks_version = NilContent
       yield self if block_given?
     end
 
@@ -285,6 +289,23 @@ module GEPUB
       @spread = Meta.new('meta', val, self, { 'property' => 'rendition:spread' })
       (@content_nodes['meta'] ||= []) << @spread
     end
+
+    def ibooks_version
+      @ibooks_version.content || ''
+    end
+
+    def ibooks_version=(val)
+      @ibooks_version = Meta.new('meta', val, self, { 'property' => 'ibooks:version' })
+      (@content_nodes['meta'] ||= []) << @ibooks_version
+    end
+    
+    def rendition_specified?
+      @layout.content || @orientation.content || @spread.content
+    end
+
+    def ibooks_vocaburaly_specified?
+      @ibooks_version.content
+    end
     
     private
     def parse_node(ns, node)

data/lib/gepub/package.rb

@@ -21,6 +21,8 @@ module GEPUB
     def_delegators :@metadata, :rendition_orientation=
     def_delegators :@metadata, :rendition_spread
     def_delegators :@metadata, :rendition_spread=
+    def_delegators :@metadata, :ibooks_version
+    def_delegators :@metadata, :ibooks_version=
 
     def_delegators :@spine, :page_progression_direction=
     def_delegators :@spine, :page_progression_direction
@@ -242,6 +244,14 @@ module GEPUB
     def rendition_enabled?
       @prefixes['rendition'] == 'http://www.idpf.org/vocab/rendition/#'      
     end
+
+    def enable_ibooks_vocabulary
+      @prefixes['ibooks'] = 'http://vocabulary.itunes.apple.com/rdf/ibooks/vocabulary-extensions-1.0/'
+    end
+
+    def ibooks_vocabulary_enabled?
+      @prefixes['ibooks'] == 'http://vocabulary.itunes.apple.com/rdf/ibooks/vocabulary-extensions-1.0/'
+    end
     
     def opf_xml
       if version.to_f < 3.0 || @epub_backward_compat
@@ -259,6 +269,13 @@ module GEPUB
           }
         end
       end
+      if @metadata.rendition_specified? || @spine.rendition_specified? 
+        enable_rendition
+      end
+      if @metadata.ibooks_vocaburaly_specified?
+        enable_ibooks_vocabulary
+      end
+
       builder = Nokogiri::XML::Builder.new {
         |xml|
         if @prefixes.size == 0

data/lib/gepub/spine.rb

@@ -46,8 +46,13 @@ module GEPUB
         add_property 'page-spread-left'
       end
 
+      def rendition_specified?
+        @rendition_specified
+      end
+
       def set_rendition_param(name, val)
         add_property "rendition:#{name}-#{val}"
+        @rendition_specified = true
       end
 
       def rendition_layout=(val)
@@ -127,6 +132,10 @@ module GEPUB
     def <<(item)
       push item
     end
+
+    def rendition_specified?
+      @item_refs.select { |itemref| itemref.rendition_specified? }.size > 0
+    end
     
     def to_xml(builder)
       builder.spine(@attributes) {

data/lib/gepub/version.rb

@@ -1,4 +1,4 @@
 module GEPUB
   # GEPUB gem version 
-  VERSION = "0.6.8.9"
+  VERSION = "0.6.9.0"
 end

data/spec/builder_spec.rb

@@ -373,8 +373,29 @@ describe GEPUB::Builder do
       builder.instance_eval{ @book.spine.itemref_list[1].properties[0] }.should == 'rendition:layout-pre-paginated'
       builder.instance_eval{ @book.spine.itemref_list[1].properties[1] }.should == 'rendition:orientation-landscape'
       builder.instance_eval{ @book.spine.itemref_list[1].properties[2] }.should == 'rendition:spread-both'
+      builder.instance_eval{
+        xml = Nokogiri::XML::Document.parse @book.opf_xml
+        xml.root['prefix'].should == 'rendition: http://www.idpf.org/vocab/rendition/#'
+      }
     end
 
+    it 'whould handle ibooks version' do
+      workdir = File.join(File.dirname(__FILE__),'fixtures', 'builder')
+      builder = GEPUB::Builder.new {
+        ibooks_version '1.1.1'
+        resources(:workdir => workdir)  {
+          ordered {
+            file('text/cover.xhtml')
+            file('text/memo.txt')
+          }
+        }
+      }
+      builder.instance_eval{
+        xml = Nokogiri::XML::Document.parse @book.opf_xml
+        xml.root['prefix'].should == 'ibooks: http://vocabulary.itunes.apple.com/rdf/ibooks/vocabulary-extensions-1.0/'
+        xml.at_xpath("//xmlns:meta[@property='ibooks:version']").content.should == '1.1.1'
+      }
+    end
     it 'should handle fallback chain' do
       workdir = File.join(File.dirname(__FILE__),'fixtures', 'builder')
       builder = GEPUB::Builder.new {

data/spec/package_spec.rb

@@ -94,11 +94,22 @@ describe GEPUB::Package do
         package.rendition_spread = 'landscape'
       end
       xml = Nokogiri::XML::Document.parse package.opf_xml
+      xml.root['prefix'].should == 'rendition: http://www.idpf.org/vocab/rendition/#'
       xml.at_xpath("//xmlns:meta[@property='rendition:layout']").content.should == 'pre-paginated'
       xml.at_xpath("//xmlns:meta[@property='rendition:orientation']").content.should == 'portlait'
       xml.at_xpath("//xmlns:meta[@property='rendition:spread']").content.should == 'landscape'
     end
 
+    it 'should handle ibooks version' do
+      package = GEPUB::Package.new('OEBPS/package.opf') do
+        |package|
+        package.ibooks_version = '1.1.1'
+      end
+      xml = Nokogiri::XML::Document.parse package.opf_xml
+      xml.root['prefix'].should == 'ibooks: http://vocabulary.itunes.apple.com/rdf/ibooks/vocabulary-extensions-1.0/'
+      xml.at_xpath("//xmlns:meta[@property='ibooks:version']").content.should == '1.1.1'
+    end
+    
     it 'should generate opf2.0' do
       opf = GEPUB::Package.new('OEBPS/package.opf', { 'version' => '2.0'}) {
         |opf|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gepub
 version: !ruby/object:Gem::Version
-  version: 0.6.8.9
+  version: 0.6.9.0
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec