epub-parser 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db9a8abb6d8ece39b51e5432c33caffdbd5efc65
-  data.tar.gz: bd9eb66c3af2ad86c1def37514c60db5d687a26d
+  metadata.gz: 397595100e38636588590b7243f631b5d36fa05a
+  data.tar.gz: 80c3b9bfd7bf935339c9a7b79e463e334e31cd98
 SHA512:
-  metadata.gz: ab94d4c2c5104e966d6f2ed8368491189ca5a215a687bd6fdd2a43424b02935c44c36f8b14f39514858d2ad92c283e6ae7780041339f28f63dc283e1c8f72c30
-  data.tar.gz: 4d8c2f4f3a8dc584386cf55a4a6be890856c466b9ae1e7c2d6dfbe4cf31362730b1cbadf89c125910f9ab86ee27ccd7776fa099efefbeee4727698e140629cac
+  metadata.gz: 8bc7936024db865257350be7d61d3d48677858cbcd3d77c561ee10979671e903d0234398b7b4ef0bc78a137ff7a0589e722d6ffb0638ab290b2a91cab496167b
+  data.tar.gz: ae0b06be290df786bf1a7038417cb1dcbc6d51602f68c5afefa8311d856c086b62fcff10a972f5c0b2544980a65ec06f863c83b77f692f941fa0c893f95876ba

data/CHANGELOG.markdown

@@ -1,6 +1,15 @@
 CHANGELOG
 =========
 
+0.2.4
+-----
+
+* Bug fix for `EPUB::CFI::Location#<=>`
+* Change default physical container adapter from `EPUB::OCF::PhysicalContainer::ZipRuby` to `EPUB::OCF::PhysicalContainer::ArchiveZip`
+* Add `EPUB::CFI::Step#element?` and `#character_data?`
+* Change attribute name: `EPUB::CFI::Step#step` -> `EPUB::CFI::Step#value`, `EPUB::CFI::CharacterOffset#offset` -> `EPUB::CFI::CharacterOffset#value`
+* Show modified on `epubinfo` command
+
 0.2.3
 -----
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011, 2012, 2013 KITAITIMAKOTO <KitaitiMakoto@gmail.com>
+Copyright (c) 2011, 2012, 2013, 2014, 2015 KITAITIMAKOTO <KitaitiMakoto@gmail.com>
 
 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:
 

data/README.markdown

@@ -133,7 +133,7 @@ Then documentation will be available in `doc` directory.
 
 REQUIREMENTS
 ------------
-* Ruby 2.0.0 or later
+* Ruby 2.1.0 or later
 * `patch` command to install Nokogiri
 * C compiler to compile Zip/Ruby and Nokogiri
 
@@ -151,6 +151,14 @@ If you find other gems, please tell me or request a pull request.
 RECENT CHANGES
 --------------
 
+### 0.2.4
+
+* Bug fix for `EPUB::CFI::Location#<=>`
+* Change default physical container adapter from `EPUB::OCF::PhysicalContainer::ZipRuby` to `EPUB::OCF::PhysicalContainer::ArchiveZip`
+* Add `EPUB::CFI::Step#element?` and `#character_data?`
+* Change attribute name: `EPUB::CFI::Step#step` -> `EPUB::CFI::Step#value`, `EPUB::CFI::CharacterOffset#offset` -> `EPUB::CFI::CharacterOffset#value`
+* Show modified on `epubinfo` command
+
 ### 0.2.3
 
 * Change the name of physical container adapter for file system: :File -> :UnpackedDirectory
@@ -177,10 +185,6 @@ RECENT CHANGES
 
 [archive-zip]: https://github.com/javanthropus/archive-zip
 
-### 0.2.0
-
-* Make it possible to parse file system directory as an EPUB file. See {file:docs/UnpackedArchive.markdown} for details.
-
 See {file:CHANGELOG.markdown} for older changelogs and details.
 
 TODOS

data/bin/epubinfo

@@ -41,6 +41,7 @@ end
 book = EPUB::Parser.parse(file)
 data = {'Title' => [book.title]}
 data.merge!(book.metadata.to_h)
+data['modified'] = [book.modified]
 data['Unique identifier'] = [book.metadata.unique_identifier]
 data['EPUB Version'] = [book.package.version]
 counts = {:chars => 0, :words => 0}

data/epub-parser.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.has_rdoc = 'yard'
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'archive-zip'
+  s.add_development_dependency 'zipruby'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-doc'
   s.add_development_dependency 'test-unit'
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'racc'
   s.add_development_dependency 'nokogiri-diff'
 
-  s.add_runtime_dependency 'zipruby'
+  s.add_runtime_dependency 'archive-zip'
   s.add_runtime_dependency 'nokogiri', '~> 1.6'
   s.add_runtime_dependency 'addressable', '>= 2.3.5'
   s.add_runtime_dependency 'rchardet', '>= 1.6.1'

