graphshaper 0.2.2 → 0.2.3

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 *.rbc
 .bundle
@@ -16,3 +17,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+generated_*

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 1.9.3
   - jruby-19mode
   - rbx-19mode
+  - ruby-head

data/bin/graphshaper

@@ -3,6 +3,8 @@
 require 'graphshaper'
 require 'optparse'
 
+start_time = Time.now
+
 options = {}
 
 optparse = OptionParser.new do |opts|
@@ -20,6 +22,10 @@ optparse = OptionParser.new do |opts|
     options[:dot] = dot
   end
   
+  opts.on("-s", "--sql", "Store the graph in sql format") do |sql|
+    options[:sql] = sql
+  end
+  
   opts.on("-p", "--png", "Export the graph as a PNG (graphviz must be installed)") do |png|
     options[:dot] = png
     options[:png] = png
@@ -38,18 +44,28 @@ if ARGV.length == 0
   exit
 end
 
-number_of_vertices = ARGV.first.to_i
-inner_vertices = 20
-  
+# check for installed components: graphviz
+if options[:png] and `which circo` == ""
+  puts "graphviz is not installed, can't export to png. Please install graphviz or run without --png option."
+  exit
+end
+
+# check for running component: AvocadoDB
+if options[:avocado]
+  begin
+    HTTParty.get 'http://localhost:8529'
+  rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+    puts "No AvocadoDB instance is running on port 8529. Please start AvocadoDB or run without --avocado option."
+    exit
+  end
+end
+
 adapters = []
-open_files = []
   
 if options[:log]
-  vertex_output_file = File.new "vertices.csv", "w"
-  open_files << vertex_output_file
-  edge_output_file = File.new "edges.csv", "w"
-  open_files << edge_output_file
-  adapters << Graphshaper::LoggingAdapter.new(vertex_output_file, edge_output_file)
+  generated_vertices_csv_file = File.new("generated_vertices.csv", "w")
+  generated_edges_csv_file = File.new("generated_edges.csv", "w")
+  adapters << Graphshaper::LoggingAdapter.new(generated_vertices_csv_file, generated_edges_csv_file)
 end
 
 if options[:avocado]
@@ -57,35 +73,44 @@ if options[:avocado]
 end
 
 if options[:dot]
-  dot_output_file = File.new "generated_graph.dot", "w"
-  open_files << dot_output_file
-  dot_adapter = Graphshaper::DotAdapter.new(dot_output_file)
-  adapters << dot_adapter
+  generated_graph_dot_file = File.new("generated_graph.dot", "w")
+  adapters << Graphshaper::DotAdapter.new(generated_graph_dot_file)
 end
 
-start_time = Time.now
+if options[:sql]
+  generated_graph_sql_file = File.new("generated_graph.sql", "w")
+  generated_vertices_sql_file = File.new("generated_vertices.sql", "w")
+  generated_edges_sql_file = File.new("generated_edges.sql", "w")
+  
+  adapters << Graphshaper::SqlAdapter.new(generated_graph_sql_file, generated_vertices_sql_file, generated_edges_sql_file)
+end
+
+inner_vertices = 20
+outer_vertices = ARGV.first.to_i - inner_vertices
+
+graph = Graphshaper::UndirectedGraph.new inner_vertices, adapters: adapters
 
-graph = Graphshaper::UndirectedGraph.without_orphans_with_order_of inner_vertices, adapters: adapters
-(number_of_vertices - inner_vertices).times do
+graph.connect_all_vertices
+
+outer_vertices.times do
   graph.add_vertex { |preferential_attachment| preferential_attachment > rand }
 end
 
-dot_adapter.close if options[:dot]
-
-ellapsed_time = Time.now - start_time
+adapters.each { |adapter| adapter.close }
 
 print "#{graph.order} vertices and #{graph.size} edges generated"
 
 print " and saved into AvocadoDB" if options[:avocado]
 print " and logged" if options[:log]
 print " and generated as a dot" if options[:dot]
-
-open_files.each { |file| file.close }
+print " and saved in sql format" if options[:sql]
 
 if options[:png]
   system('circo -Tpng generated_graph.dot -o generated_graph.png')
 end
 
+ellapsed_time = Time.now - start_time
+
 if ellapsed_time < 2
   puts " in about one second"
 elsif ellapsed_time < 60

data/graphshaper.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["me@moonglum.net"]
   gem.description   = %q{Generate realistic graphs}
   gem.summary       = %q{Graphshaper can generate realistic, scale-free graphs of any size.}
-  gem.homepage      = "http://github.com/moonglum/graphshaper"
+  gem.homepage      = "http://moonglum.github.com/graphshaper"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake", "~> 0.9.2.2"
   gem.add_development_dependency "rspec", "~> 2.9.0"
   gem.add_development_dependency "yard", "~> 0.7.5"
+  gem.add_development_dependency "webmock", "~> 1.8.6"
 end

data/lib/graphshaper.rb

@@ -3,6 +3,7 @@ require "graphshaper/undirected_graph"
 require "graphshaper/adapters/avocadodb_adapter"
 require "graphshaper/adapters/logging_adapter"
 require "graphshaper/adapters/dot_adapter"
+require "graphshaper/adapters/sql_adapter"
 
 module Graphshaper
 end

data/lib/graphshaper/adapters/avocadodb_adapter.rb

@@ -16,7 +16,6 @@ module Graphshaper
       [@vertex_collection_name, @edge_collection_name].each { |collection| drop_and_create_collection collection}
     end
     
-    # @return [String] id in the database
     def add_vertex(id)
       cmd = "/document?collection=#{@vertex_collection_name}"
     	body = "{ \"id\" : \"#{id}\" }"
@@ -34,11 +33,15 @@ module Graphshaper
       @edge_matching[edge_id] = response.parsed_response["_id"]
     end
     
+    def close
+      
+    end
+    
     private
     
     def drop_and_create_collection(name)
-    self.class.delete "/_api/collection/#{name}"
-    self.class.post "/_api/collection", body: "{ \"name\" : \"#{name}\"}"
-  end  
+      self.class.delete "/_api/collection/#{name}"
+      self.class.post "/_api/collection", body: "{ \"name\" : \"#{name}\"}"
+    end
   end
 end

data/lib/graphshaper/adapters/dot_adapter.rb

@@ -5,10 +5,6 @@ module Graphshaper
       @output_file << "digraph genereated_graph { \n  rankdir=LR;\n  node [shape = circle];\n  edge [dir=none];\n"
     end
     
-    def close
-      @output_file << "}"
-    end
-    
     def add_edge(edge_id, in_id, out_id)
       @output_file << "  #{in_id} -> #{out_id} [ label = \"#{edge_id}\" ];\n"
     end
@@ -16,5 +12,10 @@ module Graphshaper
     def add_vertex(vertex_id)
       @output_file << "  #{vertex_id};\n"
     end
+    
+    def close
+      @output_file << "}"
+      @output_file.close
+    end
   end
 end

data/lib/graphshaper/adapters/logging_adapter.rb

@@ -16,5 +16,10 @@ module Graphshaper
     def add_vertex(vertex_id)
       @vertex_logger_file << "#{vertex_id}\n"
     end
+    
+    def close
+      @vertex_logger_file.close
+      @edge_logger_file.close
+    end
   end
 end

data/lib/graphshaper/adapters/sql_adapter.rb

