onvo 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b6d8e21eeb8b789268037b845f6367d3656d946227eeb6a35ab154c83097101
-  data.tar.gz: 4dfc38a574f7b6bc400eed20143931916c272079ea67addcb55962196fe3e14b
+  metadata.gz: f68b68906f415004096ec475af32a63191275e289a253e0f1f271dc76c8386f1
+  data.tar.gz: 1f5924af7a1e67a41f4e2e086b402174d149a502d40db34539236df31389e7ea
 SHA512:
-  metadata.gz: 8abda6dad71665de1e45fe006cd7d906423d289b6dec8ef271e1601b828c0cb8afe1eb221e12b98e313a367cce1d708f1ce9777ec52b3b3b0c459f99f1981698
-  data.tar.gz: 41e3cc18f0f2a071a74f9a09c1df19b8207acad43ea29eba8d7351271825186dcc80d92d122a734d90c7a548b4fd3d15f6d760dc98b9681562d84ba0b80d71c8
+  metadata.gz: 4f90ad508dc19bd6f35da7b17dccbebe619b453339baf361d1e61a4228241008e1787c88c798c0d89f91838c760df3f83d31cf200a752ca71c7ee826e3de5de8
+  data.tar.gz: 0a02aabe44d284b69c3709d8d52d90528fe3aec8a41e9ce3ada8e562f463f69cb7fb1db09c84694b5288f45cccbe0561cd41eff3d44ee45e5e3bdcbe653c3b0d

data/lib/onvo/automations.rb

@@ -17,10 +17,10 @@ class Automations < Resource
   end
 
   def update(id, body)
-    base_post("/automations/#{id}", body)
+    base_post("/automations/#{id}", body: body)
   end
 
   def create(body)
-    base_put('/automations', body)
+    base_put('/automations', body: body)
   end
 end

data/lib/onvo/dashboard/datasources.rb

@@ -10,7 +10,7 @@ class DashboardDatasources < DashboardResource
   end
 
   def link(datasource_id)
-    base_put("/dashboards/#{@dashboard_id}/datasources", datasourceId: datasource_id) #TODO: check if not "datasourceId"
+    base_put("/dashboards/#{@dashboard_id}/datasources", body: { datasourceId: datasource_id })
   end
 
   def unlink(datasource_id)

data/lib/onvo/dashboard.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require_relative './dashboard/datasources'
-require_relative './dashboard/widgets'
-require_relative './dashboard/questions'
-require_relative './dashboard/sessions'
 
 # The Dashboard API
 class Dashboard
@@ -13,8 +10,5 @@ class Dashboard
     params = [dashboard_id, endpoint, api_key]
 
     @datasources = DashboardDatasources.new(*params)
-    @widgets = DashboardWidgets.new(*params)
-    @questions = DashboardQuestions.new(*params)
-    @sessions = DashboardSessions.new(*params)
   end
 end

data/lib/onvo/dashboards.rb

@@ -17,10 +17,10 @@ class Dashboards < Resource
   end
 
   def update(id, body)
-    base_post("/dashboards/#{id}", body)
+    base_post("/dashboards/#{id}", body: body)
   end
 
   def create(body)
-    base_put('/dashboards', body)
+    base_put('/dashboards', body: body)
   end
 end

data/lib/onvo/datasources.rb

@@ -25,10 +25,10 @@ class Datasources < Resource
   end
 
   def update(id, body)
-    base_post("/datasources/#{id}", body)
+    base_post("/datasources/#{id}", body: body)
   end
 
   def create(body)
-    base_put('/datasources', body)
+    base_put('/datasources', body: body)
   end
 end

data/lib/onvo/embed_users.rb

@@ -16,16 +16,8 @@ class EmbedUsers < Resource
     base_delete("/embed-users/#{id}")
   end
 
