rgraph 0.0.3 → 0.0.4

data/lib/rgraph/graph.rb

@@ -9,22 +9,25 @@ class Graph
   def initialize(csv)
     @nodes = []
     @links = []
-    unless not csv[-4..-1] == ".csv"
-      CSV.foreach(csv, headers: true) do |row|
-        unless source = @nodes.select{|n| n.id == row['source']}.first
-          source = Node.new(id: row['source'])
-          @nodes << source
-        end
-        unless target = @nodes.select{|n| n.id == row['target']}.first
-          target = Node.new(id: row['target'])
-          @nodes << target
-        end
-        @links << Link.new(source: source, target: target, weight: row['weight'], year: row['year'])
+    raise Exception.new("the file must be a .csv") unless File.extname(csv) == ".csv"
+
+    CSV.foreach(csv, headers: true) do |row|
+      #last because CSV#delete returns [column,value]
+      source_id = row.delete('source').last
+      target_id = row.delete('target').last
+
+      unless source = get_node_by_id(source_id)
+        source = Node.new(id: source_id)
+        @nodes << source
+      end
+      unless target = get_node_by_id(target_id)
+        target = Node.new(id: target_id)
+        @nodes << target
       end
-    else
-      raise Exception.new("the file must be a .csv")
+
+      @links << Link.new(source: source, target: target, weight: row['weight'], year: row['year'])
     end
-end
+  end
 
   def each_node(&block)
     @nodes.each(&block)
@@ -33,4 +36,10 @@ end
   def each_link(&block)
     @links.each(&block)
   end
+
+  private
+
+  def get_node_by_id(node_id)
+    @nodes.select{|n| n.id == node_id}.first
+  end
 end

data/lib/rgraph/link.rb

@@ -1,28 +1,20 @@
   class Link
-    #attr_accessor :source, :target
+    attr_accessor :source, :target
 
     def initialize(arg)
       @args = arg
-      if @args[:source] == nil
-        raise Exception.new("source cant be nil")
-      end
+      @source = @args.delete(:source)
+      @target = @args.delete(:target)
 
-      if @args[:target] == nil
-        raise Exception.new("target cant be nil")
-      end
-
-      if not @args[:source].is_a? Node
-        raise Exception.new("source must be of type Node")
-      end
-
-      if not @args[:target].is_a? Node
-        raise Exception.new("target must be of type Node")
-      end
+      raise Exception.new("source cant be nil") unless @source
+      raise Exception.new("target cant be nil") unless @target
+      raise Exception.new("source must be of type Node") unless @source.is_a? Node
+      raise Exception.new("target must be of type Node") unless @target.is_a? Node
 
       @args[:weight] ||= 1
 
-      @args[:source].neighbours << @args[:target]
-      @args[:target].neighbours << @args[:source]
+      @source.neighbours << @target
+      @target.neighbours << @source
     end
 
     def method_missing(name, *args)

data/lib/rgraph/version.rb

@@ -1,3 +1,3 @@
 module Rgraph
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/rgraph.rb

@@ -1,4 +1,7 @@
 require "rgraph/version"
+require "rgraph/link"
+require "rgraph/node"
+require "rgraph/graph"
 
 module Rgraph
   # Your code goes here...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgraph
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -96,8 +96,7 @@ description: Ruby's Graph Library
 email:
 - aride.moulin@gmail.com
 - michel@michelboaventura.com
-executables:
-- guard
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -109,7 +108,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/guard
 - lib/rgraph.rb
 - lib/rgraph/graph.rb
 - lib/rgraph/link.rb

data/bin/guard

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby19
-#
-# This file was generated by Bundler.
-#
-# The application 'guard' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('guard', 'guard')