graphshaper 0.2.4 → 0.3.0

data/.travis.yml

@@ -5,3 +5,8 @@ rvm:
   - jruby-19mode
   - rbx-19mode
   - ruby-head
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/README.md

@@ -1,6 +1,8 @@
 # Graphshaper
 
 [![Build Status](https://secure.travis-ci.org/moonglum/graphshaper.png?branch=master)](http://travis-ci.org/moonglum/graphshaper)
+[![Dependency Status](https://gemnasium.com/moonglum/graphshaper.png)](https://gemnasium.com/moonglum/graphshaper)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/moonglum/graphshaper)
 
 Graphshaper can generate realistic, scale-free graphs of any size. It is tested with MRI Ruby (1.9.2. and 1.9.3) and the 1.9 versions of jRuby and Rubinius.
 
@@ -26,7 +28,7 @@ The commandline tool expects one argument: The number of vertices you want your
 
 You can use the following options:
 
-* `-a`, `--avocado`: Store the graph in a local AvocadoDB instance
+* `-a`, `--arango`: Store the graph in a local ArangoDB instance
 * `-l`, `--log`: Store the graph in two CSV files for nodes and edges
 * `-d`, `--dot`: Store the graph in the dot format
 * `-p`, `--png`: Export the graph as a PNG (you need to install graphviz for that – circo is used for the layout)

data/bin/graphshaper

@@ -9,37 +9,41 @@ options = {}
 
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: graphshaper [options] size"
-  
-  opts.on("-a", "--avocado", "Store the graph in a local AvocadoDB instance") do |avocado|
-    options[:avocado] = avocado
+
+  opts.on("-a", "--arango", "Store the graph in a local ArangoDB instance") do |arango|
+    options[:arango] = arango
   end
-  
+
   opts.on("-l", "--log", "Store the graph in two CSV files for nodes and edges") do |log|
     options[:log] = log
   end
-  
+
   opts.on("-d", "--dot", "Store the graph in the dot format") do |dot|
     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
   end
-  
+
   opts.on("-t", "--testdata", "Generate Test Data (for shortestpath)") do |sp|
     options[:t] = sp
   end
-  
+
+  opts.on("-j", "--json", "Generate JSON files") do |j|
+    options[:json] = j
+  end
+
   opts.on_tail("--version", "Show version") do
     puts Graphshaper::VERSION
     exit
   end
-  
+
   opts.parse!
 end
 
@@ -54,26 +58,26 @@ if options[:png] and `which circo` == ""
   exit
 end
 
-# check for running component: AvocadoDB
-if options[:avocado]
+# check for running component: ArangoDB
+if options[:arango]
   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."
+    puts "No ArangoDB instance is running on port 8529. Please start ArangoDB or run without --arango option."
     exit
   end
 end
 
 adapters = []
-  
+
 if options[:log]
   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]
-  adapters << Graphshaper::AvocadoDbAdapter.new("vertices", "edges")
+if options[:arango]
+  adapters << Graphshaper::ArangoDbAdapter.new("vertices", "edges")
 end
 
 if options[:dot]
@@ -85,10 +89,16 @@ 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
 
+if options[:json]
+  `rm -r generated_edges`
+  Dir.mkdir("generated_edges")
+  adapters << Graphshaper::JsonAdapter.new("generated_edges")
+end
+
 number_of_vertices = ARGV.first.to_i
 inner_vertices = 20
 outer_vertices = number_of_vertices - inner_vertices
@@ -116,11 +126,12 @@ end
 
 print "#{graph.order} vertices and #{graph.size} edges generated"
 
-print " and saved into AvocadoDB" if options[:avocado]
+print " and saved into ArangoDB" if options[:arango]
 print " and logged" if options[:log]
 print " and generated as a dot" if options[:dot]
 print " and saved in sql format" if options[:sql]
 print " and generated test cases" if options[:t]
+print " and generated JSON files" if options[:json]
 
 if options[:png]
   system('circo -Tpng generated_graph.dot -o generated_graph.png')
@@ -134,4 +145,4 @@ elsif ellapsed_time < 60
   puts " in about #{ellapsed_time.round} seconds"
 else
   puts " in about #{ellapsed_time.round / 60} minutes and #{ellapsed_time.round % 60} seconds"
-end
+end

data/graphshaper.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Lucas Dohmen"]
   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.summary       = %q{Graphshaper can generate realistic, scale-free graphs of any size for different databases.}
   gem.homepage      = "http://moonglum.github.com/graphshaper"
 
   gem.files         = `git ls-files`.split($\)
@@ -14,10 +14,10 @@ Gem::Specification.new do |gem|
   gem.name          = "graphshaper"
   gem.require_paths = ["lib"]
   gem.version       = Graphshaper::VERSION
-  
-  gem.add_dependency "httparty", "~> 0.8.1"
-  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"
+
+  gem.add_dependency             "httparty", "~> 0.10.2"
+  gem.add_development_dependency "rake",     "~> 10.0.3"
+  gem.add_development_dependency "rspec",    "~> 2.13.0"
+  gem.add_development_dependency "webmock",  "~> 1.11.0"
+  gem.add_development_dependency "yard",     "~> 0.8.5.2"
 end

data/lib/graphshaper.rb

@@ -1,9 +1,10 @@
 require "graphshaper/version"
 require "graphshaper/undirected_graph"
-require "graphshaper/adapters/avocadodb_adapter"
+require "graphshaper/adapters/arangodb_adapter"
 require "graphshaper/adapters/logging_adapter"
 require "graphshaper/adapters/dot_adapter"
 require "graphshaper/adapters/sql_adapter"
+require "graphshaper/adapters/json_adapter"
 
 module Graphshaper
 end

data/lib/graphshaper/adapters/{avocadodb_adapter.rb → arangodb_adapter.rb}

@@ -1,47 +1,47 @@
 require "httparty"
 
 module Graphshaper
-  class AvocadoDbAdapter
+  class ArangoDbAdapter
     include HTTParty
-    
+
     base_uri 'localhost:8529'
     format :json
-  
+
     def initialize(vertex_collection_name, edge_collection_name)
       @vertex_collection_name = vertex_collection_name
       @edge_collection_name = edge_collection_name
       @vertex_matching = []
       @edge_matching = []
-      
+
       [@vertex_collection_name, @edge_collection_name].each { |collection| drop_and_create_collection collection}
     end
-    
+
     def add_vertex(id)
       cmd = "/document?collection=#{@vertex_collection_name}"
-    	body = "{ \"id\" : \"#{id}\" }"
-    	response = self.class.post(cmd, :body => body)
+      body = "{ \"id\" : \"#{id}\" }"
+      response = self.class.post(cmd, :body => body)
       @vertex_matching[id] = response.parsed_response["_id"]
     end
-    
+
     def add_edge(edge_id, from, to)
       database_id_for_first_node = @vertex_matching[from]
       database_id_for_second_node = @vertex_matching[to]
-      
+
       cmd = "/edge?collection=#{@edge_collection_name}&from=#{database_id_for_first_node}&to=#{database_id_for_second_node}"
-    	body = "{ \"id\" : \"#{edge_id}\" }"
-    	response = self.class.post(cmd, :body => body)
+      body = "{ \"id\" : \"#{edge_id}\" }"
+      response = self.class.post(cmd, :body => body)
       @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
   end
-end
+end

data/lib/graphshaper/adapters/dot_adapter.rb

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

data/lib/graphshaper/adapters/json_adapter.rb

@@ -0,0 +1,40 @@
+module Graphshaper
+  # An adapter to generate JSON files in the format specified by Michael Hackstein
+  class JsonAdapter
+    def initialize(base_path, file_class = File)
+      @base_path = base_path
+      @file_class = file_class
+      @vertex_file_names = []
+    end
+
+    def add_edge(edge_id, from_id, to_id)
+      file_name = "#{@base_path}/#{from_id}.json"
+      file = @file_class.new(file_name, "a")
+      file.write(%Q<{"id":#{to_id}},>)
+      file.close
+    end
+
+    def add_vertex(vertex_id)
+      file_name = "#{@base_path}/#{vertex_id}.json"
+      @vertex_file_names << file_name
+      file = @file_class.new(file_name, "w")
+      file.write(file_header(vertex_id))
+      file.close
+    end
+
+    def close
+      @vertex_file_names.each do |file_name|
+        content = @file_class.read(file_name).gsub(/,\z/, '')
+        file = @file_class.new(file_name, "w+")
+        file.write("#{content}]}")
+        file.close
+      end
+    end
+
+    private
+
+    def file_header(id)
+      %Q<{"id":#{id},"children" : [>
+    end
+  end
+end

data/lib/graphshaper/adapters/logging_adapter.rb

@@ -1,5 +1,4 @@
 module Graphshaper
-  
   # A simple adapter for logging the created graph
   class LoggingAdapter
     def initialize(vertex_logger_file, edge_logger_file)
@@ -8,18 +7,18 @@ module Graphshaper
       @vertex_logger_file << "vertex_id\n"
       @edge_logger_file << "edge_id,from_id,to_id\n"
     end
-    
+
     def add_edge(edge_id, from_id, to_id)
       @edge_logger_file << "#{edge_id},#{from_id},#{to_id}\n"
     end
-    
+
     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
+end

data/lib/graphshaper/adapters/sql_adapter.rb

@@ -4,38 +4,38 @@ module Graphshaper
       @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
+end

data/lib/graphshaper/undirected_graph.rb

@@ -1,12 +1,12 @@
 require "set"
 
 module Graphshaper
-  
+
   # A Graph is undirected when its edges do not have a direction.
   class UndirectedGraph
-    
+
     # Create a graph with a given number of vertices and no 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
@@ -15,66 +15,66 @@ module Graphshaper
 
       @vertex_degrees = []
       @unconnected_vertices = Set.new
-      
+
       number_of_vertices.times { add_vertex }
       @edges = Set.new
     end
-    
+
     # The number of vertices.
     #
     # @return [Integer] Number of vertices.
     def order
       @vertex_degrees.length
     end
-    
+
     # The number of edges.
-    # 
+    #
     # @return [Integer] Number of edges.
     def size
       @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.
     #
     # @yieldparam [Float] preferential_attachment The preferential attachment of the existing vertex
     # @yieldreturn [Boolean] Should the edge be added?
-    # 
+    #
     # @return [Integer] ID of the newly created vertex.
     def add_vertex(&block)
       new_vertex_id = @vertex_degrees.length
-      
+
       @vertex_degrees << 0
       @unconnected_vertices << new_vertex_id
-      
+
       unless @adapters.nil?
         @adapters.each do |adapter|
           adapter.add_vertex new_vertex_id
         end
       end
-      
-      if block_given? 
+
+      if block_given?
         each_vertex_with_preferential_attachment do |vertex_id, preferential_attachment|
           add_edge new_vertex_id, vertex_id if block.call(preferential_attachment)
         end
       end
-      
+
       new_vertex_id
     end
-    
+
     # Add a new edge to the graph between two existing vertices.
-    # 
+    #
     # @param [Integer] first_vertex_id
     # @param [Integer] second_vertex_id
     # @raise [RuntimeError] The method throws a RuntimeError if you try to add a self-referential edge or an edge with a non-existing vertex.
@@ -89,7 +89,7 @@ module Graphshaper
         @unconnected_vertices.delete second_vertex_id
         @vertex_degrees[second_vertex_id] += 1
         @edges << [first_vertex_id, second_vertex_id].sort
-        
+
         unless @adapters.nil?
           @adapters.each do |adapter|
             adapter.add_edge @edges.length - 1, first_vertex_id, second_vertex_id
@@ -97,7 +97,7 @@ module Graphshaper
         end
       end
     end
-    
+
     # Tests, if an edge between the two vertices exists.
     #
     # @param [Integer] first_vertex_id
@@ -106,21 +106,21 @@ module Graphshaper
     def edge_between?(first_vertex_id, second_vertex_id)
       @edges.include? [first_vertex_id, second_vertex_id]
     end
-    
+
     # The number of vertices without edges.
     #
     # @return [Integer] Number of vertices without edges.
     def number_of_orphans
       @unconnected_vertices.to_a.length
     end
-    
+
     # The vertices without edges as an array.
     #
     # @return [Array<Integer>] IDs of the Vertices without edges.
     def orphans
       @unconnected_vertices.to_a
     end
-    
+
     # Return the vertex degree for the vertex with the given ID.
     #
     # @param [Integer] vertex_id
@@ -128,7 +128,7 @@ module Graphshaper
     def vertex_degree_for(vertex_id)
       @vertex_degrees[vertex_id]
     end
-    
+
     # Calculates the distribution of degrees in the graph. The value at the n-th position of the returned array is the number of vertices with n edges.
     #
     # @return [Array<Integer>] The degree distribution as an array of Integers.
@@ -143,16 +143,16 @@ module Graphshaper
       end
       degree_distribution
     end
-        
+
     # Return the sum of all degrees.
     #
     # @return [Integer] Sum of all degrees
     def sum_of_all_degrees
       @edges.length * 2
     end
-    
+
     # Iterate over all vertices of the graph. Call it with a block {|vertex_id, preferential_attachment| ... }.
-    # 
+    #
     # @yield [vertex_id, preferential_attachment] The block that tests if the edge should be added.
     # @yieldparam [Integer] vertex_id The preferential attachment of the existing vertex
     # @yieldparam [Float] preferential_attachment The preferential attachment of the existing vertex
@@ -167,4 +167,4 @@ module Graphshaper
       end
     end
   end
-end
+end

data/lib/graphshaper/version.rb

@@ -1,3 +1,3 @@
 module Graphshaper
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/spec/adapters/{avocadodb_adapter_spec.rb → arangodb_adapter_spec.rb}

@@ -1,46 +1,46 @@
 require "spec_helper"
-require "graphshaper/adapters/avocadodb_adapter"
+require "graphshaper/adapters/arangodb_adapter"
 
-describe Graphshaper::AvocadoDbAdapter do
+describe Graphshaper::ArangoDbAdapter 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 )
+    .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 )
+    .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"
+    .with(:body => "{ \"id\" : \"7\" }")
+    .to_return(:body => "{ \"_rev\": 9683012, \"_id\": \"7848004/9683012\", \"error\": false }", :status => 200)
+
+    @arango_adapter = Graphshaper::ArangoDbAdapter.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
-    
+    @arango_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
-    
+    @arango_adapter.add_vertex 1
+    @arango_adapter.add_vertex 2
+    @arango_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

@@ -6,31 +6,31 @@ describe Graphshaper::DotAdapter do
     @output_file = double()
     @output_file.stub :<<
   end
-  
+
   it "should write a header into the file" do
     @output_file.should_receive(:<<).with("digraph genereated_graph { \n  rankdir=LR;\n  node [shape = circle];\n  edge [dir=none];\n")
     Graphshaper::DotAdapter.new @output_file
   end
-  
+
   describe "initialized Dot Adapter" do
     before :each do
       @dot_adapter = Graphshaper::DotAdapter.new @output_file
     end
-    
+
     it "should be closeable" do
       @output_file.should_receive(:<<).with("}")
       @output_file.should_receive(:close)
       @dot_adapter.close
     end
-    
+
     it "should write an edge in the correct format" do
       @output_file.should_receive(:<<).with("  1 -> 2 [ label = \"0\" ];\n")
       @dot_adapter.add_edge(0,1,2)
     end
-    
+
     it "should write a vertex in the correct format" do
       @output_file.should_receive(:<<).with("  15;\n")
       @dot_adapter.add_vertex(15)
     end
   end
-end
+end

data/spec/adapters/json_adapter_spec.rb

@@ -0,0 +1,63 @@
+require "spec_helper"
+require "graphshaper/adapters/json_adapter"
+
+describe Graphshaper::JsonAdapter do
+  describe "Initialized Adapter" do
+    let(:file_class) { double }
+    let(:vertex_id)  { 1 }
+    let(:edge_id)    { 2 }
+    let(:from_id)    { 3 }
+    let(:to_id)      { 4 }
+    subject { Graphshaper::JsonAdapter.new "test_dir", file_class }
+
+    it "should create a new edge file" do
+      file = double
+      file.should_receive(:write).with(%Q<{"id":#{vertex_id},"children" : [>)
+      file.should_receive(:close)
+      file_class.stub(:new).and_return { file }
+      file_class.should_receive(:new).with("test_dir/#{vertex_id}.json", "w")
+
+      subject.add_vertex(vertex_id)
+    end
+
+    it "should add edges to the vertices" do
+      file = double
+      file.should_receive(:write).with(%Q<{"id":#{to_id}},>)
+      file.should_receive(:close)
+      file_class.stub(:new).and_return { file }
+      file_class.should_receive(:new).with("test_dir/#{from_id}.json", "a")
+
+      subject.add_edge(edge_id, from_id, to_id)
+    end
+
+    it "should close all vertex files" do
+      file_1 = double
+      file_2 = double
+      close_file_1 = double
+      close_file_2 = double
+
+      [file_1, file_2, close_file_1, close_file_2].each do |f|
+        f.stub(:write)
+        f.stub(:close)
+      end
+
+      [close_file_1, close_file_2].each do |f|
+        f.should_receive(:write).with("a]}")
+        f.should_receive(:close)
+      end
+
+      file_class.stub(:read).with("test_dir/1.json").and_return { "a," }
+      file_class.stub(:read).with("test_dir/2.json").and_return { "a" }
+
+      file_class.stub(:new).with("test_dir/1.json", "w").and_return { file_1 }
+      file_class.stub(:new).with("test_dir/2.json", "w").and_return { file_2 }
+
+      file_class.stub(:new).with("test_dir/1.json", "w+").and_return { close_file_1 }
+      file_class.stub(:new).with("test_dir/2.json", "w+").and_return { close_file_2 }
+
+      subject.add_vertex(1)
+      subject.add_vertex(2)
+      subject.close
+    end
+  end
+end

data/spec/adapters/logging_adapter_spec.rb

@@ -8,26 +8,26 @@ describe Graphshaper::LoggingAdapter do
     @edge_logger = double()
     @edge_logger.stub :<<
   end
-  
+
   it "should write a header into the files" do
     @vertex_logger.should_receive(:<<).with("vertex_id\n")
     @edge_logger.should_receive(:<<).with("edge_id,from_id,to_id\n")
     Graphshaper::LoggingAdapter.new @vertex_logger, @edge_logger
   end
-  
+
   describe "Initialized Logger" do
     before :each do
       @adapter = Graphshaper::LoggingAdapter.new @vertex_logger, @edge_logger
     end
-    
+
     it "should write edges to the logger at edge creation" do
       @edge_logger.should_receive(:<<).with("0,1,3\n")
       @adapter.add_edge 0,1,3
     end
-    
+
     it "should write vertices to the logger at vertex creation" do
       @vertex_logger.should_receive(:<<).with("5\n")
       @adapter.add_vertex 5
     end
   end
-end
+end

data/spec/adapters/sql_adapter_spec.rb

@@ -8,49 +8,49 @@ describe Graphshaper::SqlAdapter do
     @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
+end

data/spec/undirected_graph_spec.rb

@@ -7,97 +7,97 @@ describe Graphshaper::UndirectedGraph do
     graph.order.should ==(5)
     graph.size.should ==(0)
   end
-  
+
   describe "initialized graph" do
     before :each do
       @graph = Graphshaper::UndirectedGraph.new 5
     end
-    
+
     it "should be able to add new vertices" do
       expect { @graph.add_vertex }.to change{ @graph.order }.by(1)
     end
-    
+
     it "should add a vertex with two existing ids" do
       expect { @graph.add_edge 0, 1 }.to change{ @graph.size }.by(1)
     end
-    
+
     it "shouldn't add a vertex if one of the ids doesn't exist" do
       expect { @graph.add_edge 0, 5}.to raise_error(RuntimeError, "ID doesn't exist")
     end
-    
+
     it "should answer the question if there is an edge between two vertices with false if they are not" do
       @graph.edge_between?(0,1).should be_false
     end
-    
+
     it "should answer the question if there is an edge between two vertices with true if they are" do
       @graph.add_edge 0,1
       @graph.edge_between?(0,1).should be_true
     end
-    
+
     it "shouldn't add an edge that has already been added" do
       @graph.add_edge 0,1
       expect { @graph.add_edge 0, 1 }.to change{ @graph.size }.by(0)
     end
-    
+
     it "shouldn't add an edge that has already been added - independent of direction" do
       @graph.add_edge 0,1
       expect { @graph.add_edge 1,0 }.to change{ @graph.size }.by(0)
     end
-    
+
     it "should not add an edge where the first and second vertex are the same" do
       expect { @graph.add_edge 0, 0}.to raise_error(RuntimeError, "No Self-Referential Edge")
     end
-    
+
     it "should return the graph's order for the number of orphans for a graph without vertices" do
       @graph.number_of_orphans.should ==(@graph.order)
     end
-    
+
     it "should return 0 for the number of orphans for a graph connected in a circle" do
       circle_array = (0...5).to_a
       circle_array.zip(circle_array.rotate).each do |vertex_a, vertex_b|
         @graph.add_edge vertex_a, vertex_b
       end
     end
-    
+
     it "should calculate the vertex degree" do
       expect { @graph.add_edge 0,1 }.to change { @graph.vertex_degree_for 1}.by(1)
     end
-    
+
     it "should calculate the degree distribution" do
       @graph.degree_distribution.should ==[5]
       @graph.add_edge 0,1
       @graph.add_edge 1,2
       @graph.degree_distribution.should ==[2,2,1]
     end
-    
+
     it "should be able to connect all vertices" do
       expect { @graph.connect_all_vertices }.to change{ @graph.number_of_orphans }.by(-5)
     end
   end
-  
+
   describe "calculating the vertex's degree and preferential attachment" do
     before :each do
       @graph = Graphshaper::UndirectedGraph.new 5
     end
-    
+
     it "should calculate the degree of 0 for every vertex in a graph without edges" do
       5.times do |vertex_id|
         @graph.vertex_degree_for(vertex_id).should ==0
       end
     end
-    
+
     it "should calculate the degree for a vertex with two edges" do
       @graph.add_edge 0,1
       @graph.add_edge 1,2
       @graph.vertex_degree_for(1).should ==2
     end
-    
+
     it "should calculate the sum of all degrees" do
       @graph.add_edge 0,1
       @graph.add_edge 1,2
       @graph.sum_of_all_degrees.should ==4
     end
-    
+
     it "should provide an iterator for preferential attachments that sums up to 0 for a graph without edges" do
       sum = 0
       @graph.each_vertex_with_preferential_attachment do |vertex_id, preferential_attachment|
@@ -105,7 +105,7 @@ describe Graphshaper::UndirectedGraph do
       end
       sum.should ==0
     end
-    
+
     it "should calculate the preferential attachments in a way that their sum is always 1 when there is at least one edge" do
       sum = 0
       @graph.add_edge 0,1
@@ -114,7 +114,7 @@ describe Graphshaper::UndirectedGraph do
       end
       sum.should ==1
     end
-    
+
     it "should add up the preferential attachments to one even if edges are added in the block" do
       sum = 0
       @graph.add_edge 0,1
@@ -124,47 +124,47 @@ describe Graphshaper::UndirectedGraph do
       end
       sum.should ==1
     end
-    
+
     it "should add a vertex to the graph with edges according to preferential attachment" do
       @graph.add_edge 0,1
-      
+
       # Two vertices with preferential_attachment of 0.5, all others with 0
       @graph.add_vertex do |preferential_attachment|
         preferential_attachment > 0.4
       end
-      
+
       # One more vertex
       @graph.order.should ==(6)
-      
+
       # Two additional edges
       @graph.size.should ==(3)
     end
   end
-  
+
   describe "Adapter Support" do
     before :each do
       @adapter = double()
       @adapter.stub :add_vertex
       @adapter.stub :add_edge
     end
-    
+
     it "should tell the adapter about the inital vertices on creation" do
       5.times do |vertex_id|
         @adapter.should_receive(:add_vertex).with(vertex_id)
       end
       graph = Graphshaper::UndirectedGraph.new 5, adapters: [@adapter]
     end
-    
+
     it "should tell the adapter about later added vertices" do
       graph = Graphshaper::UndirectedGraph.new 5, adapters: [@adapter]
       @adapter.should_receive(:add_vertex).with(5)
       graph.add_vertex
     end
-    
+
     it "should tell the adapter about later added edges" do
       graph = Graphshaper::UndirectedGraph.new 5, adapters: [@adapter]
       @adapter.should_receive(:add_edge).with(0, 1, 2)
       graph.add_edge 1, 2
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphshaper
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,63 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70149864493700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.10.2
   type: :runtime
   prerelease: false
-  version_requirements: *70149864493700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70149864493200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: 10.0.3
   type: :development
   prerelease: false
-  version_requirements: *70149864493200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70149864492740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *70149864492740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70149864492280 !ruby/object:Gem::Requirement
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 1.11.0
   type: :development
   prerelease: false
-  version_requirements: *70149864492280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &70149864491820 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 0.8.5.2
   type: :development
   prerelease: false
-  version_requirements: *70149864491820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.5.2
 description: Generate realistic graphs
 email:
 - me@moonglum.net
@@ -83,14 +108,16 @@ files:
 - bin/graphshaper
 - graphshaper.gemspec
 - lib/graphshaper.rb
-- lib/graphshaper/adapters/avocadodb_adapter.rb
+- lib/graphshaper/adapters/arangodb_adapter.rb
 - lib/graphshaper/adapters/dot_adapter.rb
+- lib/graphshaper/adapters/json_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/arangodb_adapter_spec.rb
 - spec/adapters/dot_adapter_spec.rb
+- spec/adapters/json_adapter_spec.rb
 - spec/adapters/logging_adapter_spec.rb
 - spec/adapters/sql_adapter_spec.rb
 - spec/spec_helper.rb
@@ -108,21 +135,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4051901559196272302
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4051901559196272302
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Graphshaper can generate realistic, scale-free graphs of any size.
+summary: Graphshaper can generate realistic, scale-free graphs of any size for different
+  databases.
 test_files:
-- spec/adapters/avocadodb_adapter_spec.rb
+- spec/adapters/arangodb_adapter_spec.rb
 - spec/adapters/dot_adapter_spec.rb
+- spec/adapters/json_adapter_spec.rb
 - spec/adapters/logging_adapter_spec.rb
 - spec/adapters/sql_adapter_spec.rb
 - spec/spec_helper.rb