fibre 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98cb9c7bec1b4bacca19c56a9c1f30749de6f2f2
-  data.tar.gz: ec027579676fbdf631c7d5edf3292088d3be08fd
+  metadata.gz: 07320e52433387848e04df86513a2084afb47c5f
+  data.tar.gz: 00fcf61e035ed39c5dcde9307f42511891051785
 SHA512:
-  metadata.gz: 7dce7bb0b82b76bc54a12d6073eca64c339cae076bb2be04392bbcf3f48e89a0d446f22ae88dea2e3315d79f262ac5482414b8b8692b5c78a58adb6fae718f6b
-  data.tar.gz: ac1a20aec7a195cf7e22967289279737159ef414a56d3f979e39c64d4f5f2015fb705ee7a5a85fa4bb74db8651d0b4ae3502274cad6b650e4285a695c3ca4978
+  metadata.gz: 345d4ddf8891a06747a859fd8d63eec61239eab74d5f91e97cc99d8a573e901eab0da69f1f5a5f5cc319c8fe6d2b10b5b0c3fa7f68138389cd2c56fc915ebc09
+  data.tar.gz: bb604e4a82e42707b733b8f356b8fc6e91821d63cd202d6e7aa2a6e345dee4478732332a6b91ffec5ebdd9ad3a8cbbcfb809d0c6f5c9a6dffaba4a0ea42704b7

data/fibre.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version     = '>= 2.1.0'
   spec.required_rubygems_version = '>= 2.3.0'
 
+  spec.add_development_dependency "eventmachine", "~> 1.0.3"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3"

data/lib/fibre.rb

@@ -12,6 +12,8 @@ module Fibre
     autoload :FiberPool,  'fibre/rack/fiber_pool'
   end
 
+  class LeaveError < StandardError; end
+
   # Configuration module
 
   extend self

data/lib/fibre/core_ext/fiber.rb

@@ -1,10 +1,10 @@
 require 'fiber'
 
-#
 #   Fiber.sync do |fiber|
 #     fiber.resume response
 #     fiber.leave StandardError, "Something"
 #   end
+
 class Fiber
 
   def attributes
@@ -40,18 +40,14 @@ class Fiber
       end
     end
 
-    #
-    # Fiber.sync do |fiber|
-    #   fiber.resume # ...
-    # end
-    #
+
     def sync_it
       yield(Fiber.current) if block_given?
       Fiber.yield!
     end
   end
 
-  def leave(exception, message=nil)
+  def leave(exception=Fibre::LeaveError, message=nil)
     resume exception.new(message)
   end
 end

data/lib/fibre/core_ext/synchrony.rb

@@ -5,6 +5,76 @@ module Fibre::Synchrony
       res = Fiber.scope { collect(&:sync) }
       res.collect(&:result)
     end
+
+    def sync!
+      res = Fiber.scope do
+        deep_sync_scoped
+      end
+
+      res.each do |mock|
+        node = self
+        path = mock.path.split(/./)
+        key = path.pop
+        path.each { |k| node = node[k] }
+        node[key] = mock.result
+      end
+
+      self
+    end
+
+    def deep_sync_scoped(path: [])
+      each_with_index do |item, index|
+        # deeeep
+        if item.is_a?(Array) || item.is_a?(Hash) # item.respond_to?(:deep_sync_scoped) not works in ruby 2.1.2
+          item.deep_sync_scoped(path: path + [index])
+          next
+        end
+
+        item.sync.tap do |mock|
+          mock.path = path + [index]
+        end
+      end
+    end
+  end
+
+  refine Hash do
+    def sync
+      res = Fiber.scope { values.collect(&:sync) }
+      hash = {}
+      res.each_with_index do |mock, index|
+        hash[keys[index]] = mock.result
+      end
+      hash
+    end
+
+    def sync!
+      res = Fiber.scope do
+        deep_sync_scoped
+      end
+
+      res.each do |mock|
+        node = self
+        path = mock.path
+        key = path.pop
+        path.each { |k| node = node[k] }
+        node[key] = mock.result
+      end
+
+      self
+    end
+
+    def deep_sync_scoped(path: [])
+      each do |key, item|
+        # deeeep
+        if item.is_a?(Array) || item.is_a?(Hash) # item.respond_to?(:deep_sync_scoped) not works in ruby 2.1.2
+          item.deep_sync_scoped(path: path + [key])
+          next
+        end
+        item.sync.tap do |mock|
+          mock.path = path + [key]
+        end
+      end
+    end
   end
 
   #<<<

data/lib/fibre/mock.rb

@@ -1,7 +1,8 @@
 module Fibre
   class Mock
-    attr_reader :scope
-    attr_reader :result
+    attr_reader   :scope
+    attr_reader   :result
+    attr_accessor :path
 
     def initialize(scope)
       @scope = scope

data/lib/fibre/scope.rb

@@ -7,11 +7,12 @@ module Fibre
 
       def scope
         raise "nested scopes" if Fiber.current[:scope]
-        Fiber.current[:scope] = self.new(Fiber.current)
-        res = yield
+        scope = self.new(Fiber.current)
+        Fiber.current[:scope] = scope
+        yield
         Fiber.current[:scope] = nil
         Fiber.yield!
-        res
+        scope.mocks
       end
 
       def scope?

data/lib/fibre/version.rb

@@ -1,3 +1,3 @@
 module Fibre
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/spec/fibre_spec.rb

@@ -2,8 +2,10 @@ require "spec_helper"
 
 describe Fibre do
   using EventObject
+  using Fibre::Synchrony
 
   before { Fibre.pool = nil }
+  let(:probe) { lambda {} }
 
   it "should create default pool with default size" do
     expect(Fibre.pool.size).to be(20)
@@ -14,7 +16,6 @@ describe Fibre do
     expect(Fiber.current.root?).to be true
   end
 
-  let(:probe) { lambda {} }
 
   it "should checkout fiber" do
     expect(probe).to receive(:call)
@@ -60,4 +61,85 @@ describe Fibre do
       end
     }.to_not raise_error
   end
+
+  describe "in fiber specs" do
+
+    around do |examples|
+      EventMachine.run_block do
+        Fibre.pool.checkout(&examples)
+      end
+    end
+
+    class FibreTestOperation
+      def initialize(number)
+        @number = number
+      end
+
+      def sync
+        Fiber.sync do |fiber|
+          EM.next_tick do
+            fiber.resume @number
+          end
+        end
+      end
+    end
+
+    it "should Fiber.sync works well" do
+      result = Fiber.sync do |fiber|
+        EM.next_tick do
+          fiber.resume :success
+        end
+      end
+      expect(result).to be :success
+    end
+
+    it "should method leave raise exception" do
+      expect {
+        Fiber.sync do |fiber|
+          EM.next_tick do
+            fiber.leave
+          end
+        end
+      }.to raise_error Fibre::LeaveError
+    end
+
+    it "should sync array (scoping test)" do
+      op1 = FibreTestOperation.new(4)
+      op2 = FibreTestOperation.new(7)
+      res = [op1, op2].sync
+      expect(res[0]).to be(4)
+      expect(res[1]).to be(7)
+    end
+
+    it "should sync hash" do
+      op1 = FibreTestOperation.new(3)
+      op2 = FibreTestOperation.new(13)
+      op3 = FibreTestOperation.new(5)
+      res = {op1: op1, op2: op2, op3: op3}.sync
+      expect(res).to include(op1: 3, op2: 13, op3: 5)
+    end
+
+    it "should deep sync and sync! method (two in one)" do
+      op1 = FibreTestOperation.new(3)
+      op2 = FibreTestOperation.new(13)
+      op3 = FibreTestOperation.new(5)
+      op4 = FibreTestOperation.new(8)
+      op5 = FibreTestOperation.new(9)
+      res = {
+        ops: [op1, op2],
+        op3: op3,
+        child: {
+          op45: [op4, { op5: op5 }]
+        }
+      }.sync!
+      
+      expect(res).to include(
+        op3: 5,
+        ops: match_array([3,13]),
+        child: include(
+          op45: match_array([8, include(op5: 9)])
+        )
+      )
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'bundler/setup'
 Bundler.setup
 
 require File.expand_path("./lib/fibre")
+require "eventmachine"
 
 RSpec.configure do |config|
   config.color = true

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fibre
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - che
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement