graphs 0.1.8-x86-linux → 0.1.9-x86-linux

data.tar.gz.sig

@@ -0,0 +1 @@
+&X���3��+���^�h��i5K�ޅ��B�J+%6�rS��ʵxI>#

data/lib/graph.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 
 require 'yaml'
@@ -54,7 +55,9 @@ class Graph
         attr_accessor :attrs
 
         def initialize(attrs=nil)
-            @attrs = attrs || {}
+
+            @attrs = attrs.is_a?(Node) ? attrs.attrs : attrs || {}
+
         end
 
         # compare two nodes
@@ -86,7 +89,7 @@ class Graph
         attr_accessor :attrs
 
         def initialize(attrs=nil)
-            @attrs = attrs || {}
+            @attrs = attrs.is_a?(Edge) ? attrs.attrs : attrs || {}
         end
 
         # compare two edges
@@ -222,8 +225,8 @@ class Graph
             return nil
         end
 
-        nodes = (@nodes + other.nodes) - (@nodes & other.nodes)
-        edges = (@edges + other.edges) - (@edges & other.edges)
+        nodes = (@nodes - other.nodes) + (other.nodes - @nodes)
+        edges = (@edges - other.edges) + (other.edges - @edges)
 
         Graph.new(nodes, edges)
     end
@@ -278,7 +281,7 @@ class Graph
     # Return true if the Graph is directed.
     # @see Graph.attrs
     def directed?()
-        self.attrs[:directed]
+        !!self.attrs[:directed]
     end
 
     # Clone the current graph. All nodes and edges are also cloned. A new Graph
@@ -405,23 +408,19 @@ class Graph
     # @param n [Node,String] A node with a 'label' or :label attribute, or a string
     def get_neighbours(n)
 
-        label = Graph::get_label(n)
+        label = Graph::get_label n
         neighbours = NodeArray.new []
 
         self.edges.each do |e|
 
-            begin
-
-                l1 = e.node1
-                l2 = e.node2
-
-            rescue NoMethodError; next; end
+            l1 = e[:node1] || e['node1']
+            l2 = e[:node2] || e['node2']
 
             if l2 && l1 == label
 
                 n2 = self.get_node l2
 
-                unless neighbours.include?(l2)
+                unless n2.nil? || neighbours.include?(n2)
 
                     neighbours.push(n2)
 
@@ -433,7 +432,7 @@ class Graph
 
                 n1 = self.get_node l1
             
-                unless neighbours.include?(n1)
+                unless n1.nil? || neighbours.include?(n1)
 
                     neighbours.push(n1)
                 

data/lib/graphs/gdf.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 
 require_relative '../graph'

data/lib/graphs/json.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/ruby1.9.1
+#! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 
 require 'json'

data/tests/edge_tests.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/ruby1.9.1
+#! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 
 class Edge_test < Test::Unit::TestCase
@@ -43,4 +43,50 @@ class Edge_test < Test::Unit::TestCase
         assert_equal(true, e.update({}).is_a?(Graph::Edge))
     end
 
+    def test_edge_init_with_another_edge
+
+        e = Graph::Edge.new({ :foo => 'bar' })
+
+        assert_equal( e, Graph::Edge.new(e) )
+
+    end
+
+end
+
+class EdgeArray_test < Test::Unit::TestCase
+
+    def test_edgearray_push_edge
+
+        e = Graph::Edge.new({ :foo => 42 })
+        ea = Graph::EdgeArray.new([])
+
+        ea.push(e)
+
+        assert_equal(e, ea[0])
+
+    end
+
+    def test_edgearray_push_hash
+
+        e = { :foo => 42 }
+        ea = Graph::EdgeArray.new([])
+
+        ea.push(e)
+
+        assert_equal(Graph::Edge.new(e), ea[0])
+
+    end
+
+    def test_edgearray_push_no_edge_nor_hash
+
+        ea = Graph::EdgeArray.new([])
+
+        assert_raise(TypeError) do
+
+            ea.push(42)
+
+        end
+
+    end
+
 end

data/tests/gdf_tests.rb

@@ -1,6 +1,5 @@
-#! /usr/bin/ruby1.9.1
-
-require_relative '../lib/graphs/gdf'
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
 
 module Utils
     def self.get_sample_graph
@@ -215,4 +214,11 @@ class GDF_test < Test::Unit::TestCase
         assert_equal("nodedef>n INT\n9999999999999999\nedgedef>", gdf)
 
     end
+
+    def test_unparse_float_field
+        g = Graph.new([{ 'n' => 3.14 }])
+        gdf = GDF::unparse(g)
+
+        assert_equal("nodedef>n FLOAT\n3.14\nedgedef>", gdf)
+    end
 end

data/tests/graph_tests.rb

@@ -1,10 +1,6 @@
-#! /usr/bin/ruby1.9.1
+#! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 
-require 'test/unit'
-require 'yaml'
-require_relative '../lib/graph'
-
 class Graph_test < Test::Unit::TestCase
 
     def setup
@@ -184,6 +180,19 @@ class Graph_test < Test::Unit::TestCase
         assert_equal(true, g1==g2)
     end
 
+    def test_equal_graph_and_non_graph
+
+        g = Graph.new
+
+        assert_equal(false, g==[])
+        assert_equal(false, g=={})
+        assert_equal(false, g==0)
+        assert_equal(false, g==false)
+        assert_equal(false, g==nil)
+        assert_equal(false, g==Graph::Node.new)
+
+    end
+
     # == Graph::NodeArray#set_default == #
 
     def test_nodearray_set_default_unexisting_property
@@ -384,6 +393,17 @@ class Graph_test < Test::Unit::TestCase
         assert_equal(g2, g+g)
     end
 
+    def test_graph_plus_non_graph
+
+        g = @@sample_graph
+
+        assert_equal(nil, g+42)
+        assert_equal(nil, g+[])
+        assert_equal(nil, g+{})
+        assert_equal(nil, g+Graph::Node.new)
+
+    end
+
     # == Graph#| == #
     
     def test_empty_graph_OR_empty_graph
@@ -413,6 +433,17 @@ class Graph_test < Test::Unit::TestCase
         assert_equal(g4, g2|g1)
     end
 
+    def test_graph_OR_non_graph
+
+        g = @@sample_graph
+
+        assert_equal(nil, g|42)
+        assert_equal(nil, g|[])
+        assert_equal(nil, g|{})
+        assert_equal(nil, g|Graph::Node.new)
+
+    end
+
     # == Graph#- == #
     
     def test_empty_graph_minus_empty_graph
@@ -437,6 +468,17 @@ class Graph_test < Test::Unit::TestCase
         assert_equal(@@empty, g-g)
     end
 
+    def test_graph_minus_non_graph
+
+        g = @@sample_graph
+
+        assert_equal(nil, g-42)
+        assert_equal(nil, g-[])
+        assert_equal(nil, g-{})
+        assert_equal(nil, g-Graph::Node.new)
+
+    end
+
     # == Graph#not == #
     
     def test_empty_graph_NOT_empty_graph
@@ -601,10 +643,13 @@ class Graph_test < Test::Unit::TestCase
     def test_graph_get_neighbours_undirected_graph
 
         g = @@sample_graph
+        g.attrs[:directed] = false
 
-        n = g.get_neighbours 'foo'
+        n1 = g.get_neighbours 'chuck'
+        n2 = g.get_neighbours 'foo'
 
-        assert_equal([ 'bar', 'chuck' ], n.map { |m| m.label })
+        assert_equal([ 'bar', 'foo' ], n1.map { |m| m.label })
+        assert_equal([ 'bar', 'chuck' ], n2.map { |m| m.label })
 
     end
 
@@ -616,7 +661,24 @@ class Graph_test < Test::Unit::TestCase
         assert_equal([ 'bar' ], n.map { |m| m.label })
 
         n = g.get_neighbours 'bar'
-        assert_equal([], n.map { |m| m.label })
+        assert_equal([], n)
+
+    end
+
+    def test_graph_get_neighbours_bad_edges
+
+        g = Graph.new(
+            [ { :label => 'foo' },
+              { :label => 'bar' },
+              { :label => 'moo' }],
+
+            [ { :node1 => 'foo' }, # missing :node2 attr
+              { :node1 => 'foo', :node2 => 'moo' }])
+
+        n = g.get_neighbours 'foo'
+
+        assert_equal(1, n.length)
+        assert_equal('moo', n[0].label)
 
     end
 

data/tests/json_tests.rb

@@ -1,8 +1,6 @@
-#! /usr/bin/ruby1.9.1
+#! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 
-require_relative '../lib/graphs/json'
-
 module JSONUtils
     def self.get_sample_graph
         @@json

data/tests/node_tests.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/ruby1.9.1
+#! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 
 class Node_test < Test::Unit::TestCase
@@ -92,4 +92,50 @@ class Node_test < Test::Unit::TestCase
         assert_equal(true, n.update({}).is_a?(Graph::Node))
     end
 
+    def test_node_init_with_another_node
+
+        n = Graph::Node.new({ :foo => 'bar' })
+
+        assert_equal( n, Graph::Node.new(n) )
+
+    end
+
+end
+
+class NodeArray_test < Test::Unit::TestCase
+
+    def test_nodearray_push_node
+
+        n = Graph::Node.new({ :foo => 42 })
+        na = Graph::NodeArray.new([])
+
+        na.push(n)
+
+        assert_equal(n, na[0])
+
+    end
+
+    def test_nodearray_push_hash
+
+        n = { :foo => 42 }
+        na = Graph::NodeArray.new([])
+
+        na.push(n)
+
+        assert_equal(Graph::Node.new(n), na[0])
+
+    end
+
+    def test_nodearray_push_no_node_nor_hash
+
+        na = Graph::NodeArray.new([])
+
+        assert_raise(TypeError) do
+
+            na.push(42)
+
+        end
+
+    end
+
 end

data/tests/tests.rb

@@ -1,11 +1,20 @@
-#! /usr/bin/ruby1.9.1
+#! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 
 require 'test/unit'
 require 'tempfile'
