rpromise 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b10d619743dc3c21bbeadabdabfe44644e9f1d1
-  data.tar.gz: ead44b4ddf6558d9cc86ae1845319c890803b0ad
+  metadata.gz: 1262691501de1334a31235ac093581f219d4cc44
+  data.tar.gz: d9557239fef9c4d00dd102b48b9f4cc0cb02de26
 SHA512:
-  metadata.gz: 37f7b63b48e48bd8fb678d3822341055a526f330eb615a2055964efce61461c6b41ccb3ed0f8e0d9e7906a878d93a05b0df6feb1676a658a0831b8062859801a
-  data.tar.gz: a64adabdb624c26505386d2241f7f2b89f86e7e6f06130c0587adb85b9e385f2a15a609d2f7b87a1b34f212ae971abd94b7ad43a437eb8157b3be076c1b7382f
+  metadata.gz: 3b1e40b5e717eaaf25c8baf8f22c627f75d24e8651a6192a892ac8e39378101e8db0e77c4fc3bc1b37164aec58512f3c03cfa4e455fe0311553fb5150b11241c
+  data.tar.gz: 612ef5ff492f18d43591b95aaaddd81c9b1e5bf9e60546dd5659da0cb3040adab5b9da1a4fde069cff66cbe6230e6c32e456fc1b2ff75d359d04af327d3b7e12

data/README.md

@@ -1,5 +1,7 @@
 # Rpromise
 
+[![Build Status](https://travis-ci.org/samuelmolinari/rpromise.svg?branch=master)](https://travis-ci.org/samuelmolinari/rpromise)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -21,7 +23,7 @@ Or install it yourself as:
 class Task
 
   def async
-    return ::Rpromise::Promise.new do |resolve, reject|
+    return ::Rpromise.new do |resolve, reject|
       Thread.new do
         sleep(1)
         value = Random.rand * 10
@@ -41,7 +43,7 @@ on_resolve = lambda do |value|
 
   puts value
 
-  return ::Rpromise::Promise.new do |resolve, reject|
+  return ::Rpromise.new do |resolve, reject|
     Thread.new do
       sleep(1)
       # Do an async task

data/lib/rpromise/version.rb

@@ -1,3 +1,3 @@
-module Rpromise
-  VERSION = "0.0.4"
+class Rpromise
+  VERSION = "0.0.5"
 end

data/lib/rpromise.rb

@@ -1,5 +1,98 @@
-require "rpromise/version"
-require "rpromise/promise"
+require 'rpromise/version'
 
-module Rpromise
+class Rpromise
+  module State
+    PENDING   = :pending
+    RESOLVED  = :resolved
+    REJECTED  = :rejected
+  end
+
+  Handler = Struct.new(:on_resolved, :on_rejected, :resolve, :reject)
+
+  attr_reader :state
+
+  def initialize()
+    @state = State::PENDING
+    @defered = nil
+    yield(method(:resolve!), method(:reject!),self)
+  rescue Exception => e
+    reject!(e)
+  end
+
+  def then(on_resolved = nil, on_rejected = nil)
+    raise ArgumentError unless is_valid_block?(on_resolved)
+    raise ArgumentError unless is_valid_block?(on_rejected)
+    return self if on_resolved.nil? && on_rejected.nil?
+    return ::Rpromise.new do |resolve, reject, promise|
+      handler = Handler.new(on_resolved, on_rejected, resolve, reject)
+      self.handle(handler)
+    end
+  end
+
+  def pending?
+    return @state == State::PENDING
+  end
+
+  def resolved?
+    return @state == State::RESOLVED
+  end
+
+  def rejected?
+    return @state == State::REJECTED
+  end
+
+  def resolve!(value = nil)
+    if value.is_a?(::Rpromise)
+      value.then(method(:resolve!), method(:reject!))
+      return
+    end
+
+    @state = State::RESOLVED
+    @value = value
+
+    unless @defered.nil?
+      handle(@defered)
+    end
+
+  rescue
+    reject!(nil)
+  end
+
+  def reject!(value = nil)
+    @state = State::REJECTED
+    @value = value
+
+    unless @defered.nil?
+      handle(@defered)
+    end
+  end
+
+  protected
+
+  def is_valid_block?(arg)
+    return arg.nil? || arg.is_a?(Proc) || arg.is_a?(Method)
+  end
+
+  def handle(handler)
+    if pending?
+      @defered = handler
+      return nil
+    end
+
+    callback = nil
+
+    if resolved?
+      callback = handler.on_resolved
+    else
+      callback = handler.on_rejected
+    end
+
+    unless callback.nil?
+      output = nil
+      output = callback.call(@value)
+      handler.resolve.call(output) unless handler.resolve.nil?
+    end
+  rescue
+    handler.reject.call(nil) unless handler.reject.nil?
+  end
 end

data/spec/lib/{rpromise/promise_spec.rb → rpromise_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ::Rpromise::Promise do
+describe ::Rpromise do
 
   let(:n) { 0 }
   subject(:promise) do
@@ -13,7 +13,7 @@ describe ::Rpromise::Promise do
   describe '#initialize' do
     it 'uses the resolve! method as callback' do
       t = nil
-      p = ::Rpromise::Promise.new do |resolve, reject|
+      p = described_class.new do |resolve, reject|
         t = Thread.new do
           resolve.call('hi')
         end
@@ -24,7 +24,7 @@ describe ::Rpromise::Promise do
 
     it 'uses the reject! method as callback' do
       t = nil
-      p = ::Rpromise::Promise.new do |resolve, reject|
+      p = described_class.new do |resolve, reject|
         t = Thread.new do
           reject.call('hi')
         end
@@ -37,7 +37,7 @@ describe ::Rpromise::Promise do
   describe '#then' do
 
     it 'returns a new promise' do
-      expect(promise.then).to be_kind_of ::Rpromise::Promise
+      expect(promise.then).to be_kind_of described_class
     end
 
     it 'takes an optional block as first argument' do
@@ -61,7 +61,7 @@ describe ::Rpromise::Promise do
       context 'with async task' do
         before(:each) do
           @thread = nil
-          @promise = ::Rpromise::Promise.new do |resolve, reject|
+          @promise = described_class.new do |resolve, reject|
             @thread = Thread.new do
               sleep(0.5)
               resolve.call(value)
@@ -106,7 +106,7 @@ describe ::Rpromise::Promise do
             lambda_value = nil
             lock = true
             @promise.then(lambda do |v|
-              return ::Rpromise::Promise.new do |resolve, reject|
+              return described_class.new do |resolve, reject|
                 thread2 = Thread.new do
                   sleep(0)
                   resolve.call('Hello world!')
@@ -134,7 +134,7 @@ describe ::Rpromise::Promise do
 
       context 'with non-async task' do
         let(:promise) do
-          ::Rpromise::Promise.new do |resolve, reject|
+          described_class.new do |resolve, reject|
             resolve.call(value)
           end
         end
@@ -187,7 +187,7 @@ describe ::Rpromise::Promise do
       context 'with non-async task' do
         let(:error) { Random.rand }
         let(:promise) do
-          ::Rpromise::Promise.new do |resolve, reject|
+          described_class.new do |resolve, reject|
             reject.call(error)
           end
         end
@@ -200,7 +200,7 @@ describe ::Rpromise::Promise do
         end
         it 'handles raised exceptions within the promise' do
           lambda_error = nil
-          promise = ::Rpromise::Promise.new do |resolve, reject|
+          promise = described_class.new do |resolve, reject|
             raise 'Oops'
           end
           promise.then(nil, lambda do |e|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpromise
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Samuel Molinari
@@ -96,10 +96,9 @@ files:
 - README.md
 - Rakefile
 - lib/rpromise.rb
-- lib/rpromise/promise.rb
 - lib/rpromise/version.rb
 - rpromise.gemspec
-- spec/lib/rpromise/promise_spec.rb
+- spec/lib/rpromise_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -126,5 +125,5 @@ signing_key:
 specification_version: 4
 summary: Handle async method easily
 test_files:
-- spec/lib/rpromise/promise_spec.rb
+- spec/lib/rpromise_spec.rb
 - spec/spec_helper.rb

data/lib/rpromise/promise.rb

@@ -1,101 +0,0 @@
-require 'rpromise'
-require 'pry'
-
-class ::Rpromise::Promise
-
-  module State
-    PENDING   = :pending
-    RESOLVED  = :resolved
-    REJECTED  = :rejected
-  end
-
-  Handler = Struct.new(:on_resolved, :on_rejected, :resolve, :reject)
-
-  attr_reader :state
-
-  def initialize()
-    @state = State::PENDING
-    @defered = nil
-    yield(method(:resolve!), method(:reject!),self)
-  rescue Exception => e
-    reject!(e)
-  end
-
-  def then(on_resolved = nil, on_rejected = nil)
-    raise ArgumentError unless is_valid_block?(on_resolved)
-    raise ArgumentError unless is_valid_block?(on_rejected)
-    return self if on_resolved.nil? && on_rejected.nil?
-    return ::Rpromise::Promise.new do |resolve, reject, promise|
-      handler = Handler.new(on_resolved, on_rejected, resolve, reject)
-      self.handle(handler)
-    end
-  end
-
-  def pending?
-    return @state == State::PENDING
-  end
-
-  def resolved?
-    return @state == State::RESOLVED
-  end
-
-  def rejected?
-    return @state == State::REJECTED
-  end
-
-  def resolve!(value = nil)
-    if value.is_a?(::Rpromise::Promise)
-      value.then(method(:resolve!), method(:reject!))
-      return
-    end
-
-    @state = State::RESOLVED
-    @value = value
-
-    unless @defered.nil?
-      handle(@defered)
-    end
-
-  rescue
-    reject!(nil)
-  end
-
-  def reject!(value = nil)
-    @state = State::REJECTED
-    @value = value
-
-    unless @defered.nil?
-      handle(@defered)
-    end
-  end
-
-  protected
-
-  def is_valid_block?(arg)
-    return arg.nil? || arg.is_a?(Proc) || arg.is_a?(Method)
-  end
-
-  def handle(handler)
-    if pending?
-      @defered = handler
-      return nil
-    end
-
-    callback = nil
-
-    if resolved?
-      callback = handler.on_resolved
-    else
-      callback = handler.on_rejected
-    end
-
-    unless callback.nil?
-      output = nil
-      output = callback.call(@value)
-      handler.resolve.call(output) unless handler.resolve.nil?
-    end
-  rescue
-    handler.reject.call(nil) unless handler.reject.nil?
-  end
-
-end