epub-cfi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8aca7ef76271077d0c4026b20d05df02926a9ca
-  data.tar.gz: 14dabd7b660a4047585ffa63cb2ac31bd109125f
+  metadata.gz: bdbce4ceaf9a43a511b16ea3919f1f0f028eedbf
+  data.tar.gz: fbb26bf902a5b301fa041bbe1d251bc33c840d7e
 SHA512:
-  metadata.gz: 8eb1f1a5a5a5ba3e6fca187ffcadad7b796bc0ea680b5a2ef5b2659a4c5ed95986b57593c9622a0450033d084e00cf3ef6bef36c9e73ea15cf2b80ab4a011502
-  data.tar.gz: 213f294bb142f9ef4dd5402d0d3d8a702cdca7156d0cd7b298a0d0f512b1ac239593f9908b12d1b9235fc5b24205237c557308b81d8c702726c382104814b9d0
+  metadata.gz: 450c3498f4bc08da4fc5159239fb95e13ecdce20c22175a1d7be35a8390aef947097005a5a8b5bc09e3944d2c53a9f280b764e669f6b3cb3a4a8df8af690e923
+  data.tar.gz: 781bb732392cfcc3c287465d6e2489ecaa6d6ec1a779f4443bf22416e93839a0a9b54bbc8adbf67347d24f00d7c842d073f2da8d520af68900441459bbd32f58

data/ChangeLog.md

@@ -1,3 +1,8 @@
+### 0.1.1 / 2017-09-17
+
+* Add `CFI::Location.from_parent_and_subpath`
+* [BUG FIX]Consider the case subpath includes step indirection in Range.from_parent_and_start_and_end
+
 ### 0.1.0 / 2017-03-12
 
 * Initial release:

data/README.md

@@ -34,8 +34,8 @@ Examples
     location1 = EPUB::CFI("/6/4[chap01ref]!/4[body01]/10[para05]/1:3[xx,y]")
     location2 = EPUB::CFI("/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3[yyy]")
     location1 < location2 # => true
-    location1 <=> location1 # => -1
-    # location2 appears earlier than location1
+    location1 <=> location2 # => -1
+    # location1 appears earlier than location2
     
     range = EPUB::CFI("/6/4[chap01ref]!/4[body01]/10[para05],/2/1:1,/3:4")
     # => #<EPUB::CFI::Location:/6/4[chap01ref]!/4[body01]/10[para05]/2/1:1>..#<EPUB::CFI::Location:/6/4[chap01ref]!/4[body01]/10[para05]/3:4>

data/epub-cfi.gemspec

@@ -29,8 +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 "racc"
-
+  gem.add_development_dependency "racc"
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rubygems-tasks'
   gem.add_development_dependency 'yard'

data/lib/epub/cfi.rb

@@ -20,6 +20,27 @@ module EPUB
 
       attr_reader :paths
 
+      class << self
+        def from_parent_and_subpath(parent_path, subpath)
+          new(resolve_path(parent_path, subpath))
+        end
+
+        private
+
+        def resolve_path(parent_path, subpath)
+          paths = parent_path.collect(&:dup)
+          return paths unless subpath
+
+          subpath = subpath.collect(&:dup)
+          offset = subpath.last.offset
+          paths.last.steps.concat subpath.shift.steps
+          paths.concat subpath
+          paths.last.instance_variable_set :@offset, offset
+
+          paths
+        end
+      end
+
       def initialize(paths=[])
         @paths = paths
       end
@@ -133,40 +154,16 @@ module EPUB
     class Range < ::Range
       attr_accessor :parent_path, :start_subpath, :end_subpath
 
-      # @todo consider the case subpaths are redirected path
-      # @todo FIXME: too dirty
       class << self
         def from_parent_and_start_and_end(parent_path, start_subpath, end_subpath)
-          start_str = start_subpath.join
-          end_str = end_subpath.join
-
-          first_paths = parent_path.collect(&:dup)
-          if start_subpath
-            offset_of_first = start_subpath.last.offset
-            offset_of_first = offset_of_first.dup if offset_of_first
-            last_of_first_paths = first_paths.pop
-            first_paths << last_of_first_paths
-            last_of_first_paths.steps.concat start_subpath.shift.steps
-            first_paths.concat start_subpath
-            first_paths.last.instance_variable_set :@offset, offset_of_first
-          end
-          offset_of_last = end_subpath.last.offset
-          offset_of_last = offset_of_last.dup if offset_of_last
-          last_paths = parent_path.collect(&:dup)
-          last_of_last_paths = last_paths.pop
-          last_paths << last_of_last_paths
-          last_of_last_paths.steps.concat end_subpath.shift.steps
-          last_paths.concat end_subpath
-          last_paths.last.instance_variable_set :@offset, offset_of_last
-
-          first = CFI::Location.new(first_paths)
-          last = CFI::Location.new(last_paths)
+          first = Location.from_parent_and_subpath(parent_path, start_subpath)
+          last = Location.from_parent_and_subpath(parent_path, end_subpath)
 
           new_range = new(first, last)
 
           new_range.parent_path = Location.new(parent_path)
-          new_range.start_subpath = start_str
-          new_range.end_subpath = end_str
+          new_range.start_subpath = start_subpath.join("!")
+          new_range.end_subpath = end_subpath.join("!")
 
           new_range
         end

data/lib/epub/cfi/version.rb

@@ -18,6 +18,6 @@
 module EPUB
   module CFI
     # epub-cfi version
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/test/test_cfi.rb

@@ -28,6 +28,9 @@ class TestCFI < Test::Unit::TestCase
       'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/1:0)',
       'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:0)',
       'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3)',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[iframe01]!/4/6,:6,/8:1)',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[iframe01],!/4/6:6,/8:1)',
+      'epubcfi(/6/4[chap01ref]!/4[body01]/10[iframe01],/4!/4/6:6,/8:1)',
     ].reduce({}) {|data, cfi|
       data[cfi] = cfi
       data

data/test/test_parser.rb

@@ -27,7 +27,10 @@ class TestParserCFI < Test::Unit::TestCase
     'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05]/2/1:3)',
     'epubcfi(/6/4[chap01ref]!/4[body01]/10[para05],/2/1:1,/3:4)',
     'epubcfi(/6,:1,:3)',
-    'epubcfi(/6/4[chap01ref]!/4[body01]/10[mov01]~23.5@5.75:97.6)'
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[mov01]~23.5@5.75:97.6)',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[iframe01]!/4/6,:6,/8:1)',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[iframe01],!/4/6:6,/8:1)',
+    'epubcfi(/6/4[chap01ref]!/4[body01]/10[iframe01],/4!/4/6:6,/8:1)',
   ].reduce({}) {|data, cfi|
     data[cfi] = cfi
     data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-cfi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -17,7 +17,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: EPUB CFI parser and builder