nifi_sdk_ruby 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d01124b4fdb133022e3b6a135054b882354a056
-  data.tar.gz: f3f2f366976dec99ee29adc7000ffa1c65457efc
+  metadata.gz: 3500e4f44bfedf365cf70e160f8dd1ff164778be
+  data.tar.gz: f08829cc3bb7c22621252e480bd13c4c6dbdea2f
 SHA512:
-  metadata.gz: 03517b738ecadf80fcbfb881631ab62db5483850fb8fba857ec0a75dab17dc7ff9913b257d2ebadaf0985484ef4bd3ba33d5905b7e03678d7d4043a448ed2144
-  data.tar.gz: 1146908cdbfb9a7c7f44f6fc4fa2defabaffdb95c7b977b9d8cd9357b82bc9eefbde78c0c54ec2f3b628b7cf371cb1ae13107e7073e947633d2b6fd76866c6c3
+  metadata.gz: 1b01108a556dbf05f93c47453f9a42f0a66906ad6d70d8f5d93ff200d067470b0a9c87ac7e6a99ca6d573ea6c88080052fe56e0a63d74e68900be3a3fbc32d43
+  data.tar.gz: a989e64241f6b6732bcb7bf2bc9a7b793eec5eea87f3602024c28d53a810fd53b9acf7a82c645cf0723f3799285c1517ae66ff3d1d072cf8f5ce8dc750f8cd55

data/lib/nifi_sdk_ruby.rb

@@ -14,7 +14,7 @@ class Nifi
 
   DEFAULT_HOST   = 'localhost'
   DEFAULT_SCHEMA = 'http'
-  DEFAULT_PORT   = '8080'
+  DEFAULT_PORT   = 8080
   DEFAULT_DEBUG  = false
   DEFAULT_ACYNC  = false
 
@@ -28,20 +28,26 @@ class Nifi
   @@sdk_name
   @@sdk_version
   @@client_id
+  @@cert
+  @@cert_key
+  @@cert_password
 
   def initialize(*args)
 
     args = args.reduce Hash.new, :merge
 
-    @@schema      = args[:schema] ? args[:schema] : DEFAULT_SCHEMA
-    @@host        = args[:host] ? args[:host] : DEFAULT_HOST
-    @@port        = args[:port] ? args[:port] : DEFAULT_PORT
-    @@base_url    = @@schema + '://' + @@host + ':' + @@port + '/nifi-api'
-    @@debug       = DEFAULT_DEBUG
-    @@async       = DEFAULT_ACYNC
-    @@sdk_name    = 'ruby'
-    @@sdk_version = NifiSdkRuby::VERSION
-    @@client_id   = SecureRandom.uuid
+    @@schema        = args[:schema] ? args[:schema] : DEFAULT_SCHEMA
+    @@host          = args[:host] ? args[:host] : DEFAULT_HOST
+    @@port          = args[:port] ? args[:port] : DEFAULT_PORT
+    @@base_url      = @@schema + '://' + @@host + ':' + @@port.to_s + '/nifi-api'
+    @@debug         = DEFAULT_DEBUG
+    @@async         = DEFAULT_ACYNC
+    @@sdk_name      = 'ruby'
+    @@sdk_version   = NifiSdkRuby::VERSION
+    @@client_id     = SecureRandom.uuid
+    @@cert          = args[:cert] ? args[:cert] : nil
+    @@cert_key      = args[:cert_key] ? args[:cert_key] : nil
+    @@cert_password = args[:cert_password] ? args[:cert_key] : nil
   end
 
   def set_debug(debug = nil)
@@ -167,17 +173,17 @@ class Nifi
     version = args[:version].to_s
 
     params = {
-        revision:{
-            version: version
-        },
+      revision:{
+        version: version
+      },
+      id: id,
+      component:{
         id: id,
-        component:{
-            id: id,
-            state: 'RUNNING'
-        },
-        status:{
-            runStatus: 'Running'
-        }
+        state: 'RUNNING'
+      },
+      status:{
+        runStatus: 'Running'
+      }
     }
     update_process(id: id, update_json: params)
   end
@@ -192,17 +198,17 @@ class Nifi
     version = args[:version].to_s
 
     params = {
-        revision:{
-            version: version
-        },
+      revision:{
+        version: version
+      },
+      id: id,
+      component:{
         id: id,
-        component:{
-            id: id,
-            state: 'STOPPED'
-        },
-        status:{
-            runStatus: 'Stopped'
-        }
+        state: 'STOPPED'
+      },
+      status:{
+        runStatus: 'Stopped'
+      }
     }
     update_process(id: id, update_json: params)
   end
@@ -300,7 +306,8 @@ class Nifi
     name = t.xpath('//template/name').text
 
     if self.template_by_name? name
-      raise StandardError.new('The template ' << name << ' already exists')
+      self.delete_template self.get_template_by_name name
+      #raise StandardError.new('The template ' << name << ' already exists')
     end
 
     params = Array.new
@@ -333,12 +340,12 @@ class Nifi
     res = self.class.exists
 
     t = res.select do |r|
-      r['name'] == name and r['identifier'] =~ /templates/
+      r['name'] == name and r['identifier'] =~ /^\/templates\//
     end
 
 
     if t.count == 1
-      t[0]['identifier'].scan(/\/templates\/(.*)/)
+      t[0]['identifier'].scan(/\/templates\/(.*)/)[0][0]
     else
       raise StandardError.new('Unable to locate template with name ' << name)
     end
@@ -398,6 +405,18 @@ class Nifi
     c.headers['NIFI-SDK-Name']    = @@sdk_name
     c.headers['NIFI-SDK-Version'] = @@sdk_version
     c.ssl_verify_peer             = false
+    c.ssl_verify_host             = false
+
+    if @@schema == 'https' and @@cert
+      c.cert  = @@cert
+    end
+    if @@schema == 'https' and @@cert_key
+      c.cert_key = @@cert_key
+    end
+    if @@schema == 'https' and @@cert_password
+      c.certpassword = @@cert_password
+    end
+
     #c.verbose                     = true
 
     case method
@@ -431,4 +450,4 @@ class Nifi
       puts c.body_str
     end
   end
-end
+end

data/lib/nifi_sdk_ruby/version.rb

@@ -1,3 +1,3 @@
 module NifiSdkRuby
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nifi_sdk_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Israel Calvete
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A RUBY SDK to use APACHE NIFI API