cecelia 0.0.3 → 0.0.5

data/Gemfile.lock

@@ -1,11 +1,25 @@
 PATH
   remote: .
   specs:
-    cecelia (0.0.1)
+    cecelia (0.0.4)
+      rspec
+      sequel
+      sqlite3
 
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.3)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    sequel (3.38.0)
+    sqlite3 (1.3.6)
 
 PLATFORMS
   ruby

data/lib/cecelia/graph.rb

@@ -1,20 +1,30 @@
 require 'sequel'
+require 'yaml'
 
 class Graph
-  def initialize(db_name)
-    @db = Sequel.sqlite(db_name)
+  def initialize(db_name = "sqlite:/")
+    @db = Sequel.connect(db_name)
     require 'cecelia/graph_model.rb'
   end
 
-  def add_vertex (attributes="")
-    Vertices.create(:attributes => attributes)
+  def add_vertex (label = "", attributes = {})
+    if Vertices.find(:label => label) == nil
+      Vertices.create(:label=> label, :attributes => YAML.dump(attributes))
+    end
   end
 
-  def add_edge(source,target,attributes="")
-    unless Vertices.find(:id => source) == nil && Vertices.find(:id => target) == nil
-      if ((Edges.filter(:source => source).filter(:target => target)).all).empty?
-        Edges.create(:source => source, :target => target, :attributes => attributes)
+  def add_edge(source, target, attributes = {})
+    if source.class == String && target.class == String
+      begin
+        source_id = Vertices.find(:label => source)[:id]
+        target_id = Vertices.find(:label => target)[:id]
+      rescue => exc
+         exc
+      ensure
+        add_edge_id(source_id, target_id, attributes = {})
       end
+    else
+      add_edge_id(source, target, attributes = {})
     end
   end
 
@@ -27,6 +37,51 @@ class Graph
   end
 
   def neighbors(id)
-    Edges.filter(:source => id).all
+    dataset = nil
+    if id.class == Integer
+      dataset = Edges.filter(:source => id).all
+    elsif id.class == String
+      label = Vertices.find(:label => id)[:id]
+      dataset = Edges.filter(:source => label).all
+    end
+    dataset
+  end
+
+  def find_vertex(args = {})
+    Vertices.find(args)
+  end
+
+  def find_edge(args = {})
+    Edges.find(args)
+  end
+
+  def filter_vertex(args = {})
+    Vertices.filter(args)
+  end
+
+  def filter_edge(args = {})
+    Edges.filter(args)
+  end
+
+  def remove_vertex(label)
+    if label.class == String 
+      Vertices.find(:label => label).delete
+    end
+  end
+
+  def remove_edge(id)
+    id = id.to_i  
+    Edges.find(:id => id).delete
+  end
+
+  private
+  def add_edge_id(source, target, attributes = {})
+    unless Vertices.find(:id => source) == nil && Vertices.find(:id => target) == nil
+      if ((Edges.filter(:source => source).filter(:target => target)).all).empty?
+        Edges.create(:source => source, :target => target, :attributes => YAML.dump(attributes))
+      end
+    end
   end
 end
+
+

data/lib/cecelia/graph_model.rb

@@ -6,6 +6,7 @@ class Vertices < Sequel::Model
   unless table_exists?
     set_schema do
       primary_key :id, :autoincrement => true
+      string :label
       string :attributes
     end
     create_table

data/lib/cecelia/version.rb

@@ -1,3 +1,3 @@
 module Cecelia
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/spec/graph_spec.rb

@@ -0,0 +1,126 @@
+#encoding: utf-8
+require 'rspec'
+require './lib/cecelia/graph.rb'
+
+
+describe Graph,"Iniaialize method" do
+  it "Graph.new()に空引数" do
+    Graph.new().should be_true
+  end
+
+  it "Graph.new()にSQLiteを指定" do
+    Graph.new("sqlite://hoge.db").should be_true
+  end
+
+  after(:all) do
+    #File.delete("./hoge.db")
+  end
+end
+
+describe Graph, "ノード追加に関するテスト" do
+  let(:g){Graph.new}
+
+  it "空グラフのノード数" do 
+    g.vertices.size.should == 0
+  end
+
+  it "ノード一つ追加" do
+    g.add_vertex("0").should be_true
+  end
+
+  it "グラフのノード数確認" do
+    g.vertices.size.should == 1
+  end
+
+  it "グラフに複数ノード追加" do
+    10.times{|i| g.add_vertex(i.to_s)}.should be_true
+  end
+
+  it "グラフの複数ノード数確認" do 
+    g.vertices.size.should == 10 
+  end
+
+  it "同名ノードの追加" do
+    10.times{|i|
+      g.add_vertex(i.to_s)
+    }.should be_true
+  end
+
+  it "同名ノードの禁止" do
+    g.vertices.size.should == 10
+  end
+end
+
+describe Graph,"エッジの追加に関するテスト" do
+  let(:g){Graph.new}
+
+  #before(:all){10.times{|i| g.add_vertex(i.to_s)}}
+
+  it "空グラフのエッジ数" do
+    g.edges.size.should == 0
+  end
+
+  it "エッジを1本作成" do
+    g.add_vertex("1")
+    g.add_vertex("2")
+    g.add_edge("1","2")
+    g.edges.size.should == 1
+  end
+
+  it "存在しないノード間エッジは禁止" do
+    g.add_edge("100","200").should raise_error
+  end
+
+  it "複数ノードの追加" do
+    10.times{|i|
+      g.add_vertex(i.to_s)
+    }.should be_true
+  end
+
+  it "複数エッジの追加" do
+    g.add_edge("3","4")
+    g.add_edge("5","6")
+    g.add_edge("6","7")
+    g.add_edge("1","6")
+
+    g.edges.size.should == 5
+  end
+end
+
+describe Graph,"ノード削除に関するテスト" do
+  let(:g){Graph.new}
+
+  before(:all){
+    10.times do |i|
+    g.add_vertex(i.to_s)
+    end
+  }
+
+
+  it "ノードを1つ削除" do
+    size = g.vertices.size
+    g.remove_vertex("1")
+    (size - g.vertices.size).should == 1
+  end
+end
+
+describe Graph,"エッジ削除に関するテスト" do
+
+  let(:g){Graph.new}
+
+  before(:all){
+    10.times do |i|
+    g.add_vertex(i.to_s)
+    end
+
+  g.add_edge("1","2")
+  g.add_edge("3","4")
+  g.add_edge("5","6")
+  }
+
+  it "エッジを1つ削除" do
+    size = g.edges.size
+    g.remove_edge("1")
+    (size - g.edges.size).should == 1
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cecelia
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -76,6 +76,7 @@ files:
 - lib/cecelia/graph_model.rb
 - lib/cecelia/version.rb
 - pkg/cecelia-0.0.1.gem
+- spec/graph_spec.rb
 homepage: https://github.com/onodes/cecelia
 licenses: []
 post_install_message: 
@@ -100,5 +101,6 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: cecelia
-test_files: []
+test_files:
+- spec/graph_spec.rb
 has_rdoc: