tangle 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ee56b345a6f81de14bbc7bb9d16fbb10f9e2174b2588140a6881bd1ff31d0d5
-  data.tar.gz: 2172244bbb6ab3a91dff9fb4e6491fadc1f56762d984edf75c7f325b1ce9bed5
+  metadata.gz: 49ee5268eb1851a1087ba45efac9f00794a248dfce75aadab846f6617d91620e
+  data.tar.gz: cc4d0d76f99b86c5494758311637bcb4610555afb58118e059833f62992ef492
 SHA512:
-  metadata.gz: 7bb4eeacbdf97538cef1a19738ac0260e47b56a19a6854d2de4dd735203001f7000f09239fbd3d6dcce377d8acf24a3b9647f1ddbbb2c152129b16e78de5fb16
-  data.tar.gz: 71837d3d43769c939200f450fb823ce6e82aec754527989e93ffac3db58eac2a8a99c816c9afc648dbbf97bf101b63e78656af86e487f6d3568f40333e2fa078
+  metadata.gz: c785bb5d7b83a53db61c03ffff2b6a26c17659eb9f79868e4882c884d0e97339b8748d32778bd2e73bb5293b5dd3a9a9adfef22ff38ab9e0f2c1c660dc0dd09c
+  data.tar.gz: f042503d2a4d65f6f9ed4cce56e6ba94623ef6e57e73b306a690edce5d2276aa01a7e211d83a2d2aec096a85def0923e4c8da350eb417a37101217764c84c18e

data/lib/tangle/graph.rb

@@ -62,14 +62,10 @@ module Tangle
     #
     # Unless a selector is provided, the subgraph contains the entire graph.
     #
-    def subgraph(included = nil)
-      included ||= vertices
+    def subgraph(included = nil, &selector)
       result = clone
-      vertices.each do |vertex|
-        result.remove_vertex(vertex) unless included.include?(vertex)
-        next unless block_given?
-        result.remove_vertex(vertex) unless yield(vertex)
-      end
+      result.select_vertices!(included) unless included.nil?
+      result.select_vertices!(&selector) if block_given?
       result
     end
 
@@ -77,5 +73,11 @@ module Tangle
       "#<#{self.class}: #{vertices.count} vertices, #{edges.count} edges>"
     end
     alias inspect to_s
+
+    private
+
+    def callback(receiver, method, *args)
+      receiver.send(method, *args) if receiver.respond_to?(method)
+    end
   end
 end

data/lib/tangle/graph_edges.rb

@@ -17,15 +17,16 @@ module Tangle
     # add_edge(vtx1, vtx2, ...) => Edge
     #
     def add_edge(*vertices, **kvargs)
-      insert_edge(self.class::Edge.new(*vertices, mixins: @mixins, **kvargs))
+      edge = self.class::Edge.new(*vertices, mixins: @mixins, **kvargs)
+      insert_edge(edge)
+      vertices.each { |vertex| callback(vertex, :edge_added, edge) }
+      edge
     end
 
     # Remove an edge from the graph
     def remove_edge(edge)
-      edge.each_vertex do |vertex|
-        @vertices.fetch(vertex).delete(edge)
-      end
-      @edges.delete(edge)
+      delete_edge(edge)
+      edge.each_vertex { |vertex| callback(vertex, :edge_removed, edge) }
     end
 
     protected
@@ -34,10 +35,12 @@ module Tangle
     #
     def insert_edge(edge)
       @edges << edge
-      edge.each_vertex do |vertex|
-        @vertices.fetch(vertex) << edge
-      end
-      edge
+      edge.each_vertex { |vertex| @vertices.fetch(vertex) << edge }
+    end
+
+    def delete_edge(edge)
+      edge.each_vertex { |vertex| @vertices.fetch(vertex).delete(edge) }
+      @edges.delete(edge)
     end
 
     private

data/lib/tangle/graph_vertices.rb

@@ -18,12 +18,19 @@ module Tangle
       @vertices.keys
     end
 
