kindler 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826949cf9e1f125a5731ff497c3e983f8474d6a2
-  data.tar.gz: 831f3b2539292ec43a507ef11d18fec434aba62e
+  metadata.gz: 801de4aa92350e7253473516cb0f6619a375562d
+  data.tar.gz: 7deedab8e5b97e1b116d58e33ad82db5a5487a26
 SHA512:
-  metadata.gz: 054fca1227c38e5192e2914a09d0544d6c1e67f25e8fa0e6cd97f872f51a133e4df45eb8f18b094d1b690d69150c41c3204a6157d793ddf8f4da7b5146a4c90a
-  data.tar.gz: b3e33b7aae17d1e9b6b3b8c27759aa83b61878a3c1f89e8e9d73530bbfc83523774fe02d11d8c338fa591a518045419b5aec93061c3d58a6704db12275dd012c
+  metadata.gz: c26baa4d462d1b9af0050c838cc2f680e868a8693505d5224c8f832e59ffafa1150a13d5159c4681cb737fd7de93d37fe2e89519c72b6a76a8526467156c86a1
+  data.tar.gz: 3cab0787bcb95aa6fd16849d604e0c139b0b71d3502c8c7e0b053dca2ff4829a5e94aaddabf5766d75bfa2b1cf612aeda4030bfb25f03485450fa6b7c82a2230

data/lib/kindler/version.rb

@@ -1,3 +1,3 @@
 module Kindler
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/kindler.rb

@@ -32,7 +32,7 @@ module Kindler
       @debug = options[:debug]
       @title = options[:title] || ''
       @author = options[:author] || 'unknown'
-      @mobi_type = options[:mobi_type] || :magzine
+      @mobi_type = options[:mobi_type] || :simple
       @cover = options[:cover] || ""
       @silent = options[:silent]
       @pages = []
@@ -49,7 +49,7 @@ module Kindler
       page[:section] ||= DEFAULT_SECTION
       page[:count] = pages.count + 1
       page[:file_name] = "#{page[:count].to_s.rjust(3,'0')}.html"
-      page[:author] = 'unknown' if (page[:author]==nil or page[:author]=='')
+      page[:author] = '' unless page[:author]
       # escape special chars
       page[:title] = CGI::escapeHTML(page[:title])
       page[:title] = title if(page[:title] == "")
@@ -208,8 +208,8 @@ module Kindler
     def prepare_conver_img
       if @local_images.length > 0
         image_file = @local_images.first
-        @cover_image = "#{File.dirname(image_file)}/cover-image.gif"
-        cmd = "convert #{Shellwords.escape(image_file)} -compose over -background white -flatten -resize '300x200>' -alpha off #{Shellwords.escape(@cover_image)}"
+        @cover_image = "#{File.dirname(image_file)}/cover-image.jpg"
+        cmd = "convert #{Shellwords.escape(image_file)} -compose over -background white -flatten -resize '566x738' -alpha off #{Shellwords.escape(@cover_image)}"
         `#{cmd}` rescue ''
       end
     end

data/lib/templates/book.opf.erb

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="#{title}">
+<package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="<%= title %>">
   <metadata>
     <meta content="cover-image" name="cover"/>
     <dc-metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
@@ -22,7 +22,7 @@
     <% pages.each_with_index do |page,index|%>
       <item href='<%= (index+1).to_s.rjust(3,'0') %>.html' media-type='application/xhtml+xml' id='<%= (index+1).to_s.rjust(3,'0') %>'/>
     <% end %>
-    <item href="cover-image.gif" id="cover-image" media-type="image/gif" />
+    <item href="cover-image.jpg" id="cover-image" media-type="image/jpeg" />
     <item href='contents.html' media-type='application/xhtml+xml' id='contents'/>
     <item href='nav-contents.ncx' media-type='application/x-dtbncx+xml' id='nav-contents'/>
   </manifest>
@@ -34,5 +34,6 @@
   </spine>
   <guide>
     <reference href='contents.html' type='toc' title='Table of Contents'/>
+    <reference href="cover-image.jpg" type="cover" title="Cover"/>
   </guide>
 </package>

data/lib/templates/page.html.erb

@@ -7,7 +7,9 @@
     <h2>
       <%= page[:title] %>
     </h2>
-    <p><em><%= page[:author] %></em><p>
+    <% if page[:author] != '' %>
+      <p><em><%= page[:author] %></em><p>
+    <% end%>
     <div><%= page[:content] %></div>
   </body>
 </html>

data/spec/cases/generator_spec.rb

@@ -77,7 +77,7 @@ describe "Mobi book file generator" do
 
   it "should have two sections" do
     title = 'test_contents'
-    book = Kindler::Book.new :title=>title,:author=>'mike',:debug=>true
+    book = Kindler::Book.new :title=>title,:author=>'mike',:debug=>true, :mobi_type => :magzine
     book.add_page :title=>'love page1',:author=>'mike1',:content=>'this is the love page1',:section => 'love'
     book.add_page :title=>'love page2',:author=>'mike1',:content=>'this is the love page2',:section => 'love'
     book.add_page :title=>'hate page1',:author=>'mike1',:content=>'this is the hate page1',:section => 'hate'

data/spec/cases/title_space_spec.rb

@@ -7,11 +7,11 @@ describe "Mobi book file generator" do
   end
 
   it "should generate books given title contains space" do
-    title = 'title with space'
-    book = Kindler::Book.new :title=>title,:author=>'mike',:debug=>true
+    title = 'title with space nice'
+    book = Kindler::Book.new :title=>title,:author=>'mike',:debug=>true, :mobi_type => 'simple'
     book.add_page :title=>'page1',:author=>'mike1',:content=>'this is the page 1',:wrap=>true
     book.add_page :title=>'page2',:author=>'mike1',:content=>'this is the page 2',:wrap=>true
-    book.add_page :title=>'page3',:author=>'mike1',:content=>'<img src="http://images.fanpop.com/images/image_uploads/widescreen-season-4-wallpaper-lost-661159_1680_1050.jpg"/>this is the page 3',:wrap=>true
+    book.add_page :title=>'page3',:author=>'mike1',:content=>'<img src="http://images.fanpop.com/images/image_uploads/Anne-Hathaway-anne-hathaway-749084_1280_800.jpg"/>this is the page 3',:wrap=>true
     book.generate
     book.should be_generated
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kindler
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - dongbin.li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri