gepub 0.7.1 → 1.0.0beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4bd8231fb2f42f3d42f2909605224d3ac30b9ccc52736fc158d1340810e5b3
-  data.tar.gz: f6834698805f386ce33b3eff1cba78de141e1f98ee2a9b5f3ee4ea9d588681c3
+  metadata.gz: b309e48823e6ba81b9ec3d9082cb3be3e0f0198352ad439ba422234a0ab905f2
+  data.tar.gz: 2558196c081bd7cd71d70c912213820879b1f5d6df3ad96b6b39899d23213a14
 SHA512:
-  metadata.gz: 5650ce85cec97fec3aa6da1031c15c8042a0f44008bdabd3b9f54936de48ddee6066b1e67bc1dc791e7259f13bb4f5120dba61587bdbbe7247e26106cee97fa6
-  data.tar.gz: 0d30aafeb4f8cd0d5a1b8f3ca239aa5a18142c7b8c00135dfcba7f1d7034bfad87f072b57cc6ccc6cba0d2601863ae3f691594de468c93acc0f05400efd050a9
+  metadata.gz: 3ac54805a6b2582cbefa12655fd0c7d27801f16608c70b9355b81b6d6e623ffe0b94ed3f95a4bc4acc58b69d09476551a43d9f3926c42f0d59c1fc80cdea3ec9
+  data.tar.gz: d05593c50c03ae43a6a644b7a7ac2c2a9239025f35cfc09adb2dbb61729633ec5456d426cf1bd4e83624dd14d04e9b5a3cfb2d93d7eac43ce16a7acddd7d5e45

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.4.4  
-  - 2.5.1
+  - 2.4.5  
+  - 2.5.3
 script: bundle exec rake spec

data/Rakefile

@@ -2,7 +2,7 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require 'rdoc/task'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec => :generate_code)
 
 task :default => :spec
 
@@ -11,3 +11,11 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = "rdoc"
   rdoc.rdoc_files.include("README.md", "lib/**/*.rb")
 end
+
+# also generates 'lib/gepub/book_add_item.rb' 
+file 'lib/gepub/metadata_add.rb' => 'tools/generate_function.rb' do
+	sh %Q(ruby tools/generate_function.rb)
+end
+
+desc 'auto generate code'
+task :generate_code => ['lib/gepub/metadata_add.rb'] 

data/examples/generate_example.rb

@@ -7,7 +7,7 @@ book.primary_identifier('http://example.jp/bookid_in_url', 'BookID', 'URL')
 book.language = 'ja'
 
 # you can add metadata and its property using block
