em-synchrony 1.0.1 → 1.0.2

data/spec/activerecord_spec.rb

@@ -1,109 +1,109 @@
-require "spec/helper/all"
-require "em-synchrony/activerecord"
-require "em-synchrony/fiber_iterator"
-
-# create database widgets;
-# use widgets;
-# create table widgets (
-# id INT NOT NULL AUTO_INCREMENT,
-# title varchar(255),
-# PRIMARY KEY (`id`)
-# );
-
-class Widget < ActiveRecord::Base; end;
-
-describe "Fiberized ActiveRecord driver for mysql2" do
-  DELAY = 0.25
-  QUERY = "SELECT sleep(#{DELAY})"
-
-  def establish_connection
-      ActiveRecord::Base.establish_connection(
-        :adapter => 'em_mysql2',
-        :database => 'widgets',
-        :username => 'root',
-        :pool => 10
-      )
-      Widget.delete_all
-  end
-
-  it "should establish AR connection" do
-    EventMachine.synchrony do
-      establish_connection
-
-      result = Widget.find_by_sql(QUERY)
-      result.size.should eql(1)
-      EventMachine.stop
-    end
-  end
-
-  it "should fire sequential, synchronous requests within single fiber" do
-    EventMachine.synchrony do
-      establish_connection
-
-      start = now
-      res = []
-
-      res.push Widget.find_by_sql(QUERY)
-      res.push Widget.find_by_sql(QUERY)
-
-      (now - start.to_f).should be_within(DELAY * res.size * 0.15).of(DELAY * res.size)
-      res.size.should eql(2)
-
-      EventMachine.stop
-    end
-  end
-
-  it "should fire 100 requests in fibers" do
-    EM.synchrony do
-      establish_connection
-      EM::Synchrony::FiberIterator.new(1..100, 40).each do |i|
-        widget = Widget.create title: 'hi'
-        widget.update_attributes title: 'hello'
-      end
-      EM.stop
-    end
-  end
-
-  it "should create widget" do
-    EM.synchrony do
-      establish_connection
-      Widget.create
-      Widget.create
-      Widget.count.should eql(2)
-      EM.stop
-    end
-  end
-
-  it "should update widget" do
-    EM.synchrony do
-      establish_connection
-      ActiveRecord::Base.connection.execute("TRUNCATE TABLE widgets;")
-      widget = Widget.create title: 'hi'
-      widget.update_attributes title: 'hello'
-      Widget.find(widget.id).title.should eql('hello')
-      EM.stop
-    end
-  end
-
-  describe "transactions" do
-    it "should work properly" do
-      EM.synchrony do
-        establish_connection
-        EM::Synchrony::FiberIterator.new(1..50, 30).each do |i|
-          widget = Widget.create title: "hi#{i}"
-          ActiveRecord::Base.transaction do
-            widget.update_attributes title: "hello"
-          end
-          ActiveRecord::Base.transaction do
-            raise ActiveRecord::Rollback
-          end
-        end
-        Widget.all.each do |widget|
-          widget.title.should eq('hello')
-        end
-        EM.stop
-      end
-    end
-  end
-
+require "spec/helper/all"
+require "em-synchrony/activerecord"
+require "em-synchrony/fiber_iterator"
+
+# create database widgets;
+# use widgets;
+# create table widgets (
+# id INT NOT NULL AUTO_INCREMENT,
+# title varchar(255),
+# PRIMARY KEY (`id`)
+# );
+
+class Widget < ActiveRecord::Base; end;
+
+describe "Fiberized ActiveRecord driver for mysql2" do
+  DELAY = 0.25
+  QUERY = "SELECT sleep(#{DELAY})"
+
+  def establish_connection
+      ActiveRecord::Base.establish_connection(
+        :adapter => 'em_mysql2',
+        :database => 'widgets',
+        :username => 'root',
+        :pool => 10
+      )
+      Widget.delete_all
+  end
+
+  it "should establish AR connection" do
+    EventMachine.synchrony do
+      establish_connection
+
+      result = Widget.find_by_sql(QUERY)
+      result.size.should eql(1)
+      EventMachine.stop
+    end
+  end
+
+  it "should fire sequential, synchronous requests within single fiber" do
+    EventMachine.synchrony do
+      establish_connection
+
+      start = now
+      res = []
+
+      res.push Widget.find_by_sql(QUERY)
+      res.push Widget.find_by_sql(QUERY)
+
+      (now - start.to_f).should be_within(DELAY * res.size * 0.15).of(DELAY * res.size)
+      res.size.should eql(2)
+
+      EventMachine.stop
+    end
+  end
+
+  it "should fire 100 requests in fibers" do
+    EM.synchrony do
+      establish_connection
+      EM::Synchrony::FiberIterator.new(1..100, 40).each do |i|
+        widget = Widget.create title: 'hi'
+        widget.update_attributes title: 'hello'
+      end
+      EM.stop
+    end
+  end
+
+  it "should create widget" do
+    EM.synchrony do
+      establish_connection
+      Widget.create
+      Widget.create
+      Widget.count.should eql(2)
+      EM.stop
+    end
+  end
+
+  it "should update widget" do
+    EM.synchrony do
+      establish_connection
+      ActiveRecord::Base.connection.execute("TRUNCATE TABLE widgets;")
+      widget = Widget.create title: 'hi'
+      widget.update_attributes title: 'hello'
+      Widget.find(widget.id).title.should eql('hello')
+      EM.stop
+    end
+  end
+
+  describe "transactions" do
+    it "should work properly" do
+      EM.synchrony do
+        establish_connection
+        EM::Synchrony::FiberIterator.new(1..50, 30).each do |i|
+          widget = Widget.create title: "hi#{i}"
+          ActiveRecord::Base.transaction do
+            widget.update_attributes title: "hello"
+          end
+          ActiveRecord::Base.transaction do
+            raise ActiveRecord::Rollback
+          end
+        end
+        Widget.all.each do |widget|
+          widget.title.should eq('hello')
+        end
+        EM.stop
+      end
+    end
+  end
+
 end

