cecelia 0.0.7 → 0.0.8

data/cecelia.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
   s.add_dependency('sqlite3')
-  s.add_dependency('rspec')
   s.add_dependency('sequel')
   if defined? JRUBY_VERSION
     s.add_dependency('jdbc-sqlite3')

data/lib/cecelia/graph.rb

@@ -7,12 +7,20 @@ class Graph
       db_name = "jdbc:" + db_name.sub(":/",":")
     end
     @db = Sequel.connect(db_name)
+    @beast = false
     require 'cecelia/graph_model.rb'
   end
+  attr_accessor :beast
 
   def add_vertex (label = "", attributes = {})
-    if Vertices.find(:label => label) == nil
-      Vertices.create(:label=> label, :attributes => YAML.dump(attributes))
+    unless @beast == true
+      if Vertices.find(:label => label) == nil
+        Vertices.create(:label=> label, :attributes => YAML.dump(attributes))
+      end
+    else
+      if Vertices.find(:label => label) == nil
+        @db[:vertices].insert(:label => label, :attributes => YAML.dump(attributes))
+      end
     end
   end
 
@@ -80,6 +88,18 @@ class Graph
     Edges.find(:id => id).delete
   end
 
+  def transaction
+    Vertices.use_transactions = false
+    @db.transaction do
+      yield(self)
+    end 
+  end
+
+  def db
+    @db
+  end
+
+
   private
   def add_edge_id(source, target, attributes = {})
     unless Vertices.find(:id => source) == nil && Vertices.find(:id => target) == nil

data/lib/cecelia/graph_model.rb

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

data/lib/cecelia/version.rb

@@ -1,3 +1,3 @@
 module Cecelia
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/graph_spec.rb

@@ -5,21 +5,20 @@ require './lib/cecelia/graph.rb'
 
 describe Graph,"Iniaialize method" do
   it "Graph.new()に空引数" do
-    Graph.new().should be_true
+    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")
+  after(:each) do
+    Sequel::DATABASES.delete(Sequel::DATABASES.first)
   end
 end
 
 describe Graph, "ノード追加に関するテスト" do
   let(:g){Graph.new}
-
   it "空グラフのノード数" do 
     g.vertices.size.should == 0
   end
@@ -49,11 +48,14 @@ describe Graph, "ノード追加に関するテスト" do
   it "同名ノードの禁止" do
     g.vertices.size.should == 10
   end
+
+  after(:each) do
+    Sequel::DATABASES.delete(Sequel::DATABASES.first)
+  end 
 end
 
 describe Graph,"エッジの追加に関するテスト" do
   let(:g){Graph.new}
-
   #before(:all){10.times{|i| g.add_vertex(i.to_s)}}
 
   it "空グラフのエッジ数" do
@@ -88,12 +90,16 @@ describe Graph,"エッジの追加に関するテスト" do
 
     (g.edges.size - size).should == 4
   end
+
+  after(:each) do
+      Sequel::DATABASES.delete(Sequel::DATABASES.first)
+  end 
 end
 
 describe Graph,"ノード削除に関するテスト" do
   let(:g){Graph.new}
 
-  before(:all){
+  before(:each){
     10.times do |i|
     g.add_vertex(i.to_s)
     end
@@ -105,6 +111,10 @@ describe Graph,"ノード削除に関するテスト" do
     g.remove_vertex("1")
     (size - g.vertices.size).should == 1
   end
+
+  after(:all) do
+    Sequel::DATABASES.delete(Sequel::DATABASES.first)
+  end 
 end
 
 describe Graph,"エッジ削除に関するテスト" do
@@ -126,4 +136,21 @@ describe Graph,"エッジ削除に関するテスト" do
     g.remove_edge("1")
     (size - g.edges.size).should == 1
   end
+
+  after(:all) do
+    Sequel::DATABASES.delete(Sequel::DATABASES.first)
+  end 
+end
+
+describe Graph,"トランザクション関係" do
+  let(:g){Graph.new}
+
+  it "トランザクション開いて，ノードを一つ追加" do
+    size = g.vertices.size
+    g.transaction do |t|
+      t.add_vertex("10")
+    end
+    (g.vertices.size - size).should == 1
+  end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cecelia
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement