iibee 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c1089518ba3dd3d1b4f176418ae9388d22afac
-  data.tar.gz: d293e920cd2c73fe449682e1a57e98e9927f737c
+  metadata.gz: 759337a76ea9c762263f1bf46202a02d395c4209
+  data.tar.gz: 2653f1e0b53e080847713d057172ef297b307853
 SHA512:
-  metadata.gz: 12204e9c6e144bfdcd7c0906a52676358caf979d13467dab18fc27f95930c9bd1a6699f9271a81acd30ba492322200b18ac0d3474e867acaef0877f99c080c7d
-  data.tar.gz: 826bb5d485d8ac91ce194ce3e0587b3be0e69c717408d953460e326aa4396624309be8e78799641e43b84ea3b4685417bbad8dade5e55713248e64d8c3e7d301
+  metadata.gz: a8b467d440838b33384caa5547ea06ad8f9db6c99ffd7f82dc016cb0f1c2a925bef5546aaf97d59097f1bda39ca3ffecfd0921b2e108ed1392c53f520fa9ad3d
+  data.tar.gz: eea9e7b5519a614e1dd7c38a125d57842f4c520d6bf7b71e209497c3c939b2b744b3d125109e1868c077751c79f257ac67a40980f8d06f5829d2e0e9ad6f1023

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/iibee.svg)](http://badge.fury.io/rb/iibee)
 [![Codeship Status for quantiguous/iibee](https://codeship.com/projects/8b85c0f0-36f8-0133-93cb-2615b91c1f97/status?branch=master)](https://codeship.com/projects/100974)
 [![Code Climate](https://codeclimate.com/github/quantiguous/iibee/badges/gpa.svg)](https://codeclimate.com/github/quantiguous/iibee)
 [![Test Coverage](https://codeclimate.com/github/quantiguous/iibee/badges/coverage.svg)](https://codeclimate.com/github/quantiguous/iibee/coverage)

data/iibee.gemspec

@@ -25,7 +25,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"  
   spec.add_development_dependency "codeclimate-test-reporter"  
-    
+  spec.add_development_dependency "m"
+  
+  spec.add_dependency "net-http-persistent"
   spec.add_dependency "faraday"
   spec.add_dependency "oga"
 end

data/lib/iibee/application.rb

@@ -4,27 +4,24 @@ require 'oga'
 module Iibee
   class Application
     class Properties
-      attr_reader :label, :runMode, :uuid, :isRunning, :shortDesc, :longDesc, :processId, :traceLevel, :soapNodesUseEmbeddedListener, 
-                  :compiledXPathCacheSizeEntries, :consoleMode, :httpNodesUseEmbeddedListener, :inactiveUserExitList, :activeUserExitList, 
-                  :traceNodeLevel, :userTraceLevel, :modifyTime, :deployTime, :barFileName
+      attr_reader :processId, :traceLevel, :soapNodesUseEmbeddedListener, :compiledXPathCacheSizeEntries, :consoleMode, :httpNodesUseEmbeddedListener, :inactiveUserExitList, :activeUserExitList, :traceNodeLevel, :userTraceLevel
       def initialize(document)
-        document.xpath('properties/*/property').each do |property|
+        document.xpath('properties/advancedProperties/property').each do |advancedProperty|
           
-          propertyName = property.get('name')
-          propertyValue = property.get('value')
+          propertyName = advancedProperty.get('name')
+          propertyValue = advancedProperty.get('value')
           instance_variable_set("@#{propertyName}", propertyValue)
-        end     
+        end
       end
     end
     CONTEXT_PATH = "apiv1/executiongroups"
     
-    attr_reader :type, :isRunning, :runMode, :startMode, :hasChildren, :uuid, :name, :propertiesUri, :egName
+    attr_reader :type, :isRunning, :runMode, :startMode, :hasChildren, :uuid, :name, :propertiesUri
     
     def initialize(document)
-      document.xpath('@*').each do |attribute|        
+      document.xpath('application/@*').each do |attribute|        
         instance_variable_set("@#{attribute.name}", attribute.value)
       end
-      @executionGroupName = executionGroupName
     end
     
     def properties
@@ -37,37 +34,15 @@ module Iibee
       applications = []
       response = Faraday.get("#{Iibee.configuration.base_url}/#{CONTEXT_PATH}/#{egName}/applications/")
       document = Oga.parse_xml(response.body)
-      p document.xpath('applications/application')
       document.xpath('applications/application').each do |application|
-        applications << new(application)  
+          applications << new(document)  
       end
     end
     
-    def self.find_by(egName: nil, name: nil)
-      where(executionGroupName: egName, name: name).first
-    end
-    
-    def self.where(executionGroupName: nil, name: nil) 
-      applications = []
-      
-      unless executionGroupName.nil?
-        application_url = "#{Iibee.configuration.base_url}/#{CONTEXT_PATH}/#{executionGroupName}/?depth=2"
-      else
-        application_url = "#{Iibee.configuration.base_url}/#{CONTEXT_PATH}/?depth=3"
-      end
-      
-      response = Faraday.get(application_url)
+    def self.find_by_name(egName, name)
+      response = Faraday.get("#{Iibee.configuration.base_url}/#{CONTEXT_PATH}/#{egName}/applications/#{name}")
       document = Oga.parse_xml(response.body)
-
-      document.xpath("//application[@name='#{name}']").each do |application|
-        applications << new(application, document.at_xpath("//executionGroup[applications/application/@uuid = '#{application.get('uuid')}']").get('name'))
-      end
-      
-      return applications
-    end
-    
-    def executionGroup
-      Iibee::ExecutionGroup.find_by(name: executionGroupName)
+      new(document)        
     end
   end
 end

data/lib/iibee/broker.rb

@@ -28,8 +28,7 @@ module Iibee
     end
     
     def self.find_by(options: {})
-      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
-      response = Faraday.get("#{url}#{CONTEXT_PATH}")
+      response = Iibee::Connection.new(options: options).get(CONTEXT_PATH)
       document = Oga.parse_xml(response.body)
       new(document)
     end 

data/lib/iibee/connection.rb

@@ -0,0 +1,18 @@
+require 'faraday'
+
+module Iibee
+  class Connection
+    def initialize(options: {})
+      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
+      @conn = Faraday.new(url) do |f|
+        f.response :logger
+        f.adapter :net_http_persistent
+      end
+      @conn.basic_auth(options[:user], options[:password]) unless options[:user].nil? or options[:password].nil?
+    end
+    
+    def get(url)
+      @conn.get(url)
+    end
+  end
+end

data/lib/iibee/execution_group.rb

@@ -1,4 +1,3 @@
-require 'faraday'
 require 'oga'
 
 module Iibee
@@ -29,16 +28,14 @@ module Iibee
     end
     
     def properties
-      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
-      response = Faraday.get("#{url}/#{self.propertiesUri}")
+      response = Iibee::Connection.new(options: options).get("#{self.propertiesUri}")
       document = Oga.parse_xml(response.body)
       @properties = Iibee::ExecutionGroup::Properties.new(document)
     end
     
     def self.all(options: {})      
       egs = []
-      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
-      response = Faraday.get("#{url}/#{CONTEXT_PATH}/")
+      response = Iibee::Connection.new(options: options).get(CONTEXT_PATH)
       document = Oga.parse_xml(response.body)
       document.xpath('executionGroups/executionGroup').each do |eg|
         egs << new(eg, options)  
@@ -52,9 +49,8 @@ module Iibee
     
     def self.where(name: nil, options: {})
       egs = []
-      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
       unless name.nil?
-        response = Faraday.get("#{url}/#{CONTEXT_PATH}/#{name}")
+        response = Iibee::Connection.new(options: options).get("#{CONTEXT_PATH}/#{name}")
         document = Oga.parse_xml(response.body)
         document.xpath("//executionGroup[@name='#{name}']").each do |eg|
           egs << new(eg, options)  

data/lib/iibee/service.rb

@@ -1,4 +1,3 @@
-require 'faraday'
 require 'oga'
 
 module Iibee
@@ -33,8 +32,7 @@ module Iibee
     end
     
     def properties
-      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
-      response = Faraday.get("#{url}/#{self.propertiesUri}")
+      response = Iibee::Connection.new(options: options).get("#{self.propertiesUri}")
       document = Oga.parse_xml(response.body)
       @properties = Iibee::Service::Properties.new(document)
     end
@@ -45,8 +43,6 @@ module Iibee
     
     def self.where(executionGroupName: nil, name: nil, options: {}) 
       services = []
-
-      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
       
       unless executionGroupName.nil?
         service_url = "/#{CONTEXT_PATH}/#{executionGroupName}/?depth=2"
@@ -54,7 +50,7 @@ module Iibee
         service_url = "/#{CONTEXT_PATH}/?depth=3"
       end
       
-      response = Faraday.get(url+service_url)
+      response = Iibee::Connection.new(options: options).get(service_url)
       document = Oga.parse_xml(response.body)
       
       document.xpath("//service[@name='#{name}']").each do |service|

data/lib/iibee/version.rb

@@ -1,3 +1,3 @@
 module Iibee
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/lib/iibee.rb

@@ -1,5 +1,6 @@
 require "iibee/version"
 require "iibee/configuration"
+require "iibee/connection"
 require "iibee/broker"
 require "iibee/execution_group"
 require "iibee/service"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iibee
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - akil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +171,7 @@ files:
 - lib/iibee/application.rb
 - lib/iibee/broker.rb
 - lib/iibee/configuration.rb
+- lib/iibee/connection.rb
 - lib/iibee/execution_group.rb
 - lib/iibee/service.rb
 - lib/iibee/version.rb
@@ -166,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Gem to wrap the IIB 9 REST API.