predicsis_ml_sdk 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46b0503a05a9c9bdc88f0e055fcf0b7698a85fd9
-  data.tar.gz: 2f0e48e57495268e84c215b5132245e7f9a5fc69
+  metadata.gz: 17f846220b672f48e9612199c0f4da13f79768a5
+  data.tar.gz: dd14f5bff6022e47bef01ad7dbba98d2ffb3543a
 SHA512:
-  metadata.gz: fcbaa1915aa80607fc4fc0e2d91ae10c3a8c5512d45aca5c5815c1eacb14416624f50c74b5f6c40ad2edf24e3e807d03b4f51a38415334231da72e910d83f9fc
-  data.tar.gz: e2937ae8066601f23cbacaf2994063ec9cf90172845f798db8f23c47036c9c3a0047760bd8e00e17066c589c4d9cbe25521722da8aabbbb0304655487017b5d8
+  metadata.gz: e2136fff6abb55704bff9173e12190bada270ca390657d5b3e1f66263ea4a1472dade520ff9e314eef8f51642aebda15e66d7d540590273b31a4ec87576fc030
+  data.tar.gz: 9a352eb14f112160a19af5e5f460fb589a5a4d0b6ecaeb9a360653a60f21b9a038bd29a002f1658b2d8a1cee3095ca4a07210e95a8b8316d121c9cf10ce17a75

data/lib/predicsis_ml_sdk/access_token.rb

@@ -1,13 +1,17 @@
 module PredicsisMlSdk
   class AccessToken
     include Util
+
     attr_accessor :id
 
-    def self.create(params = {}, token = nil)
-      new(nil, token).create(params)
+    def self.create(params = {}, token = bearer_token)
+      data = Requests.post_token(token, params)
+      new(data['id'], token).tap do |access_token|
+        access_token.define_attributes(data)
+      end
     end
 
-    def self.all(token = nil)
+    def self.all(token = bearer_token)
       data = Requests.get_tokens(token)
       data.each_with_object([]) do |e, a|
         a << new(e['id'], token).tap do |resource|
@@ -16,33 +20,27 @@ module PredicsisMlSdk
       end
     end
 
-    def self.get(id, token = nil)
+    def self.get(id, token = bearer_token)
       new(id, token).get
     end
 
-    def self.delete(id, token = nil)
+    def self.delete(id, token = bearer_token)
       new(id, token).delete
     end
 
-    def initialize(id = nil, token = nil)
+    def initialize(id, token = bearer_token)
       @token = token
       @id = id
     end
 
-    def create(params = {})
-      data = Requests.post_token(@token, params)
-      define_attributes(data)
-      self
-    end
-
     def get
-      data = Requests.get_token(@token, @id)
+      data = Requests.get_token(token, id)
       define_attributes(data)
       self
     end
 
     def delete
-      Requests.delete_token(@token, @id)
+      Requests.delete_token(token, id)
       self
     end
   end

data/lib/predicsis_ml_sdk/configuration.rb

@@ -1,6 +1,7 @@
 class PredicsisMlSdk::Configuration
   attr_accessor :logger
   attr_accessor :predicsis_api_host
+  attr_accessor :bearer_token
 
   def initialize
     @logger = Logger.new(STDOUT)

data/lib/predicsis_ml_sdk/credentials.rb

@@ -2,16 +2,16 @@ module PredicsisMlSdk
   class Credentials
     include Util
 
-    def self.get(type = 's3', token = nil)
+    def self.get(type = 's3', token = bearer_token)
       new(token).get(type)
     end
 
-    def initialize(token = nil)
+    def initialize(token = bearer_token)
       @token = token
     end
 
     def get(type = 's3')
-      data = Requests.get_credentials(type, @token)
+      data = Requests.get_credentials(type, token)
       define_attributes(data)
       self
     end

data/lib/predicsis_ml_sdk/data_file.rb

@@ -1,6 +1,7 @@
 module PredicsisMlSdk
   class DataFile
     include Util
+
     attr_accessor :id
 
     def self.upload(params = {})
@@ -8,27 +9,27 @@ module PredicsisMlSdk
       Requests.upload(params)
     end
 
-    def self.get(id, token = nil)
+    def self.get(id, token = bearer_token)
       new(id, token).get
     end
 
-    def self.get_signed_url(id, token = nil)
+    def self.get_signed_url(id, token = bearer_token)
       new(id, token).get_signed_url
     end
 
-    def initialize(id = nil, token = nil)
+    def initialize(id, token = bearer_token)
       @token = token
       @id = id
     end
 
     def get
-      data = Requests.get_data_file(@token, @id)
+      data = Requests.get_data_file(token, id)
       define_attributes(data)
       self
     end
 
     def get_signed_url
-      data = Requests.get_signed_url(@token, @id)
+      data = Requests.get_signed_url(token, id)
       define_attributes(data)
       self
     end

data/lib/predicsis_ml_sdk/dataset.rb

@@ -5,11 +5,14 @@ module PredicsisMlSdk
 
     attr_accessor :id
 
-    def self.create(params = {}, token = nil)
-      new(nil, token).create(params)
+    def self.create(params = {}, token = bearer_token)
+      data = Requests.post_dataset(token, params)
+      new(data['id'], token).tap do |dataset|
+        dataset.define_attributes(data)
+      end
     end
 
-    def self.all(token = nil)
+    def self.all(token = bearer_token)
       data = Requests.get_datasets(token)
       data.each_with_object([]) do |e, a|
         a << new(e['id'], token).tap do |resource|
@@ -18,43 +21,37 @@ module PredicsisMlSdk
       end
     end
 
-    def self.get(id, token = nil)
+    def self.get(id, token = bearer_token)
       new(id, token).get
     end
 
-    def self.update(id, params = {}, token = nil)
+    def self.update(id, params = {}, token = bearer_token)
       new(id, token).update(params)
     end
 
-    def self.delete(id, token = nil)
+    def self.delete(id, token = bearer_token)
       new(id, token).delete
     end
 
-    def initialize(id = nil, token = nil)
+    def initialize(id, token = bearer_token)
       @token = token
       @id = id
     end
 
-    def create(params = {})
-      data = Requests.post_dataset(@token, params)
-      define_attributes(data)
-      self
-    end
-
     def get
-      data = Requests.get_dataset(@token, @id)
+      data = Requests.get_dataset(token, id)
       define_attributes(data)
       self
     end
 
     def update(params = {})
-      data = Requests.patch_dataset(@token, @id, params)
+      data = Requests.patch_dataset(token, id, params)
       define_attributes(data)
       self
     end
 
     def delete
-      Requests.delete_dataset(@token, @id)
+      Requests.delete_dataset(token, id)
       self
     end
   end

data/lib/predicsis_ml_sdk/dictionary.rb

@@ -5,11 +5,14 @@ module PredicsisMlSdk
 
     attr_accessor :id
 
-    def self.create(params = {}, token = nil)
-      new(nil, token).create(params)
+    def self.create(params = {}, token = bearer_token)
+      data = Requests.post_dictionary(token, params)
+      new(data['id'], token).tap do |dictionary|
+        dictionary.define_attributes(data)
+      end
     end
 
-    def self.all(token = nil)
+    def self.all(token = bearer_token)
       data = Requests.get_dictionaries(token)
       data.each_with_object([]) do |e, a|
         a << new(e['id'], token).tap do |resource|
@@ -18,48 +21,42 @@ module PredicsisMlSdk
       end
     end
 
-    def self.get(id, token = nil)
+    def self.get(id, token = bearer_token)
       new(id, token).get
     end
 
-    def self.update(id, params = {}, token = nil)
+    def self.update(id, params = {}, token = bearer_token)
       new(id, token).update(params)
     end
 
-    def self.delete(id, token = nil)
+    def self.delete(id, token = bearer_token)
       new(id, token).delete
     end
 
-    def initialize(id = nil, token = nil)
+    def initialize(id, token = bearer_token)
       @token = token
       @id = id
     end
 
-    def create(params = {})
-      data = Requests.post_dictionary(@token, params)
-      define_attributes(data)
-      self
-    end
-
     def get
-      data = Requests.get_dictionary(@token, @id)
+      data = Requests.get_dictionary(token, id)
       define_attributes(data)
       self
     end
 
     def update(params = {})
-      data = Requests.patch_dictionary(@token, @id, params)
+      data = Requests.patch_dictionary(token, id, params)
       define_attributes(data)
       self
     end
 
     def delete
-      Requests.delete_dictionary(@token, @id)
+      Requests.delete_dictionary(token, id)
       self
     end
 
     def variables
