nora_mark 0.2beta11 → 0.2beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bff53f9401fc6525a0bdd225bb589f4a23190307
-  data.tar.gz: 4c13e03922f95694c20a95f50c5f16df14254f5a
+  metadata.gz: 878b5a25f32b34e6c9ba1cf27418f876e6ee3bed
+  data.tar.gz: d0079061039cf71ee91f554cafefd8613cb06895
 SHA512:
-  metadata.gz: 196f90eafc13171a5fcd7c59c126ffc5e5ef83f0329d7d6630aa25afdf6c1800e9045b6cc20c93a4d7db23ec3b0ea347526c1d7dc165ab9b48683d793cc7e658
-  data.tar.gz: 2cbf86b01d093cb5a3745495a84fb76e1e17ffa3e473a0e7f71db274499984c0e333b0adbbf240d6248fc10f58f52aa5f7085ef031834dce538d5d42e3065532
+  metadata.gz: 9b85d6e2c5ac7d9f05fba7548976874a63176573fd3fb3245934cde97b627a948e1dff94717622625c1d3aa3b136506d0511181bcac47d5673314e274963c064
+  data.tar.gz: 42cc2bc8cbc5181f365e759c6c61e883b513ae8d8e148d10ed7e53abb6ee5553004889c90e866b2c675fbd434e0fb2e70393aea094fb92de384fc92ab27a1614

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# version 0.2beta8 to 0.2beta12
+
+* Plugin API for generator
+* Support video and audio tag
+* Support nested unordered list
+* Support GFM style inline code block 
+* Tilt Adapter (@KitaitiMakoto)
+
 # version 0.2beta7 (NoraMark beta)
 
 * new table of contents feature. assign table of contents heading to every heading element (h1-h2 and Markdown style header)

data/LICENSE

@@ -1,22 +1,29 @@
-Copyright (c) 2012 KOJIMA Satoshi
+# LICENSE:
 
-MIT License
+(The New BSD License)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2012-2014, KOJIMA Satoshi
+All rights reserved.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -335,10 +335,12 @@ Result.
 </body>
 </html>
 ```
-### HTML generator default transformer
+### Transformer examples
 
 [HTML generator default transformer](https://github.com/skoji/noramark/blob/master/lib/nora_mark/html/default_transformer.rb) is a good example of transformer.
 
+HTMLBook also implements its own [transformer](https://github.com/skoji/nora_mark_htmlbook/blob/master/lib/nora_mark_htmlbook/transformer.rb).
+
 ## noramark-mode.el
 
 Experimental implementation of noramark major mode is available here. It provides font-lock for NoraMark syntax and supports outline-minor-mode for the present.

data/lib/nora_mark/html/context.rb

@@ -1,7 +1,7 @@
 module NoraMark
   module Html
     class Context
-      attr_accessor :title, :head_inserters, :lang, :stylesheets, :enable_pgroup, :render_parameter
+      attr_accessor :title, :head_inserters, :lang, :stylesheets, :enable_pgroup, :render_parameter, :namespaces, :metas
       def initialize(param = {})
         @head_inserters = []
         @lang = param[:lang] || 'en'
@@ -10,11 +10,12 @@ module NoraMark
         @enable_pgroup = param[:enable_pgroup] || true
         self.paragraph_style= param[:paragraph_style]
         @pages = Pages.new(param[:sequence_format])
-        @block_delimiter_stack = []
+        @namespaces = {}
+        @metas = []
         @render_parameter = {}
         head_inserter do
           ret = ""
-          @stylesheets.each { |s|
+          @stylesheets.each do |s|
             if s.is_a? String
               ret << "<link rel=\"stylesheet\" type=\"text/css\" href=\"#{s}\" />\n"
             elsif s.is_a? Array
@@ -22,7 +23,12 @@ module NoraMark
             else
               raise "Can't use #{s} as a stylesheet"
             end
-          }
+          end
+          ret << @metas.map do |meta|
+            "<meta " + meta.map do |k,v|
+              "#{k}=\"#{v}\""
+            end.join(" ") + " />"
+          end.join("\n")
           ret
         end
       end
@@ -60,7 +66,11 @@ module NoraMark
           end_html
         end
         page = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-        page << "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"#{@lang}\" xml:lang=\"#{@lang}\">\n"
+        page << "<html xmlns=\"http://www.w3.org/1999/xhtml\""
+        page << @namespaces.map do |k,v|
+          "xmlns:#{k}=\"#{v}\""
+        end.join(' ')
+        page << " lang=\"#{@lang}\" xml:lang=\"#{@lang}\">\n"
         page << "<head>\n"
         page << "<title>#{@title}</title>\n"
         @head_inserters.each {

data/lib/nora_mark/html/frontmatter_writer.rb

@@ -18,6 +18,12 @@ module NoraMark
           end,
           paragraph_style: proc do |value|
             @context.paragraph_style = value.strip.to_sym
+          end,
+          namespace: proc do |value|
+            @context.namespaces.merge! value
+          end,
+          meta: proc do |value|
+            @context.metas << value
           end
         }
       end

data/lib/nora_mark/version.rb

@@ -1,3 +1,3 @@
 module NoraMark
-  VERSION = "0.2beta11"
+  VERSION = "0.2beta12"
 end

data/lib/tilt/nora_mark.rb

@@ -0,0 +1,18 @@
+require 'tilt'
+require 'nora_mark'
+
+module Tilt
+  class NoraMarkTemplate < Template
+    protected
+
+    def prepare
+      @document = NoraMark::Document.parse(data).render_parameter(nonpaged: true)
+    end
+
+    def evaluate(scope, locals, &block)
+      @html ||= @document.html[0]
+    end
+  end
+
+  register NoraMarkTemplate, 'nora'
+end

data/nora_mark.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
   gem.add_dependency "kpeg"
+  gem.add_development_dependency "tilt", ">= 2.0"
   gem.add_development_dependency "rspec", "~> 2.14"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "byebug"

data/spec/fixtures/tilt/html/sample.html

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
+<head>
+<title>test title</title>
+<link rel="stylesheet" type="text/css" href="css/normalize.css" />
+<link rel="stylesheet" type="text/css" href="css/main.css" />
+</head>
+<body><article><h1 id='heading_index_1'>header 1</h1>
+<div class='pgroup'><p>article comes here.</p>
+<p>linebreak will produce paragraph.</p>
+</div>
+<div class='pgroup'><p>blank line will procude div.pgroup.</p>
+</div>
+<div class='column'><div class='pgroup'><p>This block will produce div.column.</p>
+<p>Inline commands like <a href='http://github.com/skoji/nora_mark/'>this</a> and <span class='strong'>this</span> is available.</p>
+</div>
+</div>
+</article>
+</body>
+</html>

data/spec/fixtures/tilt/nora/sample.nora

@@ -0,0 +1,18 @@
+---
+lang: ja
+title: test title
+stylesheets: [css/normalize.css, css/main.css]
+---
+
+art {
+    h1: header 1
+    article comes here.
+    linebreak will produce paragraph.
+
+    blank line will procude div.pgroup.
+
+    d.column {
+        This block will produce div.column.
+        Inline commands like [link(http://github.com/skoji/nora_mark/){this}] and [sp.strong{this}] is available.
+    }
+}

data/spec/nora_mark_spec.rb

@@ -1436,5 +1436,34 @@ EOF
                )
     end
   end
+  describe 'Frontmatter MetaData' do
+    it 'handle namespace' do
+      text = <<EOF
+---
+namespace: { epub: "http://www.idpf.org/2007/ops" }
+---
+text
+EOF
+      converted = NoraMark::Document.parse(text)
+      xhtml = Nokogiri::XML::Document.parse(converted.html[0])  
+      expect(xhtml.root.namespaces['xmlns:epub'])
+        .to eq 'http://www.idpf.org/2007/ops'
+    end
+
+    it 'handle meta tag' do
+      text = <<EOF
+---
+meta: { name: mymeta, content: mycontent }
+namespace: { epub: "http://www.idpf.org/2007/ops" }
+---
+text
+EOF
+      converted = NoraMark::Document.parse(text)
+      xhtml = Nokogiri::XML::Document.parse(converted.html[0])
+      expect(xhtml.root.at_xpath('xmlns:head/xmlns:body')).to be_nil
+      expect(xhtml.root.at_xpath('xmlns:head/xmlns:meta').selector_and_children)
+        .to eq ["meta[name='mymeta'][content='mycontent']"]
+    end
+  end
 end
 

data/spec/tilt_spec.rb

@@ -0,0 +1,16 @@
+require_relative 'spec_helper'
+require 'pathname'
+require 'tilt/nora_mark'
+
+describe Tilt::NoraMarkTemplate do
+  let(:fixtures_dir) { Pathname.new(__dir__) + 'fixtures/tilt' }
+  subject { Tilt.new(fixtures_dir + 'nora/sample.nora') }
+
+  it "should be registered for '.nora' files" do
+    expect(subject).to be_an_instance_of(Tilt::NoraMarkTemplate)
+  end
+
+  it "should convert '.nora' files to HTML" do
+    expect(subject.render).to eq (fixtures_dir + 'html/sample.html').read
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nora_mark
 version: !ruby/object:Gem::Version
-  version: 0.2beta11
+  version: 0.2beta12
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kpeg
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,7 @@ files:
 - lib/nora_mark/parser.rb
 - lib/nora_mark/transformer.rb
 - lib/nora_mark/version.rb
+- lib/tilt/nora_mark.rb
 - nora_mark.gemspec
 - spec/created_files/.gitignore
 - spec/epub30-schemas/epub-nav-30.nvdl
@@ -204,11 +219,14 @@ files:
 - spec/epub30-schemas/package-30.sch
 - spec/extensions_spec.rb
 - spec/fixtures/test-plugins/nora_mark_tester.rb
+- spec/fixtures/tilt/html/sample.html
+- spec/fixtures/tilt/nora/sample.nora
 - spec/jing-20091111/bin/jing.jar
 - spec/node_spec.rb
 - spec/nokogiri_test_helper.rb
 - spec/nora_mark_spec.rb
 - spec/spec_helper.rb
+- spec/tilt_spec.rb
 - spec/transformer_spec.rb
 homepage: ''
 licenses: []
@@ -314,9 +332,12 @@ test_files:
 - spec/epub30-schemas/package-30.sch
 - spec/extensions_spec.rb
 - spec/fixtures/test-plugins/nora_mark_tester.rb
+- spec/fixtures/tilt/html/sample.html
+- spec/fixtures/tilt/nora/sample.nora
 - spec/jing-20091111/bin/jing.jar
 - spec/node_spec.rb
 - spec/nokogiri_test_helper.rb
 - spec/nora_mark_spec.rb
 - spec/spec_helper.rb
+- spec/tilt_spec.rb
 - spec/transformer_spec.rb