data/lib/epub/cfi.rb

@@ -41,7 +41,7 @@ module EPUB
         end
 
         unless cmp == 0
-          if cmp == 1 and other_paths[index + 1]
+          if cmp == 1 and paths[index].offset and other_paths[index + 1]
             return nil
           else
             return cmp
@@ -182,24 +182,33 @@ module EPUB
     end
 
     class Step
-      attr_reader :step, :assertion
+      attr_reader :value, :assertion
+      alias step value
 
-      def initialize(step, assertion=nil)
-        @step, @assertion = step, assertion
+      def initialize(value, assertion=nil)
+        @value, @assertion = value, assertion
         @string_cache = nil
       end
 
       def initialize_copy(original)
-        @step = original.step
+        @value = original.value
         @assertion = original.assertion.dup if original.assertion
       end
 
       def to_s
-        @string_cache ||= "/#{step}#{assertion}".freeze # need escape?
+        @string_cache ||= "/#{value}#{assertion}".freeze # need escape?
       end
 
       def <=>(other)
-        step <=> other.step
+        value <=> other.value
+      end
+
+      def element?
+        value.even?
+      end
+
+      def character_data?
+        value.odd?
       end
     end
 
@@ -247,19 +256,20 @@ module EPUB
     end
 
     class CharacterOffset
-      attr_reader :offset, :assertion
+      attr_reader :value, :assertion
+      alias offset value
 
-      def initialize(offset, assertion=nil)
-        @offset, @assertion = offset, assertion
+      def initialize(value, assertion=nil)
+        @value, @assertion = value, assertion
         @string_cache = nil
       end
 
       def to_s
-        @string_cache ||= ":#{offset}#{assertion}".freeze # need escape?
+        @string_cache ||= ":#{value}#{assertion}".freeze # need escape?
       end
 
       def <=>(other)
-        offset <=> other.offset
+        value <=> other.value
       end
     end
 

data/lib/epub/ocf/physical_container.rb

@@ -1,4 +1,4 @@
-require 'epub/ocf/physical_container/zipruby'
+require 'epub/ocf/physical_container/archive_zip'
 require 'epub/ocf/physical_container/unpacked_directory'
 require 'epub/ocf/physical_container/unpacked_uri'
 
@@ -6,7 +6,7 @@ module EPUB
   class OCF
     # @todo: Make thread save
     class PhysicalContainer
-      @adapter = Zipruby
+      @adapter = ArchiveZip
 
       class << self
         def adapter

data/lib/epub/ocf/physical_container/zipruby.rb

@@ -1,18 +1,5 @@
 require 'zipruby'
 
-if $VERBOSE
-  warn <<EOW
-[WARNING]Default OCF physical container adapter will become ArchiveZip, which uses archive-zip gem to extract contents from EPUB package, instead of current default Zipruby, which uses zipruby gem, in the near future.
-You can try ArchiveZip adapter by:
-
-1. gem install archive-zip
-2. require 'epub/ocf/physical_container/archive_zip'
-3. EPUB::OCF::PhysicalContainer.adapter = :ArchiveZip
-
-If you find problems, please inform me via GitHub issues: https://github.com/KitaitiMakoto/epub-parser/issues
-EOW
-end
-
 module EPUB
   class OCF
     class PhysicalContainer

data/lib/epub/parser/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   class Parser
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/test/test_ocf_physical_container.rb

@@ -43,6 +43,7 @@ class TestOCFPhysicalContainer < Test::Unit::TestCase
     end
   end
 
+  require 'epub/ocf/physical_container/zipruby'
   class TestZipruby < self
     include ConcreteContainer
 
@@ -71,7 +72,6 @@ class TestOCFPhysicalContainer < Test::Unit::TestCase
     end
   end
 
-  require 'epub/ocf/physical_container/archive_zip'
   class TestArchiveZip < self
     include ConcreteContainer
 

data/test/test_parser.rb

@@ -44,7 +44,7 @@ class TestParser < Test::Unit::TestCase
     assert_equal 'Mon premier guide de cuisson, un Mémoire', epub.main_title
     assert_equal File.read('test/fixtures/book/OPS/nav.xhtml'), epub.nav.read
     assert_equal EPUB::OCF::PhysicalContainer::UnpackedDirectory, epub.container_adapter
-    assert_equal EPUB::OCF::PhysicalContainer::Zipruby, EPUB::OCF::PhysicalContainer.adapter
+    assert_equal EPUB::OCF::PhysicalContainer::ArchiveZip, EPUB::OCF::PhysicalContainer.adapter
   end
 
   class TestBook < TestParser

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-parser
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: archive-zip
+  name: zipruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: zipruby
+  name: archive-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="