pirka 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88fcda5b7f58df80108a0eba4386756ccd9ddbaf
-  data.tar.gz: 428c8af5035de8b0da4a0fc63507f3b5f8d2f6fe
+  metadata.gz: 2738af9c92c8ea4e733d3a5b13af7655c02a35b6
+  data.tar.gz: d2f785e5256f7a46c73b6b6e916cb165eda4a333
 SHA512:
-  metadata.gz: 55814a01738772bead120d50677462cc911d72df46621fb43b97747a603d8175d909652cc1e7a00d6b93f4c1398af654017b6b6282b658c17b7975939672515e
-  data.tar.gz: 9037389b5d65fa6867a41901102f5e8b91f5cb270e74c57357276159a3aae17dca21107a17e13a5ff8eaa8d03cc1910479fdec54942227a18536878a8bd9f6f4
+  metadata.gz: e14c7cb017f012c9e7f7c159072eba66767aa5501626dc241fa4e434d412fe35628ac6c0f16eca8a49cf6c5d7d69cfde7416e89506e08737c57704a3beea86c9
+  data.tar.gz: 801534cf03b1be044a8b828f5e37aed3a4f5eec67926e7cb2a7e12e73284b9b4a2261dc2bc33966487fd2bc8a4ed77ae89e65078705a1f0f06c6ae5b45eac7ff

data/ChangeLog.md

@@ -1,4 +1,14 @@
-### 0.1.0 / 2017-02-07
+### 0.1.2 / 2017-03-06
+
+* Make it possible to specify CSS selector when detecting source code
+* Make it possible to use location specific middleware
+* Add `TextLineNum` middleware
+
+### 0.1.1 / 2017-03-05
+
+* Introduce middleware architecture
+
+### 0.1.0 / 2017-03-05
 
 * Initial release:
 

data/README.md

@@ -73,7 +73,7 @@ You also determine languages interactively. Set `-i`(`--interactive`) option:
 
     $ pirka update
 
-Pirka provides official library files for some EPUB books as Git repository([https://gitlab.com/KitaitiMakoto/pirka-library](https://gitlab.com/KitaitiMakoto/pirka-library)). `pirka update` command fethes the files from the repository and you benefit from it.
+Pirka provides official library files for some EPUB books as Git repository([https://gitlab.com/KitaitiMakoto/pirka-library](https://gitlab.com/KitaitiMakoto/pirka-library)). `pirka update` command fetches the files from the repository and you benefit from it.
 
 Additionally, you can host library files by your own and make Pirka recognizes it by configuration file. See later section for that.
 

data/app/detect.rb

@@ -18,11 +18,14 @@ module Pirka
 
       include Subcommand
 
+      SELECTOR = "code"
+
       def initialize(config)
         super
 
         @library_path = nil
         @interactive = false
+        @selector = SELECTOR
 
         @available_lexers = Rouge::Lexer.all.sort_by(&:tag).each_with_object({}).with_index {|(lexer, lexers), index|
           lexers[(index + 1).to_s] = lexer
@@ -71,7 +74,7 @@ module Pirka
         library.metadata["Release Identifier"] = epub.release_identifier
         library.metadata["title"] = epub.title
         catch do |quit|
-          EPUB::Searcher.search_element(epub, css: 'code').each do |result|
+          EPUB::Searcher.search_element(epub, css: @selector).each do |result|
             item = result[:itemref].item
             if @interactive
               catch do |skip|
@@ -134,6 +137,9 @@ module Pirka
           opt.on "-o", "--output=FILE", "File to save library data", Pathname do |path|
             @library_path = path
           end
+          opt.on "-s", "--selector=SELECTOR", "CSS selector to detect source code element. Defaults to #{SELECTOR.dump}." do |selector|
+            @selector = selector
+          end
         end
       end
 

data/app/highlight.rb

@@ -85,8 +85,8 @@ module Pirka
             Highlighter.new),
           class_name: CSS_CLASS_NAME)
         middleware = library.metadata["middleware"]
-        if middleware && !library.metadata["middleware"].empty?
-          highlighter = library.metadata["middleware"].reduce(highlighter) {|highlighter, desc|
+        if middleware && !middleware.empty?
+          highlighter = middleware.reduce(highlighter) {|highlighter, desc|
             params = desc["params"] || {}
             Highlighter::Middleware.const_get(desc["name"]).new(highlighter, params)
           }
@@ -102,7 +102,15 @@ module Pirka
           item = itemref.item
           doc = elem.document
 
-          highlighter.markup elem, lang
+          if data["middleware"] && !data["middleware"].empty?
+            additional_highlighter = data["middleware"].reduce(highlighter) {|highlighter, desc|
+              params = desc["params"] || {}
+              Highlighter::Middleware.const_get(desc["name"]).new(highlighter, params)
+            }
+            additional_highlighter.markup elem, lang
+          else
+            highlighter.markup elem, lang
+          end
 
           link = doc.at('#pirka') # @todo Avoid conflict with existing link
           unless link

data/app/subcommand.rb

@@ -18,11 +18,11 @@ module Pirka
       def parse_options!(argv)
         parser = OptionParser.new {|opt|
           usage = "Usage: #{opt.program_name} [options] #{self.class::PROGRAM_NAME}"
-          usage << " " << self.class::ARGS.join(" ") if self::class.const_defined?(:ARGS)
+          usage << " " << self.class::ARGS.join(" ") if self.class.const_defined?(:ARGS)
 
           opt.program_name = "#{opt.program_name} [global options] #{self.class::PROGRAM_NAME}"
           opt.banner = <<EOB
-#{self::class::DESCRIPTION}
+#{self.class::DESCRIPTION}
 
 #{usage}
 EOB

data/lib/pirka/highlighter.rb

@@ -68,6 +68,27 @@ module Pirka
           }.join
         end
       end
+
+      class TextLineNum
+        def initialize(highlighter, params = {})
+          @highlighter = highlighter
+          @width = params["width"]
+        end
+
+        def markup(element, lang)
+          lines = []
+          nums = []
+          element.content.each_line do |line|
+            nums << line[0, @width]
+            lines << line[@width..-1]
+          end
+          element.inner_html = lines.join
+          @highlighter.markup element, lang
+          element.inner_html = element.inner_html.lines.collect.with_index {|line, index|
+            nums[index] << line
+          }.join
+        end
+      end
     end
   end
 end

data/lib/pirka/library.rb

@@ -125,10 +125,10 @@ module Pirka
     # @overload each
     #   @return [Enumerator] Enumerator which iterates over cfi and lang
     def each
-      sorted_list = @codelist.each_pair.sort_by {|(cfi, lang)| cfi}
+      sorted_list = @codelist.each_pair.sort_by {|(cfi, data)| cfi}
       if block_given?
-        sorted_list.each do |(cfi, lang)|
-          yield cfi, lang
+        sorted_list.each do |(cfi, data)|
+          yield cfi, data
         end
       else
         sorted_list.each

data/lib/pirka/version.rb

@@ -17,6 +17,6 @@
 
 module Pirka
   # pirka version
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
   EPUB_PARSER_VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pirka
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - KITAITI Makoto