iibee 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0079f49da198c801a90b7bd74eec535e47e54734
-  data.tar.gz: 363dd5ad483d62664fc9a55c03d541ef0fa1c6b9
+  metadata.gz: 37bb18add83a131954da1c7cf1fc3c75ee271784
+  data.tar.gz: 536731c43a4bbefdb59ab8b281da6be772555f4c
 SHA512:
-  metadata.gz: 3058871b52f739edb857dfe2181986c3930367780cd0d55846e665cd85bbeffe30da8035e603e1958d71564e128ea3e23e90facee86a75e0742a999f551b05b6
-  data.tar.gz: 8060ccc48bd62494265b9c98d634b91eb0caf2768184fd38679019ccf3bd7225190b15a54be3269cf46882b97e215a38630bcc32fa47b2f11c8f21b6c5e3629d
+  metadata.gz: 138d58ebff147bb362c1863a676122f0219b1641cd80e3d8916c3ea6313a7fefcaa72ef8f3e1d318ee42d93e229e91673491eb65d56dbe06e790a422c9200688
+  data.tar.gz: fc9578b2c869dc28e953a02b2c9094ee47cda234afffa0dbc306a7e9bb11084df1a83449a0989dec74b969d9afd29b6a6e1f924cc97fefa99db9beda1a844b73

data/lib/iibee/broker.rb

@@ -1,5 +1,6 @@
 require 'faraday'
 require 'oga'
+require 'logger'
 
 module Iibee
   class Broker
@@ -26,10 +27,11 @@ module Iibee
       
     end
     
-    def self.find(id)
-      response = Faraday.get("#{Iibee.configuration.base_url}#{CONTEXT_PATH}")
+    def self.find_by(options: {})
+      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
+      response = Faraday.get("#{url}#{CONTEXT_PATH}")
       document = Oga.parse_xml(response.body)
       new(document)
-    end    
+    end 
   end
 end

data/lib/iibee/execution_group.rb

@@ -19,41 +19,45 @@ module Iibee
     
     CONTEXT_PATH = "/apiv1/executiongroups/"
     
-    attr_reader :isRunning, :runMode, :isRestricted, :hasChildren, :uri, :propertiesUri, :uuid, :name
+    attr_reader :isRunning, :runMode, :isRestricted, :hasChildren, :uri, :propertiesUri, :uuid, :name, :options
   
-    def initialize(document)
+    def initialize(document, options)
       document.xpath('@*').each do |attribute|
         instance_variable_set("@#{attribute.name}", cast_value(attribute.name, attribute.value))
       end
+      @options = options
     end
     
     def properties
-      response = Faraday.get("#{Iibee.configuration.base_url}/#{self.propertiesUri}")
+      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
+      response = Faraday.get("#{url}/#{self.propertiesUri}")
       document = Oga.parse_xml(response.body)
       @properties = Iibee::ExecutionGroup::Properties.new(document)
     end
     
-    def self.all
+    def self.all(options: {})      
       egs = []
-      response = Faraday.get("#{Iibee.configuration.base_url}/#{CONTEXT_PATH}/")
+      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
+      response = Faraday.get("#{url}/#{CONTEXT_PATH}/")
       document = Oga.parse_xml(response.body)
       document.xpath('executionGroups/executionGroup').each do |eg|
-        egs << new(eg)  
+        egs << new(eg, options)  
       end
       return egs
     end
     
-    def self.find_by(name: nil)
-      where(name: name).first
+    def self.find_by(name: nil, options: {})
+      where(name: name, options: options).first
     end
     
-    def self.where(name: nil)
+    def self.where(name: nil, options: {})
       egs = []
+      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
       unless name.nil?
-        response = Faraday.get("#{Iibee.configuration.base_url}/#{CONTEXT_PATH}/#{name}")
+        response = Faraday.get("#{url}/#{CONTEXT_PATH}/#{name}")
         document = Oga.parse_xml(response.body)
         document.xpath("//executionGroup[@name='#{name}']").each do |eg|
