gepub 0.6.9.2 → 0.7.0beta1

data/lib/gepub/package.rb

@@ -5,7 +5,7 @@ require 'forwardable'
 module GEPUB
   # Holds data in opf file.
   class Package
-    include XMLUtil
+    include XMLUtil, DSLUtil
     extend Forwardable
     attr_accessor :path, :metadata, :manifest, :spine, :bindings, :epub_backward_compat, :contents_prefix, :prefixes 
     def_delegators :@manifest, :item_by_href
@@ -15,6 +15,7 @@ module GEPUB
     }.flatten
     def_delegators :@metadata, :set_lastmodified
     def_delegators :@metadata, :lastmodified
+    def_delegators :@metadata, :modified_now
     def_delegators :@metadata, :rendition_layout
     def_delegators :@metadata, :rendition_layout=
     def_delegators :@metadata, :rendition_orientation
@@ -23,6 +24,8 @@ module GEPUB
     def_delegators :@metadata, :rendition_spread=
     def_delegators :@metadata, :ibooks_version
     def_delegators :@metadata, :ibooks_version=
+    def_delegators :@metadata, :ibooks_scroll_axis
+    def_delegators :@metadata, :ibooks_scroll_axis=
 
     def_delegators :@spine, :page_progression_direction=
     def_delegators :@spine, :page_progression_direction
@@ -121,8 +124,17 @@ module GEPUB
       |name|
       methodbase = name.gsub('-','_').sub('xml:lang', 'lang')
       define_method(methodbase + '=') { |val| @attributes[name] =  val }
-      define_method('set_' + methodbase) { |val| @attributes[name] = val }        
-      define_method(methodbase) { @attributes[name] }
+      define_method('set_' + methodbase) { |val|
+        warn "set_#{methodbase} is obsolete. use #{methodbase} instead."
+        @attributes[name] = val
+      }        
+      define_method(methodbase, ->(val=UNASSIGNED) {
+                      if unassigned?(val)
+                        @attributes[name]
+                      else
+                        send(methodbase + '=', val)
+                      end
+                    })
     }
 
     def [](x)
@@ -134,21 +146,20 @@ module GEPUB
     end
 
 
-    def identifier
-      @metadata.identifier_by_id(unique_identifier)
+    def identifier(identifier=UNASSIGNED)
+      if unassigned?(identifier)
+        @metadata.identifier_by_id(unique_identifier)
+      else
+        self.identifier=(identifier)
+      end
     end
     
     def identifier=(identifier)
-      set_primary_identifier(identifier, nil, nil)
+      primary_identifier(identifier, nil, nil)
     end
     
-    def set_main_id(identifier, id = nil, type = nil)
-      warn 'set_main_id is deprecated. use set_primary_identifier instead.'
-      set_primary_identifier(identifier, id, type)
-    end
-
-    def set_primary_identifier(identifier, id = nil, type = nil)
-      set_unique_identifier(id || @id_pool.generate_key(:prefix => 'BookId', :without_count => true))
+    def primary_identifier(identifier, id = nil, type = nil)
+      unique_identifier(id || @id_pool.generate_key(:prefix => 'BookId', :without_count => true))
       @metadata.add_identifier identifier, unique_identifier, type
     end
 
@@ -186,37 +197,19 @@ module GEPUB
       @manifest.item_list
     end
     
-    def author=(val)
-      warn 'author= is deprecated. please use #creator'
-      @metadata.creator= val
-    end
-
-    def author
-      warn '#author is deprecated. please use #creator'
-      @metadata.creator
-    end      
-
-    def specify_cover_image(item)
-      warn 'specify_cover_image is deprecated. please use Item#cover_image'
-      item.cover_image
-    end
-
-    def locale=(val)
-      warn 'locale= is deprecated. please use #language='
-      @metadata.language = val
-    end
-
-    def locale 
-      warn '#locale is deprecated. please use #language'
-      @metadata.language
-    end
-
-    #TODO maybe it should be 'epub_version'
-    def version
-      @attributes['version']
+    def version(val=UNASSIGNED)
+      if unassigned?(val)
+        @attributes['version']
+      else
+        @attributes['version'] = val
+        @metadata.opf_version = val
+        @manifest.opf_version = val
+        @spine.opf_version = val
+      end
     end
 
     def set_version(val)
+      warn 'set_version is obsolete: use verion instead.'
       @attributes['version'] = val
       @metadata.opf_version = val
       @manifest.opf_version = val