-book.add_title('GEPUBサンプル文書', nil, GEPUB::TITLE_TYPE::MAIN) {
+book.add_title('GEPUBサンプル文書', title_type: GEPUB::TITLE_TYPE::MAIN) {
   |title|
   title.lang = 'ja'
   title.file_as = 'GEPUB Sample Book'
@@ -18,7 +18,7 @@ book.add_title('GEPUBサンプル文書', nil, GEPUB::TITLE_TYPE::MAIN) {
                        'th' => 'GEPUB ตัวอย่าง (ญี่ปุ่น)')
 }
 # you can do the same thing using method chain
-book.add_title('これはあくまでサンプルです',nil, GEPUB::TITLE_TYPE::SUBTITLE).display_seq(1).add_alternates('en' => 'this book is just a sample.')
+book.add_title('これはあくまでサンプルです', title_type: GEPUB::TITLE_TYPE::SUBTITLE).display_seq(1).add_alternates('en' => 'this book is just a sample.')
 book.add_creator('小嶋智') {
   |creator|
   creator.display_seq = 1

data/lib/gepub/book.rb

@@ -42,9 +42,9 @@ module GEPUB
   # same as identifier=, but can specify id (in the opf xml) and identifier type(i.e. URL, uuid, ISBN, etc)
   # === Book#add_identifier(string, id, type=nil) (delegated to Metadata#add_identifier)
   # Set an identifier metadata. It it not unique-identifier in opf. Many EPUB files do not set identifier other than unique-identifier.
-  # === Book#add_title(content, id = nil, title_type = nil) (delegated to Metadata#add_title)
+  # === Book#add_title(content, id: nil, title_type: nil) (delegated to Metadata#add_title)
   # add title metadata. title_type candidates is defined in TITLE_TYPES.
-  # === Book#set_title(content, id = nil, title_type = nil) (delegated to Metadata#set_title)
+  # === Book#title(content, id = nil, title_type = nil) (delegated to Metadata#title)
   # clear all titles and then add title.
   # === Book#title (delegated to Metadata)
   # returns 'main' title Meta object. 'main' title is determined by this order:
@@ -79,7 +79,7 @@ module GEPUB
   # === Book#lastmodified (delegated to Metadata#lastmodified)
   # returns Meta object contains last modified time.
   # === setting and reading other metadata: publisher, language, coverage, date, description, format, relation, rights, source, subject, type (delegated to Metadata)
-  # they all have methods like: publisher(which returns 'main' publisher), add_publisher(content, id) (which add publisher), set_publisher or publisher= (clears and set publisher), and publisher_list(returns publisher Meta object in display-seq order). 
+  # they all have methods like: publisher(which returns 'main' publisher), add_publisher(content, id) (which add publisher), publisher= (clears and set publisher), and publisher_list(returns publisher Meta object in display-seq order). 
   # === Book#page_progression_direction= (delegated to Spine#page_progression_direction=)
   # set page-proression-direction attribute to spine.
 
@@ -167,23 +167,6 @@ module GEPUB
                                
     end
     
-    # add an item(i.e. html, images, audios, etc)  to Book.
-    # the added item will be referenced by the first argument in the EPUB container.
-    def add_item(href, io_or_filename = nil, id = nil, attributes = {})
-      item = @package.add_item(href,nil,id,attributes)
-      set_singleton_methods_to_item(item)
-      item.add_content io_or_filename unless io_or_filename.nil?
-      item
-    end
-
-    # same as add_item, but the item will be added to spine of the EPUB.
-    def add_ordered_item(href, io_or_filename = nil, id = nil, attributes = {})
-      item = @package.add_ordered_item(href,io_or_filename,id,attributes)
-      set_singleton_methods_to_item(item)
-      yield item if block_given?
-      item
-    end
-
 
     # get handler item which defined in bindings for media type, 
     def get_handler_of(media_type)
@@ -279,7 +262,7 @@ EOF
     end
       
     def generate_nav_doc(title = 'Table of Contents')
-      add_item('nav.xhtml', StringIO.new(nav_doc(title)), 'nav').add_property('nav')
+      add_item('nav.xhtml', id: 'nav', content: StringIO.new(nav_doc(title))).add_property('nav')
     end
     
     def nav_doc(title = 'Table of Contents')
@@ -422,7 +405,7 @@ EOF
           if (@toc.size == 0)
             @toc << { :item => @package.manifest.item_list[@package.spine.itemref_list[0].idref] }
           end
-          add_item('toc.ncx', StringIO.new(ncx_xml), 'ncx')
+          add_item('toc.ncx', id: 'ncx', content: StringIO.new(ncx_xml))
         end
       end
     end
@@ -443,5 +426,51 @@ EOF
         }.reject(&:nil?)
       end
     end
+
+    private
+
+    def add_item_internal(href, content: nil, item_attributes: , attributes: {}, ordered: )
+      id = item_attributes.delete(:id)
+      item = 
+        if ordered
+          @package.add_ordered_item(href,attributes: attributes, id:id, content: content)
+        else
+          @package.add_item(href, attributes: attributes, id: id, content: content)
+        end
+      set_singleton_methods_to_item(item)
+      item_attributes.each do |attr, val|
+        next if val.nil?
+        method_name = if attr == :toc_text
+                        attr.to_s
+                      else
+                        "add_" + attr.to_s
+                      end
+        item.send(method_name, val)
+      end
+      item
+    end
+
+    def handle_deprecated_add_item_arguments(deprecated_content, deprecated_id, deprecated_attributes, content, id, attributes) 
+      if deprecated_content
+        msg = 'deprecated argument; use content keyword argument instead of 2nd argument' 
+        fail msg if content
+        warn msg
+        content = deprecated_content
+      end
+      if deprecated_id
+        msg = 'deprecated argument; use id keyword argument instead of 3rd argument' 
+        fail msg if id
+        warn msg
+        id = deprecated_id
+      end
+      if deprecated_attributes
+        msg = 'deprecated argument; use argument keyword attributes instead of 4th argument' 
+        fail msg if attributes.size > 0
+        warn msg
+        attributes = deprecated_attributes
+      end
+      return content, id, attributes
+    end
+
   end
 end

data/lib/gepub/book_add_item.rb

@@ -0,0 +1,20 @@
+module GEPUB
+  class Book
+    # add an item(i.e. html, images, audios, etc)  to Book.
+    # the added item will be referenced by the first argument in the EPUB container.
+    def add_item(href, deprecated_content = nil, deprecated_id = nil, deprecated_attributes = nil, content: nil, 
+                 id: nil,media_type: nil,fallback: nil,properties: nil,media_overlay: nil,toc_text: nil,
+                 attributes: {})
+      content, id, attributes = handle_deprecated_add_item_arguments(deprecated_content, deprecated_id, deprecated_attributes, content, id, attributes)
+      add_item_internal(href, content: content, item_attributes: { id: id,media_type: media_type,fallback: fallback,properties: properties,media_overlay: media_overlay,toc_text: toc_text }, attributes: attributes, ordered: false)
+    end
+
+    # same as add_item, but the item will be added to spine of the EPUB.
+    def add_ordered_item(href, deprecated_content = nil, deprecated_id = nil, deprecated_attributes = nil,  content:nil,
+                         id: nil,media_type: nil,fallback: nil,properties: nil,media_overlay: nil,toc_text: nil,
+                         attributes: {})
+      content, id, attributes = handle_deprecated_add_item_arguments(deprecated_content, deprecated_id, deprecated_attributes, content, id, attributes)
+      add_item_internal(href, content: content, item_attributes: { id: id,media_type: media_type,fallback: fallback,properties: properties,media_overlay: media_overlay,toc_text: toc_text }, attributes: attributes, ordered: true)
+    end
+  end
+end

data/lib/gepub/builder.rb

@@ -208,17 +208,17 @@ module GEPUB
         methodname = type
       end
       if methodname != "collection"
-        define_method(methodname) { |val| @last_defined_item = MetaItem.new(@book.add_title(val, nil, type)) }
+        define_method(methodname) { |val| @last_defined_item = MetaItem.new(@book.add_title(val, title_type: type)) }
       end
     }
 
     def collection(val, count = 1)
       @last_defined_item =
-        MetaItem.new(@book.add_title(val, nil, GEPUB::TITLE_TYPE::COLLECTION).group_position(count.to_s))
+        MetaItem.new(@book.add_title(val, title_type: GEPUB::TITLE_TYPE::COLLECTION).group_position(count.to_s))
     end
 
     def creator(val, role = 'aut')
-      MetaItem.new(@book.add_creator(val, nil, role))
+      MetaItem.new(@book.add_creator(val, role: role))
     end
 
     def creators(*vals)
@@ -227,7 +227,7 @@ module GEPUB
         name = v
         role = 'aut'
         name,role = v[0], v[1] if Array === name
-        MetaItem.new(@book.add_creator(name, nil, role))
+        MetaItem.new(@book.add_creator(name, role: role))
       }
     end
 
@@ -237,14 +237,14 @@ module GEPUB
         name = v
         role = nil
         name,role = v[0], v[1] if Array === name
-        MetaItem.new(@book.add_contributor(name, nil, role))
+        MetaItem.new(@book.add_contributor(name, role: role))
       }
     end
 
     def publishers(*vals)
       @last_defined_item = vals.map {
         |v|
-        MetaItem.new(@book.add_publisher(v, nil))
+        MetaItem.new(@book.add_publisher(v))
       }
     end
 
@@ -261,7 +261,7 @@ module GEPUB
     end
     
     def contributor(val, role = nil)
-      MetaItem.new(@book.add_contributor(val, nil, role))
+      MetaItem.new(@book.add_contributor(val, role: role))
     end
 
     # set page progression direction.

data/lib/gepub/item.rb

@@ -29,10 +29,10 @@ module GEPUB
       self
     end
 
-    ['id', 'href', 'media-type', 'fallback', 'properties', 'media-overlay'].each { |name|
+    ATTRIBUTES = ['id', 'href', 'media-type', 'fallback', 'properties', 'media-overlay'].each { |name|
       methodbase = name.sub('-','_')
       define_method(methodbase + '=') { |val| @attributes[name] = val }
-      define_method('set_' + methodbase) { |val| @attributes[name] = val }
+      define_method('set_' + methodbase) { |val| @attributes[name] = val; self }
       define_method(methodbase) { @attributes[name] }
     }
 
@@ -110,6 +110,7 @@ module GEPUB
     def add_raw_content(data)
       @content = data
       guess_content_property
+      self
     end
 
     # add content form io or file to the item

data/lib/gepub/meta.rb

@@ -62,7 +62,7 @@ module GEPUB
       self
     end
 
-    ['title-type', 'identifier-type', 'display-seq', 'file-as', 'group-position', 'role'].each {
+    REFINERS = ['title-type', 'identifier-type', 'display-seq', 'file-as', 'group-position', 'role'].each {
       |name|
       methodbase = name.sub('-','_')
       define_method(methodbase + '=') { |val| refine(name, val) }
@@ -114,8 +114,14 @@ module GEPUB
         @attributes['id'] = id_pool.generate_key(:prefix => name) if @attributes['id'].nil?
       end
 
-      # using eval to parametarize Namespace and content.
-      eval "builder#{ ns.nil? || @name == 'meta' ? '' : '[ns]'}.#{@name}(@attributes.reject{|k,v| v.nil?}.merge(additional_attr)#{@content.nil? ? '' : ',  self.to_s'})"
+      # using __send__ to parametarize Namespace and content.
+      target = ns.nil? || @name == 'meta' ? builder : builder[ns]
+      attr = @attributes.reject{|k,v| v.nil?}.merge(additional_attr)
+      if @content.nil?
+        target.__send__(@name, attr)
+      else
+        target.__send__(@name, attr, self.to_s)
+      end
 
       if @refiners.size > 0 && opf_version.to_f >= 3.0
         additional_attr['refines'] = "##{@attributes['id']}"

data/lib/gepub/metadata.rb

@@ -109,52 +109,6 @@ module GEPUB
       @oldstyle_meta = []
     end
     
-    CONTENT_NODE_LIST = ['identifier', 'title', 'language', 'contributor', 'creator', 'coverage', 'date','description','format','publisher','relation','rights','source','subject','type'].each {
-      |node|
-      define_method(node + '_list') { @content_nodes[node].dup.sort_as_meta }
-      define_method(node + '_clear') {
-        if !@content_nodes[node].nil?
-          @content_nodes[node].each { |x| unregister_meta(x) };
-          @content_nodes[node] = []
-        end
-      }
-
-      next if node == 'title'
-
-      define_method(node, ->(content=UNASSIGNED, id=nil) {
-                      if unassigned?(content)
-                        get_first_node(node)
-                      else
-                        send(node + "_clear")
-                        add_metadata(node, content, id)
-                      end
-                    })
-
-      define_method('set_' + node) {
-        |content, id|
-        warn "obsolete : set_#{node}. use #{node} instead."
-        send(node + "_clear")
-        add_metadata(node, content, id)
-      }
-      
-      define_method(node+'=') {
-        |content|
-        send(node + "_clear")
-        if node == 'date'
-          add_date(content, nil)
-        else
-          add_metadata(node, content, nil)
-        end
-      }
-
-      next if ["identifier", "date", "creator", "contributor"].include?(node)
-
-      define_method('add_' + node) {
-        |content, id|
-        add_metadata(node, content, id)
-      }
-    }
-
     def meta_list
       (@content_nodes['meta'] || []).sort_as_meta.dup
     end
@@ -170,7 +124,7 @@ module GEPUB
       title(content)
     end
 
-    def title(content=UNASSIGNED, id = nil, title_type = nil)
+    def title(content=UNASSIGNED, id: nil, title_type: nil)
       if unassigned?(content)
         if !@content_nodes['title'].nil?
           @content_nodes['title'].each do
@@ -181,7 +135,7 @@ module GEPUB
         get_first_node('title')
       else
         title_clear
-        meta = add_title(content, id, title_type)
+        meta = add_title(content, id: id, title_type: title_type)
         yield meta if block_given?
         meta
       end
@@ -197,13 +151,17 @@ module GEPUB
     def add_identifier(string, id=nil, type=nil)
       id = @id_pool.generate_key(:prefix => 'BookId') if id.nil?
       raise "id #{id} is already in use" if @id_pool[id]
-      identifier = add_metadata('identifier', string, id)
+      identifier = add_metadata('identifier', string, id: id)
       identifier.refine('identifier-type', type) unless type.nil?
       identifier
     end
 
-    def add_date(date, id)
-      add_metadata('date', date, id, DateMeta)
+    def add_date(date, deprecated_id = nil, id: nil)
+      if deprecated_id
+        warn "secound argument is deprecated. use id: keyword argument"
+        id = deprecated_id
+      end
+      add_metadata('date', date, id: id, itemclass: DateMeta)
     end
 
     def identifier_by_id(id)
@@ -214,42 +172,9 @@ module GEPUB
       return nil
     end
     
-    def add_metadata(name, content, id = nil, itemclass = Meta)
+    def add_metadata_internal(name, content, id: nil, itemclass: Meta)
       meta = itemclass.new(name, content, self, { 'id' => id })
       (@content_nodes[name] ||= []) << meta
-      yield meta if block_given?
-      meta
-    end
-
-    def add_title(content, id = nil, title_type = nil)
-      meta = add_metadata('title', content, id).refine('title-type', title_type)
-      yield meta if block_given?
-      meta
-    end
-
-    def set_title(content, id = nil, title_type = nil)
-      warn "obsolete : set_title. use title or title= instead."
-      title_clear
-      meta = add_title(content, id, title_type)
-      yield meta if block_given?
-      meta
-    end
-    
-    def add_person(name, content, id = nil, role = nil)
-      meta = add_metadata(name, content, id).refine('role', role)
-      yield meta if block_given?
-      meta
-    end
-
-    def add_creator(content, id = nil, role = 'aut')
-      meta = add_person('creator', content, id, role)
-      yield meta if block_given?
-      meta
-    end
-
-    def add_contributor(content, id=nil, role=nil)
-      meta = add_person('contributor', content, id, role)
-      yield meta if block_given?
       meta
     end
 
@@ -268,7 +193,7 @@ module GEPUB
             @content_nodes['meta'].delete meta
           end
         }
-        add_metadata('meta', date.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), nil, DateMeta)['property'] = 'dcterms:modified'
+        add_metadata('meta', date.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), itemclass: DateMeta)['property'] = 'dcterms:modified'
       end
     end
 
@@ -289,7 +214,7 @@ module GEPUB
           @content_nodes['meta'].delete meta
         end
       }
-      add_metadata('meta', date.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), nil, DateMeta)['property'] = 'dcterms:modified'
+      add_metadata('meta', date.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), itemclass: DateMeta)['property'] = 'dcterms:modified'
     end
 
     def add_oldstyle_meta(content, attributes = {})

data/lib/gepub/metadata_add.rb

@@ -0,0 +1,142 @@
+module GEPUB
+	class Metadata
+    CONTENT_NODE_LIST = ['identifier', 'title', 'language', 'contributor', 'creator', 'coverage', 'date','description','format','publisher','relation','rights','source','subject','type'].each {
+      |node|
+      define_method(node + '_list') { @content_nodes[node].dup.sort_as_meta }
+      define_method(node + '_clear') {
+        if !@content_nodes[node].nil?
+          @content_nodes[node].each { |x| unregister_meta(x) };
+          @content_nodes[node] = []
+        end
+      }
+
+      next if node == 'title'
+
+      define_method(node, ->(content=UNASSIGNED, deprecated_id=nil, id:nil,
+                             title_type: nil,identifier_type: nil,display_seq: nil,file_as: nil,group_position: nil,role: nil,
+														 lang: nil, alternates: {}) {
+                      if unassigned?(content)
+                        get_first_node(node)
+                      else
+                        if deprecated_id
+                          warn "secound argument is deprecated. use id: keyword argument"
+                          id = deprecated_id
+                        end
+                        send(node + "_clear")
+                        add_metadata(node, content, id: id, title_type: title_type,identifier_type: identifier_type,display_seq: display_seq,file_as: file_as,group_position: group_position,role: role, lang: lang, alternates: alternates)
+                      end
+                    })
+      
+      define_method(node+'=') {
+        |content|
+        send(node + "_clear")
+        return if content.nil?
+        if node == 'date'
+          add_date(content)
+        else
+          add_metadata(node, content)
+        end
+      }
+
+      next if ["identifier", "date", "creator", "contributor"].include?(node)
+
+      define_method('add_' + node) {
+        |content, id|
+        add_metadata(node, content, id: id)
+      }
+    }
+
+    def add_title(content, deprecated_id = nil, deprecated_title_type = nil, id: nil,
+                  title_type: nil,identifier_type: nil,display_seq: nil,file_as: nil,group_position: nil,role: nil,
+									lang: nil, alternates: {})
+      if deprecated_id
+        warn 'second argument for add_title is deprecated. use id: instead'
+        id = deprecated_id
+      end
+      if deprecated_title_type
+        warn 'third argument for add_title is deprecated. use title_type: instead'
+        title_type = deprecated_title_type
+      end
+      meta = add_metadata('title', content, id: id, 
+			                    title_type: title_type,identifier_type: identifier_type,display_seq: display_seq,file_as: file_as,group_position: group_position,role: role,
+													lang: lang, alternates: alternates)
+      yield meta if block_given?
+      meta
+    end
+
+    def add_person(name, content, deprecated_id = nil, deprecated_role = nil, id: nil,
+                  title_type: nil,identifier_type: nil,display_seq: nil,file_as: nil,group_position: nil,role: nil,
+									lang: nil, alternates: {})
+      if deprecated_id
+        warn 'second argument for add_person is deprecated. use id: instead'
+        id = deprecated_id
+      end
+      if deprecated_role
+        warn 'third argument for add_person is deprecated. use role: instead'
+        role = deprecated_role
+      end
+      meta = add_metadata(name, content, id: id,
+			                    title_type: title_type,identifier_type: identifier_type,display_seq: display_seq,file_as: file_as,group_position: group_position,role: role,
+													lang: lang, alternates: alternates)
+      yield meta if block_given?
+      meta
+    end
+
+    def add_creator(content, deprecated_id = nil, deprecated_role = nil, id: nil, 
+                    title_type: nil,identifier_type: nil,display_seq: nil,file_as: nil,group_position: nil,role: nil,
+  									lang: nil, alternates: {}) 
+      if deprecated_id
+        warn 'second argument for add_creator is deprecated. use id: instead'
+        id = deprecated_id
+      end
+      if deprecated_role
+        warn 'third argument for add_creator is deprecated. use role: instead'
+        role = deprecated_role
+      end
+			role = 'aut' if role.nil?
+      meta = add_person('creator', content, id: id,
+			                    title_type: title_type,identifier_type: identifier_type,display_seq: display_seq,file_as: file_as,group_position: group_position,role: role,
+													lang: lang, alternates: alternates)
+      yield meta if block_given?
+      meta
+    end
+
+    def add_contributor(content, deprecated_id = nil, deprecated_role = nil, id: nil,
+                        title_type: nil,identifier_type: nil,display_seq: nil,file_as: nil,group_position: nil,role: nil,
+											  lang: nil, alternates: {}) 
+      if deprecated_id
+        warn 'second argument for add_contributor is deprecated. use id: instead'
+        id = deprecated_id
+      end
+      if deprecated_role
+        warn 'third argument for add_contributor is deprecated. use role: instead'
+        role = deprecated_role
+      end
+      meta = add_person('contributor', content, id: id, 
+			                  title_type: title_type,identifier_type: identifier_type,display_seq: display_seq,file_as: file_as,group_position: group_position,role: role,
+												lang: lang, alternates: alternates)
+      yield meta if block_given?
+      meta
+    end
+
+		def add_metadata(name, content, id: nil, itemclass: Meta,
+		title_type: nil,identifier_type: nil,display_seq: nil,file_as: nil,group_position: nil,role: nil,
+		lang: nil, alternates: {}
+		)
+			meta = add_metadata_internal(name, content, id: id, itemclass: itemclass)
+      [{ value: title_type, name: 'title-type'},{ value: identifier_type, name: 'identifier-type'},{ value: display_seq, name: 'display-seq'},{ value: file_as, name: 'file-as'},{ value: group_position, name: 'group-position'},{ value: role, name: 'role'}].each do |refiner|
+				if refiner[:value]
+				  meta.refine(refiner[:name], refiner[:value])
+				end
+	    end	
+			if lang
+			  meta.lang = lang
+			end
+			if alternates
+			  meta.add_alternates alternates
+			end
+      yield meta if block_given?
+			meta
+		end
+	end
+end

data/lib/gepub/package.rb

@@ -168,9 +168,9 @@ module GEPUB
       @metadata.add_identifier identifier, unique_identifier, type
     end
 
-    def add_item(href, io_or_filename = nil, id = nil, attributes = {})
+    def add_item(href, content:nil, id: nil, attributes: {})
       item = @manifest.add_item(id, href, nil, attributes)
-      item.add_content(io_or_filename) unless io_or_filename.nil?
+      item.add_content(content) unless content.nil?
       @spine.push(item) if @ordered
       yield item if block_given?
       item
@@ -183,11 +183,10 @@ module GEPUB
       @ordered = nil
     end
 
-    def add_ordered_item(href, io_or_filename = nil, id = nil, attributes = {})
+    def add_ordered_item(href, content:nil, id: nil, attributes: {})
       raise 'do not call add_ordered_item within ordered block.' if @ordered
-      item = add_item(href, io_or_filename, id, attributes)
+      item = add_item(href, attributes: attributes, id:id, content: content)
       @spine.push(item)
-      
       item
     end
 

data/lib/gepub/resource_builder.rb

@@ -208,7 +208,7 @@ module GEPUB
         io = val[1]
       end
       name = "#{@dir_prefix}/#{name}" if !@dir_prefix.nil? && @dir_prefix.size > 0 && !name.start_with?('http')
-      @book.add_item(name, io)
+      @book.add_item(name, content: io)
     end
   end    
 

data/lib/gepub/version.rb

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

data/lib/gepub.rb

@@ -5,6 +5,7 @@ require 'gepub/meta'
 require 'gepub/datemeta'
 require 'gepub/meta_array'
 require 'gepub/metadata'
+require 'gepub/metadata_add'
 require 'gepub/manifest'
 require 'gepub/spine'
 require 'gepub/bindings'
@@ -12,6 +13,7 @@ require 'gepub/package'
 require 'gepub/mime'
 require 'gepub/item'
 require 'gepub/book'
+require 'gepub/book_add_item'
 require 'gepub/builder_mixin'
 require 'gepub/resource_builder'
 require 'gepub/builder'