+require 'simplecov'
+
+test_dir = File.expand_path( File.dirname(__FILE__) )
+
+SimpleCov.start { add_filter '/tests/' } if ENV['COVERAGE']
+
 require_relative '../lib/graph'
+require_relative '../lib/graphs/gdf'
+require_relative '../lib/graphs/json'
 
-for t in Dir.glob( File.join( File.expand_path( File.dirname(__FILE__) ),  '*_tests.rb' ) )
+for t in Dir.glob( File.join( test_dir,  '*_tests.rb' ) )
     require t
 end
 
+exit Test::Unit::AutoRunner.run

metadata

@@ -1,15 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: graphs
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: x86-linux
 authors:
 - Baptiste Fontaine
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMakNDQWhhZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVJBd0RnWURWUVFEREFkaVlY
+  UnAKWm05dU1SVXdFd1lLQ1pJbWlaUHlMR1FCR1JZRmVXRm9iMjh4RWpBUUJn
+  b0praWFKay9Jc1pBRVpGZ0ptY2pBZQpGdzB4TXpBek1qUXlNakV3TVRKYUZ3
+  MHhOREF6TWpReU1qRXdNVEphTUQweEVEQU9CZ05WQkFNTUIySmhkR2xtCmIy
+  NHhGVEFUQmdvSmtpYUprL0lzWkFFWkZnVjVZV2h2YnpFU01CQUdDZ21TSm9t
+  VDhpeGtBUmtXQW1aeU1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
+  QU1JSUJDZ0tDQVFFQXNHdENhamZBN0puOGhvanRtb2tIc3Q3SApVZThTSGQw
+  MzAyeGxNSkVxOURKanNCZG02UDFVTWFQeEUyMEtTc1VEQTVZWHE0cjhDQTVL
+  Tm5QMklJdkQ2dkNhCmNNNjFyTU5KWXFUcjZGM3JmODcyYXJuVnVDWE5hSlhw
+  ZFUySWx2YnFnMnFYNU1wYjZQZnJGbWwwanBUaXJBdTgKZURpNzdoVzl4Q1BV
+  QmtjZDk4UjRCTUtlQjZ2c0R4ZkJpRUVlT0VEY0lhTjFDRTRHWmoxckpvQ2JF
+  QmtudHBYUgovTldOQkt0THd1eHFyUllrWGtXbXBObHErMTlWR0x1NlBsRWYv
+  R2s0MXViazdJQ1F3aGJmM243UjNVb24rK2ppCktVdFF1eHU0MkU4T2RYSFdj
+  ak9HVzloYzYyUmxFTmpRazNBTFpHbTc5ekxjUWJUcjkwRlNWd1IrSXlOcmF3
+  SUQKQVFBQm96a3dOekFKQmdOVkhSTUVBakFBTUIwR0ExVWREZ1FXQkJTYVZ5
+  YUdYVThZSGxJaG1raXdmWHN3TDdTeQpNekFMQmdOVkhROEVCQU1DQkxBd0RR
+  WUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFKTC9LYSsyVDlFVFpXTVZVMGdnCkI0
+  T09xVzQ4bHVjOWhWL2tRa1BWbjA0UEFFWTdGdDVadDEzVXhEL0syR3pLUWNJ
+  UGxoang4c3g3ZTQ4d3VFMkEKcDZmeWt5OTlaSWg1NlExbUVlZnQwQXJUd0Mr
+  NE5uanFzYWlueXgrYzNCelVKMEFTYVpQSkdYaGRwaGsvTWtYNApXSDV6Y09r
+  NXpjMGx3cmluUWtWb1lDWFI1YUhmMlNWbmFsaVlLRFlzVE16R1BVeE53ZitJ
+  TjBpTm9NcUJtWEVwCk81VkdnRjlYQ1B1SmE4UEpuWDBMMEZyeS9mSk0rVm83
+  WWxFQ2dSakhId3lNanpGeVJVUkRtOElkUzVianc1ZUoKWjVWZ1VBQ2NjYWVL
+  YmxueWlrRlRYeTE2bUJubER6MUlPeG9ENFBmeFROWC94b3I0aGRmM1BFN20x
+  K3gvY0NHMApReE09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies: []
 description: Provide functions to (un)parse GDF/JSON files and generate graphs
 email: batifon@yahoo.fr
@@ -25,7 +52,6 @@ files:
 - tests/tests.rb
 - tests/node_tests.rb
 - tests/gdf_tests.rb
-- tests/gexf_tests.rb
 - tests/json_tests.rb
 homepage: https://github.com/bfontaine/Graphs.rb
 licenses:
@@ -48,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Utilities to manipulate graph files
@@ -58,5 +84,4 @@ test_files:
 - tests/tests.rb
 - tests/node_tests.rb
 - tests/gdf_tests.rb
-- tests/gexf_tests.rb
 - tests/json_tests.rb

data/tests/gexf_tests.rb

@@ -1,4 +0,0 @@
-#! /usr/bin/ruby1.9.1
-# -*- coding: UTF-8 -*-
-
-# require 'graphs/gexf'