factor-connector-api 0.0.13 → 0.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6dd5a3b66a8f33ab4b2c0c39efbc1c2e1b4f7ac2
+  data.tar.gz: 19733430d3c4ff347d74f8eb88aa452777e23209
+SHA512:
+  metadata.gz: bb665e2c63da6c405770df5c6c6f8f83caa2521bf8579398a659cd818c6ddcb19f3337a8b44d46827483ddb17f6e28c9e695565c5a0e263d139e69c13676e429
+  data.tar.gz: b9d06c6bea11da6cdb4df1a04bd34c29ff5442c602daf6505756ea38f9a6639fc6eea3e1390d5dd0be9f39c640c7041d54ce0b059d4792d155406130988cb9c8

data/lib/factor-connector-api/test.rb

@@ -47,7 +47,7 @@ module Factor::Connector
         end
       end
 
-      last_log = if @logs.last[:type]=='log' && @logs.last[:status]=='debug'
+      last_log = if @logs.last && @logs.last[:type]=='log' && @logs.last[:status]=='debug'
           @logs.select {|log| log[:type] == 'log' && log[:status]=='debug'}.first
         else
           @logs.last
@@ -81,7 +81,7 @@ module Factor::Connector
     end
 
     def expect_warn(expected_values={})
-      expect_log('info',expected_values)
+      expect_log('warn',expected_values)
     end
 
     def expect_error(expected_values={})

data/lib/instances/action_instance.rb

@@ -8,15 +8,13 @@ module Factor
       attr_accessor :service_id
 
       def start(params)
-        begin
-          self.instance_exec params, &@definition.start
-        rescue Factor::Connector::Error => ex
-          respond type:'fail', message:ex.message
-          exception ex.exception,params:params if ex.exception
-        rescue => ex
-          respond type:'fail', message:"Couldn't run action for unexpected reason. We've been informed and looking into it."
-          exception ex,params:params
-        end
+        self.instance_exec params, &@definition.start
+      rescue Factor::Connector::Error => ex
+        respond type:'fail', message:ex.message
+        exception ex.exception,params:params if ex.exception
+      rescue => ex
+        respond type:'fail', message:"Couldn't run action for unexpected reason. We've been informed and looking into it."
+        exception ex,params:params
       end
 
       def action_callback(params={})

data/lib/instances/listener_instance.rb

@@ -17,33 +17,29 @@ module Factor
       def start(params)
         @params = params
 
-        begin
-          instance_exec @params, &@definition.start if @definition && @definition.start
-          respond type: 'return'
-        rescue Factor::Connector::Error => ex
-          error ex.message
-          respond type: 'fail'
-          exception ex.exception, params: @params if ex.exception
-        rescue => ex
-          error "Couldn't start listener for unexpected reason. We've been informed and looking into it."
-          respond type: 'fail'
-          exception ex, params: @params
-        end
+        instance_exec @params, &@definition.start if @definition && @definition.start
+        respond type: 'return'
+      rescue Factor::Connector::Error => ex
+        error ex.message
+        respond type: 'fail'
+        exception ex.exception, params: @params if ex.exception
+      rescue => ex
+        error "Couldn't start listener for unexpected reason. We've been informed and looking into it."
+        respond type: 'fail'
+        exception ex, params: @params
       end
 
       def stop
-        begin
-          instance_exec @params, &@definition.stop if @definition && @definition.stop
-          respond type: 'stopped'
-        rescue Factor::Connector::Error => ex
-          error ex.message
-          respond type: 'fail'
-          exception ex.exception, params: @params if ex.exception
-        rescue ex
-          error "Couldn't stop listener for unexpected reason. We've been informed and looking into it."
-          respond type: 'fail'
-          exception ex, params: @params
-        end
+        instance_exec @params, &@definition.stop if @definition && @definition.stop
+        respond type: 'stopped'
+      rescue Factor::Connector::Error => ex
+        error ex.message
+        respond type: 'fail'
+        exception ex.exception, params: @params if ex.exception
+      rescue ex
+        error "Couldn't stop listener for unexpected reason. We've been informed and looking into it."
+        respond type: 'fail'
+        exception ex, params: @params
       end
 
       def start_workflow(params)
@@ -52,15 +48,13 @@ module Factor
 
       def call_web_hook(web_hook_id, hook_params, request, response)
         web_hook = @web_hooks[web_hook_id]
-        begin
-          self.instance_exec @params, hook_params, request, response, &web_hook.start
-        rescue Factor::Connector::Error => ex
-          error ex.message
-          exception ex.exception, params: hook_params, hook_id: web_hook_id if ex.exception
-        rescue => ex
-          error "Couldn't call webhook for unexpected reason. We've been informed and looking into it."
-          exception ex, params: @params
-        end
+        self.instance_exec @params, hook_params, request, response, &web_hook.start
+      rescue Factor::Connector::Error => ex
+        error ex.message
+        exception ex.exception, params: hook_params, hook_id: web_hook_id if ex.exception
+      rescue => ex
+        error "Couldn't call webhook for unexpected reason. We've been informed and looking into it."
+        exception ex, params: @params
       end
 
       def web_hook(vals = {}, &block)

data/lib/instances/service_instance.rb

@@ -39,6 +39,7 @@ module Factor
         action_instance.callback    = @callback
         action_instances[action_id] = action_instance
         action_instance.async.start(params)
+        action_instance
       end
 
       def start_listener(listener_id,params)
@@ -49,6 +50,7 @@ module Factor
         listener_instance.callback    = @callback
         @listener_instances[listener_id]=listener_instance
         listener_instance.async.start(params)
+        listener_instance
       end
 
       def stop_listener(listener_id)

data/spec/servicemanager_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe Factor::Connector::ServiceManager do
+  before do
+    Factor::Connector.service 'basic' do
+      action 'test' do |params|
+        info "this is info"
+        warn "this is a warning"
+        error "this is an error"
+        info "echo: #{params['echo']}"
+        action_callback some_var:'has contents'
+      end
+      action 'fail-test-method' do |params|
+        fail "this is a fail"
+      end
+      listener 'listen-test' do
+        start do |params|
+          info "this is info"
+          warn 'this is a warning'
+          error "this is an error"
+          info "echo: #{params['echo']}"
+          start_workflow some_var:'has contents'
+        end
+        stop do |params|
+
+        end
+      end
+    end
+  end
+  
+  it 'loads a service manager' do
+    service_manager = Factor::Connector.get_service_manager('basic')
+    expect(service_manager).to be_a(Factor::Connector::ServiceManager)
+  end
+
+  it 'loads a service instance' do
+    service_manager = Factor::Connector.get_service_manager('basic')
+    service_instance = service_manager.instance
+    expect(service_instance).to be_a(Factor::Connector::ServiceInstance)
+  end
+
+  describe 'Action' do
+    before do
+      service_manager = Factor::Connector.get_service_manager('basic')
+      @service_instance = service_manager.instance
+    end
+
+    it 'it can call an action' do
+      action_call = @service_instance.call_action('test', echo:'foo')
+      expect(action_call).to be_a(Factor::Connector::ActionInstance)
+    end
+
+    it 'handle all log types, test framework, and callback' do
+      require_relative '../lib/factor-connector-api/test.rb'
+      @service_instance.test_action 'test', 'echo'=>'foo' do
+        expect_info message:'this is info'
+        expect_warn message:'this is a warning'
+        expect_error message:'this is an error'
+        expect_info message:'echo: foo'
+        expect_return some_var: 'has contents'
+      end
+    end
+
+    it 'handles failures' do
+      require_relative '../lib/factor-connector-api/test.rb'
+      @service_instance.test_action 'fail-test-method' do
+        expect_fail
+      end
+    end
+  end
+
+  describe 'Listener' do
+    before do
+      service_manager = Factor::Connector.get_service_manager('basic')
+      @service_instance = service_manager.instance
+    end
+
+    it 'it can start a listener' do
+      action_call = @service_instance.start_listener('listen-test', echo:'foo')
+      expect(action_call).to be_a(Factor::Connector::ListenerInstance)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,2 +1,6 @@
 require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+CodeClimate::TestReporter.start if ENV['CODECLIMATE_REPO_TOKEN']
+
+# Dir.glob('./lib/**/*.rb').each { |f| require f }
+
+require_relative '../lib/factor-connector-api.rb'

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: factor-connector-api
 version: !ruby/object:Gem::Version
-  version: 0.0.13
-  prerelease: 
+  version: 0.0.14
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.2
 description: 
@@ -82,46 +73,47 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./lib/builders/action_builder.rb
-- ./lib/builders/listener_builder.rb
-- ./lib/builders/service_builder.rb
-- ./lib/builders/web_hook_builder.rb
-- ./lib/definitions/action_definition.rb
-- ./lib/definitions/listener_definition.rb
-- ./lib/definitions/service_definition.rb
-- ./lib/definitions/web_hook_definition.rb
-- ./lib/errors.rb
-- ./lib/factor-connector-api/test.rb
-- ./lib/factor-connector-api.rb
-- ./lib/instances/action_instance.rb
-- ./lib/instances/instance.rb
-- ./lib/instances/listener_instance.rb
-- ./lib/instances/service_instance.rb
-- ./lib/service_manager.rb
-- ./spec/spec_helper.rb
+- "./lib/builders/action_builder.rb"
+- "./lib/builders/listener_builder.rb"
+- "./lib/builders/service_builder.rb"
+- "./lib/builders/web_hook_builder.rb"
+- "./lib/definitions/action_definition.rb"
+- "./lib/definitions/listener_definition.rb"
+- "./lib/definitions/service_definition.rb"
+- "./lib/definitions/web_hook_definition.rb"
+- "./lib/errors.rb"
+- "./lib/factor-connector-api.rb"
+- "./lib/factor-connector-api/test.rb"
+- "./lib/instances/action_instance.rb"
+- "./lib/instances/instance.rb"
+- "./lib/instances/listener_instance.rb"
+- "./lib/instances/service_instance.rb"
+- "./lib/service_manager.rb"
+- "./spec/servicemanager_spec.rb"
+- "./spec/spec_helper.rb"
 homepage: https://factor.io
 licenses: []
+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.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Factor.io Connector API Library
 test_files:
-- ./spec/spec_helper.rb
+- "./spec/servicemanager_spec.rb"
+- "./spec/spec_helper.rb"