futuroscope 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03cdb1ddd7c212ef63c625d610754a92386a1c73
-  data.tar.gz: 90f54b489a3176aa6ad82c17195cb7d8e429d687
+  metadata.gz: 4fd5d28ef251a17a7ef93724aeb9bd633c7918e5
+  data.tar.gz: b99fa961184a443c7fcc68c3e547536bfa8295c6
 SHA512:
-  metadata.gz: a7cf8ff237e9610854c1dd2ab2aabb24143ce632cdf376900e68685811ba72075532c8eb0d06e685992de2ac1a5bc1da556774f9b1ce4db6a7e0e62c5fda752f
-  data.tar.gz: 7dd1ea1d9c1dda894349798a74da9b9b3f05a73774c2a135b213b762662f8ac0ef9fd6d6723eac02c77c3b7ada1082601930a203c83a3fa6c0fa05f120d22f4e
+  metadata.gz: 216febe1e1ef8ea9041cbdb053dd2d5aa926e12a30056bff728e48947931436e59160c9d1ca50bec0cafc0a4579f9e804b8887cba6270d324c0ac595370691ae
+  data.tar.gz: 702c1d669a4b74cc126aacac0cbf3841651737588b8c6068ae6f12d1aa01536698933856c80825ae33112881824e75fa923846c84b973c9b905710064bd885be

data/.travis.yml

@@ -3,6 +3,6 @@ cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - rbx
+  - rbx-2.2.3
   - 2.1.0
   - jruby-19mode

data/README.md

@@ -6,10 +6,14 @@
 [![Dependency Status](https://gemnasium.com/codegram/futuroscope.png)](https://gemnasium.com/codegram/futuroscope)
 
 Futursocope is a simple library that implements futures in ruby. Futures are a
-concurrency pattern meant to help you deal with concurrency in a simple way.
+concurrency pattern meant to help you deal with threads in a simple, transparent way.
 
-It's specially useful when working in Service Oriented Architectures where HTTP
-calls can take a long time and you only expect a value from them.
+It's specially useful in situations where you have calls to an expensive resource that
+could be done in parallel (they are not chained), but you don't wanna deal with low-level
+threads. HTTP calls are a good example.
+
+Also useful when you want to spin up a process that runs in the background, do some stuff 
+in the middle, and wait for that process to return.
 
 [![The awesome Futuroscope park](http://europe.eurostar.com/wp-content/uploads/2011/06/Futuroscope10-59-of-107.jpg)](http://futuroscope.com)
 
@@ -24,7 +28,7 @@ method on in it will be forwarded to the block's return value.
 If the thread didn't finish yet, it will block the program's execution until
 it's finished. Otherwise, it will immediately return its value.
 
-Futuroscope is tested on `MRI 1.9.3`, `MRI 2.0.0`, `MRI 2.1.0`, `Rubinius (1.9)` and `JRuby (1.9)`.
+Futuroscope is tested on `MRI 1.9.3`, `MRI 2.0.0`, `MRI 2.1.0`, `Rubinius (2.2.3)` and `JRuby (1.9)`.
 
 Check out [futuroscope's post on Codegram's blog](http://blog.codegram.com/2013/5/new-gem-released-futuroscope) to get started.
 

data/lib/futuroscope/future.rb

@@ -30,6 +30,7 @@ module Futuroscope
       @queue = ::SizedQueue.new(1)
       @pool = pool
       @block = block
+      @mutex = Mutex.new
       @pool.queue self
     end
 
@@ -70,7 +71,9 @@ module Futuroscope
     private
 
     def resolved_future_value
-      @resolved_future ||= @queue.pop
+      @resolved_future || @mutex.synchronize do
+        @resolved_future ||= @queue.pop
+      end
     end
   end
 end

data/lib/futuroscope/version.rb

@@ -1,3 +1,3 @@
 module Futuroscope
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/futuroscope/future_spec.rb

@@ -66,5 +66,32 @@ module Futuroscope
       expect(future.dup).to eq future
     end
 
+    context "when at least another thread is alive" do
+      # If no threads are alive, the VM raises an exception, therefore we need to ensure there is one.
+
+      before :each do
+        @live_thread = Thread.new { loop { } }
+      end
+
+
+      it "doesn't hang when 2 threads try to obtain its result before it's finished" do
+        test_thread = Thread.new do
+          future = Future.new { sleep 1; 1 }
+          f1 = Future.new { future + 1 }
+          f2 = Future.new { future + 2 }
+          f1.future_value
+          f2.future_value
+        end
+        sleep 2
+        expect(test_thread).to_not be_alive
+        test_thread.kill
+      end
+
+
+      after :each do
+        @live_thread.kill
+      end
+
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futuroscope
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler