vrt 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 496777a44576c8dbffd594bd593ef3e9b156bfb4
-  data.tar.gz: 846f99f14fd5ecf2014f977f99eef71df9ca9575
+  metadata.gz: f22ed952810213fc68ae4da65da024233dd76f6c
+  data.tar.gz: c517cd4bdc30fb87c1a985b8fe0167ed95eaf5ac
 SHA512:
-  metadata.gz: 656092004ad47bd26e59fd7f610860745c49e834c7998b5e26e5ecdf39f77c58dcf3c800e516afc94f7214c64857b9b6ae5d17d3702302e2f88ff6671d0b88f2
-  data.tar.gz: 3f11baed9a0935f76cdb5002dbf7ee90def6dde5257083892ff22031c5508ea98140b5f518887e64b6f420e463a77afc5f7f698c49f959dd257eead3c7ea3cf5
+  metadata.gz: 4e1537e271c74309332c3df8110936f2c8101aaed8f50bd14fd8b7ea74c2db6cf0f7ebcf3560055fac99037b35bcd1a51e71a000c133ed6c0f44c9e56ea6788d
+  data.tar.gz: 4c5cf89fe55f63c035bc6b15e9e00d2a43ffe05eac36ad935e31f7467d8200f327bb2e5fa5c5ec28f0c2553d41ce78aa3c9da9fca25fce4eee9f3045c6f48f38

data/lib/vrt/map.rb

@@ -11,21 +11,22 @@ module VRT
     def initialize(version = nil)
       @version = version || VRT.current_version
       @structure = build_structure
-      @found_nodes = {}
-      @lineages = {}
+      @_found_nodes = {}
+      @_lineages = {}
+      @_valid_vrt_ids = {}
+      @_valid_identifiers = {}
     end
 
     def find_node(string, max_depth: 'variant')
-      @found_nodes[string + max_depth] ||= walk_node_tree(string, max_depth: max_depth)
+      @_found_nodes[string + max_depth] ||= walk_node_tree(string, max_depth: max_depth)
     end
 
-    def valid?(node)
-      return false unless node =~ /[[:lower]]/
-      node == 'other' || find_node(node)
+    def valid?(vrt_id)
+      @_valid_vrt_ids[vrt_id] ||= valid_identifier?(vrt_id) && !find_node(vrt_id).nil?
     end
 
     def get_lineage(string, max_depth: 'variant')
-      @lineages[string] ||= construct_lineage(string, max_depth)
+      @_lineages[string + max_depth] ||= construct_lineage(string, max_depth)
     end
 
     # Returns list of top level categories in the shape:
@@ -39,9 +40,16 @@ module VRT
 
     private
 
+    def valid_identifier?(vrt_id)
+      # At least one string of lowercase or _, plus up to 2 more with stops
+      @_valid_identifiers[vrt_id] ||= vrt_id =~ /other|\A[a-z_]+(\.[a-z_]+){0,2}\z/
+    end
+
     def construct_lineage(string, max_depth)
+      return unless valid_identifier?(string)
       lineage = ''
       walk_node_tree(string, max_depth: max_depth) do |ids, node, level|
+        return unless node
         lineage += node.name
         lineage += ' > ' unless level == ids.length
       end
@@ -50,7 +58,6 @@ module VRT
 
     def walk_node_tree(string, max_depth: 'variant')
       id_tokens = string.split('.').map(&:to_sym)
-      return nil if id_tokens.size > 3
       ids = id_tokens.take(DEPTH_MAP[max_depth])
       node = @structure[ids[0]]
       ids.each_index do |idx|

data/lib/vrt/version.rb

@@ -1,3 +1,3 @@
 module Vrt
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vrt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Barnett Klane
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.48'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - barnett@bugcrowd.com