-      Variable.all(@id, @token)
+      Variable.all(id, token)
     end
   end
 end

data/lib/predicsis_ml_sdk/job.rb

@@ -7,11 +7,11 @@ module PredicsisMlSdk
 
     attr_accessor :id
 
-    def self.get(id, token = nil)
+    def self.get(id, token = bearer_token)
       new(id, token).get
     end
 
-    def self.all(token = nil)
+    def self.all(token = bearer_token)
       data = Requests.get_jobs(token)
       data.each_with_object([]) do |e, a|
         a << new(e['id'], token).tap do |resource|
@@ -20,32 +20,32 @@ module PredicsisMlSdk
       end
     end
 
-    def initialize(id, token = nil)
+    def initialize(id, token = bearer_token)
       @token = token
       @id = id
     end
 
     def get
-      data = Requests.get_job(@token, @id)
+      data = Requests.get_job(token, id)
       define_attributes(data)
       self
     end
 
     def delete
-      Requests.delete_job(@token, @id)
+      Requests.delete_job(token, id)
       self
     end
 
     def succeeded?
-      self.status.eql? 'completed'
+      status.eql? 'completed'
     end
 
     def failed?
-      self.status.eql? 'failed'
+      status.eql? 'failed'
     end
 
     def pending?
-      %w(pending processing).include? self.status
+      %w(pending processing).include? status
     end
   end
 end

data/lib/predicsis_ml_sdk/modalities_set.rb

@@ -5,11 +5,14 @@ module PredicsisMlSdk
 
     attr_accessor :id
 
-    def self.create(params = {}, token = nil)
-      new(nil, token).create(params)
+    def self.create(params = {}, token = bearer_token)
+      data = Requests.post_modalities_set(token, params)
+      new(data['id'], token).tap do |modalities_set|
+        modalities_set.define_attributes(data)
+      end
     end
 
-    def self.all(token = nil)
+    def self.all(token = bearer_token)
       data = Requests.get_modalities_sets(token)
       data.each_with_object([]) do |e, a|
         a << new(e['id'], token).tap do |resource|
@@ -18,43 +21,37 @@ module PredicsisMlSdk
       end
     end
 
-    def self.get(id, token = nil)
+    def self.get(id, token = bearer_token)
       new(id, token).get
     end
 
-    def self.update(id, params = {}, token = nil)
+    def self.update(id, params = {}, token = bearer_token)
       new(id, token).update(params)
     end
 
-    def self.delete(id, token = nil)
+    def self.delete(id, token = bearer_token)
       new(id, token).delete
     end
 
-    def initialize(id = nil, token = nil)
+    def initialize(id, token = bearer_token)
       @id = id
       @token = token
     end
 
-    def create(params = {})
-      data = Requests.post_modalities_set(@token, params)
-      define_attributes(data)
-      self
-    end
-
     def get
-      data = Requests.get_modalities_set(@token, @id)
+      data = Requests.get_modalities_set(token, id)
       define_attributes(data)
       self
     end
 
     def update(params = {})
-      data = Requests.patch_modalities_set(@token, @id, params)
+      data = Requests.patch_modalities_set(token, id, params)
       define_attributes(data)
       self
     end
 
     def delete
-      Requests.delete_modalities_set(@token, @id)
+      Requests.delete_modalities_set(token, id)
       self
     end
   end

data/lib/predicsis_ml_sdk/model.rb

@@ -5,11 +5,14 @@ module PredicsisMlSdk
 
     attr_accessor :id
 
-    def self.create(params = {}, token = nil)
-      new(nil, token).create(params)
+    def self.create(params = {}, token = bearer_token)
+      data = Requests.post_model(token, params)
+      new(data['id'], token).tap do |model|
+        model.define_attributes(data)
+      end
     end
 
-    def self.all(token = nil)
+    def self.all(token = bearer_token)
       data = Requests.get_models(token)
       data.each_with_object([]) do |e, a|
         a << new(e['id'], token).tap do |resource|
@@ -18,43 +21,37 @@ module PredicsisMlSdk
       end
     end
 
-    def self.get(id, token = nil)
+    def self.get(id, token = bearer_token)
       new(id, token).get
     end
 
-    def self.update(id, params = {}, token = nil)
+    def self.update(id, params = {}, token = bearer_token)
       new(id, token).update(params)
     end
 
-    def self.delete(id, token = nil)
+    def self.delete(id, token = bearer_token)
       new(id, token).delete
     end
 
-    def initialize(id, token = nil)
+    def initialize(id, token = bearer_token)
       @id = id
-      @token  = token
-    end
-
-    def create(params = {})
-      data = Requests.post_model(@token, params)
-      define_attributes(data)
-      self
+      @token = token
     end
 
     def get
-      data = Requests.get_model(@token, @id)
+      data = Requests.get_model(token, @id)
       define_attributes(data)
       self
     end
 
     def update(params = {})
-      data = Requests.patch_model(@token, @id, params)
+      data = Requests.patch_model(token, id, params)
       define_attributes(data)
       self
     end
 
     def delete
-      Requests.delete_model(@token, @id)
+      Requests.delete_model(token, id)
       self
     end
   end

data/lib/predicsis_ml_sdk/preparation_rules_set.rb

@@ -5,11 +5,14 @@ module PredicsisMlSdk
 
     attr_accessor :id
 
-    def self.create(params = {}, token = nil)
-      new(nil, token).create(params)
+    def self.create(params = {}, token = bearer_token)
+      data = Requests.post_preparation_rules_set(token, params)
+      new(data['id'], token).tap do |preparation_rules_set|
+        preparation_rules_set.define_attributes(data)
+      end
     end
 
-    def self.all(token = nil)
+    def self.all(token = bearer_token)
       data = Requests.get_preparation_rules_sets(token)
       data.each_with_object([]) do |e, a|
         a << new(e['id'], token).tap do |resource|
@@ -18,43 +21,37 @@ module PredicsisMlSdk
       end
     end
 
-    def self.get(id, token = nil)
+    def self.get(id, token = bearer_token)
       new(id, token).get
     end
 
-    def self.update(id, params = {}, token = nil)
+    def self.update(id, params = {}, token = bearer_token)
       new(id, token).update(params)
     end
 
-    def self.delete(id, token = nil)
+    def self.delete(id, token = bearer_token)
       new(id, token).delete
     end
 
-    def initialize(id = nil, token = nil)
+    def initialize(id, token = bearer_token)
       @token = token
       @id = id
     end
 
-    def create(params = {})
-      data = Requests.post_preparation_rules_set(@token, params)
-      define_attributes(data)
-      self
-    end
-
     def get
-      data = Requests.get_preparation_rules_set(@token, @id)
+      data = Requests.get_preparation_rules_set(token, id)
       define_attributes(data)
       self
     end
 
     def update(params = {})
-      data = Requests.patch_preparation_rules_set(@token, @id, params)
+      data = Requests.patch_preparation_rules_set(token, id, params)
       define_attributes(data)
       self
     end
 
     def delete
-      Requests.delete_preparation_rules_set(@token, @id)
+      Requests.delete_preparation_rules_set(token, id)
       self
     end
   end

data/lib/predicsis_ml_sdk/report.rb

@@ -5,11 +5,14 @@ module PredicsisMlSdk
 
     attr_accessor :id
 
-    def self.create(params = {}, token = nil)
-      new(nil, token).create(params)
+    def self.create(params = {}, token = bearer_token)
+      data = Requests.post_report(token, params)
+      new(data['id'], token).tap do |report|
+        report.define_attributes(data)
+      end
     end
 
-    def self.all(token = nil)
+    def self.all(token = bearer_token)
       data = Requests.get_reports(token)
       data.each_with_object([]) do |e, a|
         a << Report.new(e['id'], token).tap do |resource|
@@ -18,43 +21,37 @@ module PredicsisMlSdk
       end
     end
 
-    def self.get(id, token = nil)
+    def self.get(id, token = bearer_token)
       new(id, token).get
     end
 
-    def self.update(id, params = {}, token = nil)
+    def self.update(id, params = {}, token = bearer_token)
       new(id, token).update(params)
     end
 
-    def self.delete(id, token = nil)
+    def self.delete(id, token = bearer_token)
       new(id, token).delete
     end
 
-    def initialize(id, token = nil)
+    def initialize(id, token = bearer_token)
       @token = token
       @id = id
     end
 
-    def create(params = {})
-      data = Requests.post_report(@token, params)
-      define_attributes(data)
-      self
-    end
-
     def get
-      data = Requests.get_report(@token, @id)
+      data = Requests.get_report(token, id)
       define_attributes(data)
       self
     end
 
     def update(params = {})
