kitabu 1.0.1 → 1.0.2

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    kitabu (1.0.1)
+    kitabu (1.0.2)
       RedCloth
       activesupport
       coderay
       eeepub-with-cover-support
       i18n
-      listen
       nokogiri
       notifier
       rdiscount
@@ -17,7 +16,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (3.2.8)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     awesome_print (1.1.0)
@@ -28,27 +27,26 @@ GEM
       builder
       rubyzip
     i18n (0.6.1)
-    listen (0.5.3)
     method_source (0.8.1)
-    multi_json (1.3.7)
-    nokogiri (1.5.5)
+    multi_json (1.5.0)
+    nokogiri (1.5.6)
     notifier (0.4.1)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    pry-nav (0.2.2)
+    pry-nav (0.2.3)
       pry (~> 0.9.10)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdiscount (1.6.8)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rspec-mocks (2.12.1)
     rubyzip (0.9.9)
     slop (3.3.3)
     test_notifier (1.0.1)

data/kitabu.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   s.add_dependency "eeepub-with-cover-support"
   s.add_dependency "coderay"
   s.add_dependency "notifier"
-  s.add_dependency "listen"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "test_notifier"

data/lib/kitabu.rb

@@ -13,7 +13,6 @@ require "tempfile"
 require "pathname"
 require "thor"
 require "thor/group"
-require "listen"
 require "yaml"
 require "cgi"
 

data/lib/kitabu/extensions/redcloth.rb

@@ -7,15 +7,19 @@ module RedCloth
 
   module Inline
     FN_RE = /
-      (\s+)?    # getting spaces
-      %\{       # opening
-      (.*?)     # footnote
-      \}#       # closing
+      (\s+)?     # getting spaces
+      (\\)?%\{   # opening
+      (.*?)      # footnote
+      \}#        # closing
     /xm
 
     def footnote(text)
       text.gsub!(FN_RE) do |m|
-        %(<span class="footnote">#{$2}</span>)
+        if $2
+          %[#{$1}%{#{$3}}]
+        else
+          %(<span class="footnote">#{$3}</span>)
+        end
       end
     end
 

data/lib/kitabu/stream.rb

@@ -21,7 +21,7 @@ module Kitabu
     end
 
     def emit(node)
-      listener.send(:tag, node) if node.name =~ /h[2-6]/
+      listener.send(:tag, node) if node.name =~ /h[1-6]/
     end
   end
 end

data/lib/kitabu/toc/html.rb

@@ -16,7 +16,7 @@ module Kitabu
       def self.normalize(content)
         counter = {}
         html = Nokogiri::HTML.parse(content)
-        html.search("h2, h3, h4, h5, h6").each do |tag|
+        html.search("h1, h2, h3, h4, h5, h6").each do |tag|
           title = tag.inner_text
           permalink = title.to_permalink
 

data/lib/kitabu/version.rb

@@ -2,7 +2,7 @@ module Kitabu
   module Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/kitabu/extensions/redcloth_spec.rb

@@ -41,6 +41,11 @@ describe RedCloth do
       html = RedCloth.convert("Writing some text with a footnote %{this is a footnote}")
       html.should == %[<p>Writing some text with a footnote<span class="footnote">this is a footnote</span></p>]
     end
+
+    it "ignores escaped notations" do
+      html = RedCloth.convert("It must skip \\%{this}")
+      html.should == %[<p>It must skip %{this}</p>]
+    end
   end
 
   context "custom url helper" do

data/spec/kitabu/toc/html_spec.rb

@@ -26,6 +26,7 @@ describe Kitabu::TOC::HTML do
   end
 
   it "generates toc" do
+    html.should have_tag("div.level1.item-1", "Item 1")
     html.should have_tag("div.level2.item-1-2", "Item 1.2")
     html.should have_tag("div.level3.item-1-1-3", "Item 1.1.3")
     html.should have_tag("div.level4.item-1-1-1-4", "Item 1.1.1.4")
@@ -39,6 +40,7 @@ describe Kitabu::TOC::HTML do
   end
 
   it "adds id attribute to content" do
+    content.should have_tag("h1#item-1", "Item 1")
     content.should have_tag("h2#item-1-2", "Item 1.2")
     content.should have_tag("h3#item-1-1-3", "Item 1.1.3")
     content.should have_tag("h4#item-1-1-1-4", "Item 1.1.1.4")

data/templates/Guardfile

@@ -2,7 +2,11 @@ notification :off
 interactor :off
 
 guard :shell do
-  watch %r[^(?!output)] do |m|
+  watch %r[^(?!output|templates/scss)] do |m|
     `kitabu export`
   end
+
+  watch %r[^templates/scss] do |m|
+    `sass --unix-newlines templates/scss:templates`
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitabu
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,22 +155,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement