blockspring 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bc7d3b1074e923221774e13ffaefb946736ed1c
-  data.tar.gz: 88c1eda5789095633670df1dd90b41dea1bfb203
+  metadata.gz: d8bdb9eb70f3e1efc2f5239f139e3cbf4e3d89b9
+  data.tar.gz: daa86a908c8b85229e07ffab85b5c93c74128722
 SHA512:
-  metadata.gz: 53b71fec1279a5e9e1de4d5a9d3ba51c5d9283fce9e96053e4c9702b27857a2e7e49f1636fd19366718717727e3c8b639333e725c8131bea16ef2b75ca9b7755
-  data.tar.gz: 5dc0be7d7a1e038f4be8adf085936c1cebfb4e7612689f56fb4b80c86d621db53d7a62d3694e9916d6e4c958e5d1a622dd56d8ade697351203af0b47e24890ef
+  metadata.gz: 56366394beff6b44ab5c014fb871b9d38448d2f6075362d5e44e72c5cd01aab6a89cbd013c3a55dcbb8b38d818c1d05073e1fcbb9e6a6bc962c8cabbc2810a1d
+  data.tar.gz: c2e8e983022b841250f5109f8c08056fa2b6c24c942a74babb83b2ff47f19e71f10408f3ccdacbd6eb7ea863ede8457dce1fb911b72fad2680e38e9e6796bf4f

data/README.md

@@ -1,18 +1,47 @@
-blockspring-ruby
-================
+# blockspring.rb
 
-Gem for local dev with Blockspring.
+Ruby gem to assist in creating and running blocks (cloud functions) with Blockspring.
 
 http://rubygems.org/gems/blockspring
 
-To use
-======
-In a gemfile: `gem 'blockspring'`
+### Installation
 
-Not in a gemfile:
+```ruby
+gem install blockspring
 ```
-$ gem install 'blockspring'
 
-# In a ruby script
+### Example Usage
+
+Save the following script to an example.rb file:
+```ruby
 require 'blockspring'
+
+myBlock <- function(request, response){
+	sum <- request.params["num1"].to_f + request.params["num2"].to_f
+	
+	response.addOutput("sum", sum)
+
+	response.end()
+}
+
+Blockspring.define(myBlock)
 ```
+
+Then in your command line write:
+```shell
+ruby example.rb --num1=20 --num2=50
+```
+
+or
+
+```shell
+echo '{"num1":20, "num2": 50}' | ruby example.rb
+```
+
+### License
+
+MIT
+
+### Contact
+
+Email us: founders@blockspring.com

data/lib/blockspring.rb

@@ -2,77 +2,178 @@ require 'rest_client'
 require 'json'
 require 'base64'
 require 'mime/types'
+require "tempfile"
 
 module Blockspring
-  def self.run(block, data)
-    api_key = ENV['BLOCKSPRING_API_KEY']
-
-    if(!api_key)
-      raise "BLOCKSPRING_API_KEY environment variable not set"
+  def self.run(block, data = {}, api_key = nil )
+    if !(data.is_a?(Hash))
+      raise "your data needs to be a dictionary."
     end
 
-    block_parts = block.split("/")
-    block = block_parts[block_parts.length - 1]
+    data = data.to_json
+    api_key = api_key || ENV['BLOCKSPRING_API_KEY'] || ""
+    blockspring_url = ENV['BLOCKSPRING_URL'] || 'https://sender.blockspring.com'
+    block = block.split("/")[-1]
+
+    begin
+      response = RestClient.post "https://sender.blockspring.com/api_v2/blocks/#{block}?api_key=#{api_key}", data, :content_type => :json
+    rescue => e
+      response = e.response
+    end
 
-    response = RestClient.post "https://sender.blockspring.com/api_v2/blocks/#{block}?api_key=#{api_key}", data.to_json, :content_type => :json, :accept => :json
+    begin
+      body = JSON.parse(response.body)
+    rescue
+      body = response.body
+    end
 
-    return response.body
+    return body
   end
 
   def self.define(block)
-    @request = {
-      params: {}
-    }
+    @request = Request.new
+    @response = Response.new
 
-    # From STDIN
-    stdin = STDIN.tty? ? "{}" : $stdin.read
-    stdin_params = JSON.parse(stdin)
+    #stdin parsing
+    if(!STDIN.tty?)
+      begin
+        params = JSON.parse($stdin.read)
+      rescue
+        raise "You didn't pass valid json inputs."
+      end
+
+      if !(params.is_a?(Hash))
+        raise "Can't parse keys/values from your json inputs."
+      end
+
+      if !(params.has_key?("_blockspring_spec") && params["_blockspring_spec"])
+        @request.instance_variable_set("@params", params)
+      else
+        for var_name in params.keys
+          if (var_name == "_blockspring_spec")
+            # pass
+          elsif ((var_name == "_errors") && params[var_name].is_a?(Array))
+            for error in params[var_name]
+              if (error.is_a?(Hash)) && (error.has_key?("title"))
+                @request.addError(error)
+              end
+            end
+          elsif (
+            params[var_name].is_a?(Hash) and 
+            params[var_name].has_key?("filename") and 
+            params[var_name]["filename"] and 
+            # either data or url must exist and not be empty
+            (
+              (params[var_name].has_key?("data") and params[var_name]["data"]) or 
+              (params[var_name].has_key?("url") and params[var_name]["url"]))
+            )
+              suffix = "-%s" % params[var_name]["filename"]
+              tmp_file = Tempfile.new(["",suffix])
+              if (params[var_name].has_key?("data"))
+                begin
+                  tmp_file.write(Base64.decode64(params[var_name]["data"]))
+                  @request.params[var_name] = tmp_file.path
+                rescue
+                  @request.params[var_name] = params[var_name]
+                end
+              else
+                begin
+                  tmp_file.write(RestClient.get(params[var_name]["url"]))
+                  @request.params[var_name] = tmp_file.path
+                rescue
+                  @request.params[var_name] = params[var_name]
+                end
+              end
+              tmp_file.close
+          else
+            @request.params[var_name] = params[var_name]
+          end
+        end
+      end
+    end
 
-    @request[:params] = stdin_params
+    #args parsing
+    if (ARGV.length > 0)
+      argv = {}
+      for arg in ARGV
+        found_match = /([^=]*)\=(.*)/.match(arg)
+        if found_match
+          found_match = found_match.captures
+          if found_match[0][0..1] == "--"
+            argv[ found_match[0][2..-1] ] = found_match[1]
+          else
+            argv[ found_match[0] ] = found_match[1]
+          end
+        end
+      end
+    else
+      argv = {}
+    end
+
+    for key in argv.keys
+      @request.params[key] = argv[key]
+    end
 
-    # From sysargs
-    sys_args = Hash[ ARGV.flat_map{|s| s.scan(/--?([^=\s]+)(?:=(\S+))?/) } ]
+    block.call(@request, @response)
+  end
 
-    sys_args.each do |param_name, param_value|
-      @request[:params][param_name] = param_value
+  class Request
+    def initialize
+      @params = {}
+      @_errors = []
     end
 
-    # Set response
-    @response = Response.new
+    attr_reader :params
+    attr_reader :_errors
 
-    block.call(@request, @response)
+    def getErrors
+      return @_errors
+    end
+
+    def addError(error)
+      @_errors.push(error)
+    end
   end
 
   class Response
     def initialize
       @result = {
-        data: {},
-        files: {},
-        errors: nil
+        :_blockspring_spec => true,
+        :_errors => []
       }
     end
 
-    def addOutput(name, value)
-      @result[:data][name] = value
+    def addOutput(name, value = nil)
+      @result[name] = value
       return self
     end
 
     def addFileOutput(name, filepath)
       filename = File.basename(filepath)
-      b64_file_contents = Base64.encode64(File.read(filepath))
+      b64_file_contents = Base64.strict_encode64(File.read(filepath))
       mime_type_object = MIME::Types.of(filename).first
       mime_type = mime_type_object ? mime_type_object.content_type : nil
 
-      @result[:files][name] = {
-        filename: filename,
-        mimeType: mime_type,
-        data: b64_file_contents
+      @result[name] = {
+        :filename => filename,
+        :"content-type" => mime_type,
+        :data => b64_file_contents
       }
       return self
     end
 
+    def addErrorOutput(title, message = nil)
+      @result[:_errors].push({
+        title: title,
+        message: message
+        }
+      )
+
+      return self
+    end
+
     def end
       puts @result.to_json
     end
   end
-end
+end

data/lib/blockspring/version.rb

@@ -1,3 +1,3 @@
 module Blockspring
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blockspring
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Don Pinkus