gepub 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0bb0db88bb1fdcce1615f3b40bbb25908f1dd2bfcf64860ca8f265c1a75c18a
-  data.tar.gz: 77ec307c585b4cfa9ff8c38f6c0ddd789ad73091bf24401197185282abfa892a
+  metadata.gz: 8c4bd8231fb2f42f3d42f2909605224d3ac30b9ccc52736fc158d1340810e5b3
+  data.tar.gz: f6834698805f386ce33b3eff1cba78de141e1f98ee2a9b5f3ee4ea9d588681c3
 SHA512:
-  metadata.gz: 157c5f9ee8540f41ff5e868223f00356843e92516f1dd0385060cd8b8ab5c150ef3174c579d4843bc67abde37796e6d19f6ee354dd82710352f67e84d4fdfb7c
-  data.tar.gz: bd4731d1d62e99681a60b5517fc8e4e3c947a44be86154e171f3f59baf522071fcb038db6bdf7ecebf298ab7358af4860a929debbd404c82c8cee0af62754325
+  metadata.gz: 5650ce85cec97fec3aa6da1031c15c8042a0f44008bdabd3b9f54936de48ddee6066b1e67bc1dc791e7259f13bb4f5120dba61587bdbbe7247e26106cee97fa6
+  data.tar.gz: 0d30aafeb4f8cd0d5a1b8f3ca239aa5a18142c7b8c00135dfcba7f1d7034bfad87f072b57cc6ccc6cba0d2601863ae3f691594de468c93acc0f05400efd050a9

data/README.md

@@ -22,7 +22,7 @@ a generic EPUB parser/generator library.
 
 If you are using GEPUB::Builder from your code and do not like its behaviour(e.g. the block inside is evaluated as inside the Builder instance), please consider using GEPUB::Book directly.
 
-** GEPUB::Builder will be obsolete in gepub 0.7. GEPUB::Book#new will be enhanced instead of Builder DSL. **
+**GEPUB::Builder will be obsolete in gepub 0.7. GEPUB::Book#new will be enhanced instead of Builder DSL.**
 
 
 ## SYNOPSIS:

data/examples/generate_example.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'gepub'
 
 book = GEPUB::Book.new
-book.set_main_id('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
@@ -18,18 +18,18 @@ 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).set_display_seq(1).add_alternates('en' => 'this book is just a sample.')
+book.add_title('これはあくまでサンプルです',nil, GEPUB::TITLE_TYPE::SUBTITLE).display_seq(1).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__),  'img', 'image1.jpg')
+imgfile = File.join(File.dirname(__FILE__),  'image1.jpg')
 File.open(imgfile) do
   |io|
   book.add_item('img/image1.jpg',io).cover_image

data/examples/new_book_example.rb

@@ -1,20 +1,18 @@
 # -*- coding: utf-8 -*-
 require 'gepub'
 
-GEPUB::Book.new do |book|
-  book.set_unique_identifier 'http:/example.jp/bookid_in_url', 'BookID', 'URL'
-  book.set_title 'GEPUB Sample Book'
-  book.set_subtitle 'GEPUB Sample Book'
-  book.set_creator 'KOJIMA Satoshi'
-  book.set_contributors '電書部', 'アサガヤデンショ', '電子雑誌トルタル'
+gbook = GEPUB::Book.new do |book|
+  book.identifier = 'http://example.jp/bookid_in_url'
+  book.title = 'GEPUB Sample Book'
+  book.creator = 'KOJIMA Satoshi'
+  book.contributor = '電書部'
+  book.add_contributor 'アサガヤデンショ'
+  book.add_contributor '電子雑誌トルタル'
+  book.language = 'ja'
 
-  book.ordered {
-    book.add_item('name') do
-      |item|
-      item.content = StringIO.new()
-    end
-  }
+  book.ordered do
+    item = book.add_item('name.xhtml')
+    item.add_content StringIO.new('<html xmlns="http://www.w3.org/1999/xhtml"><head><title>c1</title></head><body><p>the first page</p></body></html>')end
 end
 
-
-
+gbook.generate_epub("test.epub")

data/lib/gepub/builder.rb

@@ -190,7 +190,9 @@ module GEPUB
     # define base methods.
     GEPUB::Metadata::CONTENT_NODE_LIST.each {
       |name|
-      define_method(name) { |val| @last_defined_item = MetaItem.new(@book.send("add_#{name}".to_sym, val, nil)) }
+      if !["title", "creator", "contributor"].include?(name)
+        define_method(name) { |val| @last_defined_item = MetaItem.new(@book.send("add_#{name}".to_sym, val, nil)) }
+      end
     }
 
     GEPUB::TITLE_TYPE::TYPES.each {
@@ -205,7 +207,9 @@ module GEPUB
       else
         methodname = type
       end
-      define_method(methodname) { |val| @last_defined_item = MetaItem.new(@book.add_title(val, nil, type)) }
+      if methodname != "collection"
+        define_method(methodname) { |val| @last_defined_item = MetaItem.new(@book.add_title(val, nil, type)) }
+      end
     }
 
     def collection(val, count = 1)

data/lib/gepub/meta.rb

@@ -143,7 +143,7 @@ module GEPUB
         }.reverse
         localized = candidates[0].content if candidates.size > 0
       end
-      (localized || self.content || super).to_s
+      (localized || self.content || super()).to_s
     end
   end
 end

data/lib/gepub/metadata.rb

@@ -119,6 +119,8 @@ module GEPUB
         end
       }
 
+      next if node == 'title'
+
       define_method(node, ->(content=UNASSIGNED, id=nil) {
                       if unassigned?(content)
                         get_first_node(node)
@@ -128,11 +130,6 @@ module GEPUB
                       end
                     })
 
-      define_method('add_' + node) {
-        |content, id|
-        add_metadata(node, content, id)
-      }
-      
       define_method('set_' + node) {
         |content, id|
         warn "obsolete : set_#{node}. use #{node} instead."
@@ -143,7 +140,18 @@ module GEPUB
       define_method(node+'=') {
         |content|
         send(node + "_clear")
-        add_metadata(node, content, nil)
+        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)
       }
     }
 

data/lib/gepub/package.rb

@@ -11,7 +11,11 @@ module GEPUB
     def_delegators :@manifest, :item_by_href
     def_delegators :@metadata, *Metadata::CONTENT_NODE_LIST.map {
       |x|
-      ["#{x}", "#{x}_list", "set_#{x}", "#{x}=", "add_#{x}"]
+      if x == "identifier"
+        ["#{x}_list", "set_#{x}", "add_#{x}"]
+      else
+        ["#{x}", "#{x}_list", "set_#{x}", "#{x}=", "add_#{x}"]
+      end
     }.flatten
     def_delegators :@metadata, :set_lastmodified
     def_delegators :@metadata, :lastmodified

data/lib/gepub/version.rb

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

data/spec/metadata_spec.rb

@@ -153,6 +153,13 @@ describe GEPUB::Metadata do
       expect(metadata.date.to_s).to eq('2012-02-27T20:00:00Z')
     end
 
+    it 'should handle date with `date=` method and Time object' do
+      metadata = GEPUB::Metadata.new
+      a = Time.parse '2012-02-27 20:00:00 UTC'
+      metadata.date = a
+      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

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gepub
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-14 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri