dense 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 24371919775ff81e60eb86f0e9bae21a13a4cd4458e14a3584b05b7a16e7937b
-  data.tar.gz: '085c7f5db832b45f4c4f0127ad224d4dfa15402b444b5312274f54ac055825d3'
+SHA1:
+  metadata.gz: e2d5a14e2829cb3ff312c8ab8bf9647e341e464a
+  data.tar.gz: c352a513f49d9fff4b7fd5a639b9cf1397afbc99
 SHA512:
-  metadata.gz: f0f291761cfb4aaa3d6151e788dc9200a361deed8556167cc9a219b96f473a9e3373f822c93b2a6940370d0a3d01ad19c17ec1e4e9dfeef48cca399c3273bf7d
-  data.tar.gz: bd667ecb92422f129e474bd2f37121963f0e618b7166e80f82003462944d2616655034b51f567405c614fbfee2405c32f9dc6b3824e650c5de50f9efdf1cb1d5
+  metadata.gz: 1a511cefbd2e347b1dac5bd39b7dc7eb9761b63f132bf794604dc0597dfc093bb8cc61a6f9214956c9b8361acee1ca474a2da39fbbbdea3bdb0aa2b1e5727cb2
+  data.tar.gz: 9dd5fb439a6eb1b1c5e8f3590c278085e262cbb6e727e59b014dd961a8453e06828f7e342a5a3d0bc5068cd8fadc4259178b6622f477ebdde237593f5acb015a

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # dense
 
 
+## dense 1.1.2  released 2018-07-15
+
+* Accept string and symbol keys in path arrays
+* Accept path arrays in Dense::Path.make
+
+
 ## dense 1.1.1  released 2018-06-15
 
 * Accept `[a;b;c]` union keys

data/Makefile

@@ -8,17 +8,20 @@ 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 != '' }"
+	find spec -name "*_spec.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
 cl: count_lines
 
 gemspec_validate:
 	@echo "---"
-	ruby -e "s = eval(File.read(Dir['*.gemspec'].first)); s.validate"
+	ruby -e "s = eval(File.read(Dir['*.gemspec'].first)); p s.validate"
 	@echo "---"
 
 name: gemspec_validate
 	@echo "$(NAME) $(VERSION)"
 
+cw:
+	find lib -name "*.rb" -exec ruby -cw {} \;
+
 build: gemspec_validate
 	gem build $(NAME).gemspec
 	mkdir -p pkg
@@ -27,6 +30,10 @@ build: gemspec_validate
 push: build
 	gem push pkg/$(NAME)-$(VERSION).gem
 
+spec:
+	bundle exec rspec
+test: spec
+
 
-.PHONY: build push
+.PHONY: count_lines gemspec_validate name cw build push spec
 

data/lib/dense.rb

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

data/lib/dense/methods.rb

@@ -3,7 +3,7 @@ module Dense; class << self
 
   def get(o, path)
 
-    pa = Dense::Path.new(path)
+    pa = Dense::Path.make(path)
     r = pa.gather(o).inject([]) { |a, e| a << e[2][e[3]] if e.first; a }
 
     pa.narrow(r)
@@ -11,7 +11,7 @@ module Dense; class << self
 
   def fetch(o, path, default=::KeyError, &block)
 
-    pa = Dense::Path.new(path)
+    pa = Dense::Path.make(path)
     r = pa.gather(o).partition(&:first)
 
     if r[0].empty?
@@ -32,7 +32,7 @@ module Dense; class << self
 
   def set(o, path, value)
 
-    Dense::Path.new(path)
+    Dense::Path.make(path)
       .gather(o)
       .each { |hit|
         fail_miss_error(path, hit) if hit[0] == false
@@ -43,7 +43,7 @@ module Dense; class << self
 
   def unset(o, path, nofail=false)
 
-    pa = Dense::Path.new(path)
+    pa = Dense::Path.make(path)
     hits = pa.gather(o)
 
     hits.each { |h| fail miss_error(path, h) unless h[0] } unless nofail
@@ -62,7 +62,7 @@ module Dense; class << self
 
   def insert(o, path, value)
 
-    Dense::Path.new(path)
+    Dense::Path.make(path)
       .gather(o)
       .each { |hit|
         fail_miss_error(path, hit) if hit[0] == false
@@ -77,17 +77,17 @@ module Dense; class << self
 
   def has_key?(o, path)
 
-    !! Dense::Path.new(path).gather(o).find { |m| m[0] }
+    !! Dense::Path.make(path).gather(o).find { |m| m[0] }
   end
 
   def path(path)
 
-    Dense::Path.new(path)
+    Dense::Path.make(path)
   end
 
   def gather(o, path)
 
-    Dense::Path.new(path).gather(o)
+    Dense::Path.make(path).gather(o)
   end
 
   protected

data/lib/dense/path.rb

@@ -23,16 +23,71 @@ class Dense::Path
     ) unless @path
   end
 
-  def self.make(path_array)
+  class << self
 
-    return nil if path_array.nil?
-    return path_array if path_array.is_a?(Dense::Path)
+    def make(path_or_array_or_string)
 
-    path = Dense::Path.allocate
-    path.instance_eval { @path = path_array }
-    path.instance_eval { @original = path.to_s }
+      case (pas = path_or_array_or_string)
+      when nil then nil
+      when Dense::Path then pas
+      when Array then make_from_array(pas)
+      when String then Dense::Path.new(pas)
+      else
+        fail ArgumentError.new(
+          "cannot make Dense::Path instance out of #{pas.inspect}")
+      end
+    end
+
+    protected
+
+    def symbolize!(o)
+
+      if o.is_a?(Array)
+        o
+          .each { |e| symbolize!(e) }
+      elsif o.is_a?(Hash)
+        o.keys
+          .select { |k| k.is_a?(String) }
+          .each { |k| o[k.to_sym] = o.delete(k) }
+      end
+    end
+
+    def make_from_array(path_array)
+
+      symbolize!(path_array)
+      validate(path_array)
+
+      path = Dense::Path.allocate
+      path.instance_eval { @path = path_array }
+      path.instance_eval { @original = path.to_s }
 
-    path
+      path
+    end
+
+    def validate(path_array)
+
+      path_array
+        .each_with_index { |elt, i|
+          (elt.is_a?(Array) ? elt : [ elt ])
+            .each { |e| validate_path_elt(e, i) } }
+
+      true
+    end
+
+    def validate_path_elt(elt, i)
+
+      return if elt.is_a?(Integer)
+      return if elt.is_a?(String)
+      return if [ :dot, :dotstar, :star ].include?(elt)
+
+      if elt.is_a?(Hash)
+        ks = elt.keys.sort
+        return if ks == [ :end, :start, :step ]
+        return if ks == [ :count, :start ]
+      end
+
+      fail TypeError.new("not a path element (@#{i}): #{elt.inspect}")
+    end
   end
 
   def single?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dense
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: fetching deep in a dense structure