Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,47 @@ PATH
remote: .
specs:
metabase (0.5.0)
faraday (~> 2.0)
faraday (~> 2.14, >= 2.14.2)
json (>= 2.19.2)

GEM
remote: https://rubygems.org/
specs:
addressable (2.8.8)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
amazing_print (1.2.2)
ast (2.4.1)
base64 (0.3.0)
bigdecimal (3.3.1)
bump (0.10.0)
coderay (1.1.3)
crack (0.4.5)
rexml
diff-lcs (1.6.2)
docile (1.3.5)
faraday (2.12.2)
faraday (2.14.3)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-net_http (3.4.0)
net-http (>= 0.5.0)
faraday-net_http (3.4.4)
net-http (~> 0.5)
hashdiff (1.0.1)
io-console (0.8.2)
json (2.18.0)
logger (1.6.6)
json (2.19.9)
logger (1.7.0)
method_source (1.1.0)
net-http (0.6.0)
uri
net-http (0.9.1)
uri (>= 0.11.1)
ostruct (0.6.1)
parallel (1.20.1)
parser (3.0.0.0)
ast (~> 2.4.1)
pry (0.16.0)
coderay (~> 1.1)
method_source (~> 1.0)
reline (>= 0.6.0)
public_suffix (7.0.0)
public_suffix (7.0.5)
racc (1.8.1)
rainbow (3.0.0)
rake (13.0.3)
regexp_parser (2.0.3)
Expand Down Expand Up @@ -82,24 +87,28 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
yard (0.9.38)
yard (0.9.44)

PLATFORMS
ruby

DEPENDENCIES
amazing_print
base64
bigdecimal
bump
bundler
metabase!
ostruct
pry
racc
rake
rspec
rubocop
simplecov
vcr
webmock
yard
yard (>= 0.9.42)

BUNDLED WITH
2.2.5
22 changes: 16 additions & 6 deletions lib/metabase/connection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,12 @@ def head(path, **params)
private

def request(method, path, params)
headers = params.delete(:headers)
query_params = params.delete(:query_params) || {}
query_params[:format_rows] = params.delete(:format_rows)
headers = request_headers(params)
query_params = request_query_params(params)

response = connection.public_send(method, path, params) do |request|
request.headers['X-Metabase-Session'] = @token if @token
headers&.each_pair { |k, v| request.headers[k] = v }
request.params = query_params.compact
request.headers.update(headers)
request.params.update(query_params)
end

error = Error.from_response(response)
Expand All @@ -44,6 +42,18 @@ def request(method, path, params)
response.body
end

def request_headers(params)
headers = { 'X-Metabase-Session' => @token }.compact
headers.update(params.delete(:headers) || {})
end

def request_query_params(params)
query_params = params.delete(:query_params) || {}
format_rows = params.delete(:format_rows)
query_params[:format_rows] = format_rows if format_rows
query_params.compact
end

def connection
@connection ||= Faraday.new(url: @url) do |c|
c.request :json
Expand Down
9 changes: 7 additions & 2 deletions metabase.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,22 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = '>= 3.2'

spec.add_runtime_dependency 'faraday', '~> 2.0'
spec.add_runtime_dependency 'faraday', '~> 2.14', '>= 2.14.2'
spec.add_runtime_dependency 'json', '>= 2.19.2'

spec.add_development_dependency 'amazing_print'
spec.add_development_dependency 'base64'
spec.add_development_dependency 'bigdecimal'
spec.add_development_dependency 'bump'
spec.add_development_dependency 'bundler'
spec.add_development_dependency 'ostruct'
spec.add_development_dependency 'pry'
spec.add_development_dependency 'racc'
spec.add_development_dependency 'rake'
spec.add_development_dependency 'rspec'
spec.add_development_dependency 'rubocop'
spec.add_development_dependency 'simplecov'
spec.add_development_dependency 'vcr'
spec.add_development_dependency 'webmock'
spec.add_development_dependency 'yard'
spec.add_development_dependency 'yard', '>= 0.9.42'
end