@@ -224,19 +217,9 @@ module GEPUB
     end
 
     def version=(val)
-      set_version(val)
+      version(val)
     end
     
-    def epub_version=(val)
-      warn 'epub_version= is deprecated. please use #version='
-      @attributes['version'] = val
-    end
-
-    def epub_version
-      warn 'epub_version is deprecated. please use #version'
-      version
-    end
-
     def enable_rendition
       @prefixes['rendition'] = 'http://www.idpf.org/vocab/rendition/#'
     end

data/lib/gepub/resource_builder.rb

@@ -30,14 +30,14 @@ module GEPUB
       @files_preprocess = {}
       current_wd = Dir.getwd
       Dir.chdir(attributes[:workdir]) unless attributes[:workdir].nil?
-      instance_eval &block
+      instance_eval(&block)
       Dir.chdir current_wd
       true
     end
 
     def ordered(&block)
       @book.ordered {
-        instance_eval &block
+        instance_eval(&block)
       }
     end
 

data/lib/gepub/version.rb

@@ -1,4 +1,4 @@
 module GEPUB
   # GEPUB gem version 
-  VERSION = "0.6.9.2"
+  VERSION = "0.7.0beta1"
 end

data/lib/gepub.rb

@@ -1,23 +1,5 @@
-if RUBY_VERSION < '1.9'
-  # hash.key
-  class Hash
-    def key(x)
-      index(x)
-    end
-  end
-  class String
-    def force_to_bin
-      self
-    end
-  end
-else
-  class String
-    def force_to_bin
-      force_encoding('us-ascii')
-    end
-  end
-end
 require 'gepub/version'
+require 'gepub/dsl_util'
 require 'gepub/xml_util'
 require 'gepub/meta'
 require 'gepub/datemeta'
@@ -27,6 +9,7 @@ require 'gepub/manifest'
 require 'gepub/spine'
 require 'gepub/bindings'
 require 'gepub/package'
+require 'gepub/mime'
 require 'gepub/item'
 require 'gepub/book'
 require 'gepub/builder_mixin'
@@ -37,3 +20,4 @@ require 'gepub/builder'
 
 
 
+

data/spec/book_spec.rb

@@ -29,30 +29,31 @@ describe GEPUB::Book do
     describe 'version=' do
       context 'overwrite version' do
         it 'will hold new version' do
-          book = GEPUB::Book.new()
-          book.version = '2.1'
-          expect(book.version).to eq('2.1')
+          GEPUB::Book.new do |book|
+            book.version = '2.1'
+            expect(book.version).to eq('2.1')
+          end
         end
       end
     end
     describe 'identifer=' do
       context 'set identifier' do
         it 'will set unique-identifier and related attributes' do
-          book = GEPUB::Book.new()
-          book.identifier = 'the-book-identifier'
-
-          expect(book.identifier).to eq('the-book-identifier')
-          expect(book.identifier_list[0]['id']).to eq(book.unique_identifier)
-          expect(book.identifier_list[0].refiner('identifier-type')).to be_nil
+          GEPUB::Book.new do |book|
+            book.identifier = 'the-book-identifier'
+            expect(book.identifier).to eq('the-book-identifier')
+            expect(book.identifier_list[0]['id']).to eq(book.unique_identifier)
+            expect(book.identifier_list[0].refiner('identifier-type')).to be_nil
+          end
         end
       end 
     end
-    describe 'set_primary_identifier=' do 
+    describe 'primary_identifier' do 
       context 'set identifier with id and type' do
         it 'will set unique-identifier and related attributes' do
-          book = GEPUB::Book.new()
-          book.set_primary_identifier 'http//example.com/the-identifier', 'MyBookID', 'URL'
-
+          book = GEPUB::Book.new do
+            primary_identifier 'http//example.com/the-identifier', 'MyBookID', 'URL'
+          end
           expect(book.identifier).to eq('http//example.com/the-identifier')
           expect(book.unique_identifier).to eq('MyBookID')
           expect(book.identifier_list[0]['id']).to eq('MyBookID')
@@ -230,12 +231,12 @@ describe GEPUB::Book do
       it 'set current time' do
         book = GEPUB::Book.new
         now = Time.now
-        book.set_lastmodified
+        book.modified_now
         expect((book.lastmodified.content - now).abs).to be < 2
       end
       it 'set time in string' do
         book = GEPUB::Book.new
-        book.set_lastmodified(Time.parse('2012-9-12 00:00:00Z'))
+        book.lastmodified(Time.parse('2012-9-12 00:00:00Z'))
         expect(book.lastmodified.content).to eq(Time.parse('2012-9-12 00:00:00 UTC'))
       end
     end