-      data = Requests.patch_report(@token, @id, params)
+      data = Requests.patch_report(token, id, params)
       define_attributes(data)
       self
     end
 
     def delete
-      Requests.delete_report(@token, @id)
+      Requests.delete_report(token, id)
       self
     end
   end

data/lib/predicsis_ml_sdk/source.rb

@@ -3,11 +3,14 @@ module PredicsisMlSdk
     include Util
     attr_accessor :id
 
-    def self.create(params = {}, token = nil)
-      new(nil, token).create(params)
+    def self.create(params = {}, token = bearer_token)
+      data = Requests.post_source(token, params)
+      new(data['id'], token).tap do |source|
+        source.define_attributes(data)
+      end
     end
 
-    def self.all(token = nil)
+    def self.all(token = bearer_token)
       data = Requests.get_sources(token)
       data.each_with_object([]) do |e, a|
         a << new(e['id'], token).tap do |resource|
@@ -16,42 +19,36 @@ module PredicsisMlSdk
       end
     end
 
-    def self.get(id, token = nil)
+    def self.get(id, token = bearer_token)
       new(id, token).get
     end
 
-    def self.update(id, params = {}, token = nil)
+    def self.update(id, params = {}, token = bearer_token)
       new(id, token).update(params)
     end
 
-    def self.delete(id, token = nil)
+    def self.delete(id, token = bearer_token)
       new(id, token).delete
     end
 
-    def initialize(id = nil, token = nil)
+    def initialize(id, token = bearer_token)
       @token = token
       @id = id
     end
 
-    def create(params = {})
-      data = Requests.post_source(@token, params)
-      define_attributes(data)
-      self
-    end
-
     def update(params = {})
-      data = Requests.patch_source(@token, @id, params)
+      data = Requests.patch_source(token, id, params)
       define_attributes(data)
       self
     end
 
     def delete
-      Requests.delete_source(@token, @id)
+      Requests.delete_source(token, id)
       self
     end
 
     def get
-      data = Requests.get_source(@token, @id)
+      data = Requests.get_source(token, id)
       define_attributes(data)
       self
     end

data/lib/predicsis_ml_sdk/util.rb

@@ -1,4 +1,10 @@
 module Util
+  attr_reader :token
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
   def with_captured_console
     old_stdout = $stdout
     old_stderr = $stderr
@@ -24,4 +30,14 @@ module Util
       end
     end
   end
+
+  def bearer_token
+    PredicsisMlSdk.config.bearer_token
+  end
+
+  module ClassMethods
+    def bearer_token
+      PredicsisMlSdk.config.bearer_token
+    end
+  end
 end

data/lib/predicsis_ml_sdk/variable.rb

@@ -3,15 +3,15 @@ module PredicsisMlSdk
     include Util
     attr_accessor :dictionary_id, :id
 
-    def self.get(dictionary_id, id, token = nil)
+    def self.get(dictionary_id, id, token = bearer_token)
       new(dictionary_id, id, token).get
     end
 
-    def self.update(dictionary_id, id, params = {}, token = nil)
+    def self.update(dictionary_id, id, params = {}, token = bearer_token)
       new(dictionary_id, id, token).update(params)
     end
 
-    def self.all(dictionary_id, token = nil)
+    def self.all(dictionary_id, token = bearer_token)
       data = Requests.get_variables(token, dictionary_id)
       data.each_with_object([]) do |e, a|
         a << new(dictionary_id, e['id'], token).tap do |variable|
@@ -20,20 +20,20 @@ module PredicsisMlSdk
       end
     end
 
-    def initialize(dictionary_id, id = nil, token = nil)
+    def initialize(dictionary_id, id, token = bearer_token)
       @dictionary_id = dictionary_id
       @id = id
       @token = token
     end
 
     def get
-      data = Requests.get_variable(@token, @id, @dictionary_id)
+      data = Requests.get_variable(token, id, dictionary_id)
       define_attributes(data)
       self
     end
 
     def update(params = {})
-      data = Requests.patch_variable(@token, @id, @dictionary_id, params)
+      data = Requests.patch_variable(token, id, dictionary_id, params)
       define_attributes(data)
       self
     end

data/lib/predicsis_ml_sdk/version.rb

@@ -1,3 +1,3 @@
 module PredicsisMlSdk
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicsis_ml_sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Armand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json