-  def upsert(id, name, email, metadata = {})
-    base_post(
-      '/embed-users',
-      {
-        'id': id,
-        'name': name,
-        'email': email,
-        'metadata': metadata
-      }
-    )
+  def upsert(body)
+    base_post('/embed-users', body: body)
   end
 
   def get_access_token(id)

data/lib/onvo/questions.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'uri'
+require_relative '../resource'
+
+# Dashboard Question endpoints
+class Questions < Resource
+  def list(dashboard_id)
+    base_get('/questions', query: { dashboard: dashboard_id })
+  end
+
+  def create(dashboard_id, query)
+    base_put('/questions', query: { query: query }, body: { dashboard: dashboard_id })
+  end
+
+  def delete(id)
+    base_delete("/questions/#{id}")
+  end
+end

data/lib/onvo/sessions.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative '../resource'
+
+# Dashboard session endpoints
+class Sessions < Resource
+  def list(dashboard_id)
+    base_get('/sessions', query: { dashboard: dashboard_id })
+  end
+
+  def delete(dashboard_id)
+    base_delete('/sessions', query: { dashboard: dashboard_id })
+  end
+
+  def upsert(dashboard_id, user_id)
+    session_data = base_post(
+      '/sessions',
+      body: { dashboard: dashboard_id, user: user_id }
+    )
+    session_data.merge({ 'url': "#{@endpoint}#{session_data['url']}" })
+  end
+end

data/lib/onvo/widgets.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative '../resource'
+
+# Dashboard Widget endpoints
+class Widgets < Resource
+  def list(dashboard_id)
+    base_get('/widgets', query: { dashboard: dashboard_id })
+  end
+
+  def get(widget_id)
+    base_get("/widgets/#{widget_id}")
+  end
+
+  def get_image(widget_id)
+    base_get("/widgets/#{widget_id}/image")
+  end
+
+  def delete(widget_id)
+    base_delete("/widgets/#{widget_id}")
+  end
+
+  def update(widget_id, body)
+    base_post("/widgets/#{widget_id}", body: body)
+  end
+
+  def create(dashboard_id, query)
+    base_put('/widgets', query: { query: query }, body: { dashboard: dashboard_id })
+  end
+end

data/lib/onvo.rb

@@ -6,12 +6,15 @@ require_relative './onvo/embed_users'
 require_relative './onvo/datasources'
 require_relative './onvo/automations'
 require_relative './onvo/dashboards'
+require_relative './onvo/questions'
+require_relative './onvo/sessions'
+require_relative './onvo/widgets'
 
 require_relative './onvo/dashboard'
 
 # The Onvo Ruby SDK
 class Onvo
-  attr_reader :accounts, :teams, :embed_users, :datasources, :automations, :dashboards
+  attr_reader :accounts, :teams, :embed_users, :datasources, :automations, :dashboards, :questions, :sessions, :widgets
   attr_accessor :endpoint, :api_key
 
   def initialize(endpoint = ENV['ONVO_API_ENDPOINT'], api_key = ENV['ONVO_API_KEY'])
@@ -23,8 +26,11 @@ class Onvo
     @teams = Teams.new(*params)
     @embed_users = EmbedUsers.new(*params)
     @datasources = Datasources.new(*params)
-    @automations = Automations.new(*params)
     @dashboards = Dashboards.new(*params)
+    @automations = Automations.new(*params)
+    @questions = Questions.new(*params)
+    @sessions = Sessions.new(*params)
+    @widgets = Widgets.new(*params)
   end
 
   def dashboard(dashboard_id)

data/lib/resource.rb

@@ -31,21 +31,26 @@ class Resource
     response.body
   end
 
-  def base_get(subdirectory)
-    base_request { self.class.get(subdirectory, options) }
+  def merge_options(extra_options)
+    filtered_extras = {}
+    filtered_extras[:query] = extra_options[:query] if extra_options.key? :query
+    filtered_extras[:body] = extra_options[:body].to_json if extra_options.key? :body
+    options.merge(filtered_extras)
   end
 
-  def base_put(subdirectory, body = nil)
-    params = body ? options.merge({ body: body.to_json }) : options
-    base_request { self.class.put(subdirectory, params) }
+  def base_get(subdirectory, **extra_options)
+    base_request { self.class.get(subdirectory, **merge_options(extra_options)) }
   end
 
-  def base_post(subdirectory, body = nil)
-    params = body ? options.merge({ body: body.to_json }) : options
-    base_request { self.class.post(subdirectory, params) }
+  def base_put(subdirectory, **extra_options)
+    base_request { self.class.put(subdirectory, **merge_options(extra_options)) }
   end
 
-  def base_delete(subdirectory)
-    base_request { self.class.delete(subdirectory, options) }
+  def base_post(subdirectory, **extra_options)
+    base_request { self.class.post(subdirectory, **merge_options(extra_options)) }
+  end
+
+  def base_delete(subdirectory, **extra_options)
+    base_request { self.class.delete(subdirectory, **merge_options(extra_options)) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onvo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Bryan Davis
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -25,20 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.7
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: minitest-hooks
   requirement: !ruby/object:Gem::Requirement
@@ -81,13 +67,13 @@ files:
 - lib/onvo/dashboard.rb
 - lib/onvo/dashboard/dashboard_resource.rb
 - lib/onvo/dashboard/datasources.rb
-- lib/onvo/dashboard/questions.rb
-- lib/onvo/dashboard/sessions.rb
-- lib/onvo/dashboard/widgets.rb
 - lib/onvo/dashboards.rb
 - lib/onvo/datasources.rb
 - lib/onvo/embed_users.rb
+- lib/onvo/questions.rb
+- lib/onvo/sessions.rb
 - lib/onvo/teams.rb
+- lib/onvo/widgets.rb
 - lib/resource.rb
 homepage:
 licenses: []
@@ -96,7 +82,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- lib/onvo
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/onvo/dashboard/questions.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'uri'
-require_relative './dashboard_resource'
-
-# Dashboard Question endpoints
-class DashboardQuestions < DashboardResource
-  def list
-    base_get("/dashboards/#{@dashboard_id}/questions")
-  end
-
-  # TODO: ask?
-  def create(query)
-    processed_query = URI.encode_www_form_component(query)
-    base_put("/dashboards/#{@dashboard_id}/questions?query=#{processed_query}")
-  end
-end

data/lib/onvo/dashboard/sessions.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require_relative './dashboard_resource'
-
-# Dashboard session endpoints
-class DashboardSessions < DashboardResource
-  def list
-    base_get("/dashboards/#{@dashboard_id}/sessions")
-  end
-
-  # TODO: check if rename to delete_all
-  def delete
-    base_delete("/dashboards/#{@dashboard_id}/sessions")
-  end
-
-  def upsert(user_id, parameters = {})
-    session_data = base_post(
-      "/dashboards/#{@dashboard_id}/sessions",
-      user: user_id,
-      parameters: parameters
-    )
-    session_data.merge({ 'url': "#{@endpoint}#{session_data['url']}" })
-  end
-end

data/lib/onvo/dashboard/widgets.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'uri'
-require_relative './dashboard_resource'
-
-# Dashboard Widget endpoints
-class DashboardWidgets < DashboardResource
-  def list
-    base_get("/dashboards/#{@dashboard_id}/widgets")
-  end
-
-  def get(widget_id)
-    base_get("/dashboards/#{@dashboard_id}/widgets/#{widget_id}")
-  end
-
-  def delete(widget_id)
-    base_delete("/dashboards/#{@dashboard_id}/widgets/#{widget_id}")
-  end
-
-  def update(widget_id, body)
-    base_post("/dashboards/#{@dashboard_id}/widgets/#{widget_id}", body)
-  end
-
-  def create(query)
-    processed_query = URI.encode_www_form_component(query)
-    base_put("/dashboards/#{@dashboard_id}/widgets?query=#{processed_query}")
-  end
-end