metybur 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cd1e4839ca1350e3e953be00f1428c1fbf31b84
-  data.tar.gz: e344a1a7e9537edd9eeb1f925518880b9f431e17
+  metadata.gz: f69ccd216fe6e46fe9472a0975e31de3c15a9c14
+  data.tar.gz: 91fdac926fc0e44432c67da5e27a072e7e027ab8
 SHA512:
-  metadata.gz: 863a4003723aade726d6a753a15dacb6d5666f7dd5b5453048ed8eb9557f48dfb940d530431d3cc38e358de4fcdd3fd73793bb4f1af8264e85919d12409e062e
-  data.tar.gz: dd9b0fa2281be1a3441d6069c408b1b896e665dd93f5c3c57114ed9ce9fd2756295361cf7afccba14d299e4a019772bfaccbe1c336951ca7f545f535d7c59ca4
+  metadata.gz: 020974269a114c7ed5edba2b2d8a7168931d7dd61ea81064a8a1df0a18464a564b703eb9fcae536e8d3ec1526ee2affab60cab47e1f1b7443e11cc41cdb127b2
+  data.tar.gz: 9682e9bcd748d3aa069fab63548672a522dda50eae8dafe4beadea581641b95b095a7f35e6bae4720b176d2bea1357594eec7a818fd8ce68338d692d857d1122

data/README.md

@@ -150,8 +150,34 @@ messages.each { |message| puts message }
 Instead, pass a block to the method. The block will get called once the result arrives.
 
 ```ruby
-meteor.chat_messages(in_room: 'General') do |messages|
-  messages.each { |message| puts message }
+meteor.chat_messages(in_room: 'General') do
+  result.each { |message| puts message }
+end
+```
+
+#### Errors
+
+Your meteor methods might throw errors, or the method you call might not even exist. You can rescue these errors right in the method's result block:
+
+```ruby
+meteor.chat_messages(in_room: 'General') do
+  begin
+    result.each { |message| puts message }
+  rescue Metybur::MethodError => e
+    puts "An error ocurred: #{e}"
+  end
+end
+```
+
+Note that the error is raised by the `result`. If your method doesn't return a result, you can still handle the error:
+
+```ruby
+meteor.post_chat_message('Hey there!', in_room: 'General') do
+  begin
+    raise_errors
+  rescue Metybur::MethodError => e
+    puts "An error ocurred: #{e}"
+  end
 end
 ```
 

data/lib/metybur/method.rb

@@ -1,4 +1,30 @@
+Metybur::MethodError = Class.new(Exception)
+
 class Metybur::Method
+  class Result
+    def initialize(attributes, callback)
+      @attributes = attributes
+      @callback = callback
+    end
+
+    def publish
+      instance_eval(&@callback) if @callback
+    end
+
+    def result
+      error = @attributes[:error]
+      if error
+        fail(
+          Metybur::MethodError,
+          "error: #{error[:error]}, reason: #{error[:reason]}, details: #{error[:details]}"
+        )
+      else
+        @attributes[:result]
+      end
+    end
+    alias_method :raise_errors, :result
+  end
+
   def initialize(name, websocket)
     require 'securerandom'
 
@@ -28,6 +54,7 @@ class Metybur::Method
 
   def handle_message(attributes)
     id = attributes[:id]
-    @callbacks[id].call attributes[:result] if @callbacks[id]
+    result = Result.new(attributes, @callbacks[id])
+    result.publish
   end
 end

data/lib/metybur/version.rb

@@ -1,3 +1,3 @@
 module Metybur
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/metybur_spec.rb

@@ -319,11 +319,12 @@ describe Metybur do
 
     it 'passes the result to a block' do
       meteor = Metybur.connect(url)
+      expectation = proc { |result| expect(result[:price]).to eq 99 }
 
       wait_for_callback do |done|
-        meteor.get_product(27) do |product|
+        meteor.get_product(27) do
           done.call
-          expect(product[:price]).to eq 99
+          expectation.call(result)
         end
 
         id = last_sent_message[:id]
@@ -338,7 +339,7 @@ describe Metybur do
     it "doesn't trigger the callback for ping messages" do
       meteor = Metybur.connect(url)
 
-      meteor.get_product(27) do |product|
+      meteor.get_product(27) do
         fail
       end
 
@@ -347,11 +348,12 @@ describe Metybur do
 
     it 'triggers the callback with the right result' do
       meteor = Metybur.connect(url)
+      expectation = proc { |result| expect(result[:price]).to eq 99 }
 
       wait_for_callback do |done|
-        meteor.get_product(27) do |product|
+        meteor.get_product(27) do
           done.call
-          expect(product[:price]).to eq 99
+          expectation.call(result)
         end
 
         id = last_sent_message[:id]
@@ -367,5 +369,67 @@ describe Metybur do
         }.to_json)
       end
     end
+
+    it 'raises an error if an exception occurs in the method' do
+      meteor = Metybur.connect(url)
+      error = FFaker::Lorem.word
+      reason = FFaker::Lorem.sentence
+      details = FFaker::Lorem.paragraph
+      expectation = proc { |e| expect(e.message).to eq "error: #{error}, reason: #{reason}, details: #{details}" }
+
+      wait_for_callback do |done|
+        meteor.get_product(27) do
+          begin
+            done.call
+            result
+            fail("result didn't trigger error")
+          rescue Metybur::MethodError => e
+            expectation.call(e)
+          end
+        end
+
+        id = last_sent_message[:id]
+        websocket.receive({
+          msg: 'result',
+          id: id,
+          error: {
+            error: error,
+            reason: reason,
+            details: details
+          }
+        }.to_json)
+      end
+    end
+
+    it 'raises an error if an exception occurs in the method' do
+      meteor = Metybur.connect(url)
+      error = FFaker::Lorem.word
+      reason = FFaker::Lorem.sentence
+      details = FFaker::Lorem.paragraph
+      expectation = proc { |e| expect(e.message).to eq "error: #{error}, reason: #{reason}, details: #{details}" }
+
+      wait_for_callback do |done|
+        meteor.get_product(27) do
+          begin
+            done.call
+            raise_errors
+            fail("result didn't trigger error")
+          rescue Metybur::MethodError => e
+            expectation.call(e)
+          end
+        end
+
+        id = last_sent_message[:id]
+        websocket.receive({
+          msg: 'result',
+          id: id,
+          error: {
+            error: error,
+            reason: reason,
+            details: details
+          }
+        }.to_json)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metybur
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Clemens Helm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket