em-synchrony 0.3.0.beta.1 → 1.0.0

data/spec/{mysqlplus_spec.rb → mysql2_spec.rb}

@@ -1,20 +1,32 @@
 require "spec/helper/all"
-require "mysqlplus"
-require "em-mysqlplus"
+require "em-synchrony/mysql2"
 
-DELAY = 0.25
-QUERY = "select sleep(#{DELAY})"
+describe Mysql2::EM::Client do
 
-describe EventMachine::MySQL do
+  DELAY = 0.25
+  QUERY = "SELECT sleep(#{DELAY}) as mysql2_query"
+
+  it "should support queries" do
+    res = []
+    EventMachine.synchrony do
+      db = Mysql2::EM::Client.new
+      res = db.query QUERY
+
+      EventMachine.stop
+    end
+
+    res.first.keys.should include("mysql2_query")
+  end
 
   it "should fire sequential, synchronous requests" do
     EventMachine.synchrony do
-      db = EventMachine::MySQL.new(host: "localhost")
+      db = Mysql2::EM::Client.new
+
       start = now
       res = []
 
-      res.push db.query(QUERY)
-      res.push db.query(QUERY)
+      res.push db.query QUERY
+      res.push db.query QUERY
       (now - start.to_f).should be_within(DELAY * res.size * 0.15).of(DELAY * res.size)
 
       EventMachine.stop
@@ -23,12 +35,12 @@ describe EventMachine::MySQL do
 
   it "should have accept a callback, errback on async queries" do
     EventMachine.synchrony do
-      db = EventMachine::MySQL.new(host: "localhost")
+      db = Mysql2::EM::Client.new
 
       res = db.aquery(QUERY)
       res.errback {|r| fail }
       res.callback {|r|
-        r.all_hashes.size.should == 1
+        r.size.should == 1
         EventMachine.stop
       }
     end
@@ -38,7 +50,7 @@ describe EventMachine::MySQL do
     EventMachine.synchrony do
 
       db = EventMachine::Synchrony::ConnectionPool.new(size: 2) do
-        EventMachine::MySQL.new(host: "localhost")
+        Mysql2::EM::Client.new
       end
 
       start = now
@@ -59,7 +71,7 @@ describe EventMachine::MySQL do
   it "should fire sequential and simultaneous MySQL requests" do
     EventMachine.synchrony do
       db = EventMachine::Synchrony::ConnectionPool.new(size: 3) do
-        EventMachine::MySQL.new(host: "localhost")
+        Mysql2::EM::Client.new
       end
 
       start = now
@@ -87,10 +99,10 @@ describe EventMachine::MySQL do
 
   it "should raise Mysql::Error in case of error" do
     EventMachine.synchrony do
-      db = EventMachine::MySQL.new(host: "localhost")
+      db = Mysql2::EM::Client.new
       proc {
         db.query("SELECT * FROM i_hope_this_table_does_not_exist;")
-      }.should raise_error(Mysql::Error)
+      }.should raise_error(Mysql2::Error)
       EventMachine.stop
     end
   end

data/spec/redis_spec.rb

@@ -23,6 +23,19 @@ describe EM::Protocols::Redis do
     end
   end
 
+  it "should mapped_mget synchronously" do
+    EventMachine.synchrony do
+      redis = EM::Protocols::Redis.connect
+
+      redis.set('mmget1', 'value1')
+      redis.set('mmget3', 'value3')
+      redis.mapped_mget('mmget1', 'mmget2', 'mmget3').should ==
+        { 'mmget1' => 'value1', 'mmget3' => 'value3' }
+
+      EM.stop
+    end
+  end
+
   it "should incr/decr key synchronously" do
     EventMachine.synchrony do
       redis = EM::Protocols::Redis.connect
@@ -63,4 +76,30 @@ describe EM::Protocols::Redis do
       end
     end
   end
+
+  it "should execute async mapped_mget" do
+    EventMachine.synchrony do
+      redis = EM::Protocols::Redis.connect
+
+      redis.aset('some_key', 'some_value') do
+        redis.amapped_mget('some_key', 'some_other_key') do |values|
+          values.should == { 'some_key' => 'some_value' }
+          EM.stop
+        end
+      end
+    end
+  end
+
+  it "should execute sync add and auth" do
+    EventMachine.synchrony do
+      redis = EM::Protocols::Redis.connect
+      redis.auth('abc')
+
+      redis.delete('key')
+      redis.add('key', 'value')
+      redis.scard('key').should == 1
+
+      EM.stop
+    end
+  end
 end

data/spec/synchrony_spec.rb

@@ -0,0 +1,14 @@
+require "helper/all"
+
+describe EM::Synchrony, "#sync" do
+  it "returns immediately if the syncee already succeeded" do
+    args = stub("args")
+    
+    Fiber.new {
+      df = EM::DefaultDeferrable.new
+      df.succeed args
+      
+      EM::Synchrony.sync(df).should == args
+    }.resume
+  end
+end

data/spec/timer_spec.rb

@@ -0,0 +1,35 @@
+require "spec/helper/all"
+
+describe EventMachine::Synchrony do
+
+  it "should execute one-shot timer in Fiber" do
+    EM.synchrony do
+      start = Time.now.to_f
+
+      EM::Synchrony.add_timer(0.1) do
+        EM::Synchrony.sleep(0.1)
+
+        (Time.now.to_f - start).should > 0.2
+        EventMachine.stop
+      end
+    end
+  end
+
+  it "should execute period timers in Fibers" do
+    EM.synchrony do
+      start = Time.now.to_f
+      num = 0
+
+      EM::Synchrony.add_periodic_timer(0.1) do
+        EM::Synchrony.sleep(0.1)
+        num += 1
+
+        if num > 1
+          (Time.now.to_f - start).should > 0.3
+          EventMachine.stop
+        end
+      end
+    end
+  end
+
+end

metadata

@@ -1,58 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-synchrony
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 3
-  - 0
-  - beta
-  - 1
-  version: 0.3.0.beta.1
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-23 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154266640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        - beta
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.beta.1
   type: :runtime
   prerelease: false
-  version_requirements: *id001
+  version_requirements: *2154266640
 description: Fiber aware EventMachine libraries
-email: 
+email:
 - ilya@igvita.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
 - em-synchrony.gemspec
 - examples/all.rb
-- examples/bitly.rb
 - examples/go/README.md
 - examples/go/channel.go
 - examples/go/channel.rb
@@ -61,84 +44,93 @@ files:
 - examples/go/go.rb
 - examples/nethttp.rb
 - lib/em-synchrony.rb
+- lib/em-synchrony/active_record/connection_adapters/em_mysql2_adapter.rb
+- lib/em-synchrony/active_record/patches.rb
+- lib/em-synchrony/activerecord.rb
 - lib/em-synchrony/connection_pool.rb
-- lib/em-synchrony/em-bitly.rb
+- lib/em-synchrony/em-hiredis.rb
 - lib/em-synchrony/em-http.rb
 - lib/em-synchrony/em-jack.rb
 - lib/em-synchrony/em-memcache.rb
 - lib/em-synchrony/em-mongo.rb
 - lib/em-synchrony/em-multi.rb
-- lib/em-synchrony/em-mysqlplus.rb
 - lib/em-synchrony/em-redis.rb
 - lib/em-synchrony/em-remcached.rb
+- lib/em-synchrony/fiber_iterator.rb
 - lib/em-synchrony/iterator.rb
+- lib/em-synchrony/keyboard.rb
 - lib/em-synchrony/mongo.rb
 - lib/em-synchrony/mongoid.rb
+- lib/em-synchrony/mysql2.rb
 - lib/em-synchrony/tcpsocket.rb
 - lib/em-synchrony/thread.rb
+- spec/activerecord_spec.rb
 - spec/beanstalk_spec.rb
 - spec/connection_pool_spec.rb
 - spec/em-mongo_spec.rb
+- spec/fiber_iterator_spec.rb
 - spec/helper/all.rb
 - spec/helper/stub-http-server.rb
 - spec/helper/tolerance_matcher.rb
+- spec/hiredis_spec.rb
 - spec/http_spec.rb
 - spec/inlinesync_spec.rb
 - spec/iterator_spec.rb
+- spec/keyboard_spec.rb
 - spec/memcache_spec.rb
 - spec/mongo_spec.rb
-- spec/mysqlplus_spec.rb
+- spec/mysql2_spec.rb
 - spec/redis_spec.rb
 - spec/remcached_spec.rb
+- spec/synchrony_spec.rb
 - spec/tcpsocket_spec.rb
-has_rdoc: true
+- spec/timer_spec.rb
 homepage: http://github.com/igrigorik/em-synchrony
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1057112667937056146
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1015811308506799380
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: em-synchrony
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Fiber aware EventMachine libraries
-test_files: 
+test_files:
+- spec/activerecord_spec.rb
 - spec/beanstalk_spec.rb
 - spec/connection_pool_spec.rb
 - spec/em-mongo_spec.rb
+- spec/fiber_iterator_spec.rb
 - spec/helper/all.rb
 - spec/helper/stub-http-server.rb
 - spec/helper/tolerance_matcher.rb
+- spec/hiredis_spec.rb
 - spec/http_spec.rb
 - spec/inlinesync_spec.rb
 - spec/iterator_spec.rb
+- spec/keyboard_spec.rb
 - spec/memcache_spec.rb
 - spec/mongo_spec.rb
-- spec/mysqlplus_spec.rb
+- spec/mysql2_spec.rb
 - spec/redis_spec.rb
 - spec/remcached_spec.rb
+- spec/synchrony_spec.rb
 - spec/tcpsocket_spec.rb
+- spec/timer_spec.rb

data/examples/bitly.rb

@@ -1,25 +0,0 @@
-require 'lib/em-synchrony'
-
-require "em-synchrony/em-bitly"
-EM.synchrony do
-  bitly = Bitly.new('[INSERT_LOGIN]', '[INSERT_API_KEY]')
-  url = 'http://github.com/igrigorik/em-synchrony'
-  short = bitly.shorten(url)
-
-  p "Short #{url} => #{short.jmp_url}"
-  EM.stop
-end
-
-
-Bitly.use_api_version_3
-EM.synchrony do
-  bitly = Bitly.new('[INSERT_LOGIN]', '[INSERT_API_KEY]')
-
-  url = 'http://github.com/igrigorik/em-synchrony'
-  domain='nyti.ms'
-
-  pro = bitly.bitly_pro_domain(domain)
-  p "Domain #{domain} pro=#{pro}"
-
-  EM.stop
-end

data/lib/em-synchrony/em-bitly.rb

@@ -1,58 +0,0 @@
-require 'cgi'
-
-begin
-  require "em-synchrony/em-http"
-  require "bitly"
-rescue LoadError => error
-  raise "Missing EM-Synchrony dependencies: gem install em-http-request; gem install bitly -v=0.5.0"
-end
-
-module Bitly
-  module Utils
-    def get_result(request)
-      http = EventMachine::HttpRequest.new(request).get(:timeout => 100)
-
-      result = if (http.response_header.status == 200)
-        Crack::JSON.parse(http.response)
-      else
-        {'errorMessage' => 'JSON Parse Error(Bit.ly messed up)', 'errorCode' => 69, 'statusCode' => 'ERROR'}
-      end
-
-      if 'OK' == result['statusCode']
-        result['results']
-      else
-        raise BitlyError.new(result['errorMessage'],result['errorCode'])
-      end
-    end
-  end
-  
-  module V3
-    class Client
-      class << self
-        def get(method, query)
-          query_values=[]
-          query[:query].each do |key, value|
-            query_values << "#{key}=#{CGI::escape(value.to_s)}"
-          end
-          query_values=query_values.join('&')
-          request=(method[0]=='/' ? "#{base_uri}#{method}" : method)
-          request=(request.include?('?') ? "#{request}&#{query_values}" :  "#{request}?#{query_values}")
-          
-          http = EventMachine::HttpRequest.new(request).get(:timeout => 100)
-          response = if (http.response_header.status == 200)
-            Crack::JSON.parse(http.response)
-          else
-            {'errorMessage' => 'JSON Parse Error(Bit.ly messed up)', 'errorCode' => 69, 'statusCode' => 'ERROR'}
-          end      
-          
-          if response['status_code'] == 200
-            return response
-          else
-            raise BitlyError.new(response['status_txt'], response['status_code'])
-          end
-          
-        end
-      end
-    end
-  end	
-end