nokogiri-xml-range 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2b9a05b01ac98bf6a41a88fa74ee6e7c12caebdf
-  data.tar.gz: 491dc04b1eb68735c18330a472b3645f62c01ac7
+SHA256:
+  metadata.gz: 92f36b17f2298f254b71c2afc1e074f427a15b76f6e732c6a253d64c7e6b67d4
+  data.tar.gz: 648f5fe677f526e735c7d7f24e26541daaf45374d9dbd883070e22511eb7a248
 SHA512:
-  metadata.gz: d197d502e3fc10c82510bc074ecdd04a728dffff385eb97f1e304504d7f325f92340285c66ab1abe99492f5fd222477bb16c2796970f492a6386ce1bc8374a74
-  data.tar.gz: 1f2606fa9df9778aa7c2ef4289d24f1469a8242e5ccbbda4cb2bda073ff581320442945d74c17ee1843fa808c804af53b1ba53f974fec653095424ee22eda144
+  metadata.gz: 24917bcad96a0e62148748c23d9022082e7809c810581820fd6bf5dfd8fea4fc26f0422216f6511ff567223e6c9edf27ea0b041de9fc6c8275cb7c9600fb3224
+  data.tar.gz: 84025d816602ec7622733e7b22d4bbeb5161bf89e65282d7d83b6f9359626da9aef5fbc4970ef76800cb4f9824f7ff995dff0f9c79a1cf41be0e0a1fe428772d

data/.document

@@ -1,3 +1,3 @@
 - 
 ChangeLog.md
-LICENSE.txt
+COPYING.txt

data/.gitignore

@@ -1,2 +1,4 @@
 doc/
 pkg/
+.yardoc/
+coverage/

data/.gitlab-ci.yml

@@ -0,0 +1,17 @@
+before_script:
+  - gem install --no-document nokogiri test-unit test-unit-notify rubygems-tasks yard rake pry simplecov
+
+test:2.4:
+  image: ruby:2.4
+  script:
+    - rake test
+
+test:2.5:
+  image: ruby:2.5
+  script:
+    - rake test
+
+test:2.6:
+  image: ruby:2.6
+  script:
+    - rake test

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 0.1.1 / 2019-05-05
+
+* Use refinements to add method to CharacterData and ProcessingInstruction instead of module inclusion
+
 ### 0.1.0 / 2015-09-05
 
 * Initial release:

data/README.md

@@ -1,11 +1,13 @@
 Nokogiri::XML::Range
 ====================
 
-[![Build Status](https://travis-ci.org/KitaitiMakoto/nokogiri-xml-range.svg?branch=master)](https://travis-ci.org/KitaitiMakoto/nokogiri-xml-range)
-[![Coverage Status](https://coveralls.io/repos/KitaitiMakoto/nokogiri-xml-range/badge.svg?branch=master&service=github)](https://coveralls.io/github/KitaitiMakoto/nokogiri-xml-range?branch=master)
+[![pipeline status](https://gitlab.com/KitaitiMakoto/nokogiri-xml-range/badges/master/pipeline.svg)](https://gitlab.com/KitaitiMakoto/nokogiri-xml-range/commits/master)
+[![coverage report](https://gitlab.com/KitaitiMakoto/nokogiri-xml-range/badges/master/coverage.svg)](https://gitlab.com/KitaitiMakoto/nokogiri-xml-range/commits/master)
+[![Gem Version](https://badge.fury.io/rb/nokogiri-xml-range.svg)](http://badge.fury.io/rb/nokogiri-xml-range)
 
-* [Homepage](https://rubygems.org/gems/nokogiri-xml-range)
+* [Homepage](https://gitlab.com/KitaitiMakoto/nokogiri-xml-range)
 * [Documentation](http://rubydoc.info/gems/nokogiri-xml-range)
+* [Source code](https://gitlab.com/KitaitiMakoto/nokogiri-xml-range)
 * [Email](mailto:KitaitiMakoto at gmail.com)
 
 DOM Range implementation on Nokogiri
@@ -50,9 +52,18 @@ Examples
     child2 = doc.search('child')[1]
     child1_text = child1.child
     child2_text = child2.child
+
     # Initialize range with nodes and offsets of start and end point
     range = Nokogiri::XML::Range.new(child1_text, 0, child2_text, 5)
+
     # This range expresses `child 1</child>\n        <child>child`
+    # Pseudoly expressed as:
+    # <root>
+    #   <parent>
+    #     <child>[**START POINT**]child 1</child>
+    #     <child>child[**END POINT**] 2</child>
+    #   </parent>
+    # </root>
 
 ### Deleting contents ###
 
@@ -147,6 +158,14 @@ Install
 
     $ gem install nokogiri-xml-range
 
+Todos
+-----
+
+* Helpful error messages
+* C0 coverage 100%
+* More test cases from use cases in the wild
+* Performance optimization, especially caching
+
 Copyright
 ---------
 

data/lib/nokogiri/xml/range.rb

@@ -2,20 +2,19 @@
 require 'nokogiri/xml/range/version'
 require 'nokogiri'
 require 'nokogiri/xml/range/refinement'
-require 'nokogiri/xml/replacable'
 
 using Nokogiri::XML::Range::Refinement
 
 module Nokogiri::XML
-  class InvalidNodeTypeError < StandardError; end
-  class IndexSizeError < StandardError; end
-  class NotSupportedError < StandardError; end
-  class WrongDocumentError < StandardError; end
-  class HierarchyRequestError < StandardError; end
-  class NotFoundError < StandardError; end
-  class InvalidStateError < StandardError; end
-
   class Range
+    class InvalidNodeTypeError < StandardError; end
+    class IndexSizeError < StandardError; end
+    class NotSupportedError < StandardError; end
+    class WrongDocumentError < StandardError; end
+    class HierarchyRequestError < StandardError; end
+    class NotFoundError < StandardError; end
+    class InvalidStateError < StandardError; end
+
     START_TO_START = 0
     START_TO_END = 1
     END_TO_END = 2

data/lib/nokogiri/xml/range/refinement.rb

@@ -58,7 +58,7 @@ module Nokogiri::XML
         end
 
         def replacable?
-          kind_of? Nokogiri::XML::Replacable
+          kind_of?(CharacterData) || kind_of?(ProcessingInstruction)
         end
 
         def validate_pre_insertion(parent, child)
@@ -119,6 +119,36 @@ module Nokogiri::XML
       refine DocumentFragment do
         attr_accessor :host
       end
+
+      [CharacterData, ProcessingInstruction].each do |klass|
+        refine klass do
+          def replace_data(offset, count, data)
+            len = length
+            raise IndexSizeError, 'offset is greater than node length' if offset > len
+
+            count = len - offset if offset + count > len
+            encoding = content.encoding
+            utf16_content = content.encode('UTF-16LE')
+            utf16_data = data.encode('UTF-16LE')
+            result = utf16_content.byteslice(0, offset * 2) + utf16_data + utf16_content.byteslice(offset * 2, utf16_content.bytesize)
+            delete_offset = offset + utf16_data.bytesize / 2
+            result = result.byteslice(0, delete_offset * 2) + result.byteslice((delete_offset + count) * 2, result.bytesize)
+
+            self.content = result.encode(encoding)
+          end
+
+          def substring_data(offset, count)
+            len = length
+            raise IndexSizeError, 'offset is greater than node length' if offset > len
+
+            encoding = content.encoding
+            utf16_content = content.encode('UTF-16LE')
+
+            byte_length = [utf16_content.bytesize - offset * 2, count * 2].min
+            utf16_content.byteslice(offset * 2, byte_length).encode(encoding)
+          end
+        end
+      end
     end
   end
 end

data/lib/nokogiri/xml/range/version.rb

@@ -2,7 +2,7 @@ module Nokogiri
   module XML
     class Range
       # nokogiri-xml-range version
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

data/nokogiri-xml-range.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.license       = "LGPL"
   gem.authors       = ["KITAITI Makoto"]
   gem.email         = "KitaitiMakoto@gmail.com"
-  gem.homepage      = "https://rubygems.org/gems/nokogiri-xml-range"
+  gem.homepage      = "https://gitlab.com/KitaitiMakoto/nokogiri-xml-range"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -21,11 +21,9 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'test-unit', '~> 3'
   gem.add_development_dependency 'test-unit-notify'
-  gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
-  gem.add_development_dependency 'yard', '~> 0.8'
+  gem.add_development_dependency 'rubygems-tasks'
+  gem.add_development_dependency 'yard'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'coveralls'
 end

data/test/helper.rb

@@ -1,10 +1,4 @@
 require 'simplecov'
-require 'coveralls'
-Coveralls.wear!
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
 SimpleCov.start do
   add_filter '/test/'
 end

data/test/test_nokogiri-xml-range-refinement.rb

@@ -1,7 +1,6 @@
 require 'helper'
 require 'nokogiri'
 require 'nokogiri/xml/range/refinement'
-require 'nokogiri/xml/replacable'
 
 class TestNokogiriXMLRangeRefinement < Test::Unit::TestCase
   using Nokogiri::XML::Range::Refinement

data/test/test_nokogiri-xml-replacable.rb

@@ -1,9 +1,10 @@
 require 'helper'
 require 'nokogiri'
 require 'nokogiri/xml/range/refinement'
-require 'nokogiri/xml/replacable'
 
 class TestNokogiriXMLReplacable < Test::Unit::TestCase
+  using Nokogiri::XML::Range::Refinement
+
   def setup
     @doc = Nokogiri::XML::Document.new
     @text = Nokogiri::XML::Text.new('Hello, world.', @doc)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-xml-range
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -54,34 +54,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -156,26 +128,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
 - ".document"
 - ".gitignore"
-- ".travis.yml"
+- ".gitlab-ci.yml"
 - ".yardopts"
 - COPYING.txt
 - ChangeLog.md
-- Gemfile
 - README.md
 - Rakefile
 - lib/nokogiri/xml/range.rb
 - lib/nokogiri/xml/range/refinement.rb
 - lib/nokogiri/xml/range/version.rb
-- lib/nokogiri/xml/replacable.rb
 - nokogiri-xml-range.gemspec
 - test/helper.rb
 - test/test_nokogiri-xml-range-refinement.rb
 - test/test_nokogiri-xml-range.rb
 - test/test_nokogiri-xml-replacable.rb
-homepage: https://rubygems.org/gems/nokogiri-xml-range
+homepage: https://gitlab.com/KitaitiMakoto/nokogiri-xml-range
 licenses:
 - LGPL
 metadata: {}
@@ -194,8 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: DOM Range implementation on Nokogiri

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
-  - ruby-head
-  - 2.2.3
-  - 2.1.7

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/lib/nokogiri/xml/replacable.rb

@@ -1,39 +0,0 @@
-using Nokogiri::XML::Range::Refinement
-
-module Nokogiri::XML
-  module Replacable
-    def replace_data(offset, count, data)
-      len = length
-      raise IndexSizeError, 'offset is greater than node length' if offset > len
-
-      count = len - offset if offset + count > len
-      encoding = content.encoding
-      utf16_content = content.encode('UTF-16LE')
-      utf16_data = data.encode('UTF-16LE')
-      result = utf16_content.byteslice(0, offset * 2) + utf16_data + utf16_content.byteslice(offset * 2, utf16_content.bytesize)
-      delete_offset = offset + utf16_data.bytesize / 2
-      result = result.byteslice(0, delete_offset * 2) + result.byteslice((delete_offset + count) * 2, result.bytesize)
-
-      self.content = result.encode(encoding)
-    end
-
-    def substring_data(offset, count)
-      len = length
-      raise IndexSizeError, 'offset is greater than node length' if offset > len
-
-      encoding = content.encoding
-      utf16_content = content.encode('UTF-16LE')
-
-      byte_length = [utf16_content.bytesize - offset * 2, count * 2].min
-      utf16_content.byteslice(offset * 2, byte_length).encode(encoding)
-    end
-  end
-
-  class CharacterData
-    include Replacable
-  end
-
-  class ProcessingInstruction
-    include Replacable
-  end
-end