em-synchrony 0.2.0 → 0.3.0.beta.1

data/.gitignore

@@ -0,0 +1,3 @@
+Gemfile.lock
+.bundle
+misc

data/Gemfile

@@ -4,12 +4,12 @@ gem 'eventmachine', :git => 'git://github.com/eventmachine/eventmachine.git'
 
 group :development do
   gem 'rspec', '~> 2.0.0'
-  gem 'em-http-request'
+  gem 'em-http-request', :git => 'git://github.com/igrigorik/em-http-request'
   gem 'remcached'
   gem 'em-mongo'
   gem 'bson_ext'
   gem 'mysqlplus'
   gem 'em-mysqlplus'
-  gem 'em-redis'
+  gem 'em-redis', '~> 0.3.0'
   gem 'mongo'
 end

data/em-synchrony.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "em-synchrony"
-  s.version     = "0.2.0"
+  s.version     = "0.3.0.beta.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ilya Grigorik"]
   s.email       = ["ilya@igvita.com"]
@@ -13,8 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "em-synchrony"
 
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.add_runtime_dependency("eventmachine", [">= 0.12.9"])
+  s.add_runtime_dependency("eventmachine", ">= 1.0.0.beta.1")
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/em-synchrony.rb

@@ -12,7 +12,7 @@ require "em-synchrony/thread"
 require "em-synchrony/em-multi"
 require "em-synchrony/tcpsocket"
 require "em-synchrony/connection_pool"
-require "em-synchrony/iterator"  unless EventMachine::VERSION >= '0.12.10'
+require "em-synchrony/iterator"  if EventMachine::VERSION > '0.12.10'
 
 module EventMachine
 

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

@@ -5,7 +5,7 @@ rescue LoadError => error
 end
 
 module EventMachine
-  class HttpRequest
+  module HTTPMethods
      %w[get head post delete put].each do |type|
        class_eval %[
          alias :a#{type} :#{type}

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

@@ -21,13 +21,15 @@ module EventMachine
 
         Fiber.yield
       end
-
+      
+      alias :old_call_command :call_command
+      
       def call_command(argv, &blk)
         # async commands are 'a' prefixed, but do check
         # for the 'add' command corner case (ugh)
         if argv.first.size > 3 && argv.first[0] == 'a'
           argv[0] = argv[0].to_s.slice(1,argv[0].size)
-          callback { raw_call_command(argv, &blk) }
+          old_call_command(argv, &blk)
 
         else
           # wrap response blocks into fiber callbacks
@@ -36,7 +38,7 @@ module EventMachine
           blk = proc { |v| v } if !block_given?
           clb = proc { |v| f.resume(blk.call(v)) }
 
-          callback { raw_call_command(argv, &clb) }
+          old_call_command(argv, &clb)
           Fiber.yield
         end
       end

data/spec/http_spec.rb

@@ -4,6 +4,18 @@ URL = "http://localhost:8081/"
 DELAY = 0.25
 
 describe EventMachine::HttpRequest do
+  it "should perform a synchronous fetch" do
+    EM.synchrony do
+      s = StubServer.new("HTTP/1.0 200 OK\r\nConnection: close\r\n\r\nFoo", DELAY)
+
+      r = EventMachine::HttpRequest.new(URL).get
+      r.response.should == 'Foo'
+
+      s.stop
+      EventMachine.stop
+    end
+  end
+
   it "should fire sequential requests" do
     EventMachine.synchrony do
       s = StubServer.new("HTTP/1.0 200 OK\r\nConnection: close\r\n\r\nFoo", DELAY)

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: em-synchrony
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  - beta
+  - 1
+  version: 0.3.0.beta.1
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -04:00
+date: 2011-02-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +27,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 0
         - 0
-        - 12
-        - 9
-        version: 0.12.9
+        - beta
+        - 1
+        version: 1.0.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -42,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -100,18 +105,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -1057112667937056146
       segments: 
-      - 1
-      - 9
-      version: "1.9"
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: em-synchrony