data/spec/amqp_spec.rb

@@ -1,146 +1,146 @@
-require "spec/helper/all"
-
-describe EM::Synchrony::AMQP do
-
-  it "should yield until connection is ready" do
-    EM.synchrony do
-      connection = EM::Synchrony::AMQP.connect
-      connection.connected?.should be_true
-      EM.stop
-    end
-  end
-
-  it "should yield until disconnection is complete" do
-    EM.synchrony do
-      connection = EM::Synchrony::AMQP.connect
-      connection.disconnect
-      connection.connected?.should be_false
-      EM.stop
-    end
-  end
-
-  it "should yield until the channel is created" do
-    EM.synchrony do
-      connection = EM::Synchrony::AMQP.connect
-      channel = EM::Synchrony::AMQP::Channel.new(connection)
-      channel.should be_kind_of(EM::Synchrony::AMQP::Channel)
-      EM.stop
-    end
-  end
-
-  it "should yield until the queue is created" do
-    EM.synchrony do
-      connection = EM::Synchrony::AMQP.connect
-      channel = EM::Synchrony::AMQP::Channel.new(connection)
-      queue = EM::Synchrony::AMQP::Queue.new(channel, "test.em-synchrony.queue1", :auto_delete => true)
-      EM.stop
-    end
-  end
-
-  it "should yield when a queue is created from a channel" do
-    EM.synchrony do
-      connection = EM::Synchrony::AMQP.connect
-      channel = EM::Synchrony::AMQP::Channel.new(connection)
-      queue = channel.queue("test.em-synchrony.queue1", :auto_delete => true)
-      EM.stop
-    end
-  end
-
-  it "should yield until the exchange is created" do
-    EM.synchrony do
-      connection = EM::Synchrony::AMQP.connect
-      channel = EM::Synchrony::AMQP::Channel.new(connection)
-
-      exchange = EM::Synchrony::AMQP::Exchange.new(channel, :fanout, "test.em-synchrony.exchange")
-      exchange.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
-
-      direct = channel.direct("test.em-synchrony.direct")
-      fanout = channel.fanout("test.em-synchrony.fanout")
-      topic = channel.topic("test.em-synchrony.topic")
-      headers = channel.headers("test.em-synchrony.headers")
-
-      direct.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
-      fanout.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
-      topic.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
-      headers.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
-      EM.stop
-    end
-  end
-
-  it "should publish and receive messages" do
-    nb_msg = 10
-    EM.synchrony do
-      connection = EM::Synchrony::AMQP.connect
-      channel = EM::Synchrony::AMQP::Channel.new(connection)
-      ex = EM::Synchrony::AMQP::Exchange.new(channel, :fanout, "test.em-synchrony.fanout")
-
-      q1 = channel.queue("test.em-synchrony.queues.1", :auto_delete => true)
-      q2 = channel.queue("test.em-synchrony.queues.2", :auto_delete => true)
-
-      q1.bind(ex)
-      q2.bind(ex)
-
-      nb_q1, nb_q2 = 0, 0
-      stop_cb = proc { EM.stop if nb_q1 + nb_q2 == 2 * nb_msg }
-
-      q1.subscribe do |meta, msg|
-        msg.should match(/^Bonjour [0-9]+/)
-        nb_q1 += 1
-        stop_cb.call
-      end
-
-      q2.subscribe do |meta, msg|
-        msg.should match(/^Bonjour [0-9]+/)
-        nb_q2 += 1
-        stop_cb.call
-      end
-
-      Fiber.new do
-        nb_msg.times do |n|
-          ex.publish("Bonjour #{n}")
-          EM::Synchrony.sleep(0.1)
-        end
-      end.resume
-    end
-  end
-
-  it "should handle several consumers" do
-    nb_msg = 10
-    EM.synchrony do
-      connection = EM::Synchrony::AMQP.connect
-      channel = EM::Synchrony::AMQP::Channel.new(connection)
-      exchange = EM::Synchrony::AMQP::Exchange.new(channel, :fanout, "test.em-synchrony.consumers.fanout")
-
-      queue = channel.queue("test.em-synchrony.consumers.queue", :auto_delete => true)
-      queue.bind(exchange)
-
-      cons1 = EM::Synchrony::AMQP::Consumer.new(channel, queue)
-      cons2 = EM::Synchrony::AMQP::Consumer.new(channel, queue)
-
-      nb_cons1, nb_cons2 = 0, 0
-      stop_cb = Proc.new do
-        if nb_cons1 + nb_cons2 == nb_msg
-          nb_cons1.should eq(nb_cons2)
-          EM.stop
-        end
-      end
-
-      cons1.on_delivery do |meta, msg|
-        msg.should match(/^Bonjour [0-9]+/)
-        nb_cons1 += 1
-        stop_cb.call
-      end.consume
-
-      cons2.on_delivery do |meta, msg|
-        msg.should match(/^Bonjour [0-9]+/)
-        nb_cons2 += 1
-        stop_cb.call
-      end.consume
-
-      10.times do |n|
-        exchange.publish("Bonjour #{n}")
-        EM::Synchrony.sleep(0.1)
-      end
-   end
-  end
-end
+require "spec/helper/all"
+
+describe EM::Synchrony::AMQP do
+
+  it "should yield until connection is ready" do
+    EM.synchrony do
+      connection = EM::Synchrony::AMQP.connect
+      connection.connected?.should be_true
+      EM.stop
+    end
+  end
+
+  it "should yield until disconnection is complete" do
+    EM.synchrony do
+      connection = EM::Synchrony::AMQP.connect
+      connection.disconnect
+      connection.connected?.should be_false
+      EM.stop
+    end
+  end
+
+  it "should yield until the channel is created" do
+    EM.synchrony do
+      connection = EM::Synchrony::AMQP.connect
+      channel = EM::Synchrony::AMQP::Channel.new(connection)
+      channel.should be_kind_of(EM::Synchrony::AMQP::Channel)
+      EM.stop
+    end
+  end
+
+  it "should yield until the queue is created" do
+    EM.synchrony do
+      connection = EM::Synchrony::AMQP.connect
+      channel = EM::Synchrony::AMQP::Channel.new(connection)
+      queue = EM::Synchrony::AMQP::Queue.new(channel, "test.em-synchrony.queue1", :auto_delete => true)
+      EM.stop
+    end
+  end
+
+  it "should yield when a queue is created from a channel" do
+    EM.synchrony do
+      connection = EM::Synchrony::AMQP.connect
+      channel = EM::Synchrony::AMQP::Channel.new(connection)
+      queue = channel.queue("test.em-synchrony.queue1", :auto_delete => true)
+      EM.stop
+    end
+  end
+
+  it "should yield until the exchange is created" do
+    EM.synchrony do
+      connection = EM::Synchrony::AMQP.connect
+      channel = EM::Synchrony::AMQP::Channel.new(connection)
+
+      exchange = EM::Synchrony::AMQP::Exchange.new(channel, :fanout, "test.em-synchrony.exchange")
+      exchange.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
+
+      direct = channel.direct("test.em-synchrony.direct")
+      fanout = channel.fanout("test.em-synchrony.fanout")
+      topic = channel.topic("test.em-synchrony.topic")
+      headers = channel.headers("test.em-synchrony.headers")
+
+      direct.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
+      fanout.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
+      topic.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
+      headers.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
+      EM.stop
+    end
+  end
+
+  it "should publish and receive messages" do
+    nb_msg = 10
+    EM.synchrony do
+      connection = EM::Synchrony::AMQP.connect
+      channel = EM::Synchrony::AMQP::Channel.new(connection)
+      ex = EM::Synchrony::AMQP::Exchange.new(channel, :fanout, "test.em-synchrony.fanout")
+
+      q1 = channel.queue("test.em-synchrony.queues.1", :auto_delete => true)
+      q2 = channel.queue("test.em-synchrony.queues.2", :auto_delete => true)
+
+      q1.bind(ex)
+      q2.bind(ex)
+
+      nb_q1, nb_q2 = 0, 0
+      stop_cb = proc { EM.stop if nb_q1 + nb_q2 == 2 * nb_msg }
+
+      q1.subscribe do |meta, msg|
+        msg.should match(/^Bonjour [0-9]+/)
+        nb_q1 += 1
+        stop_cb.call
+      end
+
+      q2.subscribe do |meta, msg|
+        msg.should match(/^Bonjour [0-9]+/)
+        nb_q2 += 1
+        stop_cb.call
+      end
+
+      Fiber.new do
+        nb_msg.times do |n|
+          ex.publish("Bonjour #{n}")
+          EM::Synchrony.sleep(0.1)
+        end
+      end.resume
+    end
+  end
+
+  it "should handle several consumers" do
+    nb_msg = 10
+    EM.synchrony do
+      connection = EM::Synchrony::AMQP.connect
+      channel = EM::Synchrony::AMQP::Channel.new(connection)
+      exchange = EM::Synchrony::AMQP::Exchange.new(channel, :fanout, "test.em-synchrony.consumers.fanout")
+
+      queue = channel.queue("test.em-synchrony.consumers.queue", :auto_delete => true)
+      queue.bind(exchange)
+
+      cons1 = EM::Synchrony::AMQP::Consumer.new(channel, queue)
+      cons2 = EM::Synchrony::AMQP::Consumer.new(channel, queue)
+
+      nb_cons1, nb_cons2 = 0, 0
+      stop_cb = Proc.new do
+        if nb_cons1 + nb_cons2 == nb_msg
+          nb_cons1.should eq(nb_cons2)
+          EM.stop
+        end
+      end
+
+      cons1.on_delivery do |meta, msg|
+        msg.should match(/^Bonjour [0-9]+/)
+        nb_cons1 += 1
+        stop_cb.call
+      end.consume
+
+      cons2.on_delivery do |meta, msg|
+        msg.should match(/^Bonjour [0-9]+/)
+        nb_cons2 += 1
+        stop_cb.call
+      end.consume
+
+      10.times do |n|
+        exchange.publish("Bonjour #{n}")
+        EM::Synchrony.sleep(0.1)
+      end
+   end
+  end
+end