bellite 0.0.8 → 1.4.22

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ffcbbd4905c36a0a471e6217c512b0a9e3d7e877
+  data.tar.gz: a6dc6bc4a07fcc3e3d5f8d15b41e4d26b3ec7ade
+SHA512:
+  metadata.gz: f5c636d0bd931f0697bd252ae687eaf9539e70bbe7a75ae97756d4f942487bb1746d731c592dbe6c0198969deabf2a1a24654f0111f544b017c62ad88b547f14
+  data.tar.gz: 7b7eb5553913bfcc15046c53ccd8b544bcca702dc99d485fb559d7588643cedcdde827d49512350fcd03ed2d2d57e03b8176fb0e4cb6bfa9e85a7f846a1bb202

data/MIT-LICENSE.txt

@@ -0,0 +1,21 @@
+Copyright (c) 2013, Bellite.io.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

data/bellite.gemspec

@@ -3,10 +3,10 @@ require File.expand_path('../lib/bellite/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Shane Holloway"]
-  gem.email         = ["shane@techgame.net"]
-  gem.description   = "Bellite JSON-RPC Client library"
-  gem.summary       = "Implements connection to JSON-RPC server, calling remote methods and bindings to server events"
-  gem.homepage      = ""
+  gem.email         = ["shane@bellite.io"]
+  gem.description   = "Bellite JSON-RPC client library"
+  gem.summary       = "Create desktop applications for Mac OSX (10.7 & 10.8) and Windows XP, 7 & 8 using modern web technology and Ruby (Python or Node.js or PHP or Java)."
+  gem.homepage      = "https://github.com/bellite/bellite-ruby"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "bellite"
   gem.require_paths = ["lib"]
   gem.version       = Bellite::VERSION
+  gem.license       = 'MIT'
 
 
   gem.add_development_dependency "redcarpet", "~> 1.17"

data/lib/bellite.rb

@@ -5,23 +5,6 @@ require 'socket'
 include Socket::Constants
 
 
-# Clone of {http://docs.python.org/2/library/functools.html#functools.partial Python functools.partial}
-#   Creates a lambda with passed func and applies to it args. Args can be overriden when this lambda called.
-#
-#@param [Proc] func - func to be called with partial parameters
-#@param [Array] *args   - default parameters which should be passed to func
-#@return [Proc] wrapper around func which passes *args or new args, passed to wrapper to func
-def partial(func, *args)
-    return  Proc.new do |*new_args|
-        merged_params = args.clone()
-        new_args.each_with_index {|v,k|
-            merged_params[k] = new_args[k]
-        }
-        func.call(*merged_params)
-    end
-end
-
-
 # Simple implementation of {http://docs.python.org/2/library/asyncore.html Python Asyncore}
 class Async
     #!attribute @@map
@@ -87,38 +70,19 @@ class Async
     #Running check while at least one socket in objects map is connected
     #@param [Float] timeout - timeout, passed to {.check}
     #@param [Hash] map, passed to {.check}
-    def Async.loop(timeout,map=false)
-        while Async.check(timeout, map) != false
-        end
+    def Async.loop(timeout, map=false)
+        return Async.check(timeout, map) != false
     end
 end
 
 
 
-# Implements new pythonic {http://docs.python.org/2/library/stdtypes.html#dict.setdefault setdefault} method in ruby class Hash
-class Hash
-    #(see {Hash})
-    #@param key key of hash
-    #@param value value of key in hash
-    #@return [Value] if key in hash - hash value, attached to key; otherwise value, passed to setdefault
-    def setdefault(key, value)
-        if self[key] == nil
-            self[key] = value
-        end
-        return self[key]
-    end
-end
-
-
 # @abstract This is common interface of Bellite json-rpc API
 class BelliteJsonRpcApi
     #Constructor. Connects to server with cred credentials
     #@param [String] cred Credentials in format: 'host:port/token';
-    def initialize(cred)
-        cred = findCredentials(cred)
-        if cred
-            _connect(cred)
-        end
+    def initialize(cred=nil)
+        connect(cred)
     end
 
     #Authenticates with server using token
@@ -223,10 +187,28 @@ class BelliteJsonRpcApi
         end
     end
 
-    #@abstract Connecting to JSON-RPC server
+    # Return promise for ready event
+    def ready()
+        return @ready
+    end
+
+    # Connecting to JSON-RPC server
     #@param [String] host Host
     #@param [Fixnum] port Port
-    def _connect(host, port)
+    def connect(cred=nil)
+        cred = findCredentials(cred)
+        if cred
+            f_ready = deferred()
+            @ready = f_ready.promise
+            _connect(cred, f_ready)
+            return @ready
+        end
+    end
+
+    #@abstract Connecting to JSON-RPC server
+    #@param [String] cred Credentials in format: 'host:port/token';
+    #@param [Future] f_ready Ready future instance
+    def _connect(cred, f_ready)
         raise NotImplementedError, "Subclass Responsibility"
     end
 
@@ -272,7 +254,9 @@ class BelliteJsonRpc < BelliteJsonRpcApi
         msgId = @_nextMsgId
         @_nextMsgId += 1
         res = _newResult(msgId)
-        _sendJsonRpc(method, params, msgId)
+        if not _sendJsonRpc(method, params, msgId)
+            res.reject('Bellite client not connected')
+        end
         return res.promise
     end
 
@@ -312,13 +296,17 @@ class BelliteJsonRpc < BelliteJsonRpcApi
     #Puts send packets to STDOUT
     #@param [String] msg Same as for _sendMessage
     def logSend(msg)
-        puts "send ==> " + JSON.fast_generate(msg)
+        if @logging
+            puts "send ==> " + JSON.fast_generate(msg)
+        end
     end
 
     #Puts received packets to STDOUT
     #@param [String] msg Same as for _sendMessage
     def logRecv(msg)
-        puts "recv ==> " + JSON.fast_generate(msg)
+        if @logging
+            puts "recv ==> " + JSON.fast_generate(msg)
+        end
     end
 
     #Receives JSON-RPC response or call from JSON-RPC Server
@@ -360,16 +348,21 @@ class BelliteJsonRpc < BelliteJsonRpcApi
         end
 
         if msg.has_key?('error')
-            tgt.reject.call(msg['error'])
+            tgt.reject(msg['error'])
+        elsif msg['result'][0]
+            tgt.reject(msg['result'])
         else
-            tgt.resolve.call(msg['result'])
+            tgt.resolve(msg['result'])
         end
     end
 
     #Called on connect to remote JSON-RPC server. 
     #@param [Hash] cred Server credentials: port, host, token and original `credentials` string
-    def on_connect(cred)
-        auth(cred['token'])._then.call(method(:on_auth_succeeded), method(:on_auth_failed))
+    #@param [Future] f_ready Ready future instance
+    def on_connect(cred, f_ready)
+        auth(cred['token']) \
+            .then(f_ready.method(:resolve), f_ready.method(:reject)) \
+            .then(method(:on_auth_succeeded), method(:on_auth_failed))
     end
 
     #Called when auth is successfully ended
@@ -391,20 +384,13 @@ class BelliteJsonRpc < BelliteJsonRpcApi
     #~ micro event implementation ~~~~~~~~~~~~~~~~~~~~~~~
     #
 
-    #Adds ready event handler
-    #@param [Proc] fnReady Event hanlder lambda 
-    #@return [Proc] Your event handler
-    def ready(fnReady)
-        return on('ready', fnReady)
-    end
-
     #Adds any event handler
     #@param [String] key Event name like `ready`
     #@param [Proc] fn Function to bind on event
     #@return [Proc] Your event handler or bindEvent method to bind your handler later if you skip fn
     def on(key, fn=false)
         bindEvent = lambda do |fn|
-            @_evtTypeMap.setdefault(key, []) << fn
+            (@_evtTypeMap[key]||=[]) << fn
             return fn
         end
         if not fn
@@ -439,21 +425,22 @@ end
 class Bellite < BelliteJsonRpc
 
 
-#!attribute [rw] timeout 
-# Timeout of IO.select socket wait
-#@return [Float] Timeout value in seconds
+    #!attribute [rw] timeout 
+    # Timeout of IO.select socket wait
+    #@return [Float] Timeout value in seconds
     attr_accessor :timeout
 
     #Connecting to JSON-RPC server
     # Calls on_connect if connection successfull
-    #@param [Hash] cred Server credentials: port, host, token and original `credentials` string
-    def _connect(cred)
+    #@param [String] cred Credentials in format: 'host:port/token';
+    #@param [Future] f_ready Ready future instance
+    def _connect(cred, f_ready)
         @timeout = 0.5
         @conn = TCPSocket.new cred['host'], cred['port']
         @buf = ""
 
         if @conn
-            on_connect(cred)
+            on_connect(cred, f_ready)
         end
     end
 
@@ -578,22 +565,32 @@ class PromiseApi
     #Runs then-function call with same function for success and failure
     #@param [Proc] fn Function to handle success or failure
     #@return Result of then-function call
-    def always(fn)
-        return @_then.call(fn, fn)
+    def always(fn=nil, &blk)
+        return then_(fn||blk, fn||blk)
     end
 
     #Runs then-function in case of failure
     #@param [Proc] failure Failure handler
     #@return Result of then-function call
-    def fail(failure)
-        return @_then.call(false, failure)
+    def fail(failure, &blk)
+        return then_(false, failure||blk)
     end
 
     #Runs then-function in case of success
     #@param [Proc] success Success handler
     #@return Result of then-function call
-    def done(success)
-        return @_then.call(success,false)
+    def done(success, &blk)
+        return then_(success||blk,false)
+    end
+
+    def then(success=false, failure=false, &blk)
+        return then_(success, failure, &blk)
+    end
+    def then_(success=false, failure=false, &blk)
+        if (blk && (success || failure))
+            raise ArgumentError, "Ambiguous block argument"
+        end
+        return @_then.call(success,failure)
     end
 end
 
@@ -612,13 +609,6 @@ class Promise < PromiseApi
     def promise
         return self
     end
-
-    #@!attribute [r] _then
-    # Then-function
-    #@return [Proc,lambda]
-    def _then
-        @_then
-    end
 end
 
 #Implements Future
@@ -641,15 +631,15 @@ class Future < PromiseApi
     #@!attribute [r] resolve
     # Success-function
     #@return [Proc,lambda]
-    def resolve
-        @resolve
+    def resolve(res=true)
+        @resolve.call(res)
     end
 
     #@!attribute [r] reject
     # Failure-function
     #@return [Proc,lambda]
-    def reject
-        @reject
+    def reject(err)
+        @reject.call(err)
     end
 
     #@!attribute [r] promise
@@ -658,6 +648,10 @@ class Future < PromiseApi
     def promise
         @promise
     end
+
+    def then_(success=false, failure=false)
+        return @promise.then_(success, failure)
+    end
 end
 
 #Creates Future object for JSON-RPC Server response
@@ -681,11 +675,11 @@ def deferred()
 
     resolve = lambda do |result|
         while cb.size > 0
-            success, failure = cb.pop()
+            success, failure = cb.shift()
             begin
                 if success != false
-                    res = success.call(result)
-                    if res != false
+                    change, res = success.call(result)
+                    if change and res===nil
                         result = res
                     end
                 end
@@ -695,23 +689,19 @@ def deferred()
                 elsif cb.size = 0
                     #excepthook
                 end
-                if res == false
-                    return reject.call(err)
-                else
-                    return reject.call(res)
-                end
+                return reject.call(res==nil ? err : res)
             end
         end
-        answer = partial(resolve, result)
+        answer = lambda { resolve.call(result) }
     end
 
     reject = lambda do |error|
         while cb.size > 0
-            failure = cb.pop()[1]
+            failure = cb.shift()[1]
             begin
                 if failure != false
-                    res = failure.call(error)
-                    if res != false
+                    change, res = failure.call(error)
+                    if change and res===nil
                         error = res
                     end
                 end
@@ -722,9 +712,10 @@ def deferred()
                 end
             end
         end
-        answer = partial(reject, error)
+        answer = lambda { reject.call(error) }
     end
 
     future = Future.new _then, resolve, reject
     return future
 end
+

data/lib/bellite/version.rb

@@ -1,3 +1,3 @@
 module Bellite
-  VERSION = "0.0.8"
+  VERSION = "1.4.22"
 end

data/test/_doBelliteTest.rb

@@ -2,8 +2,8 @@
 
 require '../lib/bellite.rb'
 app = Bellite.new
-app.ready Proc.new { 
-    puts "READY"
+
+app.ready.done lambda {
     app.ping
     app.version
     app.perform(142, "echo", {"name" => [nil, true, 42, "value"]})
@@ -12,8 +12,6 @@ app.ready Proc.new {
     app.unbindEvent(118, "*")
 
     app.on("testEvent", lambda { |app, eobj|
-        puts "TEST EVENT"
-        puts eobj
         if eobj['evt']
             app.perform(0, eobj['evt'])
         else
@@ -26,4 +24,5 @@ app.ready Proc.new {
 }
 
 app.timeout = false
-app.loop false
+while app.loop()
+end

data/test/testClientJSONRPC.js

@@ -1,6 +1,6 @@
 /*-*- coding: utf-8 -*- vim: set ts=4 sw=4 expandtab
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~##
-##~ Copyright (C) 2002-2012 Bellite.io                            ##
+##~ Copyright (C) 2002-2013 Bellite.io                            ##
 ##~                                                               ##
 ##~ This library is free software; you can redistribute it        ##
 ##~ and/or modify it under the terms of the MIT style License as  ##
@@ -176,9 +176,9 @@ function testBelliteJSONRPC(opt, doneCallback) {
             return Object.create(rpc).connect(api) }
     })
 
-    function spawnClient(exec, args) {
+    function spawnClient(exec, args, cwd) {
         var cp = require('child_process')
-        test.proc = cp.spawn(exec, args, {stdio:'inherit',cwd:__dirname})
+        test.proc = cp.spawn(exec, args, {stdio:'inherit',cwd:cwd||__dirname})
         test.proc.on('exit', function(code, signal) {
             log('process_exit', code, signal)
             test.proc = false;
@@ -251,7 +251,7 @@ exports.assetTestResults = assetTestResults;
 if (!module.parent) {
     // test the bellist JSON-RPC interactions
     testBelliteJSONRPC({
-        debugLog: console.log,
+        //debugLog: console.log,
         timeout: 2000,
         //timeout: false,
         //port: 3099,

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: bellite
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 1.4.22
 platform: ruby
 authors:
 - Shane Holloway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,22 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Bellite JSON-RPC Client library
+description: Bellite JSON-RPC client library
 email:
-- shane@techgame.net
+- shane@bellite.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -69,7 +62,7 @@ files:
 - .gitignore
 - .yardopts
 - Gemfile
-- LICENSE
+- MIT-LICENSE.txt
 - README.md
 - Rakefile
 - bellite.gemspec
@@ -77,34 +70,31 @@ files:
 - lib/bellite/version.rb
 - test/_doBelliteTest.rb
 - test/testClientJSONRPC.js
-- test/testClientJSONRPC.py
-homepage: ''
-licenses: []
+homepage: https://github.com/bellite/bellite-ruby
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: Implements connection to JSON-RPC server, calling remote methods and bindings
-  to server events
+specification_version: 4
+summary: Create desktop applications for Mac OSX (10.7 & 10.8) and Windows XP, 7 &
+  8 using modern web technology and Ruby (Python or Node.js or PHP or Java).
 test_files:
 - test/_doBelliteTest.rb
 - test/testClientJSONRPC.js
-- test/testClientJSONRPC.py
-has_rdoc: 

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012, Bellite.io.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/testClientJSONRPC.py

@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*- vim: set ts=4 sw=4 expandtab
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~##
-##~ Copyright (C) 2002-2012 Bellite.io                            ##
-##~                                                               ##
-##~ This library is free software; you can redistribute it        ##
-##~ and/or modify it under the terms of the MIT style License as  ##
-##~ found in the LICENSE file included with this distribution.    ##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~##
-
-import unittest, os, sys
-
-class TestJSONRPC(unittest.TestCase):
-    def testBelliteClient(self):
-        src = os.path.splitext(__file__)[0]+'.js'
-        assert 0==os.system('node '+src)
-
-
-if __name__=='__main__':
-    unittest.main()
-