mint 0.5.0 → 0.5.1

data/lib/mint/plugins/epub.rb

@@ -32,7 +32,7 @@ module Mint
       end
 
       Dir.chdir document.destination_directory do
-        metadata = standardize document.metadata
+        metadata = standardized_metadata document
         chapters = document.chapters
         locals = { chapters: chapters }.merge metadata
 
@@ -156,8 +156,8 @@ module Mint
 
     def self.create_chapters!(chapters, opts={})
       opts = chapter_defaults.deep_merge(opts)
-      template_file = EPub.template_directory + '/layout.haml'
-      renderer = Tilt.new template_file, :ugly => false
+      template_file = EPub.template_directory + '/layouts/layout.haml'
+      renderer = Tilt.new template_file, :ugly => true
       chapters.map do |chapter|
         renderer.render Object.new, opts[:locals].merge(:content => chapter)
       end.each_with_index do |text, id| 
@@ -168,8 +168,8 @@ module Mint
     private
 
     def self.create_from_template!(opts={})
-      template_file = EPub.template_directory + "/#{opts[:from]}"
-      renderer = Tilt.new template_file, :ugly => false
+      template_file = EPub.template_directory + "/layouts/#{opts[:from]}"
+      renderer = Tilt.new template_file, :ugly => true
       content = renderer.render Object.new, opts[:locals]
 
       File.open(opts[:to], 'w') do |f|
@@ -195,7 +195,8 @@ module Mint
       }
     end
 
-    def self.standardize(metadata)
+    def self.standardized_metadata(document)
+      metadata = document.metadata.merge(:stylesheet => document.stylesheet)
       sanitized_metadata = 
         Helpers.symbolize_keys(metadata, :downcase => true)
       standardized_metadata = 
@@ -260,7 +261,7 @@ module Mint
           genre: 'Non-fiction',
           rights: 'All Rights Reserved',
           ncx_file: 'toc.ncx',
-          style_file: 'style.css',
+          stylesheet: 'style.css',
           title_file: 'title.html',
         }
       }
@@ -284,7 +285,8 @@ module Mint
         to: "#{CONTENT_DIR}/title.html",
         locals: {
           title: 'Untitled',
-          creators: ['Anonymous']
+          creators: ['Anonymous'],
+          stylesheet: 'style.css'
         }
       }
     end

data/lib/mint/version.rb

@@ -1,3 +1,3 @@
 module Mint
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/plugins/templates/epub/{content.haml → layouts/content.haml}

@@ -1,21 +1,20 @@
 !!! XML
 %package(version='2.0' xmlns='http://www.idpf.org/2007/opf' unique-identifier=uuid)
-  %metadata{ 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
-             'xmlns:dcterms' => 'http://purl.org/dc/terms/',
-             'xmlns:opf' => 'http://www.idpf.org/2007/opf',
-             'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance' }
+  %metadata(xmlns:dc='http://purl.org/dc/elements/1.1/'
+            xmlns:dcterms='http://purl.org/dc/terms/'
+            xmlns:opf='http://www.idpf.org/2007/opf'
+            xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance')
   
     %dc:title= title
-    %dc:language{ 'xsi:type' => 'dcterms:RFC3066' }= language
-    %dc:identifier{ :id => uuid }= short_title
+    %dc:language(xsi:type='dcterms:RFC3066')= language
+    %dc:identifier(id=uuid)= short_title
     %dc:description= description
-    %dc:date{ 'xsi:type' => 'dcterms:W3CDTF' }= date
+    %dc:date(xsi:type='dcterms:W3CDTF')= date
     
     - creators.each do |creator|
-      %dc:creator{ 'opf:file-as' => creator, 'opf:role' => 'aut' }
+      %dc:creator(opf:file-as=creator opf:role='aut')
     - contributors.each do |contributor|
-      %dc:contributor{ 'opf:file-as' => contributor,
-        'opf:role' => 'edt' }
+      %dc:contributor(opf:file-as=contributor opf:role='edt')
     
     %dc:publisher= publisher
     %dc:type= genre
@@ -23,7 +22,7 @@
   
   %manifest
     %item(id='ncx' href=ncx_file media-type='application/x-dtbncx+xml')/
-    %item(id='style' href=style_file media-type='text/css')/
+    %item(id='style' href=stylesheet media-type='text/css')/
     %item(id='title' href=title_file media-type='application/xhtml+xml')/
     - chapters.each_with_index do |content, id|
       - idx = id + 1

data/plugins/templates/epub/{title.haml → layouts/title.haml}

@@ -4,7 +4,7 @@
     %meta(http-equiv='Content-Type' 
           content='text/html; charset=utf-8')
     %title= title
-    %link(href='style.css' type='text/css' rel='stylesheet')
+    %link(href=stylesheet type='text/css' rel='stylesheet')
   
   %body
     %h1= title

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mint
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70164764165920 !ruby/object:Gem::Requirement
+  requirement: &70146447648180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764165920
+  version_requirements: *70146447648180
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70164764165440 !ruby/object:Gem::Requirement
+  requirement: &70146447647640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764165440
+  version_requirements: *70146447647640
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70164764165000 !ruby/object:Gem::Requirement
+  requirement: &70146447647160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764165000
+  version_requirements: *70146447647160
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70164764164560 !ruby/object:Gem::Requirement
+  requirement: &70146447646720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764164560
+  version_requirements: *70146447646720
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70164764164040 !ruby/object:Gem::Requirement
+  requirement: &70146447646240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764164040
+  version_requirements: *70146447646240
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70164764163620 !ruby/object:Gem::Requirement
+  requirement: &70146447645760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764163620
+  version_requirements: *70146447645760
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &70164764163180 !ruby/object:Gem::Requirement
+  requirement: &70146447645300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764163180
+  version_requirements: *70146447645300
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &70164764162740 !ruby/object:Gem::Requirement
+  requirement: &70146447644880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764162740
+  version_requirements: *70146447644880
 - !ruby/object:Gem::Dependency
   name: radius
-  requirement: &70164764162300 !ruby/object:Gem::Requirement
+  requirement: &70146447644460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764162300
+  version_requirements: *70146447644460
 - !ruby/object:Gem::Dependency
   name: markaby
-  requirement: &70164764161880 !ruby/object:Gem::Requirement
+  requirement: &70146447644040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764161880
+  version_requirements: *70146447644040
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70164764161460 !ruby/object:Gem::Requirement
+  requirement: &70146447643620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764161460
+  version_requirements: *70146447643620
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70164764161020 !ruby/object:Gem::Requirement
+  requirement: &70146447643180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764161020
+  version_requirements: *70146447643180
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70164764160600 !ruby/object:Gem::Requirement
+  requirement: &70146447642760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764160600
+  version_requirements: *70146447642760
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70164764160180 !ruby/object:Gem::Requirement
+  requirement: &70146447642320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164764160180
+  version_requirements: *70146447642320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70164764159760 !ruby/object:Gem::Requirement
+  requirement: &70146447641860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164764159760
+  version_requirements: *70146447641860
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70164764155220 !ruby/object:Gem::Requirement
+  requirement: &70146447641380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164764155220
+  version_requirements: *70146447641380
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70164764154580 !ruby/object:Gem::Requirement
+  requirement: &70146447640940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +197,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164764154580
+  version_requirements: *70146447640940
 description: 
 email: david@wit.io
 executables:
@@ -228,11 +228,11 @@ files:
 - templates/default/style.sass
 - templates/pro/layout.haml
 - templates/pro/style.sass
-- plugins/templates/epub/container.haml
-- plugins/templates/epub/layout.haml
-- plugins/templates/epub/title.haml
-- plugins/templates/epub/toc.haml
-- plugins/templates/epub/content.haml
+- plugins/templates/epub/layouts/container.haml
+- plugins/templates/epub/layouts/layout.haml
+- plugins/templates/epub/layouts/title.haml
+- plugins/templates/epub/layouts/toc.haml
+- plugins/templates/epub/layouts/content.haml
 - features/support/env.rb
 - features/publish.feature
 - features/plugins/epub.feature