-          egs << new(eg)  
+          egs << new(eg, options)  
         end
       end
       return egs

data/lib/iibee/service.rb

@@ -4,7 +4,7 @@ require 'oga'
 module Iibee
   class Service
     class Properties
-      attr_reader :label, :runMode, :uuid, :isRunning, :shortDesc, :longDesc, :processId, :traceLevel, :soapNodesUseEmbeddedListener, 
+      attr_reader :version, :label, :runMode, :uuid, :isRunning, :shortDesc, :longDesc, :processId, :traceLevel, :soapNodesUseEmbeddedListener, 
                   :compiledXPathCacheSizeEntries, :consoleMode, :httpNodesUseEmbeddedListener, :inactiveUserExitList, :activeUserExitList, 
                   :traceNodeLevel, :userTraceLevel, :modifyTime, :deployTime, :barFileName
       def initialize(document)        
@@ -19,43 +19,46 @@ module Iibee
     CONTEXT_PATH = "apiv1/executiongroups"
     
     attr_reader :type, :isRunning, :runMode, :startMode, :hasChildren, :uuid, :name, :propertiesUri, :executionGroupName
-    attr_accessor :uuid, :name
     
-    def initialize(document, executionGroupName)
+    def initialize(document, executionGroupName, options)
       document.xpath('@*').each do |attribute|        
         instance_variable_set("@#{attribute.name}", attribute.value)
       end
       @executionGroupName = executionGroupName
+      @options = options
     end
     
     def executionGroup
-      Iibee::ExecutionGroup.find_by(name: executionGroupName)
+      Iibee::ExecutionGroup.find_by(name: executionGroupName, options: @options)
     end
     
     def properties
-      response = Faraday.get("#{Iibee.configuration.base_url}/#{self.propertiesUri}")
+      url = "#{self.options[:scheme]}://#{self.options[:host]}:#{self.options[:port]}".chomp(":")
+      response = Faraday.get("#{url}/#{self.propertiesUri}")
       document = Oga.parse_xml(response.body)
       @properties = Iibee::Service::Properties.new(document)
     end
     
-    def self.find_by(executionGroupName: nil, name: nil)
-      where(executionGroupName: executionGroupName, name: name).first
+    def self.find_by(executionGroupName: nil, name: nil, options: {})
+      where(executionGroupName: executionGroupName, name: name, options: options).first
     end
     
-    def self.where(executionGroupName: nil, name: nil) 
+    def self.where(executionGroupName: nil, name: nil, options: {}) 
       services = []
+
+      url = "#{options[:scheme]}://#{options[:host]}:#{options[:port]}".chomp(":")
       
       unless executionGroupName.nil?
-        service_url = "#{Iibee.configuration.base_url}/#{CONTEXT_PATH}/#{executionGroupName}/?depth=2"
+        service_url = "/#{CONTEXT_PATH}/#{executionGroupName}/?depth=2"
       else
-        service_url = "#{Iibee.configuration.base_url}/#{CONTEXT_PATH}/?depth=3"
+        service_url = "/#{CONTEXT_PATH}/?depth=3"
       end
       
-      response = Faraday.get(service_url)
+      response = Faraday.get(url+service_url)
       document = Oga.parse_xml(response.body)
-
+      
       document.xpath("//service[@name='#{name}']").each do |service|
-        services << new(service, document.at_xpath("//executionGroup[services/service/@uuid = '#{service.get('uuid')}']").get('name'))
+        services << new(service, document.at_xpath("//executionGroup[services/service/@uuid = '#{service.get('uuid')}']").get('name'), options)
       end
       
       return services

data/lib/iibee/version.rb

@@ -1,3 +1,3 @@
 module Iibee
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/lib/iibee.rb

@@ -6,15 +6,5 @@ require "iibee/service"
 require "iibee/application"
 
 module Iibee
-  class << self
-    attr_writer :configuration
-  end
-  
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
 
-  def self.configure
-    yield(configuration)
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iibee
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - akil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler