dense 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 314a76ad0969382d65813cfa4ab3eb62db8a1ecf
-  data.tar.gz: ff138616d42d086fd7abbd1beee76c9f81c55172
+SHA256:
+  metadata.gz: 24371919775ff81e60eb86f0e9bae21a13a4cd4458e14a3584b05b7a16e7937b
+  data.tar.gz: '085c7f5db832b45f4c4f0127ad224d4dfa15402b444b5312274f54ac055825d3'
 SHA512:
-  metadata.gz: bcc1ff383a330a6da5068fd16774663e65577290bc7737a02d5102188f5c79d0fb2cbd24a627d607c7366ec13262d738b12121d61ac62042cbdf37883d7d0cf7
-  data.tar.gz: '098e9342bec870d2f21339c89e70d8825aaa24381234276d1e22f20391fd9488009589dcc1e1d01a1a75c57a0048dd8cb62b591ba2db55c5989519695dc86dff'
+  metadata.gz: f0f291761cfb4aaa3d6151e788dc9200a361deed8556167cc9a219b96f473a9e3373f822c93b2a6940370d0a3d01ad19c17ec1e4e9dfeef48cca399c3273bf7d
+  data.tar.gz: bd667ecb92422f129e474bd2f37121963f0e618b7166e80f82003462944d2616655034b51f567405c614fbfee2405c32f9dc6b3824e650c5de50f9efdf1cb1d5

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # dense
 
 
+## dense 1.1.1  released 2018-06-15
+
+* Accept `[a;b;c]` union keys
+* Accept regular expressions for object keys
+
+
 ## dense 1.1.0  released 2018-04-29
 
 * Add Dense.path(path) and Dense.gather(collection, path)

data/Makefile

@@ -8,6 +8,7 @@ VERSION = \
 
 count_lines:
 	find lib -name "*.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
+	find spec -name "*.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
 cl: count_lines
 
 gemspec_validate:

data/README.md

@@ -117,7 +117,7 @@ When it doesn't find, it raises an instance of `KeyError`:
 ```ruby
 Dense.fetch({}, 'a.0.b')
   # raises
-  #   KeyError: Found nothing at "a" ("0.b" remains)
+  #   KeyError: found nothing at "a" ("0.b" remains)
 ```
 
 It might instead raise an instance of `TypeError` if a non-integer key is requested of an array:
@@ -125,7 +125,7 @@ It might instead raise an instance of `TypeError` if a non-integer key is reques
 ```ruby
 Dense.fetch({ 'a' => [] }, 'a.k.b')
   # raises
-  #   TypeError: No key "k" for Array at "a"
+  #   TypeError: no key "k" for Array at "a"
 ```
 
 See KeyError and TypeError below for more details.
@@ -207,7 +207,7 @@ r   # => 'three'
 
 c = { 'a' => [] }
 Dense.set(c, 'a.b', 1)
-  # => TypeError: No key "b" for Array at "a"
+  # => TypeError: no key "b" for Array at "a"
 
 
 c = { 'a' => {} }
@@ -217,7 +217,7 @@ r   # => 1
 
 c = {}
 Dense.set(c, 'a.0', 1)
-  # => KeyError: Found nothing at "a" ("0" remains)
+  # => KeyError: found nothing at "a" ("0" remains)
 ```
 
 Setting at multiple places in one go is possible:
@@ -282,11 +282,11 @@ r   # => 3
 It fails with a `KeyError` or a `TypeError` if it cannot unset.
 ```ruby
 Dense.unset({}, 'a')
-  # => KeyError: Found nothing at "a"
+  # => KeyError: found nothing at "a"
 Dense.unset([], 'a')
-  # => TypeError: No key "a" for Array at root
+  # => TypeError: no key "a" for Array at root
 Dense.unset([], '1')
-  # => KeyError: Found nothing at "1"
+  # => KeyError: found nothing at "1"
 ```
 
 Unsetting multiple values is OK:
@@ -309,7 +309,7 @@ e =
   rescue => err
     err
   end
-  # => #<KeyError: Found nothing at "a" ("b" remains)>
+  # => #<KeyError: found nothing at "a" ("b" remains)>
 e.full_path
   # => "a"
 e.miss

data/dense.gemspec

@@ -27,9 +27,9 @@ Fetching deep in a dense structure. A kind of bastard of JSONPath.
     "#{s.name}.gemspec",
   ]
 
-  s.add_runtime_dependency 'raabro', '>= 1.1.5'
+  s.add_runtime_dependency 'raabro', '~> 1.1', '>= 1.1.5'
 
-  s.add_development_dependency 'rspec', '~> 3.4'
+  s.add_development_dependency 'rspec', '~> 3.7'
 
   s.require_path = 'lib'
 end

data/lib/dense.rb

@@ -1,7 +1,7 @@
 
 module Dense
 
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end
 
 require 'raabro'

data/lib/dense/methods.rb

@@ -126,7 +126,7 @@ module Dense; class << self
     path1 = Dense::Path.make(miss[1] + [ miss[3] ]).to_s.inspect
     path2 = Dense::Path.make(miss[4]).to_s.inspect
 
-    msg = "Found nothing at #{path1}"
+    msg = "found nothing at #{path1}"
     msg = "#{msg} (#{path2} remains)" if path2 != '""'
 
     make_error(KeyError, msg, path, miss)
@@ -138,7 +138,7 @@ module Dense; class << self
     cla = miss[2].class
     pat = miss[1].empty? ? 'root' : Dense::Path.make(miss[1]).to_s.inspect
 
-    make_error(TypeError, "No key #{key} for #{cla} at #{pat}", path, miss)
+    make_error(TypeError, "no key #{key} for #{cla} at #{pat}", path, miss)
   end
 
   def miss_error(path, miss)

data/lib/dense/parser.rb

@@ -3,6 +3,17 @@ module Dense::Path::Parser include ::Raabro
 
   # piece parsers bottom to top
 
+  def rxnames(i)
+
+    rex(:rxnames, i, %r{
+      /(
+        \\[\/bfnrt] |
+        \\u[0-9a-fA-F]{4} |
+        [^/\b\f\n\r\t]
+      )*/[imxouesn]*
+    }x)
+  end
+
   def dqname(i)
 
     rex(:qname, i, %r{
@@ -26,7 +37,8 @@ module Dense::Path::Parser include ::Raabro
   end
 
   def dot(i); str(nil, i, '.'); end
-  def comma(i); rex(nil, i, / *, */); end
+  def comma_or_semicolon(i); rex(nil, i, / *[,;] */); end
+
   def bend(i); str(nil, i, ']'); end
   def bstart(i); str(nil, i, '['); end
   def blank(i); str(:blank, i, ''); end
@@ -43,15 +55,23 @@ module Dense::Path::Parser include ::Raabro
       /(
         (-?\d+)?:(-?\d+)?:(-?\d+)? |
         (-?\d+)?:(-?\d+)? |
+        (-?\d+)?,(\d+)? |
         -?\d+
       )/x)
   end
 
   def escape(i); rex(:esc, i, /\\[.*]/); end
 
-  def bindex(i); alt(:index, i, :dqname, :sqname, :star, :ses, :name, :blank); end
-  def bindexes(i); jseq(:bindexes, i, :bindex, :comma); end
-  def simple_index(i); alt(:index, i, :off, :escape, :star, :name); end
+  def bindex(i)
+    alt(:index, i, :dqname, :sqname, :star, :ses, :rxnames, :name, :blank)
+  end
+  def bindexes(i)
+    jseq(:bindexes, i, :bindex, :comma_or_semicolon)
+  end
+
+  def simple_index(i)
+    alt(:index, i, :off, :escape, :star, :rxnames, :name)
+  end
 
   def dotdot(i); str(:dotdot, i, '.'); end
   def dotdotstar(i); rex(:dotdotstar, i, /(\.\.\*|\.\[\*\])/); end
@@ -67,10 +87,21 @@ module Dense::Path::Parser include ::Raabro
   # rewrite parsed tree
 
   def rewrite_ses(t)
-    a = t.string.split(':').collect { |e| e.empty? ? nil : e.to_i }
-    return a[0] if a[1] == nil && a[2] == nil
-    { start: a[0], end: a[1], step: a[2] }
+
+    s = t.string
+
+    if (a = s.split(',')).length == 2
+      { start: a[0].to_i, count: a[1].to_i }
+    else
+      a = s.split(':').collect { |e| e.empty? ? nil : e.to_i }
+      if a[1] == nil && a[2] == nil
+        a[0]
+      else
+        { start: a[0], end: a[1], step: a[2] }
+      end
+    end
   end
+
   def rewrite_esc(t); t.string[1, 1]; end
   def rewrite_star(t); :star; end
   def rewrite_dotdot(t); :dot; end
@@ -84,6 +115,30 @@ module Dense::Path::Parser include ::Raabro
 
   def rewrite_blank(t); nil; end
 
+  ENCODINGS = {
+    'u' => 'UTF-8', 'e' => 'EUC-JP', 's' => 'Windows-31J', 'n' => 'ASCII-8BIT' }
+  R_ENCODINGS = ENCODINGS
+    .inject({}) { |h, (k, v)| h[v] = k; h }
+
+  def rewrite_rxnames(t)
+
+    m = t.string.match(/\A\/(.+)\/([imxuesn]*)\z/)
+
+    s = m[1]
+
+    e = ENCODINGS[(m[2].match(/[uesn]/) || [])[0]]
+    #s = s.force_encoding(e) if e
+    s = s.encode(e) if e
+
+    flags = 0
+    flags = flags | Regexp::EXTENDED if m[2].index('x')
+    flags = flags | Regexp::IGNORECASE if m[2].index('i')
+    #flags = flags | Regexp::MULTILINE if m[2].index('m')
+    flags = flags | Regexp::FIXEDENCODING if e
+
+    Regexp.new(s, flags)
+  end
+
   def rewrite_qname(t); t.string[1..-2]; end
   def rewrite_name(t); t.string; end
 

data/lib/dense/path.rb

@@ -8,7 +8,7 @@ class Dense::Path
     @original = s
 
     fail ArgumentError.new(
-      "Argument is a #{s.class}, not a String"
+      "argument is a #{s.class}, not a String"
     ) unless s.is_a?(String)
 
     s = ".#{s}" \
@@ -124,8 +124,13 @@ class Dense::Path
     return [ nil ] unless o.is_a?(Array)
 
     be = k[:start] || 0
-    en = k[:end] || o.length - 1
-    st = k[:step] || 1
+
+    en, st =
+      if co = k[:count]
+        [ be + co - 1, 1 ]
+      else
+        [ k[:end] || o.length - 1, k[:step] || 1 ]
+      end
 
     Range.new(be, en).step(st).to_a
   end
@@ -134,12 +139,18 @@ class Dense::Path
 
     return _resolve_hash_key(o, k) if k.is_a?(Hash)
 
-    return [ k.to_s ] if o.is_a?(Hash)
+    if o.is_a?(Hash)
+
+      return o.keys.select { |ok| ok =~ k } if k.is_a?(Regexp)
+      [ k.to_s ]
+
+    else # o is a Array
 
-    case k
-    when /\Afirst\z/i then [ 0 ]
-    when /\Alast\z/i then [ -1 ]
-    else [ k ]
+      case k
+      when /\Afirst\z/i then [ 0 ]
+      when /\Alast\z/i then [ -1 ]
+      else [ k ]
+      end
     end
   end
 
@@ -251,12 +262,19 @@ class Dense::Path
 
     case elt
     when Hash
-      s = [ "#{elt[:start]}:#{elt[:end]}", elt[:step] ].compact.join(':')
+      s =
+        if elt[:count]
+          [ elt[:start], elt[:count] ].collect(&:to_s).join(',')
+        else
+          [ "#{elt[:start]}:#{elt[:end]}", elt[:step] ].compact.join(':')
+        end
       in_array ? s : "[#{s}]"
     when Array
-      "[#{elt.map { |e| _to_s(e, true) }.join(',')}#{elt.size < 2 ? ',' : ''}]"
+      "[#{elt.map { |e| _to_s(e, true) }.join(';')}#{elt.size < 2 ? ';' : ''}]"
     when String
       _str_to_s(elt, in_array)
+    when Regexp
+      _rex_to_s(elt)
     when :star
       '*'
     when :dot
@@ -278,5 +296,12 @@ class Dense::Path
     return "[#{elt.inspect}]" if s =~ /["']/
     s
   end
+
+  def _rex_to_s(r)
+
+    r.fixed_encoding? ?
+      r.inspect + (Dense::Path::Parser::R_ENCODINGS[r.encoding.name] || '') :
+      r.inspect
+  end
 end # Dense::Path
 

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: dense
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-29 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
@@ -30,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
 description: Fetching deep in a dense structure. A kind of bastard of JSONPath.
 email:
 - jmettraux+flor@gmail.com
@@ -74,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: fetching deep in a dense structure