graphshaper 0.1 → 0.2

data/bin/graphshaper

@@ -10,11 +10,12 @@ else
   number_of_vertices = ARGV[0].to_i
   inner_vertices = 20
   
-  edge_output_file = File.new "edges.csv", "w"
   vertex_output_file = File.new "vertices.csv", "w"
+  edge_output_file = File.new "edges.csv", "w"
+  logger = Graphshaper::LoggingAdapter.new vertex_output_file, edge_output_file
   
   start_time = Time.now
-  graph = Graphshaper::UndirectedGraph.without_orphans_with_order_of inner_vertices, edge_creation_logger: edge_output_file, vertex_creation_logger: vertex_output_file
+  graph = Graphshaper::UndirectedGraph.without_orphans_with_order_of inner_vertices, adapters: [logger]
   (number_of_vertices - inner_vertices).times do
     graph.add_vertex do |preferential_attachment|
       preferential_attachment > rand
@@ -34,4 +35,4 @@ else
   else
     puts "Generated in about #{ellapsed_time.round / 60} minutes and #{ellapsed_time.round % 60} seconds"
   end
-end
+end

data/graphshaper.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   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"

data/lib/graphshaper/adapters/logging_adapter.rb

@@ -0,0 +1,20 @@
+module Graphshaper
+  
+  # A simple adapter for logging the created graph
+  class LoggingAdapter
+    def initialize(vertex_logger_file, edge_logger_file)
+      @vertex_logger_file = vertex_logger_file
+      @edge_logger_file = edge_logger_file
+      @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
+  end
+end

data/lib/graphshaper/undirected_graph.rb

@@ -9,12 +9,10 @@ module Graphshaper
     # 
     # @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 [IO] :edge_creation_logger An IO object that should log every edge creation in the graph (default: no logging)
-    # @option options_hash [IO] ::vertex_creation_logger An IO object that should log every vertex creation in the graph (default: no logging)
+    # @option options_hash [Array<Object>] :adapters An array of adapters you want to use
     def initialize(number_of_vertices, options_hash = {})
-      @edge_creation_logger = options_hash[:edge_creation_logger] if options_hash.has_key? :edge_creation_logger
-      @vertex_creation_logger = options_hash[:vertex_creation_logger] if options_hash.has_key? :vertex_creation_logger
-      
+      @adapters = options_hash[:adapters] if options_hash.has_key? :adapters
+
       @vertex_degrees = []
       @unconnected_vertices = Set.new
       
@@ -26,8 +24,7 @@ module Graphshaper
     # 
     # @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 [IO] :edge_creation_logger An IO object that should log every edge creation in the graph (default: no logging)
-    # @option options_hash [IO] ::vertex_creation_logger An IO object that should log every vertex creation in the graph (default: no logging)
+    # @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
@@ -70,7 +67,11 @@ module Graphshaper
       @vertex_degrees << 0
       @unconnected_vertices << new_vertex_id
       
-      @vertex_creation_logger << "#{new_vertex_id}\n" if @vertex_creation_logger
+      unless @adapters.nil?
+        @adapters.each do |adapter|
+          adapter.add_vertex new_vertex_id
+        end
+      end
       
       if block_given? 
         each_vertex_with_preferential_attachment do |vertex_id, preferential_attachment|
@@ -98,7 +99,11 @@ module Graphshaper
         @vertex_degrees[second_vertex_id] += 1
         @edges << [first_vertex_id, second_vertex_id].sort
         
-        @edge_creation_logger << "#{first_vertex_id},#{second_vertex_id}\n" if @edge_creation_logger
+        unless @adapters.nil?
+          @adapters.each do |adapter|
+            adapter.add_edge @edges.length - 1, first_vertex_id, second_vertex_id
+          end
+        end
       end
     end
     

data/lib/graphshaper/version.rb

@@ -1,3 +1,3 @@
 module Graphshaper
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

data/lib/graphshaper.rb

@@ -1,5 +1,6 @@
 require "graphshaper/version"
 require "graphshaper/undirected_graph"
+require "graphshaper/adapters/logging_adapter"
 
 module Graphshaper
 end

data/spec/adapters/logging_adapter_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+
+describe Graphshaper::LoggingAdapter do
+  before :each do
+    @vertex_logger = double()
+    @vertex_logger.stub :<<
+    @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

data/spec/undirected_graph_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "stringio" # for testing the logger
 
 describe Graphshaper::UndirectedGraph do
   it "should create a graph with a given number of vertices and no edges" do
@@ -8,23 +7,6 @@ describe Graphshaper::UndirectedGraph do
     graph.size.should ==(0)
   end
   
-  it "should create a graph with a logger for edge creation" do
-    edge_creation_logger = StringIO.new
-    graph = Graphshaper::UndirectedGraph.new 5, edge_creation_logger: edge_creation_logger
-    
-    graph.add_edge 1,3
-    graph.add_edge 2,3
-    edge_creation_logger.string.should ==("1,3\n2,3\n")
-  end
-  
-  it "should create a graph with a logger for vertex creation" do
-    vertex_creation_logger = StringIO.new
-    graph = Graphshaper::UndirectedGraph.new 5, vertex_creation_logger: vertex_creation_logger
-    
-    graph.add_vertex
-    vertex_creation_logger.string.should ==("0\n1\n2\n3\n4\n5\n")
-  end
-  
   describe "initialized graph" do
     before :each do
       @graph = Graphshaper::UndirectedGraph.new 5
@@ -167,4 +149,31 @@ describe Graphshaper::UndirectedGraph do
       @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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphshaper
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -11,9 +11,20 @@ bindir: bin
 cert_chain: []
 date: 2012-04-04 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &70304824409140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *70304824409140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70350123480940 !ruby/object:Gem::Requirement
+  requirement: &70304824408640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70350123480940
+  version_requirements: *70304824408640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70350123480440 !ruby/object:Gem::Requirement
+  requirement: &70304824408180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70350123480440
+  version_requirements: *70304824408180
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70350123479980 !ruby/object:Gem::Requirement
+  requirement: &70304824407720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +54,7 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70350123479980
+  version_requirements: *70304824407720
 description: Generate realistic graphs
 email:
 - me@moonglum.net
@@ -61,8 +72,10 @@ files:
 - bin/graphshaper
 - graphshaper.gemspec
 - lib/graphshaper.rb
+- lib/graphshaper/adapters/logging_adapter.rb
 - lib/graphshaper/undirected_graph.rb
 - lib/graphshaper/version.rb
+- spec/adapters/logging_adapter_spec.rb
 - spec/spec_helper.rb
 - spec/undirected_graph_spec.rb
 homepage: http://github.com/moonglum/graphshaper
@@ -90,6 +103,7 @@ signing_key:
 specification_version: 3
 summary: Graphshaper can generate realistic, scale-free graphs of any size.
 test_files:
+- spec/adapters/logging_adapter_spec.rb
 - spec/spec_helper.rb
 - spec/undirected_graph_spec.rb
 has_rdoc: