pirka 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2738af9c92c8ea4e733d3a5b13af7655c02a35b6
-  data.tar.gz: d2f785e5256f7a46c73b6b6e916cb165eda4a333
+  metadata.gz: 8efc7a4fc80d21165bc3028ce64eaec7da9ad6a0
+  data.tar.gz: cc83f7eda83e32e524382b68d0e38945ae37ad35
 SHA512:
-  metadata.gz: e14c7cb017f012c9e7f7c159072eba66767aa5501626dc241fa4e434d412fe35628ac6c0f16eca8a49cf6c5d7d69cfde7416e89506e08737c57704a3beea86c9
-  data.tar.gz: 801534cf03b1be044a8b828f5e37aed3a4f5eec67926e7cb2a7e12e73284b9b4a2261dc2bc33966487fd2bc8a4ed77ae89e65078705a1f0f06c6ae5b45eac7ff
+  metadata.gz: 51263f69726fc459254de1fe5d466cf3fe46a54a4ae69610c5b605b0794e742aa06ce8f86362fb75819a06ff1c883454bd82481ea9116b90b544116918d7c875
+  data.tar.gz: f59125cb2a8383bb709680c10308fac044ebedcfa42ce414434ec6bb7da5fcf9005d6dbc206c04ab621110106852332691279579e076967768f98545ca17a08e

data/.yardopts

@@ -1 +1 @@
---markup markdown --title "pirka Documentation" --protected
+--markup markdown --markup-provider kramdown --title "Pirka Documentation" --protected

data/app/highlight.rb

@@ -34,17 +34,9 @@ module Pirka
         parse_options! argv
 
         epub_path = argv.shift
-        raise ArgumentError, 'Specify EPUB file' unless epub_path
+        epub = prepare_epub(epub_path)
 
-        begin
-          # @todo Make this optional
-          require 'epub/maker/ocf/physical_container/zipruby'
-          EPUB::OCF::PhysicalContainer.adapter = :Zipruby
-        rescue LoadError
-        end
-        epub = EPUB::Parser.parse(epub_path)
-        library = find_library(epub.unique_identifier, epub.modified)
-        raise RuntimeError, "Cannot find code list #{Library.filename(epub.release_identifier)} for #{epub.release_identifier}(#{epub_path}) in any directory of #{Library.directories.join(", ")}" unless library
+        library = find_library(epub)
 
         css_item = add_css_file(epub)
         need_save = highlight_contents(epub, css_item, library)
@@ -70,10 +62,23 @@ module Pirka
         }
       end
 
+      # @todo Make this optional
+      def prepare_epub(path)
+        raise ArgumentError, 'Specify EPUB file' unless path
+        begin
+          require 'epub/maker/ocf/physical_container/zipruby'
+          EPUB::OCF::PhysicalContainer.adapter = :Zipruby
+        rescue LoadError
+        end
+        EPUB::Parser.parse(path)
+      end
+
       # @todo Do the best when file for release identifier is not find but for unique identifier found
-      def find_library(unique_identifier, modified)
-        @library_path ? Library.load_file(@library_path) :
-          Library.find_by_release_identifier("#{unique_identifier}@#{modified}")
+      def find_library(epub)
+        library = @library_path ? Library.load_file(@library_path) :
+          Library.find_by_release_identifier(epub.release_identifier)
+        raise RuntimeError, "Cannot find code list #{Library.filename(epub.release_identifier)} for #{epub.release_identifier}(#{epub_path}) in any directory of #{Library.directories.join(", ")}" unless library
+        library
       end
 
       # @todo Consider descendant elements of code
@@ -92,7 +97,7 @@ module Pirka
           }
         end
 
-        library.each.reverse_each do |(cfi, data)|
+        library.reverse_each do |(cfi, data)|
           lang = data["language"]
           unless lang
             warn "Language for #{cfi} is not detected"
@@ -112,19 +117,7 @@ module Pirka
             highlighter.markup elem, lang
           end
 
-          link = doc.at('#pirka') # @todo Avoid conflict with existing link
-          unless link
-            item_entry_name = DUMMY_ORIGIN + item.entry_name
-            entry_name = DUMMY_ORIGIN + css_item.entry_name
-            href = entry_name.route_from(item_entry_name)
-            link = Nokogiri::XML::Node.new('link', doc)
-            link['href'] = href
-            link['type'] = 'text/css'
-            link['rel'] = 'stylesheet'
-            link['id'] = 'pirka'
-            head = (doc/'head').first
-            head << link
-          end
+          embed_stylesheet_link doc, item, css_item
           item.content = doc.to_xml
           need_save << item
         end
@@ -152,6 +145,22 @@ module Pirka
         epub.package.edit
       end
 
+      def embed_stylesheet_link(doc, item, css_item)
+        link = doc.at('#pirka') # @todo Avoid conflict with existing link
+        unless link
+          item_entry_name = DUMMY_ORIGIN + item.entry_name
+          entry_name = DUMMY_ORIGIN + css_item.entry_name
+          href = entry_name.route_from(item_entry_name)
+          link = Nokogiri::XML::Node.new('link', doc)
+          link['href'] = href
+          link['type'] = 'text/css'
+          link['rel'] = 'stylesheet'
+          link['id'] = 'pirka'
+          head = (doc/'head').first
+          head << link
+        end
+      end
+
       private
 
       # @todo theme

data/app.rb

@@ -2,7 +2,7 @@ require "optparse"
 require "pirka/version"
 require "pirka/config"
 
-gem "epub-parser", Pirka::EPUB_PARSER_VERSION
+gem "epub-parser", ">= #{Pirka::EPUB_PARSER_VERSION}"
 
 module Pirka
   class App

data/lib/pirka/library.rb

@@ -1,7 +1,7 @@
 require "pathname"
 require "base64"
 require "yaml"
-require "epub/parser/cfi"
+require "epub/cfi"
 
 module Pirka
   # Environment variables affect this class:
@@ -10,6 +10,8 @@ module Pirka
   # 
   # @see https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
   class Library
+    include Enumerable
+
     DIR_NAME = "pirka/local"
     EXT = ".yaml"
     SUBDIR_LENGTH = 4
@@ -79,7 +81,7 @@ module Pirka
         h.each_pair do |key, value|
           if key == "codelist"
             value.each_pair do |cfi, data|
-              library.codelist[EPUB::Parser::CFI.parse(cfi)] = data
+              library.codelist[EPUB::CFI.parse(cfi)] = data
             end
           else
             library.metadata[key] = value
@@ -139,7 +141,7 @@ module Pirka
     def to_h
       metadata.merge({
         "codelist" => each.with_object({}) {|(cfi, value), list|
-          list[cfi.to_fragment] = value
+          list[cfi.to_s] = value
         }
       })
     end

data/lib/pirka/version.rb

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

data/pirka.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'epub-parser', Pirka::EPUB_PARSER_VERSION
+  gem.add_runtime_dependency 'epub-parser', ">= #{Pirka::EPUB_PARSER_VERSION}"
   gem.add_runtime_dependency 'epub-maker'
   gem.add_runtime_dependency 'rouge'
   gem.add_runtime_dependency 'rouge-lexers-fluentd'

data/test/test_library.rb

@@ -2,7 +2,7 @@ require "helper"
 require "yaml"
 require "tmpdir"
 require "pirka/library"
-require "epub/parser/cfi"
+require "epub/cfi"
 
 class TestLibrary < Test::Unit::TestCase
   def setup
@@ -47,7 +47,7 @@ EOY
               /6/31!/4/2/56/2]
     i = 0
     @library.each do |(cfi, _)|
-      assert_equal cfi.to_s, cfis[i]
+      assert_equal cfi.path_string, cfis[i]
       i += 1
     end
   end
@@ -56,7 +56,7 @@ EOY
     assert_equal %w[/6/30!/4/2/56/2
                     /6/30!/4/2/58/2
                     /6/31!/4/2/56/2],
-                 @library.each.collect {|(cfi, _)| cfi.to_s}
+                 @library.each.collect {|(cfi, _)| cfi.path_string}
   end
 
   def test_to_yaml
@@ -74,7 +74,7 @@ EOY
       assert_equal @library.metadata, data
 
       expected_codelist = @library.each.with_object({}) {|(cfi, value), list|
-        list[cfi.to_fragment] = value
+        list[cfi.to_s] = value
       }
       assert_equal expected_codelist, codelist
     end
@@ -97,7 +97,7 @@ EOY
       assert_equal @library.metadata, data
 
       expected_codelist = @library.each.with_object({}) {|(cfi, value), list|
-        list[cfi.to_fragment] = value
+        list[cfi.to_s] = value
       }
       assert_equal expected_codelist, codelist
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pirka
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epub-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: epub-maker
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Syntax highlighting tool for EPUB books