@@ -0,0 +1,41 @@
+module Graphshaper
+  class SqlAdapter
+    def initialize(schema_file, vertex_file, edge_file)
+      @schema_file = schema_file
+      @vertex_file = vertex_file
+      @edge_file = edge_file
+      
+      File.readlines("templates/schema.sql").each do |schema_line|
+        @schema_file << schema_line
+      end
+      
+      @vertex_file << "LOCK TABLES `vertices` WRITE;\n"
+      @vertex_file << "INSERT INTO `vertices` (`id`, `vertex_id`)\n"
+      @vertex_file << "VALUES\n\t"
+      
+      @edge_file << "LOCK TABLES `edges` WRITE;\n"
+      @edge_file << "INSERT INTO `edges` (`id`, `edge_id`, `from_id`, `to_id`)\n"
+      @edge_file << "VALUES\n\t"
+      
+      @first_vertex = true
+      @first_edge = true
+    end
+    
+    def add_vertex(vertex_id)
+      @vertex_file << ",\n\t" unless @first_vertex
+      @vertex_file << "(#{vertex_id + 1},#{vertex_id})"
+      @first_vertex = false
+    end
+    
+    def add_edge(edge_id, from_id, to_id)
+      @edge_file << ",\n\t" unless @first_edge
+      @edge_file << "(#{edge_id + 1},#{edge_id},#{from_id + 1},#{to_id + 1})"
+      @first_edge = false
+    end
+    
+    def close
+      [@vertex_file, @edge_file].each { |file| file << ";\nUNLOCK TABLES;"}
+      [@schema_file, @vertex_file, @edge_file].each { |file| file.close }
+    end
+  end
+end

data/lib/graphshaper/undirected_graph.rb

@@ -20,25 +20,6 @@ module Graphshaper
       @edges = Set.new
     end
     
-    # Create a graph with a given number of vertices. Then it adds random edges until the graph doesn't contain any orphans (vertices without edges).
-    # 
-    # @param [Integer] number_of_vertices The number of vertices that the generated graph should have
-    # @param [Hash] options_hash The options to create an undirected graph
-    # @option options_hash [Array<Object>] :adapters An array of adapters you want to use
-    # @return [UndirectedGraph] The generated graph.
-    def UndirectedGraph.without_orphans_with_order_of(number_of_vertices, options_hash = {})
-      graph = self.new number_of_vertices, options_hash
-      
-      while graph.number_of_orphans > 0
-        vertex_orphan = graph.orphans.shuffle.first
-        while vertex_orphan == (random_vertex = rand(graph.order)); end
-        
-        graph.add_edge vertex_orphan, random_vertex
-      end
-      
-      return graph
-    end
-    
     # The number of vertices.
     #
     # @return [Integer] Number of vertices.
@@ -53,6 +34,16 @@ module Graphshaper
       @edges.length
     end
     
+    # Connect all orphans with existing nodes
+    def connect_all_vertices
+      while number_of_orphans > 0
+        vertex_orphan = orphans.shuffle.first
+        while vertex_orphan == (random_vertex = rand(order)); end
+        
+        add_edge vertex_orphan, random_vertex
+      end
+    end
+    
     # Add a new vertex to the graph.
     # If you call it with a block {|preferential_attachment| ... }, the block will be called for every existing vertex: An edge from the new vertex to this vertex will be created if and only if the block returns true.
     # @yield [preferential_attachment] The block that tests if the edge should be added.

data/lib/graphshaper/version.rb

@@ -1,3 +1,3 @@
 module Graphshaper
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/adapters/avocadodb_adapter_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+require "graphshaper/adapters/avocadodb_adapter"
+
+describe Graphshaper::AvocadoDbAdapter do
+  before :each do
+    stub_request(:delete, "http://localhost:8529/_api/collection/vertices").to_return(:status => 200, :body => "", :headers => {})
+    stub_request(:post, "http://localhost:8529/_api/collection").with(:body => "{ \"name\" : \"vertices\"}")
+    stub_request(:delete, "http://localhost:8529/_api/collection/edges").to_return(:status => 200, :body => "", :headers => {})
+    stub_request(:post, "http://localhost:8529/_api/collection").with(:body => "{ \"name\" : \"edges\"}")
+    stub_request(:post, "http://localhost:8529/document?collection=vertices")
+      .with(:body => "{ \"id\" : \"1\" }")
+      .to_return(:body => "{ \"_rev\": 26445614, \"_id\": \"73482/26445614\", \"error\": false }", :status => 200 )
+    stub_request(:post, "http://localhost:8529/document?collection=vertices")
+      .with(:body => "{ \"id\" : \"2\" }")
+      .to_return(:body => "{ \"_rev\": 26445614, \"_id\": \"73482/26445615\", \"error\": false }", :status => 200 )
+    stub_request(:post, "http://localhost:8529/edge?collection=edges&from=73482/26445614&to=73482/26445615")
+      .with(:body => "{ \"id\" : \"7\" }")
+      .to_return(:body => "{ \"_rev\": 9683012, \"_id\": \"7848004/9683012\", \"error\": false }", :status => 200)
+    
+    @avocado_adapter = Graphshaper::AvocadoDbAdapter.new "vertices", "edges"
+  end
+  
+  it "should drop the collections on startup" do
+    WebMock.should have_requested(:delete, "http://localhost:8529/_api/collection/vertices")
+    WebMock.should have_requested(:delete, "http://localhost:8529/_api/collection/edges")
+  end
+  
+  it "should create the collections on startup" do
+    WebMock.should have_requested(:post,   "http://localhost:8529/_api/collection").with(:body => "{ \"name\" : \"vertices\"}")
+    WebMock.should have_requested(:post,   "http://localhost:8529/_api/collection").with(:body => "{ \"name\" : \"edges\"}")    
+  end
+  
+  it "should add a vertex" do
+    @avocado_adapter.add_vertex 1
+    
+    WebMock.should have_requested(:post, "http://localhost:8529/document?collection=vertices").with(:body => "{ \"id\" : \"1\" }")
+  end
+  
+  it "should add an edge with the correct vertex ids" do
+    @avocado_adapter.add_vertex 1
+    @avocado_adapter.add_vertex 2
+    @avocado_adapter.add_edge 7, 1, 2
+    
+    WebMock.should have_requested(:post, "http://localhost:8529/edge?collection=edges&from=73482/26445614&to=73482/26445615").with(:body => "{ \"id\" : \"7\" }")
+  end
+end

data/spec/adapters/dot_adapter_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "graphshaper/adapters/dot_adapter.rb"
 
 describe Graphshaper::DotAdapter do
   before :each do
@@ -18,6 +19,7 @@ describe Graphshaper::DotAdapter do
     
     it "should be closeable" do
       @output_file.should_receive(:<<).with("}")
+      @output_file.should_receive(:close)
       @dot_adapter.close
     end
     

data/spec/adapters/logging_adapter_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "graphshaper/adapters/logging_adapter"
 
 describe Graphshaper::LoggingAdapter do
   before :each do

data/spec/adapters/sql_adapter_spec.rb

@@ -0,0 +1,56 @@
+require 'stringio'
+require "spec_helper"
+require "graphshaper/adapters/sql_adapter"
+
+describe Graphshaper::SqlAdapter do
+  before :each do
+    @schema_file = StringIO.new
+    @vertex_file = StringIO.new
+    @edge_file = StringIO.new
+  end
+  
+  describe "generated files" do
+    before :each do
+      @sql_adapter = Graphshaper::SqlAdapter.new @schema_file, @vertex_file, @edge_file
+    end
+    
+    it "should write the schema to the file" do
+      schema_string = @schema_file.string
+      
+      File.readlines("templates/schema.sql").each do |schema_line|
+        schema_string.should include(schema_line)
+      end
+    end
+    
+    it "should write the vertices to the file" do
+      @sql_adapter.add_vertex(0)
+      @sql_adapter.add_vertex(1)
+      @sql_adapter.close
+      
+      vertex_string = @vertex_file.string
+      
+      vertex_string.should include("	(1,0),\n")
+      vertex_string.should include("	(2,1);\n")
+    end
+    
+    it "should write the vertices to the file" do
+      @sql_adapter.add_edge(0,5,6)
+      @sql_adapter.add_edge(1,7,8)
+      @sql_adapter.close
+      
+      edge_string = @edge_file.string
+      
+      edge_string.should include("	(1,0,6,7),\n")
+      edge_string.should include("	(2,1,8,9);\n")
+    end
+  end
+  
+  it "should close the three files" do
+    @schema_file.should_receive(:close)
+    @edge_file.should_receive(:close)
+    @vertex_file.should_receive(:close)
+      
+    sql_adapter = Graphshaper::SqlAdapter.new @schema_file, @vertex_file, @edge_file
+    sql_adapter.close
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
-require 'graphshaper'
+# For HTTP Testing
+require 'webmock/rspec'

data/spec/undirected_graph_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "graphshaper/undirected_graph"
 
 describe Graphshaper::UndirectedGraph do
   it "should create a graph with a given number of vertices and no edges" do
@@ -68,19 +69,9 @@ describe Graphshaper::UndirectedGraph do
       @graph.add_edge 1,2
       @graph.degree_distribution.should ==[2,2,1]
     end
-  end
-  
-  describe "random generated graph without orphans" do
-    before :each do
-      @graph = Graphshaper::UndirectedGraph.without_orphans_with_order_of 15
-    end
-    
-    it "should have the correct order" do
-      @graph.order.should ==(15)
-    end
     
-    it "should have no orphans" do
-      @graph.number_of_orphans.should ==(0)
+    it "should be able to connect all vertices" do
+      expect { @graph.connect_all_vertices }.to change{ @graph.number_of_orphans }.by(-5)
     end
   end
   

data/templates/schema.sql

@@ -0,0 +1,20 @@
+DROP TABLE IF EXISTS `edges`;
+DROP TABLE IF EXISTS `vertices`;
+
+CREATE TABLE `vertices` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `vertex_id` int(11) unsigned NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `edges` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `edge_id` int(11) unsigned NOT NULL,
+  `from_id` int(11) unsigned NOT NULL,
+  `to_id` int(11) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `from_id` (`from_id`),
+  KEY `to_id` (`to_id`),
+  CONSTRAINT `edges_ibfk_2` FOREIGN KEY (`to_id`) REFERENCES `vertices` (`id`),
+  CONSTRAINT `edges_ibfk_1` FOREIGN KEY (`from_id`) REFERENCES `vertices` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphshaper
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000Z
+date: 2012-04-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70255428363860 !ruby/object:Gem::Requirement
+  requirement: &70105889221160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70255428363860
+  version_requirements: *70105889221160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70255428363360 !ruby/object:Gem::Requirement
+  requirement: &70105889192700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70255428363360
+  version_requirements: *70105889192700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70255428362900 !ruby/object:Gem::Requirement
+  requirement: &70105889192240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70255428362900
+  version_requirements: *70105889192240
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70255428362440 !ruby/object:Gem::Requirement
+  requirement: &70105889191740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,18 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70255428362440
+  version_requirements: *70105889191740
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70105889191160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.6
+  type: :development
+  prerelease: false
+  version_requirements: *70105889191160
 description: Generate realistic graphs
 email:
 - me@moonglum.net
@@ -75,13 +86,17 @@ files:
 - lib/graphshaper/adapters/avocadodb_adapter.rb
 - lib/graphshaper/adapters/dot_adapter.rb
 - lib/graphshaper/adapters/logging_adapter.rb
+- lib/graphshaper/adapters/sql_adapter.rb
 - lib/graphshaper/undirected_graph.rb
 - lib/graphshaper/version.rb
+- spec/adapters/avocadodb_adapter_spec.rb
 - spec/adapters/dot_adapter_spec.rb
 - spec/adapters/logging_adapter_spec.rb
+- spec/adapters/sql_adapter_spec.rb
 - spec/spec_helper.rb
 - spec/undirected_graph_spec.rb
-homepage: http://github.com/moonglum/graphshaper
+- templates/schema.sql
+homepage: http://moonglum.github.com/graphshaper
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -106,8 +121,10 @@ signing_key:
 specification_version: 3
 summary: Graphshaper can generate realistic, scale-free graphs of any size.
 test_files:
+- spec/adapters/avocadodb_adapter_spec.rb
 - spec/adapters/dot_adapter_spec.rb
 - spec/adapters/logging_adapter_spec.rb
+- spec/adapters/sql_adapter_spec.rb
 - spec/spec_helper.rb
 - spec/undirected_graph_spec.rb
 has_rdoc: