em-synchrony 0.1.4 → 0.1.5

data/README.md

@@ -1,8 +1,8 @@
 # EM-Synchrony
 
-http://www.igvita.com/2010/03/22/untangling-evented-code-with-ruby-fibers
+Blog post: [Untangling Evented Code with Ruby Fibers](http://www.igvita.com/2010/03/22/untangling-evented-code-with-ruby-fibers)
 
-Collection of convenience classes and patches to common EventMachine clients to 
+Collection of convenience classes and patches to common EventMachine clients to
 make them Fiber aware and friendly. Word of warning: even though fibers have been
 backported to Ruby 1.8.x, these classes assume Ruby 1.9 (if you're using fibers
 in production, you should be on 1.9 anyway)
@@ -15,72 +15,82 @@ Features:
  * em-http-request: .get, etc are synchronous, while .aget, etc are async
  * em-mysqlplus: .query is synchronous, while .aquery is async
  * remcached: .get, etc, and .multi_* methods are synchronous
+ * bitly: synchronous api calls with EM::HttpRequest.
 
 ## Example with async em-http client:
+    require "em-synchrony/em-http"
+    EventMachine.synchrony do
+        res = EventMachine::HttpRequest.new("http://www.postrank.com").get
+        p "Look ma, no callbacks!"
+        p res
 
-	EventMachine.synchrony do
-      res = EventMachine::HttpRequest.new("http://www.postrank.com").get
-		
-	  p "Look ma, no callbacks!"
-	  p res
-
-      EventMachine.stop
+        EventMachine.stop
     end
 
 ## EM Iterator & mixing sync / async code
 
-	EM.synchrony do
-	  concurrency = 2
-	  urls = ['http://url.1.com', 'http://url2.com']
-
-	  # iterator will execute async blocks until completion, .each, .inject also work!
-	  results = EM::Synchrony::Iterator.new(urls, concurrency).map do |url, iter|
+    require "em-synchrony/em-http"
+    EM.synchrony do
+        concurrency = 2
+        urls = ['http://url.1.com', 'http://url2.com']
 
-		# fire async requests, on completion advance the iterator
-	    http = EventMachine::HttpRequest.new(url).aget
-	    http.callback { iter.return(http) }
-	  end
+        # iterator will execute async blocks until completion, .each, .inject also work!
+        results = EM::Synchrony::Iterator.new(urls, concurrency).map do |url, iter|
 
-	  p results # all completed requests
+            # fire async requests, on completion advance the iterator
+            http = EventMachine::HttpRequest.new(url).aget
+            http.callback { iter.return(http) }
+        end
 
-	  EventMachine.stop
-	end
+        p results # all completed requests
+        EventMachine.stop
+    end
 
 ## Example connection pool shared by a fiber:
 
-	EventMachine.synchrony do
-	  db = EventMachine::Synchrony::ConnectionPool.new(size: 2) do
-	    EventMachine::MySQL.new(host: "localhost")
-	  end
+    require "em-synchrony/em-mysqlplus"
+    EventMachine.synchrony do
+        db = EventMachine::Synchrony::ConnectionPool.new(size: 2) do
+            EventMachine::MySQL.new(host: "localhost")
+        end
 
-	  start = now
+        multi = EventMachine::Synchrony::Multi.new
+        multi.add :a, db.aquery("select sleep(1)")
+        multi.add :b, db.aquery("select sleep(1)")
+        res = multi.perform
 
-	  multi = EventMachine::Synchrony::Multi.new
-	  multi.add :a, db.aquery("select sleep(1)")
-	  multi.add :b, db.aquery("select sleep(1)")
-	  res = multi.perform
+        p "Look ma, no callbacks, and parallel MySQL requests!"
+        p res
 
-	  p "Look ma, no callbacks, and parallel MySQL requests!"
-	  p res
+        EventMachine.stop
+    end
 
-	  EventMachine.stop
-	end
+## Example with multi-request async em-http client:
 
+    require "em-synchrony/em-http"
+    EventMachine.synchrony do
+        multi = EventMachine::Synchrony::Multi.new
+        multi.add :a, EventMachine::HttpRequest.new("http://www.postrank.com").aget
+        multi.add :b, EventMachine::HttpRequest.new("http://www.postrank.com").apost
+        res = multi.perform
 
-## Example with multi-request async em-http client:
+        p "Look ma, no callbacks, and parallel HTTP requests!"
+        p res
+
+        EventMachine.stop
+    end
+
+## Example with async Bitly client:
+
+    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}"
+    end
 
-	EventMachine.synchrony do
- 	  multi = EventMachine::Synchrony::Multi.new
-      multi.add :a, EventMachine::HttpRequest.new("http://www.postrank.com").aget
-      multi.add :b, EventMachine::HttpRequest.new("http://www.postrank.com").apost
-      res = multi.perform
-	 
-	  p "Look ma, no callbacks, and parallel HTTP requests!"
-	  p res
-     
-	  EventMachine.stop
-	end
-	
 # License
 
 (The MIT License)

data/Rakefile

@@ -16,5 +16,5 @@ begin
 
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available: gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/em-synchrony.rb

@@ -1,16 +1,16 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
-require "rubygems"
 require "eventmachine"
-require "fiber"
+
+begin
+  require "fiber"
+rescue LoadError => error
+  raise error unless defined? Fiber
+end
 
 require "em-synchrony/em-multi"
-# require "em-synchrony/iterator" # iterators are not release in EM yet
 require "em-synchrony/connection_pool"
-
-require "em-synchrony/em-http"
-require "em-synchrony/em-mysql"
-require "em-synchrony/em-remcached"
+# require "em-synchrony/iterator" # iterators are not release in EM yet
 
 module EventMachine
 

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

@@ -0,0 +1,26 @@
+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.4.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
+end

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

@@ -1,4 +1,8 @@
-require "em-http"
+begin
+  require "em-http"
+rescue LoadError => error
+  raise "Missing EM-Synchrony dependency: gem install em-http-request"
+end
 
 module EventMachine
   class HttpRequest
@@ -12,9 +16,9 @@ module EventMachine
             conn.callback { f.resume(conn) }
             conn.errback  { f.resume(conn) }
 
-            Fiber.yield  
+            Fiber.yield
          end
       ]
-    end  
+    end
   end
 end

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

@@ -1,4 +1,8 @@
-require "em-jack"
+begin
+  require "em-jack"
+rescue LoadError => error
+  raise "Missing EM-Synchrony dependency: gem install em-jack"
+end
 
 # WANT: namespaced under EventMachine.. would be nice :-)
 # NOTE: no need for "pooling" since Beanstalk supports pipelining
@@ -18,11 +22,11 @@ module EMJack
 
       @used_tube = tube
       @conn.send(:use, tube)
-      
+
       # WANT: Add conditional on add_deferrable to either accept two procs, or a single block
       #       .. two procs = callback, errback
       add_deferrable { |r| f.resume(r) }
-      
+
       Fiber.yield
     end
 

data/lib/em-synchrony/{em-mysql.rb → em-mysqlplus.rb}

@@ -1,4 +1,8 @@
-require "em-mysqlplus"
+begin
+  require "em-mysqlplus"
+rescue LoadError => error
+  raise "Missing EM-Synchrony dependency: gem install em-mysqlplus"
+end
 
 module EventMachine
   class MySQL

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

@@ -1,4 +1,8 @@
-require "remcached"
+begin
+  require "remcached"
+rescue LoadError => error
+  raise "Missing EM-Synchrony dependency: gem install remcached"
+end
 
 module Memcached
   class << self
@@ -45,19 +49,19 @@ module Memcached
          def amulti_#{type}(contents, &callback)
            df = EventMachine::DefaultDeferrable.new
            df.callback &callback
-    
+
            cb = Proc.new { |res| df.succeed(res) }
            multi_operation Request::#{type.capitalize}, contents, &cb
-    
+
              df
          end
-    
+
          def multi_#{type}(contents, &callback)
            fiber = Fiber.current
-    
+
            df = amulti_#{type}(contents, &Proc.new { |res| fiber.resume(res) })
            df.callback &callback
-    
+
            Fiber.yield
          end
        ]

data/spec/beanstalk_spec.rb

@@ -7,7 +7,7 @@ describe EMJack do
 
   it "should fire sequential Beanstalk requests" do
     pending
-    
+
     EventMachine.run do
       Fiber.new {
         jack = EMJack::Connection.new
@@ -22,7 +22,7 @@ describe EMJack do
 
   it "should fire multiple requests in parallel" do
     pending
-    
+
     EventMachine.run do
       Fiber.new {
         jack = EMJack::Connection.new
@@ -31,14 +31,14 @@ describe EMJack do
         multi.add jack.ause('mytube-1')
         multi.add jack.ause('mytube-2')
         res = multi.perform
-        
+
         res.responses.size.should == 2
         p [:multi, res.responses]
-        
+
         EventMachine.stop
       }.resume
 
     end
   end
-  
+
 end

data/spec/connection_pool_spec.rb

@@ -107,7 +107,7 @@ describe EventMachine::Synchrony::ConnectionPool do
             fiber.transfer if results.size == 3
           }.resume
         end
-        
+
         Fiber.new {
           # execute a synchronous requests
           results.push db.query(QUERY)

data/spec/helper/all.rb

@@ -3,6 +3,10 @@ require 'spec'
 require 'pp'
 
 require 'lib/em-synchrony'
+require 'lib/em-synchrony/em-http'
+require 'lib/em-synchrony/em-mysqlplus'
+require 'lib/em-synchrony/em-remcached'
+
 require 'helper/tolerance_matcher'
 require 'helper/stub-http-server'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -04:00
+date: 2010-04-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,10 +45,11 @@ files:
 - VERSION
 - lib/em-synchrony.rb
 - lib/em-synchrony/connection_pool.rb
+- lib/em-synchrony/em-bitly.rb
 - lib/em-synchrony/em-http.rb
 - lib/em-synchrony/em-jack.rb
 - lib/em-synchrony/em-multi.rb
-- lib/em-synchrony/em-mysql.rb
+- lib/em-synchrony/em-mysqlplus.rb
 - lib/em-synchrony/em-remcached.rb
 - lib/em-synchrony/iterator.rb
 - spec/beanstalk_spec.rb
@@ -58,7 +59,7 @@ files:
 - spec/helper/tolerance_matcher.rb
 - spec/http_spec.rb
 - spec/iterator_spec.rb
-- spec/mysql_spec.rb
+- spec/mysqlplus_spec.rb
 - spec/remcached_spec.rb
 has_rdoc: true
 homepage: http://github.com/igrigorik/em-synchrony
@@ -99,6 +100,6 @@ test_files:
 - spec/helper/tolerance_matcher.rb
 - spec/http_spec.rb
 - spec/iterator_spec.rb
-- spec/mysql_spec.rb
+- spec/mysqlplus_spec.rb
 - spec/remcached_spec.rb
 - examples/all.rb