data/spec/builder_spec.rb

@@ -402,12 +402,31 @@ describe GEPUB::Builder do
           }
         }
       }
-      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'
+      xml =  builder.instance_eval{
+        Nokogiri::XML::Document.parse @book.opf_xml
+      }
+      expect(xml.root['prefix']).to eq 'ibooks: http://vocabulary.itunes.apple.com/rdf/ibooks/vocabulary-extensions-1.0/'
+      expect(xml.at_xpath("//xmlns:meta[@property='ibooks:version']").content).to eq '1.1.1'
+    end
+
+    it 'handle ibooks scroll-axis' do
+      workdir = File.join(File.dirname(__FILE__),'fixtures', 'builder')
+      builder = GEPUB::Builder.new {
+        ibooks_scroll_axis :vertical
+        resources(:workdir => workdir)  {
+          ordered {
+            file('text/cover.xhtml')
+            file('text/memo.txt')
+          }
+        }
       }
+      xml =  builder.instance_eval{
+        Nokogiri::XML::Document.parse @book.opf_xml
+      }
+      expect(xml.root['prefix']).to eq 'ibooks: http://vocabulary.itunes.apple.com/rdf/ibooks/vocabulary-extensions-1.0/'
+      expect(xml.at_xpath("//xmlns:meta[@property='ibooks:scroll-axis']").content).to eq 'vertical'
     end
+
     it 'should handle fallback chain' do
       workdir = File.join(File.dirname(__FILE__),'fixtures', 'builder')
       builder = GEPUB::Builder.new {
@@ -421,13 +440,13 @@ describe GEPUB::Builder do
           }
         }
       }
-      builder.instance_eval {
-        fallbackid = @book.item_by_href('chap3_docbook.xml').fallback
-        @book.items[fallbackid].href.should == 'chap3.xml'
-
-        fallbackid = @book.items[fallbackid].fallback
-        @book.items[fallbackid].href.should == 'chap3.xhtml'        
+      book = builder.instance_eval {
+        @book
       }
+      fallbackid = book.item_by_href('chap3_docbook.xml').fallback
+      expect(book.items[fallbackid].href).to eq 'chap3.xml'
+      fallbackid = book.items[fallbackid].fallback
+      expect(book.items[fallbackid].href).to eq 'chap3.xhtml'        
     end
 
     it 'should handle fallback chain with fallback_chain_files' do
@@ -438,13 +457,11 @@ describe GEPUB::Builder do
           fallback_chain_files({'chap3_docbook.xml' => nil}, {'chap3.xml' => nil}, {'chap3.xhtml' => nil})
         }
       }
-      builder.instance_eval {
-        fallbackid = @book.item_by_href('chap3_docbook.xml').fallback
-        @book.items[fallbackid].href.should == 'chap3.xml'
-
-        fallbackid = @book.items[fallbackid].fallback
-        @book.items[fallbackid].href.should == 'chap3.xhtml'        
-      }
+      book = builder.instance_eval { @book }
+      fallbackid = book.item_by_href('chap3_docbook.xml').fallback
+      expect(book.items[fallbackid].href).to eq 'chap3.xml'
+      fallbackid = book.items[fallbackid].fallback
+      expect(book.items[fallbackid].href).to eq 'chap3.xhtml'
     end
 
     it 'should handle fallback chain with fallback_chain_files in with_media_type' do
@@ -456,16 +473,15 @@ describe GEPUB::Builder do
           }
         }
       }
-      builder.instance_eval {
-        @book.item_by_href('chap3_docbook.xml').media_type.should == 'application/docbook+xml'
-        fallbackid = @book.item_by_href('chap3_docbook.xml').fallback
-        @book.items[fallbackid].href.should == 'chap3.xml'
-        @book.items[fallbackid].media_type.should == 'application/z3986-auth+xml'
+      book =  builder.instance_eval { @book }
+      expect(book.item_by_href('chap3_docbook.xml').media_type).to eq 'application/docbook+xml'
+      fallbackid = book.item_by_href('chap3_docbook.xml').fallback
+      expect(book.items[fallbackid].href).to eq 'chap3.xml'
+      expect(book.items[fallbackid].media_type).to eq 'application/z3986-auth+xml'
 
-        fallbackid = @book.items[fallbackid].fallback
-        @book.items[fallbackid].href.should == 'chap3.xhtml'        
-        @book.items[fallbackid].media_type.should == 'application/xhtml+xml'
-      }
+      fallbackid = book.items[fallbackid].fallback
+      expect(book.items[fallbackid].href).to eq 'chap3.xhtml'        
+      expect(book.items[fallbackid].media_type).to eq 'application/xhtml+xml'
     end
 
     it 'should handle fallback chain in spine' do
@@ -485,17 +501,15 @@ describe GEPUB::Builder do
           }
         }
       }
-      builder.instance_eval {
-        @book.cleanup
-        fallbackid = @book.item_by_href('chap3_docbook.xml').fallback
-        @book.items[fallbackid].href.should == 'chap3.xml'
-        fallbackid = @book.items[fallbackid].fallback
-        @book.items[fallbackid].href.should == 'chap3.xhtml'
+      book = builder.instance_eval { @book }
+      book.cleanup
+      fallbackid = book.item_by_href('chap3_docbook.xml').fallback
+      expect(book.items[fallbackid].href).to eq 'chap3.xml'
+      fallbackid = book.items[fallbackid].fallback
+      expect(book.items[fallbackid].href).to eq 'chap3.xhtml'
 
-        @book.spine_items.size.should == 1
-        @book.spine_items[0].href == 'chap3_docbook.xhtml'
-
-      }
+      expect(book.spine_items.size).to eq 1
+      book.spine_items[0].href == 'chap3_docbook.xhtml'
     end
 
     it 'should create remote-resources' do
@@ -511,7 +525,7 @@ describe GEPUB::Builder do
     end
 
     it 'should handle remote resource URL' do
-      builder = GEPUB::Builder.new {
+      GEPUB::Builder.new {
         unique_identifier 'uid'
         resources {
           file 'http://foo.bar'

data/spec/example_spec.rb

@@ -35,11 +35,7 @@ describe 'GEPUB usage' do
       }
       epubname = File.join(File.dirname(__FILE__), 'example_test_with_builder_buffer.epub')
       File.open(epubname, 'wb') { |io| io.write builder.generate_epub_stream.string }
-      jar = File.join(File.dirname(__FILE__), 'fixtures/epubcheck-3.0.1/epubcheck-3.0.1.jar')    
-      @stdout = capture(:stdout) do 
-        puts %x(java -jar #{jar} #{epubname})
-      end
-      expect(@stdout).to include("No errors or warnings detected.")
+      epubcheck(epubname)
     end
 
     it 'should generate simple EPUB3 with Builder' do
@@ -70,16 +66,12 @@ describe 'GEPUB usage' do
       }
       epubname = File.join(File.dirname(__FILE__), 'example_test_with_builder.epub')
       builder.generate_epub(epubname)
-      jar = File.join(File.dirname(__FILE__), 'fixtures/epubcheck-3.0.1/epubcheck-3.0.1.jar')    
-      @stdout = capture(:stdout) do 
-        puts %x(java -jar #{jar} #{epubname})
-      end
-      expect(@stdout).to include("No errors or warnings detected.")
+      epubcheck(epubname)
     end
 
     it 'should generate simple EPUB3 with rather complicated matadata' do
       book = GEPUB::Book.new
-      book.set_primary_identifier('http:/example.jp/bookid_in_url', 'BookID', 'URL')
+      book.primary_identifier('http:/example.jp/bookid_in_url', 'BookID', 'URL')
       book.language = 'ja'
 
       # you can add metadata and its property using block
@@ -94,16 +86,16 @@ describe 'GEPUB usage' do
                              'th' => 'GEPUB ตัวอย่าง (ญี่ปุ่น)')
       }
       # you can do the same thing using method chain
-      book.add_title('これはあくまでサンプルです',nil, GEPUB::TITLE_TYPE::SUBTITLE).set_display_seq(2).add_alternates('en' => 'this book is just a sample.')
+      book.add_title('これはあくまでサンプルです',nil, GEPUB::TITLE_TYPE::SUBTITLE).display_seq(2).add_alternates('en' => 'this book is just a sample.')
       book.add_creator('小嶋智') {
         |creator|
         creator.display_seq = 1
         creator.add_alternates('en' => 'KOJIMA Satoshi')
       }
-      book.add_contributor('電書部').set_display_seq(1).add_alternates('en' => 'Denshobu')
-      book.add_contributor('アサガヤデンショ').set_display_seq(2).add_alternates('en' => 'Asagaya Densho')
-      book.add_contributor('湘南電書鼎談').set_display_seq(3).add_alternates('en' => 'Shonan Densho Teidan')
-      book.add_contributor('電子雑誌トルタル').set_display_seq(4).add_alternates('en' => 'eMagazine Torutaru')
+      book.add_contributor('電書部').display_seq(1).add_alternates('en' => 'Denshobu')
+      book.add_contributor('アサガヤデンショ').display_seq(2).add_alternates('en' => 'Asagaya Densho')
+      book.add_contributor('湘南電書鼎談').display_seq(3).add_alternates('en' => 'Shonan Densho Teidan')
+      book.add_contributor('電子雑誌トルタル').display_seq(4).add_alternates('en' => 'eMagazine Torutaru')
 
       imgfile = File.join(File.dirname(__FILE__),  'fixtures', 'testdata', 'image1.jpg')
       book.add_item('img/image1.jpg',imgfile).cover_image
@@ -116,11 +108,7 @@ describe 'GEPUB usage' do
       }
       epubname = File.join(File.dirname(__FILE__), 'example_test.epub')
       book.generate_epub(epubname)
-      jar = File.join(File.dirname(__FILE__), 'fixtures/epubcheck-3.0.1/epubcheck-3.0.1.jar')    
-      @stdout = capture(:stdout) do 
-        puts %x(java -jar #{jar} #{epubname})
-      end
-      expect(@stdout).to include("No errors or warnings detected.")
+      epubcheck(epubname)
     end
   end
 end

data/spec/gepub_spec.rb

@@ -168,12 +168,7 @@ EOF
   it "should generate correct epub" do
     epubname = File.join(File.dirname(__FILE__), 'testepub.epub')
     @book.generate_epub(epubname)
-    jar = File.join(File.dirname(__FILE__), 'fixtures/epubcheck-3.0.1/epubcheck-3.0.1.jar')
-    @stdout = capture(:stdout) do 
-      puts %x(java -jar #{jar} #{epubname})
-    end
-    expect(@stdout).to include("No errors or warnings detected.")
-
+    epubcheck(epubname)
   end
   it "should generate correct epub with buffer" do
     epubname = File.join(File.dirname(__FILE__), 'testepub_buf.epub')
@@ -181,12 +176,7 @@ EOF
       |io|
       io.write @book.generate_epub_stream.string
     }
-    jar = File.join(File.dirname(__FILE__), 'fixtures/epubcheck-3.0.1/epubcheck-3.0.1.jar')
-    @stdout = capture(:stdout) do 
-      puts %x(java -jar #{jar} #{epubname})
-    end
-    expect(@stdout).to include("No errors or warnings detected.")
-
+    epubcheck(epubname)
   end
 
   it "should generate correct epub2.0" do
@@ -207,21 +197,12 @@ EOF
                                    'c2')
     item2.toc_text 'test chapter'
     @book.generate_epub(epubname)
-    jar = File.join(File.dirname(__FILE__), 'fixtures/epubcheck-3.0.1/epubcheck-3.0.1.jar')
-    @stdout = capture(:stdout) do 
-      puts %x(java -jar #{jar} #{epubname})
-    end
-    expect(@stdout).to include("No errors or warnings detected.")
-
+    epubcheck(epubname)
   end
   it 'should generate epub with extra file' do
     epubname = File.join(File.dirname(__FILE__), 'testepub3.epub')
     @book.add_optional_file('META-INF/foobar.xml', StringIO.new('<foo></foo>'))
     @book.generate_epub(epubname)
-    jar = File.join(File.dirname(__FILE__), 'fixtures/epubcheck-3.0.1/epubcheck-3.0.1.jar')
-    @stdout = capture(:stdout) do 
-      puts %x(java -jar #{jar} #{epubname})
-    end
-    expect(@stdout).to include("No errors or warnings detected.")
+    epubcheck(epubname)
   end
 end

data/spec/metadata_spec.rb

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-p# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'rubygems'
 require 'nokogiri'
@@ -49,9 +48,9 @@ describe GEPUB::Metadata do
 
     it 'should parse OPF2.0 meta node' do
       expect(@metadata.oldstyle_meta.size).to eq(1)
-      @metadata.oldstyle_meta[0].name == 'meta'
-      @metadata.oldstyle_meta[0]['name'] == 'cover'
-      @metadata.oldstyle_meta[0]['content'] == 'cover-image'
+      expect(@metadata.oldstyle_meta[0].name).to eq 'meta'
+      expect(@metadata.oldstyle_meta[0]['name']).to eq 'cover'
+      expect(@metadata.oldstyle_meta[0]['content']).to eq 'cover-image'
     end
   end
 
@@ -65,9 +64,9 @@ describe GEPUB::Metadata do
     end
     it 'should parse OPF2.0 meta node' do
       expect(@metadata.oldstyle_meta.size).to eq(1)
-      @metadata.oldstyle_meta[0].name == 'meta'
-      @metadata.oldstyle_meta[0]['name'] == 'cover'
-      @metadata.oldstyle_meta[0]['content'] == 'cover-image'
+      expect(@metadata.oldstyle_meta[0].name).to eq 'meta'
+      expect(@metadata.oldstyle_meta[0]['name']).to eq 'cover'
+      expect(@metadata.oldstyle_meta[0]['content']).to eq 'cover-image'
     end
   end
   
@@ -103,7 +102,7 @@ describe GEPUB::Metadata do
     it 'should write and read multipletitle with type' do
       metadata = GEPUB::Metadata.new
       metadata.add_title('The Main Title', 'maintitle', GEPUB::TITLE_TYPE::MAIN)
-      metadata.add_title('The Book Series', 'series', GEPUB::TITLE_TYPE::COLLECTION).set_group_position(1)
+      metadata.add_title('The Book Series', 'series', GEPUB::TITLE_TYPE::COLLECTION).group_position(1)
       expect(metadata.title.to_s).to eq('The Main Title')
       expect(metadata.title.title_type.to_s).to eq('main')
 
@@ -114,7 +113,7 @@ describe GEPUB::Metadata do
 
     it 'should handle alternate-script metadata of creator, not using method chain' do
       metadata = GEPUB::Metadata.new
-      metadata.add_creator('TheCreator', 'author', 'aut').set_display_seq(1).set_file_as('Creator, The').add_alternates({ 'ja-JP' => '作成者' })
+      metadata.add_creator('TheCreator', 'author', 'aut').display_seq(1).file_as('Creator, The').add_alternates({ 'ja-JP' => '作成者' })
       expect(metadata.creator.to_s).to eq('TheCreator')
       expect(metadata.creator.to_s('ja')).to eq('作成者')
     end
@@ -154,6 +153,14 @@ describe GEPUB::Metadata do
       expect(metadata.date.to_s).to eq('2012-02-27T20:00:00Z')
     end
 
+    it 'should handle date with Time object by content = ' do
+      metadata = GEPUB::Metadata.new
+      a = Time.parse '2012-02-27 20:00:00 UTC'
+      metadata.add_date('2011-01-01', 'date')
+      metadata.date.content = a
+      expect(metadata.date.to_s).to eq('2012-02-27T20:00:00Z')
+    end
+
     it 'should handle date with a not W3C-DTF string' do
       metadata = GEPUB::Metadata.new
       metadata.add_date('2012-02-28 05:00:00 +0900', 'date')
@@ -173,7 +180,7 @@ describe GEPUB::Metadata do
 
     it 'should generate metadata with creator refiner' do
       metadata = GEPUB::Metadata.new
-      metadata.add_creator('TheCreator', nil, 'aut').set_display_seq(1).set_file_as('Creator, The').add_alternates({ 'ja-JP' => '作成者' })
+      metadata.add_creator('TheCreator', nil, 'aut').display_seq(1).file_as('Creator, The').add_alternates({ 'ja-JP' => '作成者' })
       builder = Nokogiri::XML::Builder.new { |xml|
         xml.package('xmlns' => "http://www.idpf.org/2007/opf",'version' => "3.0",'unique-identifier' => "pub-id",'xml:lang' => "ja") {
           metadata.to_xml(xml)
@@ -191,7 +198,7 @@ describe GEPUB::Metadata do
 
     it 'should generate metadata with old style meta tag' do
       metadata = GEPUB::Metadata.new
-      metadata.add_creator('TheCreator', nil, 'aut').set_display_seq(1).set_file_as('Creator, The').add_alternates({ 'ja-JP' => '作成者' })
+      metadata.add_creator('TheCreator', nil, 'aut').display_seq(1).file_as('Creator, The').add_alternates({ 'ja-JP' => '作成者' })
       metadata.add_oldstyle_meta(nil, { 'name' => 'cover', 'content' => 'cover.jpg' })
       builder = Nokogiri::XML::Builder.new { |xml|
         xml.package('xmlns' => "http://www.idpf.org/2007/opf",'version' => "3.0",'unique-identifier' => "pub-id",'xml:lang' => "ja") {