+    # Select vertices in the graph
+    def select(&selector)
+      @vertices.each_key.select(&selector)
+    end
+
     # Add a vertex into the graph
     #
-    # If a name: is given, it will be registered by name
+    # If a name: is given, or the vertex responds to :name,
+    # it will be registered by name in the graph
     def add_vertex(vertex, name: nil)
-      @vertices[vertex] = Set[]
-      @vertices_by_name[name] = vertex unless name.nil?
+      name ||= callback(vertex, :name)
+      insert_vertex(vertex, name)
+      callback(vertex, :added_to_graph, self)
       self
     end
     alias << add_vertex
@@ -33,7 +40,31 @@ module Tangle
       @vertices[vertex].each do |edge|
         remove_edge(edge) if edge.include?(vertex)
       end
+      delete_vertex(vertex)
+      callback(vertex, :removed_from_graph, self)
+    end
+
+    protected
+
+    def select_vertices!(selected = nil)
+      vertices.each do |vertex|
+        delete_vertex(vertex) if block_given? && !yield(vertex)
+        next if selected.nil?
+        delete_vertex(vertex) unless selected.any? { |vtx| vtx.eql?(vertex) }
+      end
+    end
+
+    def insert_vertex(vertex, name = nil)
+      @vertices[vertex] = Set[]
+      @vertices_by_name[name] = vertex unless name.nil?
+    end
+
+    def delete_vertex(vertex)
+      @vertices[vertex].each do |edge|
+        delete_edge(edge) if edge.include?(vertex)
+      end
       @vertices.delete(vertex)
+      @vertices_by_name.delete_if { |_, vtx| vtx.eql?(vertex) }
     end
 
     private

data/lib/tangle/mixin/directory.rb

@@ -7,17 +7,23 @@ module Tangle
     # options are:
     #   root:           root directory for the structure (mandatory)
     #   loaders:        list of object loader lambdas (mandatory)
+    #                     ->(graph, **) { ... } => finished?
     #   follow_links:   bool for following symlinks to directories
     #                   (default false)
     #
-    # A loader lambda will be called like
-    #   ->(graph, path, parent_path) { ... }
+    # A loader lambda is called with the graph as only positional
+    # argument, and a number of keyword arguments:
     #
-    # The lambdas are called in order until one returns true
+    #   path:     Path of current filesystem object
+    #   parent:   Path of filesystem parent object
+    #   lstat:    File.lstat for path
+    #   stat:     File.stat for path, if lstat.symlink?
+    #
+    # The lambdas are called in order until one returns true.
     #
     # Example:
-    #   loader = lambda do |g, path, parent|
-    #       vertex = File::Stat.new(path)
+    #   loader = lambda do |g, path:, parent:, lstat:, **|
+    #       vertex = kwargs[:lstat]
     #       g.add_vertex(vertex, name: path)
     #       g.add_edge(g[parent], vertex) unless parent.nil?
     #     end
@@ -38,17 +44,28 @@ module Tangle
         end
 
         def load_directory_graph(path, parent = nil)
-          @directory_loaders.any? do |loader|
-            loader.to_proc.call(self, path, parent)
-          end
-
-          return if File.symlink?(path) && !@follow_directory_links
-          return unless File.directory?(path)
+          return unless load_directory_object(path, parent)
 
           Dir.each_child(path) do |file|
             load_directory_graph(File.join(path, file), path)
           end
         end
+
+        # Load a filesystem object into the graph, returning
+        # +true+ if the object was a directory (or link to one,
+        # and we're following links).
+        def load_directory_object(path, parent = nil)
+          stat = lstat = File.lstat(path)
+          stat = File.stat(path) if lstat.symlink?
+
+          @directory_loaders.any? do |loader|
+            loader.to_proc.call(self, path: path, parent: parent,
+                                      lstat: lstat, stat: stat)
+          end
+
+          return if lstat.symlink? && !@follow_directory_links
+          stat.directory?
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tangle
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Calle Englund
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-version-bump